csl 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c6bac5a4e0a88bd83e78fc8acac300a9d8a122
-  data.tar.gz: 6cae82297a9550d275d92c8f1b86ca34b67fe181
+  metadata.gz: cab543528f090e62ec1de8296b73a9bed91f6753
+  data.tar.gz: fe30a500160c78d30915572e95a95890817b6b5a
 SHA512:
-  metadata.gz: 27597362d702c9ff06902e59386ed237050f63aa238c336318cfc9012e7576d7e0299b6e053cbd35861799e734338e1a69eb38113149578c2f65e42999e5a2a1
-  data.tar.gz: 42e659e3de7d61a556317178a031a0cd5b0305aa8c6c804627d40a5a4e2ecf6551f69dabdb3a3413276f649e7d7058ba5dba509a531d6fa34b7aa526aeb031fa
+  metadata.gz: 6ed351e95b6bf9fdd3c38199f2197c9c6c3140ce1b5ad78e7da38be7b7f483c517d63b40acae8967dcfee622ed8cca34072628d75de1f1201a71c7106e9265f4
+  data.tar.gz: e1c5ac96e6826f0178f34dc6dcfeb1b0a112e6b3011dc7925c61ae86954aff362bf924c586e2ea5947722f754aedf3fff3b0ab6b91775a32b00b711613617f85

data/lib/csl/node.rb

@@ -474,11 +474,12 @@ module CSL
       attribute?(:'quotes') && !!(attributes[:'quotes'].to_s =~ /^true$/i)
     end
 
+
     def <=>(other)
       return nil unless other.is_a?(Node)
-      return 1 if other.textnode?
-
-      [nodename, attributes, children] <=> [other.nodename, other.attributes, other.children]
+      comparables <=> other.comparables
+    rescue
+      nil
     end
 
     # Returns the node' XML tags (including attribute assignments) as an
@@ -511,6 +512,18 @@ module CSL
     def match_conditions
     end
 
+    def comparables
+      c = []
+
+      c << nodename
+      c << attributes
+
+      c << (textnode? ? text : '')
+      c << (has_children? ? children : [])
+
+      c
+    end
+
     private
 
     def attribute_assignments
@@ -604,13 +617,6 @@ module CSL
       ["<#{attribute_assignments.unshift(nodename).join(' ')}>#{to_s}</#{nodename}>"]
     end
 
-    def <=>(other)
-      return nil unless other.is_a?(Node)
-      return -1 unless other.textnode?
-
-      [nodename, attributes, text] <=> [other.nodename, other.attributes, other.text]
-    end
-
     def inspect
       "#<#{[self.class.name, text.inspect, *attribute_assignments].join(' ')}>"
     end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

data/spec/csl/node_spec.rb

@@ -207,11 +207,11 @@ module CSL
         n1.children[0][:foo] = 'bar'
         expect(n1).to eq(n2)
       end
+
     end
   end
 
   describe TextNode do
-
     it { is_expected.not_to be nil }
     it { is_expected.not_to have_children }
     it { is_expected.to have_attributes(:attributes => {}) }
@@ -267,11 +267,6 @@ module CSL
         n2.text = 'foo'
         expect(n1).to eq(n2)
       end
-
-      it 'text nodes are less than other nodes' do
-        expect(TextNode.new).to be < Node.new
-        expect(Node.new).not_to be < TextNode.new
-      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Sylvester Keil