range_dsl 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/range_dsl/connection_exp.rb

@@ -27,6 +27,16 @@ module RangeDsl
         "#{left_str} #{name_for_inspect} #{right_str}"
       end
 
+      def eql?(other)
+        (other.class == self.class) &&
+          self.left.eql?(other.left) && self.right.eql?(other.right)
+      end
+      alias_method :==, :eql?
+
+      def hash
+        "#{self.class.name}:#{inspect}".hash
+      end
+
       private
       def require_brace?(other)
         return false unless other.is_a?(ConnectionExp::Base)

data/lib/range_dsl/container_exp.rb

@@ -14,6 +14,16 @@ module RangeDsl
         args = @values.inspect.gsub(/^\[|\]$/, '')
         "#{name_for_inspect}(#{args})"
       end
+
+      def eql?(other)
+        (other.class == self.class) && (self.values == other.values)
+      end
+      alias_method :==, :eql?
+
+      def hash
+        "#{self.class.name}:#{inspect}".hash
+      end
+
     end
 
     class Any < Base

data/lib/range_dsl/exact_exp.rb

@@ -17,6 +17,15 @@ module RangeDsl
       def inspect
         "eq(#{@value.inspect})"
       end
+
+      def eql?(other)
+        (other.value == self.value) && (other.class == self.class)
+      end
+      alias_method :==, :eql?
+
+      def hash
+        "#{self.class.name}:#{inspect}".hash
+      end
     end
 
     class NotEqual < Equal

data/lib/range_dsl/filter_exp.rb

@@ -17,11 +17,21 @@ module RangeDsl
       def inspect
         "not_be(#{@src.inspect})"
       end
+
+      def eql?(other)
+        (other.class == self.class) && self.src.eql?(other.src)
+      end
+      alias_method :==, :eql?
+
+      def hash
+        "#{self.class.name}:#{inspect}".hash
+      end
     end
 
     class Func
       include ConnectionExp::Client
 
+      attr_reader :block_str
       def initialize(block_str = nil, &block)
         @block_str = block_str
         @block = block
@@ -34,6 +44,16 @@ module RangeDsl
       def inspect
         "func" << (@block_str ? "(#{@block_str.inspect})" : '{}')
       end
+
+      def eql?(other)
+        return false if @block_str.nil?
+        (other.class == self.class) && self.block_str.eql?(other.block_str)
+      end
+      alias_method :==, :eql?
+
+      def hash
+        "#{self.class.name}:#{inspect}".hash
+      end
     end
 
   end

data/lib/range_dsl/open_range_exp.rb

@@ -20,6 +20,15 @@ module RangeDsl
       def inspect
         "#{name_for_inspect}(#{@value.inspect})"
       end
+
+      def eql?(other)
+        (other.value == self.value) && (other.class == self.class)
+      end
+      alias_method :==, :eql?
+
+      def hash
+        "#{self.class.name}:#{inspect}".hash
+      end
     end
 
     class GreaterThanEqual < Base

data/range_dsl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{range_dsl}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["akimatter"]

data/spec/range_dsl_spec.rb

@@ -4,9 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "RangeDsl" do
   describe "introduction" do
     it "1,2と5以上はtrue" do
-      r = RangeDsl.compile do
-        any 1, 2, gte(5)
-      end
+      r = RangeDsl.compile{any 1, 2, gte(5)}
       r.include?(-10000).should == false
       r.include?(0).should == false
       r.include?(1).should == true
@@ -16,6 +14,7 @@ describe "RangeDsl" do
       r.include?(5).should == true
       r.include?(6).should == true
       r.include?(10000).should == true
+      r.should == RangeDsl.compile{any 1, 2, gte(5)}
     end
   end
 
@@ -29,6 +28,7 @@ describe "RangeDsl" do
           @r1.include?(100.0).should == true
           @r1.include?(1234567890).should == true
           @r1.inspect.should == "gte(100)"
+          @r1.should == RangeDsl.gte(100)
         end
       end
     end
@@ -91,11 +91,12 @@ describe "RangeDsl" do
           @r1.include?(100.0001).should == false
           @r1.include?(101).should == false
           @r1.inspect.should == "eq(100)"
+          @r1.should == RangeDsl.eq(100)
         end
       end
     end
 
-    describe "lt" do
+    describe "neq" do
       [:neq, :not_equal].each do |operator|
         it operator do
           @r1 = RangeDsl.send(operator, 100)
@@ -106,6 +107,7 @@ describe "RangeDsl" do
           @r1.include?(100.0001).should == true
           @r1.include?(101).should == true
           @r1.inspect.should == "neq(100)"
+          @r1.should == RangeDsl.neq(100)
         end
       end
     end
@@ -130,6 +132,7 @@ describe "RangeDsl" do
           @r1.include?(7.1).should == false
           @r1.include?(8).should == false
           @r1.inspect.should == "any(3, 7)"
+          @r1.should == RangeDsl.any(3, 7)
         end
       end
     end
@@ -148,6 +151,7 @@ describe "RangeDsl" do
       r1.include?(100.1).should == true
       r1.include?(101).should == true
       r1.inspect.should == "not_be(eq(100))"
+      r1.should == RangeDsl.compile{ not_be(eq(100)) }
     end
   end
 
@@ -170,6 +174,7 @@ describe "RangeDsl" do
           @r2.include?(6.1).should == false
           @r2.include?(7).should == false
           @r2.inspect.should == "gt(3) & lt(6)"
+          @r2.should == RangeDsl.compile{ gt(3) & lt(6) }
         end
       end
     end
@@ -267,6 +272,8 @@ describe "RangeDsl" do
         r1.include?(2).should == false
         r1.include?(3).should == true
         r1.inspect.should == "gte(1) & func{}"
+        # func{|v| v % 2 == 1} のブロックが取得できないので、常に一致しません。
+        r1.should_not == RangeDsl.compile{ gt(3) & lt(6) }
       end
 
       it "動的なブロックはinspectで出力できないので、文字列でも渡せるように" do
@@ -278,6 +285,7 @@ describe "RangeDsl" do
         r1.include?(2).should == false
         r1.include?(3).should == true
         r1.inspect.should == "gte(1) & func(\"{|v| v % 2 == 1}\")"
+        r1.should == RangeDsl.compile("gte(1) & func(\"{|v| v % 2 == 1}\")")
       end
     end
   end
@@ -286,6 +294,7 @@ describe "RangeDsl" do
     it "lt(3) | gt(30) | any(2, 14, 36)" do
       r2 = RangeDsl.compile("lt(3) | gt(30) | any(12, 14, 16)")
       r2.inspect.should == "lt(3) | gt(30) | any(12, 14, 16)"
+      r2.should == RangeDsl.compile("lt(3) | gt(30) | any(12, 14, 16)")
     end
 
     it "gte(3) & lt(10) & any(2, 4, 6)" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: range_dsl
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - akimatter