chainedexpressions 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ca3ff7d238ea1837df9515a15ca665ea9ee0dc9
-  data.tar.gz: d6cb0e3b60799c6327e010fa997efafda9cd9365
+  metadata.gz: a0080d860307a431d8e18cb9960c58e891b2e8ec
+  data.tar.gz: c14be71435652bf0f82c42dc9b1b5fe70461e37e
 SHA512:
-  metadata.gz: ab8145ace1efc8a8e8a67ff750e83dffe5ec4b65285e1c39af3b5d8d3b38c9b5a67db4297d96361ce887bd9f9291fb639fcb7b746dc6a603feb8236d93e6a41c
-  data.tar.gz: 25ffadf8397664d56c5c84d0cc74025815acf96afa63bbad4a72652d3caa51c1eb4a9ef8193d620a640a23b537dd958cb43babcd360f8e17039fd6b66c540f89
+  metadata.gz: 9744d7c4d860e29fc650c1baa30aecc2cbd96ce19983e57d0c12c8843f0ad3df313a6fec06c89d876fb77465d767e556cb81e82072909757632ac2590d0cba99
+  data.tar.gz: c4b5aa883017e5d0d9becfbed909997af89fb29a2148332a0b0925b71060e364edbffbb66497e5bdc1f00670cbf66dddf1f322af598c9489dc32cb4c8f23715a

data/lib/chainedexpressions/chainedexpressions.rb

@@ -13,40 +13,49 @@ module ChainedExpressions
     :<   => :lt,
     :<=  => :lte,
     :>=  => :gte,
-    :>   => :gt,
+    :>   => :gt
   }
 
+  refine Numeric do
+    def eval_expression(op, n)
+      case op
+        when :<   then (self <=> n) == -1
+        when :<=  then (self <=> n) == -1 || (self <=> n) == 0
+        when :>=  then (self <=> n) ==  0 || (self <=> n) == 1
+        when :>   then (self <=> n) ==  1
+      end
+    end
+  end
+
   %w(TrueClass FalseClass).each { |c|
     eval <<-EOM
       refine #{c} do
-        $operators.each { |k, o|
-          define_method o do |n|
-            $f.exp_true? k, n
+        $operators.each { |op, o|
+          define_method o do |n|            
+            prev = $prev
+            $prev = n
+            prev.eval_expression op, n
           end
 
-          alias_method k, o
+          alias_method op, o
         }
       end
     EOM
   }
 
-  refine Fixnum do
-    def exp_true?(op, n)
-      case op
-        when :<  then (self <=> n) == -1
-        when :<= then (self <=> n) == -1 || (self <=> n) == 0
-        when :>= then (self <=> n) ==  0 || (self <=> n) == 1
-        when :>  then (self <=> n) ==  1
-      end
-    end
+  %w(Fixnum Float Bignum).each { |c|
+    eval <<-EOM
+      refine #{c} do
+        $operators.each { |op, o|
+          define_method o do |n|
+            $prev = n
+            eval_expression op, n
+          end
 
-    $operators.each { |k, o|
-      define_method o do |n|
-        $f = n
-        self.exp_true? k, n
+          alias_method op, o
+        }
       end
+    EOM
+  }
+end
 
-      alias_method k, o
-    }
-  end
-end

data/lib/chainedexpressions/version.rb

@@ -9,5 +9,5 @@
 #++
 
 module ChainedExpressions
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/spec/chainedexpressions_spec.rb

@@ -10,39 +10,28 @@
 
 require 'rspec'
 require 'chainedexpressions'
-
 using ChainedExpressions
 
 describe ChainedExpressions do
   it 'can evaluate true expressions' do
-    (20 < 25).should be true
-
-    (20 < 25 < 30).should be true
-    (20 < 25 < 30).should be true
-
-    (20 <= 25 <= 30 <= 30 <= 35).should be true
-    (20 <= 25 <= 30 <= 30 <= 35).should be true
-
-    (35 > 30 > 25 > 20).should be true
+    (20 < 25          ).should be true
+    (20 < 25 < 30     ).should be true
     (35 > 30 > 25 > 20).should be true
 
-    (35 >= 30 >= 30 >= 25 >= 20).should be true
-    (35 >= 30 >= 30 >= 25 >= 20).should be true
+    (20   <= 25 <= 30  <= 30  <= 35).should be true
+    (35   >= 30 >= 30  >= 25  >= 20).should be true
+    (20.5 >= 10 >= 2.5 >= 2.5      ).should be true
   end
 
   it 'can evaluate false expressions' do
-    (30 < 25).should be false
-
-    (30 < 25 < 20).should be false
-    (30 < 25 < 20).should be false
-
-    (35 <= 30 <= 30 <= 25 <= 20).should be false
-    (35 <= 30 <= 30 <= 25 <= 20).should be false
-
-    (20 > 25 > 30 > 35).should be false
+    (30 < 25          ).should be false
+    (30 < 25 < 20     ).should be false
     (20 > 25 > 30 > 35).should be false
 
-    (20 >= 25 >= 30 >= 30 >= 35).should be false
-    (20 >= 25 >= 30 >= 30 >= 35).should be false
+    (35   <= 30 <= 30  <= 25  <= 20).should be false
+    (20   >= 25 >= 30  >= 30  >= 35).should be false
+    (20.5 >= 10 >= 2.5 >= 3.5      ).should be false
+
+    ([1, 2])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chainedexpressions
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Giovanni Capuano