doc_wrapper 0.9.0 → 0.9.1

data/lib/doc_wrapper/base_class_methods.rb

@@ -1,6 +1,49 @@
 module DocWrapper
   module ClassMethods
 
+    # Create a typed property definition for a document wrapper. 
+    # The property_name must be a symbol.
+    def property (property_name, type, selector, options = {}, &block)
+      raise "Unhandled property type: #{type.to_s}" if ![:string, :date, :time, :boolean, :raw].include?(type)
+      add_property_definition(property_name,  build_property_definition(property_name, type, selector, initialize_options(options), block))
+    end
+
+    def multi_property (property_name, selectors, options = {}, &block)
+      raise "Multi properties require a block" if block.nil?
+      add_property_definition(property_name, MultiPropertyDefinition.new(property_name, selectors, initialize_options(options), block))
+    end
+
+    def has_many (property_name, selector, klass, options = {})
+      options = initialize_options(options)
+      define_method property_name do
+        get_has_many( property_name, selector, klass, options)
+      end
+    end
+
+    def has_one (property_name, selector, klass, options = {})
+      options = initialize_options(options)
+      define_method(property_name) do
+        get_has_one(property_name, selector, klass, options)
+      end
+    end
+    
+    def namespaces (namespaces)
+      @namespaces
+      # define_method(:namespaces) do
+      #   namespaces
+      # end
+    end
+    
+    ##################
+    # Helper Methods #
+    ##################
+
+    def add_property_definition (property_name, wrapper)
+      add_property_name(property_name)
+      add_property_wrapper(property_name, wrapper)
+      add_property_accessor(property_name)
+    end
+
     # Add a property name to the singleton property_names attribute.
     def add_property_name (property_name)
       # Add the property name to the property_names collection.
@@ -25,21 +68,10 @@ module DocWrapper
       # Make sure the options have a :document key with a value of 1.
       # This forces all lookups to be for the 0th document in documents if
       # the user did not specify an offset into the array.
-      { :document => 1 }.merge(options)
-    end
-
-    def add_property_definition (property_name, wrapper)
-      add_property_name(property_name)
-      add_property_wrapper(property_name, wrapper)
-      add_property_accessor(property_name)
+      options = { :document => 1 }.merge(options)
+      options.merge(@namespaces) if @namespaces
     end
 
-    # Create a typed property definition for a document wrapper. 
-    # The property_name must be a symbol.
-    def property (property_name, type, selector, options = {}, &block)
-      raise "Unhandled property type: #{type.to_s}" if ![:string, :date, :time, :boolean, :raw].include?(type)
-      add_property_definition(property_name,  build_property_definition(property_name, type, selector, initialize_options(options), block))
-    end
     
     def build_property_definition (property_name, type, selector, options, block)
       DocWrapper.const_get("#{camelize(type.to_s)}PropertyDefinition").new(property_name, type, selector, initialize_options(options), block)
@@ -49,23 +81,5 @@ module DocWrapper
       string.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
     end
     
-    def multi_property (property_name, selectors, options = {}, &block)
-      raise "Multi properties require a block" if block.nil?
-      add_property_definition(property_name, MultiPropertyDefinition.new(property_name, selectors, initialize_options(options), block))
-    end
-
-    def has_many (property_name, selector, klass, options = {})
-      options = initialize_options(options)
-      define_method property_name do
-        get_has_many( property_name, selector, klass, options)
-      end
-    end
-
-    def has_one (property_name, selector, klass, options = {})
-      options = initialize_options(options)
-      define_method(property_name) do
-        get_has_one(property_name, selector, klass, options)
-      end
-    end
   end
 end

data/lib/doc_wrapper/base_property_definition.rb

@@ -11,10 +11,14 @@ module DocWrapper
     end
 
     def property (documents)
-      begin
-        transform(documents[@options[:document] - 1].search(@selector))
-      rescue Nokogiri::CSS::SyntaxError
-        transform(documents[@options[:document] - 1].xpath(@selector))
+      if options[:namespaces]
+        transform(documents[@options[:document] - 1].xpath(@selector, options[:namespaces] ))
+      else
+        begin
+          transform(documents[@options[:document] - 1].search(@selector))
+        rescue Nokogiri::CSS::SyntaxError
+          transform(documents[@options[:document] - 1].xpath(@selector))
+        end
       end
     end
 

data/lib/doc_wrapper/version.rb

@@ -1,3 +1,3 @@
 module DocWrapper
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doc_wrapper
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Mark Menard
@@ -15,85 +9,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -05:00
+date: 2011-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  type: :development
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
-  type: :development
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ZenTest
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+    version: 
 description: Using the DocWrapper DSL you can easily define classes that wrap HTML DOM Documents allowing extraction of properties using either XPath or CSS selectors.
 email: 
 - mark@enablelabs.com
@@ -137,29 +105,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
+  version: 
 requirements: []
 
 rubyforge_project: doc_wrapper
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Declarative DSL for defining classes to wrap HTML DOM Documents