saxerator 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3275996c0843e22e1ef7148b6fc14c58aff415d
-  data.tar.gz: bd4ea2b9abb8c9ad8cea065c7d2c41fd472df4e7
+  metadata.gz: a0cafde22b9761403aa299dcc6600e6905340929
+  data.tar.gz: 045107a2d6e516c20b179d868cc1c32d1e01a664
 SHA512:
-  metadata.gz: 5891cd6b524b6880717f21c59552dd909f73ec3135439aaafc79e90dcf76a4a30d774c1b12ad14ebf7b395d7cff6a1c2e3a049bb958ab03d0b681d06092d1b15
-  data.tar.gz: 82f8257eeaedf4b4942979aa961dcd4574f7c4320fd821697fbea25bc1926064bad3f5fd5cbc176382443d81fb69a79d9c323fd1fc87263c713b6b35a44e8e34
+  metadata.gz: e700487f042456f67b269e98c872aa4e91a9116f66abb11fe1d28b7569ddefeef14498b74131b05c799ca17a8bf4068704b229798e106a634453ead7052df93c
+  data.tar.gz: 0f6ba9c8758489f4315027e0878ba0d27f19a0985bb0ad8a24d3a6178f62b72be0c7e88553b86934585732000bee213343d4b4b71a3042f3dad3053493986520

data/lib/saxerator/builder/hash_builder.rb

@@ -35,7 +35,6 @@ module Saxerator
         end
 
         if @config.put_attributes_in_hash?
-
           @attributes.each do |attribute|
             attribute.each_slice(2) do |name, element|
               add_to_hash_element(hash, name, element)
@@ -61,7 +60,7 @@ module Saxerator
 
       def block_variable
         return to_s if @text
-        return to_hash if @children.count > 0
+        return to_hash if @children.count > 0 || (@attributes.count > 0 && @config.put_attributes_in_hash?)
         to_empty_element
       end
     end

data/lib/saxerator/builder/hash_element.rb

@@ -17,6 +17,8 @@ module Saxerator
         array.concat super
         array
       end
+
+      def to_h; self end
     end
   end
 end

data/lib/saxerator/version.rb

@@ -1,3 +1,3 @@
 module Saxerator
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/lib/builder/hash_builder_spec.rb

@@ -26,6 +26,18 @@ describe "Saxerator (default) hash format" do
   # name on a string
   specify { entry['title'].name.should == 'title' }
 
+  describe "#to_s" do
+    it "preserves the element name" do
+      entry['title'].to_a.name.should == 'title'
+    end
+  end
+
+  describe "#to_h" do
+    it "preserves the element name" do
+      entry.to_h.name.should == 'entry'
+    end
+  end
+
   describe "#to_a" do
     it "preserves the element name on a parsed hash" do
       entry.to_a.name.should == 'entry'
@@ -50,7 +62,6 @@ describe "Saxerator (default) hash format" do
   # character entity decoding
   specify { entry['content'].should == "<p>Airplanes are very large — this can present difficulty in digestion.</p>" }
 
-  # empty element
   context "parsing an empty element" do
     subject(:element) { entry['media:thumbnail'] }
 

data/spec/lib/dsl/all_spec.rb

@@ -10,22 +10,22 @@ describe "Saxerator::FullDocument#all" do
         <blurb>two</blurb>
         <blurb>three</blurb>
         <notablurb>four</notablurb>
+        <empty with="attribute"/>
       </blurbs>
     eos
   end
 
   it "should allow you to parse an entire document" do
-    parser.all.should == {'blurb' => ['one', 'two', 'three'], 'notablurb' => 'four'}
+    parser.all.should == {'blurb' => ['one', 'two', 'three'], 'notablurb' => 'four', 'empty' => {} }
   end
-  
+
   context "with_put_attributes_in_hash" do
     subject(:parser) do
       Saxerator.parser(xml) { |config| config.put_attributes_in_hash! }
     end
-        
+
     it "should allow you to parse an entire document" do
-      parser.all.should == {'blurb' => ['one', 'two', 'three'], 'notablurb' => 'four'}
+      parser.all.should == {'blurb' => ['one', 'two', 'three'], 'notablurb' => 'four', 'empty' => { "with" => "attribute"}}
     end
   end
-  
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saxerator
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Bradley Schaefer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri