xml_dsl 0.3.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06859b2ea2ebab29cd30ca0dd451005459ed911
-  data.tar.gz: 476df9143b24ecc659d2751d06d4b315216394c5
+  metadata.gz: 8d3183fbdb92747ea50fb27908eb272551ebf4bd
+  data.tar.gz: 766e973b240d651b0d1fe373c5a0e5a22d02b12b
 SHA512:
-  metadata.gz: 8803eeda3e875094fb8a52fed5bf224b5fd0b9f3eebf94f7c6f9632fa8d5be086871bc3e14a05872c0d19795ca6c804662cc98fde2f79fd75554c3db86384343
-  data.tar.gz: 20d55686eebf557caefd68da858ffd8215c1105ae8d53d9231d0d48309402a6cdb469313d58010f047b13d6667a7c28802ab485844b33f26c228a66316667950
+  metadata.gz: 1520370bb9c152b497b8759d79c6b3c86114626e6a23cd3fabb5472fc2eb289ff9e3bc2262a4acffc1562c8a5580fc9626251e7bcb219c868ec1b01e4d68460c
+  data.tar.gz: e3de1ad0490194b3f3ed02bbfa208a4b1695b63dccf294cd0bbb8872439dbb220e9da2fd01304c1acb71203eac84d35b21765c803ee13f76e656bf7555cf1d40

data/README.md

@@ -66,8 +66,13 @@ Then we can define our mapper as following
           self.external = external
         end
 
+        #
         # Here we definig parser, which will put attributes to Hash, and look for <offer> nodes inside <root>
-        # any length of root path can be provided
+        # any length of root path can be provided, also attributes full path is also a choise
+        # define_xml_parser arbitrary_class, :root, "offer[type=uniq]"
+        # You can pass as first argument not only Hash, but any Ruby class capable to set attributes defined in fields
+        # define_xml_parser OpenStruct
+        # define_xml_parser NiftyActiveRecordModel
         define_xml_parser Hash, :root, :offer do
 
           # Here is basic validation blocks
@@ -130,6 +135,9 @@ Then you can use your newly defined parser as you wish:
     
     # or you can pass some accumulator for your instances to be put into
     parser.iterate acc: []
+    
+    # or event call a method on instances without getting them actually
+    parser.iterate after_method: :save
 ```
 
 ## Contributing

data/lib/xml_dsl/block_method.rb

@@ -7,6 +7,7 @@ module XmlDsl
       @block = block if block_given?
     end
 
+    # order of params to be called can differ, so naming is ambiguous
     def call(a, b = nil, c = nil)
       if block
         self.send method, *[a, b, c].compact + args, &block
@@ -17,11 +18,12 @@ module XmlDsl
 
     def field(instance, node, parser, target, source = nil, getter: :text, matcher: :to_s, null: false, &block)
       raise ArgumentError, 'Wrong target' unless target.is_a? Symbol
+      wrapped_instance = XmlDsl::InstanceWrapper.new instance
       if block_given?
-        instance[target] = parser.instance_exec instance, node, &block
+        wrapped_instance.set target, parser.instance_exec(instance, node, &block)
       else
         raise ArgumentError, 'No source specified' if source.nil?
-        instance[target] = node.search(convert_source(source)).send(getter).send(matcher)
+        wrapped_instance.set target,  node.search(convert_source(source)).send(getter).send(matcher)
       end
       if null
         raise XmlDsl::ParseError, "#{target} is empty. Node: #{node}" if instance[target].nil? || instance[target] == ""
@@ -52,5 +54,21 @@ module XmlDsl
           source.to_s
       end
     end
+
+  end
+  class InstanceWrapper
+    attr_accessor :instance
+
+    def initialize(instance)
+      self.instance = instance
+    end
+
+    def set(key, value)
+      if instance.is_a? Hash
+        instance[key] = value
+      else
+        instance.send "#{key}=", value
+      end
+    end
   end
 end

data/lib/xml_dsl/extensions.rb

@@ -18,7 +18,7 @@ module XmlDsl
     end
 
     module InstanceMethods
-      def iterate(xml_obj = nil, acc: nil, &block)
+      def iterate(xml_obj = nil, acc: nil, after_method: nil, &block)
         xml_obj ||= xml
         raise ArgumentError, "If there is no @xml in parser, pass it to iterate" if xml_obj.nil?
         xml_obj.search(_xml_root_path).each do |node|
@@ -33,6 +33,9 @@ module XmlDsl
               bm.call instance, node, self
             end
             yield instance if block_given?
+            if after_method && after_method.is_a?(Symbol)
+              instance.send after_method
+            end
             acc << instance if acc
           rescue XmlDsl::ParseError => e
             _xml_parse_callbacks[:error_handlers].each do |bm|

data/lib/xml_dsl/version.rb

@@ -1,3 +1,3 @@
 module XmlDsl
-  VERSION = "0.3.2"
+  VERSION = "0.5.1"
 end

data/lib/xml_dsl/xml_parser.rb

@@ -58,7 +58,9 @@ module XmlDsl
     end
 
     def root_path
-      @root_path.join('/').prepend('//')
+      rp = @root_path.join('/')
+      rp.prepend('//') if @root_path.map {|part| part.is_a? Symbol}.reduce(true, :&)
+      rp
     end
   end
 end

data/spec/fixtures/some.xml

@@ -18,7 +18,7 @@
       <area type="kitchen">10</area>
     </areas>
   </offer>
-  <offer>
+  <offer type="uniq">
     <id>703102</id>
     <distance>25</distance>
     <house>7</house>

data/spec/integrational/example_parser_spec.rb

@@ -133,4 +133,57 @@ describe 'Example Xml Mapper Spec' do
       expect(@parser.iterate(acc:[]).length).to eql(1)
     end
   end
+
+  context 'Output parser and arbitrary class' do
+    before(:each) do
+      arbitrary_class = Class.new
+      arbitrary_class.class_eval do
+        attr_accessor :id, :minutes, :magick
+
+        def very_important_method
+          puts self.id
+        end
+      end
+      clazz = Class.new
+      @external_obj = double
+      clazz.class_eval do
+        attr_accessor :xml, :external
+        def initialize(xml, external)
+          self.xml = xml
+          self.external = external
+        end
+
+        define_xml_parser arbitrary_class, :root, "offer[type=uniq]" do
+          field :id, :id, matcher: :to_i
+          field :minutes, :distance, matcher: :to_i
+        end
+      end
+      @parser = clazz.new some_xml, @external_obj
+    end
+
+    it 'calls on iterate' do
+      d = double
+      expect(d).to receive(:fire).once
+      @parser.iterate do |i|
+        d.fire i
+      end
+    end
+
+    it 'appends instances to a list provided' do
+      list = []
+      @parser.iterate acc: list
+      expect(list.length).to eql(1)
+    end
+
+    it 'instances are having attributes set' do
+      list = []
+      @parser.iterate acc: list
+      expect(list.last.id).to eql(703102)
+    end
+
+    it 'calls after_method if provided' do
+      expect_any_instance_of(@parser.instance_variable_get(:@_xml_target_class)).to receive(:very_important_method).at_least(:once)
+      @parser.iterate after_method: :very_important_method
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml_dsl
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Vladislav Bogomolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri