sequel_spec 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc55d801d8460a333aec9a8a6e615060def64cb
-  data.tar.gz: f777ca9fdb5a21a4da44f42aa79848db8210315a
+  metadata.gz: de26b2570088012fdbfa1147ccb13dfaf9adc4d3
+  data.tar.gz: 63fee3e646f9695259ef79b36e21eb8faa7e46df
 SHA512:
-  metadata.gz: b2d90a2402dc7fd5e1e679e9d23f1246b52b3f96ef3a6337cbf04146071d5b1cbf872679962265732b34ea7e2b75ff0c62c7856dd1b1e882588e55ea6f768dce
-  data.tar.gz: e48d8533c4b7238da88c7c8f98afc44337962a56ef58fa33090ff35d4ced2345b4c31805d9f7d273b0a8a7472dd9c6a424050ce420c7f99130e6940be93eecb7
+  metadata.gz: c1723528491f381b6fb2bf8845e84cc9133cd92286dc3f9168b3a0237254d7c3d182442c7f005b1282b44b47c58287126da1bf970bc842dc50538e8cd99f48dc
+  data.tar.gz: dce48f7a64de632b4dfa97a1fc342da2985bb6b1c4522ce5eac3c2b6f7a54b9b2ac300854555eaf2da0af5aa6a172dfdcf0287a9a627a68dba0c9066cb0cfe20

data/lib/sequel_spec/association/association_matcher.rb

@@ -17,8 +17,14 @@ module SequelSpec
           else
             matching = @association[:type] == association_type
             options.each do |key, value|
-              if @association[key] != value
-                @suffix << "expected #{key.inspect} == #{value.inspect} but found #{@association[key].inspect} instead"
+              assoc_key = @association[key]
+
+              if assoc_key.is_a?(String) && assoc_key.start_with?('::')
+                assoc_key = assoc_key.demodulize
+              end
+
+              if assoc_key != value
+                @suffix << "expected #{key.inspect} == #{value.inspect} but found #{assoc_key.inspect} instead"
                 matching = false
               end
             end

data/lib/sequel_spec/base.rb

@@ -33,7 +33,7 @@ module SequelSpec
         [@prefix, description, @suffix].flatten.compact.join(" ")
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         [@prefix, "not", description, @suffix].flatten.compact.join(" ")
       end
 

data/lib/sequel_spec/validation/validate_length_matcher.rb

@@ -28,8 +28,8 @@ module SequelSpec
         end
 
         def is(value)
-          unless value.is_a?(Fixnum)
-            raise ArgumentError, "#is expects a Fixnum, #{value.class} given"
+          unless value.is_a?(Integer)
+            raise ArgumentError, "#is expects an Integer, #{value.class} given"
           end
 
           @additionnal = value
@@ -40,8 +40,8 @@ module SequelSpec
         alias :is_equal_to :is
 
         def is_at_least(value)
-          unless value.is_a?(Fixnum)
-            raise ArgumentError, "#is_at_least expects a Fixnum, #{value.class} given"
+          unless value.is_a?(Integer)
+            raise ArgumentError, "#is_at_least expects an Integer, #{value.class} given"
           end
 
           @additionnal = value
@@ -50,8 +50,8 @@ module SequelSpec
         end
 
         def is_at_most(value)
-          unless value.is_a?(Fixnum)
-            raise ArgumentError, "#is_at_most expects a Fixnum, #{value.class} given"
+          unless value.is_a?(Integer)
+            raise ArgumentError, "#is_at_most expects an Integer, #{value.class} given"
           end
 
           @additionnal = value

data/lib/sequel_spec/version.rb

@@ -1,3 +1,3 @@
 module SequelSpec
-  VERSION = "0.1.1".freeze
+  VERSION = "0.2.0".freeze
 end

data/sequel_spec.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "sequel_spec"
   spec.version       = SequelSpec::VERSION
   spec.authors       = ["Adrià Planas", "Jonathan Tron", "Joseph Halter"]
-  spec.email         = ["adriaplanas@liquidcodeworks.com"]
+  spec.email         = ["adriaplanas@edgecodeworks.com"]
   spec.summary       = %q{RSpec Matchers for Sequel}
   spec.homepage      = "https://github.com/planas/sequel_spec"
   spec.license       = "MIT"
@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sequel", "~> 4.0"
+  spec.add_runtime_dependency "rspec", "~> 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rspec", "~> 2.0"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "sqlite3"
 end

data/spec/sequel_spec/association/have_many_through_many_matcher_spec.rb

@@ -19,36 +19,36 @@ describe "have_many_through_many_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_many_through_many :comments
-        @matcher.description.should == "have a many_through_many association :comments"
+        expect(@matcher.description).to eq "have a many_through_many association :comments"
       end
 
       it "should set failure messages" do
         @matcher = have_many_through_many :comments
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
     end
 
     describe "with options" do
       it "should contain a description" do
         @matcher = have_many_through_many(:comments).with_options :join_table => :comments_items
-        @matcher.description.should == 'have a many_through_many association :comments with option(s) :join_table => :comments_items'
+        expect(@matcher.description).to eq 'have a many_through_many association :comments with option(s) :join_table => :comments_items'
       end
 
       it "should set failure messages" do
         @matcher = have_many_through_many(:comments).with_options :class_name => "Comment"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
 
       it "should explicit used options if different than expected" do
         @matcher = have_many_through_many(:comments).with_options :join_table => :whatever
         @matcher.matches? subject
         explanation = ' expected :join_table == :whatever but found :comments_items instead'
-        @matcher.failure_message.should == "expected Item to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description + explanation
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description + explanation
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description + explanation
       end
     end
   end

data/spec/sequel_spec/association/have_many_to_many_matcher_spec.rb

@@ -14,36 +14,36 @@ describe "have_many_to_many_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_many_to_many :items
-        @matcher.description.should == "have a many_to_many association :items"
+        expect(@matcher.description).to eq "have a many_to_many association :items"
       end
 
       it "should set failure messages" do
         @matcher = have_many_to_many :items
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Comment to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Comment to not " + @matcher.description
       end
     end
 
     describe "with options" do
       it "should contain a description" do
         @matcher = have_many_to_many(:items).with_options :class_name => "Item"
-        @matcher.description.should == 'have a many_to_many association :items with option(s) :class_name => "Item"'
+        expect(@matcher.description).to eq 'have a many_to_many association :items with option(s) :class_name => "Item"'
       end
 
       it "should set failure messages" do
         @matcher = have_many_to_many(:items).with_options :class_name => "Item"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Comment to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Comment to not " + @matcher.description
       end
 
       it "should explicit used options if different than expected" do
         @matcher = have_many_to_many(:items).with_options :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Item" instead'
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description + explanation
+        expect(@matcher.failure_message).to eq "expected Comment to " + @matcher.description + explanation
+        expect(@matcher.failure_message_when_negated).to eq "expected Comment to not " + @matcher.description + explanation
       end
     end
   end

data/spec/sequel_spec/association/have_many_to_one_matcher_spec.rb

@@ -14,36 +14,36 @@ describe "have_many_to_one_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_many_to_one :item
-        @matcher.description.should == "have a many_to_one association :item"
+        expect(@matcher.description).to eq "have a many_to_one association :item"
       end
 
       it "should set failure messages" do
         @matcher = have_many_to_one :item
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Comment to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Comment to not " + @matcher.description
       end
     end
 
     describe "with options" do
       it "should contain a description" do
         @matcher = have_many_to_one(:item).with_options :class_name => "Item"
-        @matcher.description.should == 'have a many_to_one association :item with option(s) :class_name => "Item"'
+        expect(@matcher.description).to eq 'have a many_to_one association :item with option(s) :class_name => "Item"'
       end
 
       it "should set failure messages" do
         @matcher = have_many_to_one(:item).with_options :class_name => "Item"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Comment to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Comment to not " + @matcher.description
       end
 
       it "should explicit used options if different than expected" do
         @matcher = have_many_to_one(:item).with_options :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Item" instead'
-        @matcher.failure_message.should == "expected Comment to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description + explanation
+        expect(@matcher.failure_message).to eq "expected Comment to " + @matcher.description + explanation
+        expect(@matcher.failure_message_when_negated).to eq "expected Comment to not " + @matcher.description + explanation
       end
     end
   end

data/spec/sequel_spec/association/have_one_through_one_matcher_spec.rb

@@ -14,36 +14,36 @@ describe "have_one_through_one_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_one_through_one :comment
-        @matcher.description.should == "have a one_through_one association :comment"
+        expect(@matcher.description).to eq "have a one_through_one association :comment"
       end
 
       it "should set failure messages" do
         @matcher = have_one_through_one :comment
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated). to eq "expected Item to not " + @matcher.description
       end
     end
 
     describe "with options" do
       it "should contain a description" do
         @matcher = have_one_through_one(:comment).with_options :class_name => "Comment"
-        @matcher.description.should == 'have a one_through_one association :comment with option(s) :class_name => "Comment"'
+        expect(@matcher.description).to eq 'have a one_through_one association :comment with option(s) :class_name => "Comment"'
       end
 
       it "should set failure messages" do
         @matcher = have_one_through_one(:comment).with_options :class_name => "Comment"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
 
       it "should explicit used options if different than expected" do
         @matcher = have_one_through_one(:comment).with_options :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Comment" instead'
-        @matcher.failure_message.should == "expected Item to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description + explanation
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description + explanation
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description + explanation
       end
     end
   end

data/spec/sequel_spec/association/have_one_to_many_matcher_spec.rb

@@ -14,36 +14,36 @@ describe "have_one_to_many_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_one_to_many :comments
-        @matcher.description.should == "have a one_to_many association :comments"
+        expect(@matcher.description).to eq "have a one_to_many association :comments"
       end
 
       it "should set failure messages" do
         @matcher = have_one_to_many :comments
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
     end
 
     describe "with options" do
       it "should contain a description" do
         @matcher = have_one_to_many(:comments).with_options :class_name => "Comment"
-        @matcher.description.should == 'have a one_to_many association :comments with option(s) :class_name => "Comment"'
+        expect(@matcher.description).to eq 'have a one_to_many association :comments with option(s) :class_name => "Comment"'
       end
 
       it "should set failure messages" do
         @matcher = have_one_to_many(:comments).with_options :class_name => "Comment"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
 
       it "should explicit used options if different than expected" do
         @matcher = have_one_to_many(:comments).with_options :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Comment" instead'
-        @matcher.failure_message.should == "expected Item to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description + explanation
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description + explanation
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description + explanation
       end
     end
   end

data/spec/sequel_spec/association/have_one_to_one_matcher_spec.rb

@@ -14,36 +14,36 @@ describe "have_one_to_one_matcher" do
     describe "without option" do
       it "should contain a description" do
         @matcher = have_one_to_one :comment
-        @matcher.description.should == "have a one_to_one association :comment"
+        expect(@matcher.description).to eq "have a one_to_one association :comment"
       end
 
       it "should set failure messages" do
         @matcher = have_one_to_one :comment
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
     end
 
     describe "with options" do
       it "should contain a description" do
         @matcher = have_one_to_one(:comment).with_options :class_name => "Comment"
-        @matcher.description.should == 'have a one_to_one association :comment with option(s) :class_name => "Comment"'
+        expect(@matcher.description).to eq 'have a one_to_one association :comment with option(s) :class_name => "Comment"'
       end
 
       it "should set failure messages" do
         @matcher = have_one_to_one(:comment).with_options :class_name => "Comment"
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
 
       it "should explicit used options if different than expected" do
         @matcher = have_one_to_one(:comment).with_options :class_name => "Price"
         @matcher.matches? subject
         explanation = ' expected :class_name == "Price" but found "Comment" instead'
-        @matcher.failure_message.should == "expected Item to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description + explanation
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description + explanation
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description + explanation
       end
     end
   end

data/spec/sequel_spec/validation/validate_format_matcher_spec.rb

@@ -15,73 +15,73 @@ describe "validate_format_matcher" do
 
   it "should require an attribute" do
     expect {
-      subject.should validate_format
+      expect(subject).to validate_format
     }.to raise_error(ArgumentError)
   end
 
   it "should require additionnal parameters" do
     expect {
-      subject.should validate_format(:name)
+      expect(subject).to validate_format(:name)
     }.to raise_error(ArgumentError)
   end
 
   it "should accept with valid parameters" do
     expect {
-      subject.should validate_format_of(:name).with(/[abc]+/)
+      expect(subject).to validate_format_of(:name).with(/[abc]+/)
     }.not_to raise_error
   end
 
   it "should reject with invalid parameters" do
     expect {
-      subject.should validate_format_of(:name).with(/[xyz]+/)
-    }.to raise_error
+      expect(subject).to validate_format_of(:name).with(/[xyz]+/)
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
   end
 
   it "should accept with valid parameters and options" do
     expect {
-      subject.should validate_format_of(:name).with(/[abc]+/).allowing_nil
+      expect(subject).to validate_format_of(:name).with(/[abc]+/).allowing_nil
     }.not_to raise_error
   end
 
   it "should reject with valid parameters but invalid options" do
     expect {
-      subject.should validate_format_of(:name).with(/[abc]+/).allowing_missing
-    }.to raise_error
+      expect(subject).to validate_format_of(:name).with(/[abc]+/).allowing_missing
+    }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
   end
 
   describe "messages" do
     describe "without option" do
       it "should contain a description" do
         @matcher = validate_format_of(:name).with(/[abc]+/)
-        @matcher.description.should == "validate format of :name against /[abc]+/"
+        expect(@matcher.description).to eq "validate format of :name against /[abc]+/"
       end
 
       it "should set failure messages" do
         @matcher = validate_format_of(:name).with(/[abc]+/)
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
     end
     describe "with options" do
       it "should contain a description" do
         @matcher = validate_format_of(:name).with(/[abc]+/).allowing_nil
-        @matcher.description.should == "validate format of :name against /[abc]+/ with option(s) :allow_nil => true"
+        expect(@matcher.description).to eq "validate format of :name against /[abc]+/ with option(s) :allow_nil => true"
       end
 
       it "should set failure messages" do
         @matcher = validate_format_of(:price).with(/[abc]+/).allowing_nil
         @matcher.matches? subject
-        @matcher.failure_message.should == "expected Item to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description
       end
 
       it "should explicit used options if different than expected" do
         @matcher = validate_format_of(:name).with(/[abc]+/).allowing_blank
         @matcher.matches? subject
         explanation = " but called with option(s) :allow_nil => true instead"
-        @matcher.failure_message.should == "expected Item to " + @matcher.description + explanation
-        @matcher.negative_failure_message.should == "expected Item to not " + @matcher.description + explanation
+        expect(@matcher.failure_message).to eq "expected Item to " + @matcher.description + explanation
+        expect(@matcher.failure_message_when_negated).to eq "expected Item to not " + @matcher.description + explanation
       end
     end
   end