sax-machine 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbab8ba0a044c67b908e367534220284eb66be82
-  data.tar.gz: fed3ba53ea5a6736e7ea66c7ec8165e619117e14
+  metadata.gz: 0917a0f1c569089b182a6517a6cb6706ddb3c42a
+  data.tar.gz: 0828562df1e97d795f0cbc506b7258beed5f7d23
 SHA512:
-  metadata.gz: 893aea24b7264ba1306b010f117fb06583e0bc9d70c2d4f6fa87ca955048276ae1f1cfbb1d237f9e06c3f391a799ded075048de6b5b0494efe3e5ae9e88b060b
-  data.tar.gz: 90348f313389a5a7d9d058624e81bc13b7833968cb94ca1442b21b29cdffa65ae438265f365da9623c4cc4f65664006fac7c4b6832486dffe85476d8b27078aa
+  metadata.gz: 81eff065ec6ec812f7b8ff6c5e48ed4f48490e17a2a199a0f3980d1578863aab9a1bdba28be58b03338aaa7127e55632a7792354dcc57c9f980760b9ec402a51
+  data.tar.gz: b7e005d33a7765814a1188e10f6be96d5aee196df56a5913fbc94b0a5624b9d70f0f5a2270417ce1bcc8c736aec836c3227bdd0b96d569bdb8206e6c421408d8

data/HISTORY.md

@@ -1,5 +1,11 @@
 # HEAD
 
+# 1.3.1
+
+* Allow default value to be `false` [[#66](https://github.com/pauldix/sax-machine/pull/66)]
+* Support adding class to an attribute [[#68](https://github.com/pauldix/sax-machine/pull/68)]
+* Adjust Ox handler to skip empty text/cdata values
+
 # 1.3.0
 
 * Improve block modifiers to support all config options

data/lib/sax-machine/config/sax_element_value.rb

@@ -1,13 +1,14 @@
 module SAXMachine
   class SAXConfig
     class ElementValueConfig
-      attr_reader :name, :setter
+      attr_reader :name, :setter, :data_class
 
       def initialize(name, options)
         @name     = name.to_s
         @as       = options[:as]
         @setter   = "#{@as}="
         @required = options[:required]
+        @data_class = options[:class]
       end
 
       def column

data/lib/sax-machine/handlers/sax_abstract_handler.rb

@@ -107,26 +107,8 @@ module SAXMachine
 
           object.send(config.accessor) << element
         else
-          value =
-            case config.data_class.to_s
-            when "String"  then value != NO_BUFFER ? value.to_s : value
-            when "Integer" then value != NO_BUFFER ? value.to_i : value
-            when "Float"   then value != NO_BUFFER ? value.to_f : value
-            when "Symbol"  then
-              if value != NO_BUFFER
-                value.to_s.empty? ? nil : value.to_s.downcase.to_sym
-              else
-                value
-              end
-            # Assumes that time elements will be string-based and are not
-            # something else, e.g. seconds since epoch
-            when "Time"    then value != NO_BUFFER ? Time.parse(value.to_s) : value
-            when ""        then value
-            else
-              element
-            end
-
-          object.send(config.setter, value) unless value == NO_BUFFER
+          value = data_class_value(config.data_class, value) || element
+          object.send(config.setter, value) if value != NO_BUFFER
           mark_as_parsed(object, config)
         end
 
@@ -186,8 +168,27 @@ module SAXMachine
 
       if config
         config.attribute_configs_for_element(attributes).each do |ac|
-          object.send(ac.setter, ac.value_from_attrs(attributes))
+          value = data_class_value(ac.data_class, ac.value_from_attrs(attributes))
+          object.send(ac.setter, value)
+        end
+      end
+    end
+
+    def data_class_value(data_class, value)
+      case data_class.to_s
+      when "String"  then value != NO_BUFFER ? value.to_s : value
+      when "Integer" then value != NO_BUFFER ? value.to_i : value
+      when "Float"   then value != NO_BUFFER ? value.to_s.gsub(",",".").to_f : value
+      when "Symbol"  then
+        if value != NO_BUFFER
+          value.to_s.empty? ? nil : value.to_s.downcase.to_sym
+        else
+          value
         end
+      # Assumes that time elements will be string-based and are not
+      # something else, e.g. seconds since epoch
+      when "Time"    then value != NO_BUFFER ? Time.parse(value.to_s) : value
+      when ""        then value
       end
     end
 

data/lib/sax-machine/handlers/sax_ox_handler.rb

@@ -34,12 +34,16 @@ module SAXMachine
       @element = name
     end
 
+    def text(value)
+      _characters(value) if value && !value.empty?
+    end
+
+    alias_method :cdata, :text
+
     def error(message, line, column)
       _error("#{message} on line #{line} column #{column}")
     end
 
-    alias_method :text, :_characters
-    alias_method :cdata, :_characters
     alias_method :end_element, :_end_element
 
     private

data/lib/sax-machine/sax_document.rb

@@ -21,7 +21,7 @@ module SAXMachine
 
       self.class.sax_config.top_level_elements.each do |_, configs|
         configs.each do |config|
-          next unless config.default
+          next if config.default.nil?
           next unless send(config.as).nil?
 
           send(config.setter, config.default)

data/lib/sax-machine/version.rb

@@ -1,3 +1,3 @@
 module SAXMachine
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/sax-machine/sax_document_spec.rb

@@ -143,54 +143,154 @@ describe "SAXMachine" do
           expect(@klass.data_class(:date)).to eq(DateTime)
         end
 
-        it "handles an integer class" do
-          @klass = Class.new do
-            include SAXMachine
-            element :number, class: Integer
+        describe "string" do
+          before do
+            class TestString
+              include SAXMachine
+              element :number, class: String
+            end
+
+            class TestStringAttribute
+              include SAXMachine
+              attribute :sub_number, class: String
+            end
+
+            class TestStringWithAttribute
+              include SAXMachine
+              element :number, class: TestStringAttribute
+            end
+          end
+
+          it "is handled in an element" do
+            document = TestString.parse("<number>5.5</number>")
+            expect(document.number).to eq("5.5")
           end
 
-          document = @klass.parse("<number>5</number>")
-          expect(document.number).to eq(5)
+          it "is handled in an attribute" do
+            document = TestStringWithAttribute.parse("<number sub_number='5.5'></number>")
+            expect(document.number.sub_number).to eq("5.5")
+          end
         end
 
-        it "handles an float class" do
-          @klass = Class.new do
-            include SAXMachine
-            element :number, class: Float
+        describe "integer" do
+          before do
+            class TestInteger
+              include SAXMachine
+              element :number, class: Integer
+            end
+
+            class TestIntegerAttribute
+              include SAXMachine
+              attribute :sub_number, class: Integer
+            end
+
+            class TestIntegerWithAttribute
+              include SAXMachine
+              element :number, class: TestIntegerAttribute
+            end
           end
 
-          document = @klass.parse("<number>5.5</number>")
-          expect(document.number).to eq(5.5)
+          it "is handled in an element" do
+            document = TestInteger.parse("<number>5</number>")
+            expect(document.number).to eq(5)
+          end
+
+          it "is handled in an attribute" do
+            document = TestIntegerWithAttribute.parse("<number sub_number='5'></number>")
+            expect(document.number.sub_number).to eq(5)
+          end
         end
 
-        it "handles an string class" do
-          @klass = Class.new do
-            include SAXMachine
-            element :number, class: String
+        describe "float" do
+          before do
+            class TestFloat
+              include SAXMachine
+              element :number, class: Float
+            end
+
+            class TestFloatAttribute
+              include SAXMachine
+              attribute :sub_number, class: Float
+            end
+
+            class TestFloatWithAttribute
+              include SAXMachine
+              element :number, class: TestFloatAttribute
+            end
+          end
+
+          it "is handled in an element with '.' delimiter" do
+            document = TestFloat.parse("<number>5.5</number>")
+            expect(document.number).to eq(5.5)
+          end
+
+          it "is handled in an element with ',' delimiter" do
+            document = TestFloat.parse("<number>5,5</number>")
+            expect(document.number).to eq(5.5)
           end
 
-          document = @klass.parse("<number>5.5</number>")
-          expect(document.number).to eq("5.5")
+          it "is handled in an attribute" do
+            document = TestFloatWithAttribute.parse("<number sub_number='5.5'>5.5</number>")
+            expect(document.number.sub_number).to eq(5.5)
+          end
         end
 
-        it "handles a time class" do
-          @klass = Class.new do
-            include SAXMachine
-            element :time, class: Time
+        describe "symbol" do
+          before do
+            class TestSymbol
+              include SAXMachine
+              element :symbol, class: Symbol
+            end
+
+            class TestSymbolAttribute
+              include SAXMachine
+              attribute :sub_symbol, class: Symbol
+            end
+
+            class TestSymbolWithAttribute
+              include SAXMachine
+              element :symbol, class: TestSymbolAttribute
+            end
           end
 
-          document = @klass.parse("<time>1994-02-04T06:20:00Z</time>")
-          expect(document.time).to eq(Time.utc(1994, 2, 4, 6, 20, 0, 0))
+          it "is handled in an element" do
+            document = TestSymbol.parse("<symbol>MY_SYMBOL_VALUE</symbol>")
+            expect(document.symbol).to eq(:my_symbol_value)
+          end
+
+          it "is handled in an attribute" do
+            document = TestSymbolWithAttribute.parse("<symbol sub_symbol='MY_SYMBOL_VALUE'></symbol>")
+            expect(document.symbol.sub_symbol).to eq(:my_symbol_value)
+          end
         end
 
-        it "handles a Symbol class" do
-          @klass = Class.new do
-            include SAXMachine
-            element :symbol, class: Symbol
+        describe "time" do
+          before do
+            class TestTime
+              include SAXMachine
+              element :time, class: Time
+            end
+
+            class TestTimeAttribute
+              include SAXMachine
+              attribute :sub_time, class: Time
+            end
+
+            class TestTimeWithAttribute
+              include SAXMachine
+              element :time, class: TestTimeAttribute
+            end
+          end
+
+          it "is handled in an element" do
+            document = TestTime.parse("<time>1994-02-04T06:20:00Z</time>")
+            expect(document.time).to eq(Time.utc(1994, 2, 4, 6, 20, 0, 0))
           end
 
-          document = @klass.parse("<symbol>MY_SYMBOL_VALUE</symbol>")
-          expect(document.symbol).to eq(:my_symbol_value)
+          it "is handled in an attribute" do
+            document = TestTimeWithAttribute.parse("<time sub_time='1994-02-04T06:20:00Z'>1994-02-04T06:20:00Z</time>")
+            expect(document.time.sub_time).to eq(Time.utc(1994, 2, 4, 6, 20, 0, 0))
+          end
         end
       end
 
@@ -207,6 +307,22 @@ describe "SAXMachine" do
           document = @klass.parse("<number></number>")
           expect(document.number).to eq(0)
         end
+
+        it "can be a Boolean" do
+          @klass = Class.new do
+            include SAXMachine
+            element(:bool, default: false) { |v| !!v }
+          end
+
+          document = @klass.parse("<no>bool</no>")
+          expect(document.bool).to be false
+
+          document = @klass.parse("<bool></bool>")
+          expect(document.bool).to be false
+
+          document = @klass.parse("<bool>1</bool>")
+          expect(document.bool).to be true
+        end
       end
 
       describe "the required attribute" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sax-machine
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Paul Dix
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec