miketracy-wwmd 0.2.16 → 0.2.17

data/lib/wwmd/viewstate/viewstate_types.rb

@@ -49,7 +49,3 @@ module WWMD
   } unless defined?(VIEWSTATE_TYPES)
 
 end
-
-if __FILE__ == $0
-  puts "size: #{WWMD::VIEWSTATE_TYPES.size}"
-end

data/lib/wwmd/viewstate/viewstate_utils.rb

@@ -1,5 +1,5 @@
 module WWMD
-  class ViewStateUtils
+  module ViewStateUtils
 
     def putd(msg)
       puts(msg) if self.debug
@@ -8,11 +8,16 @@ module WWMD
     def slog(obj,msg=nil)
       raise "No @value" if not obj.respond_to?(:value)
       raise "No @size"  if not obj.respond_to?(:size)
+      return nil if !self.debug
       putd "#{@stack.size.to_s(16).rjust(8,"0")} [0x#{obj.opcode.to_s(16)}] #{obj.class}: #{msg}"
     end
 
     def dlog(t,msg)
       raise "null token passed to dlog()" if t.nil?
+      o = WWMD::VIEWSTATE_TYPES[t]
+      @obj_counts[o] ||= 0
+      @obj_counts[o] += 1
+      return nil if !self.debug
       putd "#{self.last_offset} [0x#{t.to_s(16).rjust(2,"0")}] #{VIEWSTATE_TYPES[t]}: #{msg}"
     end
 

data/lib/wwmd/viewstate/vs_stubs.rb

@@ -0,0 +1,22 @@
+module WWMD::VSStubs; end
+require 'wwmd/viewstate/vs_stubs/vs_stub_helpers'
+require 'wwmd/viewstate/vs_stubs/vs_read_value'
+require 'wwmd/viewstate/vs_stubs/vs_read_types'
+require 'wwmd/viewstate/vs_stubs/vs_value'
+require 'wwmd/viewstate/vs_stubs/vs_array'
+require 'wwmd/viewstate/vs_stubs/vs_binary_serialized'
+require 'wwmd/viewstate/vs_stubs/vs_int_enum'
+require 'wwmd/viewstate/vs_stubs/vs_hashtable'
+require 'wwmd/viewstate/vs_stubs/vs_hybrid_dict'
+require 'wwmd/viewstate/vs_stubs/vs_list'
+require 'wwmd/viewstate/vs_stubs/vs_pair'
+require 'wwmd/viewstate/vs_stubs/vs_sparse_array'
+require 'wwmd/viewstate/vs_stubs/vs_string'
+require 'wwmd/viewstate/vs_stubs/vs_string_array'
+require 'wwmd/viewstate/vs_stubs/vs_string_formatted'
+require 'wwmd/viewstate/vs_stubs/vs_triplet'
+require 'wwmd/viewstate/vs_stubs/vs_type'
+require 'wwmd/viewstate/vs_stubs/vs_unit'
+require 'wwmd/viewstate/vs_stubs/vs_indexed_string'
+require 'wwmd/viewstate/vs_stubs/vs_indexed_string_ref'
+

data/lib/wwmd/viewstate/{vs_array.rb → vs_stubs/vs_array.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSArray < VSClassHelpers
+  class VSStubs::VSArray
+    include VSStubHelpers
+
     attr_accessor :value
     attr_reader   :typeref
     attr_reader   :typeval

data/lib/wwmd/viewstate/{vs_binary_serialized.rb → vs_stubs/vs_binary_serialized.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSBinarySerialized < VSClassHelpers
+  class VSStubs::VSBinarySerialized
+    include VSStubHelpers
+
     attr_accessor :value
 
     def initialize()

data/lib/wwmd/viewstate/{vs_hashtable.rb → vs_stubs/vs_hashtable.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSHashtable < VSClassHelpers
+  class VSStubs::VSHashtable
+    include VSStubHelpers
+
     attr_accessor :value
 
     def initialize()

data/lib/wwmd/viewstate/{vs_hybrid_dict.rb → vs_stubs/vs_hybrid_dict.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSHybridDict < VSClassHelpers
+  class VSStubs::VSHybridDict
+    include VSStubHelpers
+
     attr_accessor :value
 
     def initialize()

data/lib/wwmd/viewstate/{vs_indexed_string.rb → vs_stubs/vs_indexed_string.rb}

@@ -1,5 +1,5 @@
 module WWMD
-  class VSIndexedString < VSString
+  class VSStubs::VSIndexedString < VSStubs::VSString
     def serialize; super; end
     def to_xml; super; end
   end

data/lib/wwmd/viewstate/{vs_indexed_string_ref.rb → vs_stubs/vs_indexed_string_ref.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSIndexedStringRef < VSClassHelpers
+  class VSStubs::VSIndexedStringRef
+    include VSStubHelpers
+
     attr_reader :value
 
     def initialize(ref)

data/lib/wwmd/viewstate/{vs_int_enum.rb → vs_stubs/vs_int_enum.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSIntEnum < VSClassHelpers
+  class VSStubs::VSIntEnum
+    include VSStubHelpers
+
     attr_accessor :value
     attr_reader   :typeref
     attr_reader   :typeval

data/lib/wwmd/viewstate/{vs_list.rb → vs_stubs/vs_list.rb}

@@ -1,6 +1,7 @@
 module WWMD
+  class VSStubs::VSList
+    include VSStubHelpers
 
-  class VSList < VSClassHelpers
     attr_accessor :value
 
     def initialize()

data/lib/wwmd/viewstate/{vs_pair.rb → vs_stubs/vs_pair.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSPair < VSClassHelpers
+  class VSStubs::VSPair
+    include VSStubHelpers
+
     attr_accessor :value
 
     def initialize(obj1,obj2)

data/lib/wwmd/viewstate/vs_stubs/vs_read_types.rb

@@ -0,0 +1,11 @@
+module WWMD
+  class VSStubs::VSInt16      < VSStubs::VSReadValue; end
+  class VSStubs::VSInt32      < VSStubs::VSReadValue; end
+  class VSStubs::VSByte       < VSStubs::VSReadValue; end
+  class VSStubs::VSChar       < VSStubs::VSReadValue; end
+  class VSStubs::VSDateTime   < VSStubs::VSReadValue; end
+  class VSStubs::VSDouble     < VSStubs::VSReadValue; end
+  class VSStubs::VSSingle     < VSStubs::VSReadValue; end
+  class VSStubs::VSColor      < VSStubs::VSReadValue; end
+  class VSStubs::VSKnownColor < VSStubs::VSReadValue; end
+end

data/lib/wwmd/viewstate/{vs_read_value.rb → vs_stubs/vs_read_value.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSReadValue < VSClassHelpers
+  class VSStubs::VSReadValue
+    include VSStubHelpers
+
     attr_accessor :value
 
     def initialize(val)

data/lib/wwmd/viewstate/{vs_sparse_array.rb → vs_stubs/vs_sparse_array.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSSparseArray < VSClassHelpers
+  class VSStubs::VSSparseArray
+    include VSStubHelpers
+
     attr_accessor :value
     attr_reader   :typeref
     attr_reader   :typeval

data/lib/wwmd/viewstate/{vs_string.rb → vs_stubs/vs_string.rb}

@@ -1,6 +1,7 @@
 module WWMD
+  class VSStubs::VSString
+    include VSStubHelpers
 
-  class VSString < VSClassHelpers
     attr_accessor :value
 
     def initialize(val)

data/lib/wwmd/viewstate/{vs_string_array.rb → vs_stubs/vs_string_array.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSStringArray < VSClassHelpers
+  class VSStubs::VSStringArray
+    include VSStubHelpers
+
     attr_accessor :value
 
     def initialize()
@@ -24,7 +26,7 @@ module WWMD
       xml = super
       xml.add_attribute("size",self.value.size.to_s)
       self.value.each do |v|
-        xml.add_element(VSString.new(v).to_xml)
+        xml.add_element(VSStubs::VSString.new(v).to_xml)
       end
       xml
     end

data/lib/wwmd/viewstate/{vs_string_formatted.rb → vs_stubs/vs_string_formatted.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSStringFormatted < VSClassHelpers
+  class VSStubs::VSStringFormatted
+    include VSStubHelpers
+
     attr_accessor :value
     attr_reader   :typeref
     attr_reader   :typeval
@@ -18,7 +20,7 @@ module WWMD
 
     def to_xml
       xml = super
-      xml.add_element(VSString.new(self.value).to_xml)
+      xml.add_element(VSStubs::VSString.new(self.value).to_xml)
       xml
     end
 

data/lib/wwmd/viewstate/{viewstate_class_helpers.rb → vs_stubs/vs_stub_helpers.rb}

@@ -1,5 +1,6 @@
 module WWMD
-  class VSClassHelpers < ViewStateUtils
+  module VSStubHelpers
+    include ViewStateUtils
 
     def to_sym
       self.class.to_s.split(":").last.gsub(/[A-Z]+/,'\1_\0').downcase[1..-1].gsub(/\Avs/,"").to_sym

data/lib/wwmd/viewstate/{vs_triplet.rb → vs_stubs/vs_triplet.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSTriplet < VSClassHelpers
+  class VSStubs::VSTriplet
+    include VSStubHelpers
+
     attr_accessor :value
 
     def initialize(obj1,obj2,obj3)

data/lib/wwmd/viewstate/{vs_type.rb → vs_stubs/vs_type.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSType < VSClassHelpers
+  class VSStubs::VSType
+    include VSStubHelpers
+
     attr_accessor :value
     attr_reader   :typeref
     attr_reader   :typeval

data/lib/wwmd/viewstate/{vs_unit.rb → vs_stubs/vs_unit.rb}

@@ -1,5 +1,7 @@
 module WWMD
-  class VSUnit < VSClassHelpers
+  class VSStubs::VSUnit
+    include VSStubHelpers
+
     attr_reader :dword
     attr_reader :word
     attr_reader :value

data/lib/wwmd/viewstate/{vs_value.rb → vs_stubs/vs_value.rb}

@@ -1,8 +1,10 @@
 module WWMD
-  # gin up all the single byte values
-  class VSValue < VSClassHelpers
+  class VSStubs::VSValue
+    include VSStubHelpers
+
     attr_accessor :value
 
+    # gin up all the single byte values
     def initialize(str)
       @value = str
     end

data/lib/wwmd/wwmd_config.rb

@@ -1,44 +1,52 @@
 module WWMD
-  class WWMDConfig
 
-    def self.load_config(file)
-      begin
-        config = YAML.load_file(file)
-      rescue => e
-        putw "config file not found #{file}"
-        putw e.inspect
-        exit
-      end
-      return config
+  class WWMDConfig#:nodoc:
+    # for backward compat
+    def self.load_config(file); WWMD::load_config(file); end
+    def self.parse_opts(args); WWMD::parse_opts(args); end
+  end
+
+  def load_config(file)
+    begin
+      config = YAML.load_file(file)
+    rescue => e
+      putw "config file not found #{file}"
+      putw e.inspect
+      exit
     end
+    return config
+  end
 
-    def self.parse_opts(args)
-      inopts = Hash.new
-      opts = OptionParser.new do |opts|
-        # set defaults
-        opts.on("-p", "--password PASSWORD", "Password")     { |v| inopts[:password] = v }
-        opts.on("-u", "--username USERNAME", "Username")     { |v| inopts[:username] = v }
-        opts.on("--header_file HEADER_FILE","Header file")   { |v| inopts[:header_file] = v }
-        opts.on("--base_url BASE_URL","Base url")            { |v| inopts[:base_url] = v }
-        opts.on("--use_proxy PROXY_URL", "Use proxy at url") do |v|
-          ENV['HTTP_PROXY'] = "http://" + v.to_s
-          inopts[:use_proxy] = true
-          inopts[:proxy_url] = v
-        end
-        opts.on("--no_proxy","do not use proxy") do |v|
-          inopts[:use_proxy] = false
-          inopts[:proxy_url] = nil
-        end
-        opts.on("--use_auth","login before getting url")     { |v| inopts[:use_auth] = true }
-        opts.on("--no_auth","no login before getting url")   { |v| inopts[:use_auth] = false }
-        opts.on("--debug","debugging really doesn't work")   { |v| inopts[:debug] = true }
-        opts.on_tail("-h", "--help", "Show this message") do
-          putx opts
-          exit
-        end
+  def parse_opts(args)
+    inopts = Hash.new
+    inopts[:max_redirects] = 10
+    inopts[:timeout] = 30
+    inopts[:scrape_warn] = false
+    opts = OptionParser.new do |opts|
+    # set defaults
+      opts.on("-p", "--password PASSWORD", "Password")     { |v| inopts[:password] = v }
+      opts.on("-u", "--username USERNAME", "Username")     { |v| inopts[:username] = v }
+      opts.on("--header_file HEADER_FILE","Header file")   { |v| inopts[:header_file] = v }
+      opts.on("--base_url BASE_URL","Base url")            { |v| inopts[:base_url] = v }
+      opts.on("--use_proxy PROXY_URL", "Use proxy at url") do |v|
+        ENV['HTTP_PROXY'] = "http://" + v.to_s
+        inopts[:use_proxy] = true
+        inopts[:proxy_url] = v
+      end
+      opts.on("--no_proxy","do not use proxy") do |v|
+        inopts[:use_proxy] = false
+        inopts[:proxy_url] = nil
+      end
+      opts.on("--use_auth","login before getting url")     { |v| inopts[:use_auth] = true }
+      opts.on("--no_auth","no login before getting url")   { |v| inopts[:use_auth] = false }
+      opts.on("--debug","debugging really doesn't work")   { |v| inopts[:debug] = true }
+      opts.on_tail("-h", "--help", "Show this message") do
+        putx opts
+        exit
       end
-      opts.parse!(args)
-      return inopts
     end
+    opts.parse!(args)
+    return inopts
   end
+
 end

data/lib/wwmd/wwmd_puts.rb

@@ -0,0 +1,9 @@
+module WWMD
+  attr_accessor :console
+  attr_accessor :debug
+  @console = false
+  @debug = false
+  def putd(*args); puts *args if WWMD::debug; end
+  def putx(*args); puts *args if WWMD::console; end
+  def putw(*args); puts *args if WWMD::console; end
+end

data/lib/wwmd/wwmd_utils.rb

@@ -1,30 +1,28 @@
-module WWMD
-  class WWMDUtils
+module WWMDUtils
 
-    def self.header_array_from_file(filename)
-      ret = Hash.new
-      File.readlines(filename).each do |line|
-        a = line.chomp.split(/\t/,2)
-        ret[a[0]] = a[1]
-      end
-      return ret
-    end
-
-    def self.ranstr(len=8,digits=false)
-      chars = ("a".."z").to_a
-      chars += ("0".."9").to_a if digits
-      ret = ""
-      1.upto(len) { |i| ret << chars[rand(chars.size-1)] }
-      return ret
+  def self.header_array_from_file(filename)
+    ret = Hash.new
+    File.readlines(filename).each do |line|
+      a = line.chomp.split(/\t/,2)
+      ret[a[0]] = a[1]
     end
+    return ret
+  end
 
-    def self.rannum(len=8,hex=false)
-      chars = ("0".."9").to_a
-      chars += ("A".."F").to_a if hex
-      ret = ""
-      1.upto(len) { |i| ret << chars[rand(chars.size-1)] }
-      return ret
-    end
+  def self.ranstr(len=8,digits=false)
+    chars = ("a".."z").to_a
+    chars += ("0".."9").to_a if digits
+    ret = ""
+    1.upto(len) { |i| ret << chars[rand(chars.size-1)] }
+    return ret
+  end
 
+  def self.rannum(len=8,hex=false)
+    chars = ("0".."9").to_a
+    chars += ("A".."F").to_a if hex
+    ret = ""
+    1.upto(len) { |i| ret << chars[rand(chars.size-1)] }
+    return ret
   end
+
 end

data/tasks/setup.rb

@@ -28,7 +28,7 @@ PROJ = OpenStruct.new(
   :ruby_opts => %w(-w),
   :libs => [],
   :history_file => 'History.txt',
-  :readme_file => 'README.txt',
+  :readme_file => 'README.rdoc',
   :ignore_file => '.bnsignore',
 
   # Announce

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: miketracy-wwmd
 version: !ruby/object:Gem::Version 
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors: 
 - Michael L. Tracy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.8.0
+        version: 0.2.9.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones
@@ -60,62 +60,69 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- README.txt
+- README.rdoc
 files: 
 - History.txt
-- README
-- README.txt
+- README.rdoc
 - Rakefile
 - examples/config_example.yaml
 - examples/wwmd_example.rb
 - lib/wwmd.rb
-- lib/wwmd/encoding.rb
+- lib/wwmd/class_extensions.rb
+- lib/wwmd/class_extensions/extensions_base.rb
+- lib/wwmd/class_extensions/extensions_encoding.rb
+- lib/wwmd/class_extensions/extensions_external.rb
+- lib/wwmd/class_extensions/extensions_nilclass.rb
+- lib/wwmd/class_extensions/extensions_rbkb.rb
+- lib/wwmd/class_extensions/mixins_string_encoding.rb
 - lib/wwmd/guid.rb
-- lib/wwmd/hpricot_html2text.rb
-- lib/wwmd/mixins.rb
-- lib/wwmd/mixins_extends.rb
-- lib/wwmd/mixins_external.rb
-- lib/wwmd/nokogiri_html2text.rb
 - lib/wwmd/page.rb
 - lib/wwmd/page/auth.rb
 - lib/wwmd/page/constants.rb
 - lib/wwmd/page/form.rb
 - lib/wwmd/page/form_array.rb
 - lib/wwmd/page/headers.rb
+- lib/wwmd/page/helpers.rb
+- lib/wwmd/page/html2text_hpricot.rb
+- lib/wwmd/page/html2text_nokogiri.rb
 - lib/wwmd/page/inputs.rb
 - lib/wwmd/page/irb_helpers.rb
+- lib/wwmd/page/page.rb
 - lib/wwmd/page/parsing_convenience.rb
 - lib/wwmd/page/reporting_helpers.rb
 - lib/wwmd/page/scrape.rb
 - lib/wwmd/page/spider.rb
 - lib/wwmd/urlparse.rb
 - lib/wwmd/viewstate.rb
-- lib/wwmd/viewstate/viewstate_class_helpers.rb
+- lib/wwmd/viewstate/viewstate.rb
 - lib/wwmd/viewstate/viewstate_deserializer_methods.rb
 - lib/wwmd/viewstate/viewstate_from_xml.rb
 - lib/wwmd/viewstate/viewstate_types.rb
 - lib/wwmd/viewstate/viewstate_utils.rb
 - lib/wwmd/viewstate/viewstate_yaml.rb
-- lib/wwmd/viewstate/vs_array.rb
-- lib/wwmd/viewstate/vs_binary_serialized.rb
-- lib/wwmd/viewstate/vs_hashtable.rb
-- lib/wwmd/viewstate/vs_hybrid_dict.rb
-- lib/wwmd/viewstate/vs_indexed_string.rb
-- lib/wwmd/viewstate/vs_indexed_string_ref.rb
-- lib/wwmd/viewstate/vs_int_enum.rb
-- lib/wwmd/viewstate/vs_list.rb
-- lib/wwmd/viewstate/vs_pair.rb
-- lib/wwmd/viewstate/vs_read_types.rb
-- lib/wwmd/viewstate/vs_read_value.rb
-- lib/wwmd/viewstate/vs_sparse_array.rb
-- lib/wwmd/viewstate/vs_string.rb
-- lib/wwmd/viewstate/vs_string_array.rb
-- lib/wwmd/viewstate/vs_string_formatted.rb
-- lib/wwmd/viewstate/vs_triplet.rb
-- lib/wwmd/viewstate/vs_type.rb
-- lib/wwmd/viewstate/vs_unit.rb
-- lib/wwmd/viewstate/vs_value.rb
+- lib/wwmd/viewstate/vs_stubs.rb
+- lib/wwmd/viewstate/vs_stubs/vs_array.rb
+- lib/wwmd/viewstate/vs_stubs/vs_binary_serialized.rb
+- lib/wwmd/viewstate/vs_stubs/vs_hashtable.rb
+- lib/wwmd/viewstate/vs_stubs/vs_hybrid_dict.rb
+- lib/wwmd/viewstate/vs_stubs/vs_indexed_string.rb
+- lib/wwmd/viewstate/vs_stubs/vs_indexed_string_ref.rb
+- lib/wwmd/viewstate/vs_stubs/vs_int_enum.rb
+- lib/wwmd/viewstate/vs_stubs/vs_list.rb
+- lib/wwmd/viewstate/vs_stubs/vs_pair.rb
+- lib/wwmd/viewstate/vs_stubs/vs_read_types.rb
+- lib/wwmd/viewstate/vs_stubs/vs_read_value.rb
+- lib/wwmd/viewstate/vs_stubs/vs_sparse_array.rb
+- lib/wwmd/viewstate/vs_stubs/vs_string.rb
+- lib/wwmd/viewstate/vs_stubs/vs_string_array.rb
+- lib/wwmd/viewstate/vs_stubs/vs_string_formatted.rb
+- lib/wwmd/viewstate/vs_stubs/vs_stub_helpers.rb
+- lib/wwmd/viewstate/vs_stubs/vs_triplet.rb
+- lib/wwmd/viewstate/vs_stubs/vs_type.rb
+- lib/wwmd/viewstate/vs_stubs/vs_unit.rb
+- lib/wwmd/viewstate/vs_stubs/vs_value.rb
 - lib/wwmd/wwmd_config.rb
+- lib/wwmd/wwmd_puts.rb
 - lib/wwmd/wwmd_utils.rb
 - spec/README
 - spec/form_array.spec
@@ -133,13 +140,12 @@ files:
 - tasks/spec.rake
 - tasks/test.rake
 - tasks/zentest.rake
-- wwmd.gemspec
 has_rdoc: false
 homepage: http://github.com/miketracy/wwmd/tree/master
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement