attr_comparable 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,2 @@
 .idea
+pkg

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attr_comparable (0.0.1)
+    attr_comparable (0.0.2)
       minitest
 
 GEM

data/lib/attr_comparable.rb

@@ -3,36 +3,43 @@
 #
 # Use attr_comparabie <attribute list>
 # to declare the attributes which should be compared, and the order they should be
-# Attributes may be nil; nil attributes sort earlier than non-nil to match the SQL convention
+# Attributes may be nil; nil attributes sort earlier than non-nil to match SQL NULL ordering
 #
 module AttrComparable
   include Comparable
 
   module ClassMethods
     # like <=> but handles nil values
-    # when equal, returns nil rather than 0 so the caller can || together
-    def compare_with_nil(left, right)
-      if left.nil?
-        if right.nil?
-          nil
+    # returns the code in string form to be eval'd
+    # code will return nil instead of 0 for equal iff return_nil_on_equal is truthy
+    def compare_with_nil_code(left, right, return_nil_on_equal)
+      <<-EOS
+        if #{ left }.nil?
+          if #{ right }.nil?
+            #{ return_nil_on_equal ? 'nil' : '0' }
+          else
+            -1
+          end
+        elsif #{ right }.nil?
+          1
         else
-          -1
+          (#{ left } <=> #{ right })#{ '.nonzero?' if return_nil_on_equal }
         end
-      elsif right.nil?
-        1
-      else
-        (left <=> right).nonzero?
-      end
+      EOS
     end
 
-    def attr_compare(*attributes)
-      attributes = attributes.flatten
+    def attr_compare(*attributes_arg)
+      attributes = attributes_arg.flatten
+
+      remaining_attrs = attributes.size;
+      attr_exprs = attributes.map do |attribute|
+        remaining_attrs -= 1
+        compare_with_nil_code("self.#{attribute}", "rhs.#{attribute}", remaining_attrs.nonzero?).strip
+      end
+
       class_eval <<-EOS
         def <=>(rhs)
-          #{attributes.map do |attribute|
-              "self.class.compare_with_nil(self.#{attribute}, rhs.#{attribute})"
-            end.join(" || ")
-           } || 0
+          #{ attr_exprs.join(" || ") }
         end
       EOS
     end

data/lib/attr_comparable/version.rb

@@ -1,3 +1,3 @@
 module AttrComparable
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/attr_comparable_test.rb

@@ -75,13 +75,6 @@ describe 'AttrComparable' do
     end
   end
 
-  it "should be able to compare with nil" do
-    assert_equal nil, ComparableTestManyParameters.compare_with_nil(nil, nil)
-    assert_equal -1, ComparableTestManyParameters.compare_with_nil(nil, 1)
-    assert_equal  1, ComparableTestOneParameter.compare_with_nil(1, nil)
-    assert_equal  1, ComparableTestOneParameter.compare_with_nil("dog", "cat")
-  end
-
   describe "many parameters with nil" do
     before do                                                  # sort order
       @d1 = ComparableTestManyParameters.new(nil, 'S')          # 1

metadata

@@ -1,55 +1,57 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: attr_comparable
-version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Colin Kelley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2013-08-10 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: minitest
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  name: rake
+  requirement: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
 description: AttrComparable
-email:
+email: 
 - colindkelley@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -59,37 +61,35 @@ files:
 - lib/attr_comparable.rb
 - lib/attr_comparable/version.rb
 - test/attr_comparable_test.rb
+has_rdoc: true
 homepage: https://github.com/RingRevenue/attr_comparable
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: 4162700180279227236
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: 4162700180279227236
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Mix-in to make a value class Comparable. Simply declare the order of attributes
-  to compare and the <=> (as needed by Comparable) is generated for you, including
-  support for nil. Includes Comparable.
-test_files:
+summary: Mix-in to make a value class Comparable. Simply declare the order of attributes to compare and the <=> (as needed by Comparable) is generated for you, including support for nil. Includes Comparable.
+test_files: 
 - test/attr_comparable_test.rb