viewstate.rb in miketracy-wwmd-0.2.17

- old
+ new
@@ -1,120 +1,17 @@
-require 'wwmd/viewstate/viewstate_utils'
-module WWMD
-  class ViewState < ViewStateUtils
-  end
-end
 require 'rubygems'
 require 'nokogiri'
 require 'rexml/document'
 require 'htmlentities'
-require 'wwmd/mixins'
-require 'wwmd/mixins_extends'
-require 'wwmd/mixins_external'
+require 'wwmd/viewstate/viewstate_utils'
+module WWMD
+  class ViewState
+    include ViewStateUtils
+  end
+end
+require 'wwmd/class_extensions'
+require 'wwmd/viewstate/viewstate'
 require 'wwmd/viewstate/viewstate_types'
-require 'wwmd/viewstate/viewstate_class_helpers'
 require 'wwmd/viewstate/viewstate_yaml'
 require 'wwmd/viewstate/viewstate_deserializer_methods'
 require 'wwmd/viewstate/viewstate_from_xml'
-require 'wwmd/viewstate/vs_read_value'
-require 'wwmd/viewstate/vs_read_types'
-require 'wwmd/viewstate/vs_value'
-require 'wwmd/viewstate/vs_array'
-require 'wwmd/viewstate/vs_binary_serialized'
-require 'wwmd/viewstate/vs_int_enum'
-require 'wwmd/viewstate/vs_hashtable'
-require 'wwmd/viewstate/vs_hybrid_dict'
-require 'wwmd/viewstate/vs_list'
-require 'wwmd/viewstate/vs_pair'
-require 'wwmd/viewstate/vs_sparse_array'
-require 'wwmd/viewstate/vs_string'
-require 'wwmd/viewstate/vs_string_array'
-require 'wwmd/viewstate/vs_string_formatted'
-require 'wwmd/viewstate/vs_triplet'
-require 'wwmd/viewstate/vs_type'
-require 'wwmd/viewstate/vs_unit'
-require 'wwmd/viewstate/vs_indexed_string'
-require 'wwmd/viewstate/vs_indexed_string_ref'
-module WWMD
-  class ViewState
-    attr_accessor :b64
-    attr_accessor :obj_queue
-    attr_accessor :mac
-    attr_accessor :debug
-    attr_reader   :raw
-    attr_reader   :stack
-    attr_reader   :bufarr
-    attr_reader   :magic
-    attr_reader   :size
-    attr_reader   :indexed_strings
-    attr_reader   :last_offset
-    attr_reader   :xml
-
-    def initialize(b64=nil)
-      @b64 = b64
-      @raw = ""
-      @stack = ""
-      @obj_queue = []
-      @bufarr = []
-      @size = 0
-      @indexed_strings = []
-      @mac = nil
-      @debug = false
-      self.deserialize if b64
-    end
-
-    # mac_enabled?
-    def mac_enabled?
-      return !@mac.nil?
-    end
-
-    # deserialize
-    def deserialize(b64=nil)
-      @obj_queue = []
-      @b64 = b64 if b64
-      @raw = @b64.b64d
-      @bufarr = @raw.scan(/./m)
-      @size = @bufarr.size
-      raise "Invalid ViewState" if not self.magic?
-      @obj_queue << self.deserialize_value
-      if @bufarr.size == 20 then
-        @mac = bufarr.slice!(0..19).join("")
-        dlog(0x00,"MAC = #{@mac.hexify}")
-      end
-      raise "Error Parsing Viewstate (left: #{@buffarr.size})" if not @bufarr.size == 0
-      return !self.raw.nil?
-    end
-
-    def serialize(objs=nil,version=2)
-      @obj_queue = objs if objs
-      @stack << "\xFF\x01"
-      @stack << @obj_queue.first.serialize
-      @stack << @mac if @mac
-      return !self.stack.nil?
-    end
-
-    def to_xml
-      @xml = REXML::Document.new()
-      header = REXML::Element.new("ViewState")
-      header.add_attribute("version", @magic.b64e)
-      header.add_attribute("version_string", @magic.hexify)
-      header.add_element(@obj_queue.first.to_xml)
-      if self.mac_enabled?
-        max = REXML::Element.new("Mac")
-        max.add_attribute("encoding","hexify")
-        max.add_text(@mac.hexify)
-        header.add_element(max)
-      end
-      @xml.add_element(header)
-      @xml
-    end
-
-    def from_yaml(yaml)
-      @obj_queue = YAML.load(yaml)
-    end
-
-    def to_yaml
-      @obj_queue.to_yaml
-    end
-
- end
-end
+require 'wwmd/viewstate/vs_stubs'