dm-rspec 0.2.4 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1ff4e2329c1b538cb3ac029d4c20296db78cd6a1
+  data.tar.gz: f29ac09e597531c33da8a477c45cbdb962d82c07
+SHA512:
+  metadata.gz: 2c8b450a4e00d1b1ef1e9cd4c4160c801aee83814de31a2c21e5a338aa5316d3e16c0dd57630afb4ce99baaef17dc1e14b271959b3ec7262755ceedc3837c684
+  data.tar.gz: 1431bf8c35b9655e1119747373f5369df2c6028779ba8dfd33922adbdd3c3b555f17a2ee00cdec5cba29069a3157c4470b300c7b06219fe7f8c609add1e04968

data/.rspec

@@ -1,3 +1,3 @@
 --color
 --backtrace
---format nested
+--format documentation

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+### version 0.3.0 / 2014-08-16
+* Move to RSpec 3 (chip, duduribeiro)
+
 ### version 0.2.4 / 2013-02-07
 * New matcher: validate\_length\_of (GavinJoyce)
 

data/Gemfile

@@ -8,14 +8,12 @@ gem 'dm-validations'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec"
+  gem "rspec", "~> 3.0.0"
   gem "bundler"
   gem "jeweler"
   gem "reek"
   gem 'guard-rspec', :require => false
   gem 'libnotify' if RUBY_PLATFORM =~ /linux/
-  gem 'ruby-debug19' if RUBY_VERSION =~ /^1\.9/
-  gem 'ruby-debug' if RUBY_VERSION =~ /^1\.8/
 
   gem 'dm-migrations'
   gem 'dm-sqlite-adapter'

data/Gemfile.lock

@@ -1,14 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.7)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.6)
-    data_objects (0.10.8)
+    addressable (2.3.6)
+    builder (3.2.2)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
+    data_objects (0.10.14)
       addressable (~> 2.1)
-    diff-lcs (1.1.3)
-    dm-core (1.2.0)
-      addressable (~> 2.2.6)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    dm-core (1.2.1)
+      addressable (~> 2.3)
     dm-do-adapter (1.2.0)
       data_objects (~> 0.10.6)
       dm-core (~> 1.2.0)
@@ -19,56 +23,102 @@ GEM
       do_sqlite3 (~> 0.10.6)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_sqlite3 (0.10.8)
-      data_objects (= 0.10.8)
-    ffi (1.0.11)
-    git (1.2.5)
-    guard (1.0.0)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-rspec (0.6.0)
-      guard (>= 0.10.0)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
+    do_sqlite3 (0.10.14)
+      data_objects (= 0.10.14)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.3)
+    formatador (0.2.5)
+    git (1.2.8)
+    github_api (0.12.0)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
+      oauth2
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hashie (3.2.0)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.6.5)
-    libnotify (0.7.2)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.1)
+    jwt (1.0.0)
+    libnotify (0.8.3)
+      ffi (>= 1.0.11)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rainbow (2.0.0)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdoc (4.1.1)
       json (~> 1.4)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby2ruby (1.3.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.10)
-    thor (0.14.6)
+    reek (1.3.8)
+      rainbow (>= 1.99, < 3.0)
+      ruby2ruby (>= 2.0.8, < 3.0)
+      ruby_parser (~> 3.3)
+      sexp_processor
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    ruby2ruby (2.1.1)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.6.2)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.4.3)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    timers (1.1.0)
 
 PLATFORMS
   ruby
@@ -83,5 +133,4 @@ DEPENDENCIES
   jeweler
   libnotify
   reek
-  rspec
-  ruby-debug19
+  rspec (~> 3.0.0)

data/Rakefile

@@ -44,13 +44,3 @@ Reek::Rake::Task.new do |t|
 end
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "dm-rspec #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/dm/matchers/belong_to.rb

@@ -19,7 +19,7 @@ module DataMapper
         "expected to belong to #{@parent}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected to not belong to #{@parent}"
       end
 

data/lib/dm/matchers/have_many.rb

@@ -25,7 +25,7 @@ module DataMapper
         "expected to have many #{@children}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected to not have many #{@children}"
       end
 

data/lib/dm/matchers/have_many_and_belong_to.rb

@@ -16,7 +16,7 @@ module DataMapper
         "expected to have many and belong to #{@name}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected to not have many and belong to #{@name}"
       end
       

data/lib/dm/matchers/have_many_through.rb

@@ -19,7 +19,7 @@ module DataMapper
         "expected to have many #{@children} through #{@broker}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected to not have many #{@children} through #{@broker}"
       end
       

data/lib/dm/matchers/have_one.rb

@@ -18,7 +18,7 @@ module DataMapper
         "expected to have one #{@child}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected not to have one #{@child}"
       end
 

data/lib/dm/matchers/have_property.rb

@@ -15,7 +15,7 @@ module DataMapper
         "expected to have property #{@property}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected to not have property #{@property}"
       end
       

data/lib/dm/matchers/validate_format_of.rb

@@ -30,7 +30,7 @@ module DataMapper
         msg
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         msg = "expected to not validate #{@validation_subject} of #{@property} with #{@format.inspect}"
         msg = %Q'#{msg} and message "#{@msg}"' if @msg
         msg

data/lib/dm/matchers/validate_presence_of.rb

@@ -19,7 +19,17 @@ module DataMapper
         true
       end
 
-    end
+      def failure_message_for_presence
+        "expected to validate presence of #{@property}#{with_msg}"
+      end
+
+      def negative_failure_message
+        "expected to not validate presence of #{@property}#{with_msg}"
+      end
 
+      def with_msg
+        " with message \"#{@msg}\"" if @msg
+      end
+    end
   end
 end

data/lib/dm/matchers/validation_matcher.rb

@@ -32,7 +32,7 @@ module DataMapper
         msg
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         msg = "expected to not validate #{@validation_subject} of #{@property}"
         msg = %Q'#{msg} with message "#{@msg}"' if @msg
         msg

data/spec/dm/matchers/belong_to_spec.rb

@@ -4,23 +4,23 @@ require 'spec_helper'
 describe DataMapper::Matchers::BelongTo do
   context '#should' do
     it 'passes if association exists' do
-      lambda { Book.should belong_to :author }.should_pass
+      lambda { expect(Book).to belong_to :author }.should_pass
     end
 
     it 'fails if association does not exist' do
-      lambda { Book.should belong_to :bad_relation}.should fail_with "expected to belong to bad_relation"
+      expect { expect(Book).to belong_to :bad_relation}.to fail_with "expected to belong to bad_relation"
     end
   end
 
   context '#should_not' do
     it 'fails if association exists' do
-      lambda { Book.should_not belong_to :author }.should fail_with "expected to not belong to author"
+      expect { expect(Book).not_to belong_to :author }.to fail_with "expected to not belong to author"
     end
   end
 
   context 'instance of model' do
     it "should pass" do
-      lambda{ Book.new.should belong_to :author}.should_pass
+      lambda{ expect(Book.new).to belong_to :author}.should_pass
     end
   end
 

data/spec/dm/matchers/errors_on_spec.rb

@@ -11,20 +11,20 @@ describe 'have errors_on' do
 
   context '#should' do
     it 'passes' do
-      lambda {@one_err.should have(1).error_on :name}.should_pass
-      lambda {@two_errs.should have(2).errors_on :name}.should_pass
-      lambda {@valid.should have(0).errors_on :name}.should_pass
+      lambda {expect((@one_err.error_on :name).size).to eq(1)}.should_pass
+      lambda {expect((@two_errs.errors_on :name).size).to eq(2)}.should_pass
+      lambda {expect((@valid.errors_on :name).size).to eq(0)}.should_pass
     end
 
     it 'fails for valid mode' do
-      lambda {@valid.should have(1).errors_on :name}.should fail
+      expect {expect(@valid.errors_on :name.size).to eq(1)}.to fail
     end
   end
 
   context '#should_not' do
     it 'fails for invalid model' do
-      lambda {@one_err.should_not have(1).error_on :name}.should fail
-      lambda {@two_errs.should_not have(2).errors_on :name}.should fail
+      expect {expect((@one_err.error_on :name).size).not_to eq(1)}.to fail
+      expect {expect((@two_errs.errors_on :name).size).not_to eq(2)}.to fail
     end
   end
 end

data/spec/dm/matchers/have_many_and_belong_to_spec.rb

@@ -4,25 +4,25 @@ require 'spec_helper'
 describe DataMapper::Matchers::HaveManyAndBelongTo do
   context '#should' do
     it 'passes if association exists' do
-      lambda { Book.should have_many_and_belong_to :genres}.should_pass
+      lambda { expect(Book).to have_many_and_belong_to :genres}.should_pass
     end
 
     it 'fails if association does not exist' do
-      lambda { Book.should have_many_and_belong_to :authors}.
-        should fail_with "expected to have many and belong to authors"
+      expect { expect(Book).to have_many_and_belong_to :authors}.
+        to fail_with "expected to have many and belong to authors"
     end
   end
 
   context '#should_not' do
     it 'fails if association exists' do
-      lambda { Genre.should_not have_many_and_belong_to :books}.
-        should fail_with "expected to not have many and belong to books"
+      expect { expect(Genre).not_to have_many_and_belong_to :books}.
+        to fail_with "expected to not have many and belong to books"
     end
   end
 
   context 'instance of model' do
     it "should pass" do
-      lambda{ Book.new.should have_many_and_belong_to :genres}.should_pass
+      lambda{ expect(Book.new).to have_many_and_belong_to :genres}.should_pass
     end
   end
 end

data/spec/dm/matchers/have_many_spec.rb

@@ -4,23 +4,23 @@ require 'spec_helper'
 describe DataMapper::Matchers::HaveMany do
   context '#should' do
     it 'passes if association exists' do
-      lambda { Author.should have_many :books}.should_pass
+      lambda { expect(Author).to have_many :books}.should_pass
     end
 
     it 'fails if association does not exist' do
-      lambda { Author.should have_many :bad_relations}.should fail_with "expected to have many bad_relations"
+      expect { expect(Author).to have_many :bad_relations}.to fail_with "expected to have many bad_relations"
     end
   end
 
   context '#should_not' do
     it 'fails if association exists' do
-      lambda { Author.should_not have_many :books}.should fail_with "expected to not have many books"
+      expect { expect(Author).not_to have_many :books}.to fail_with "expected to not have many books"
     end
   end
 
   context 'instance of model' do
     it "should pass" do
-      lambda { Author.new.should have_many :books }.should_pass
+      lambda { expect(Author.new).to have_many :books }.should_pass
     end
   end
 end

data/spec/dm/matchers/have_many_through_spec.rb

@@ -4,24 +4,24 @@ require 'spec_helper'
 describe DataMapper::Matchers::HaveManyThrough do
   context '#should' do
     it 'passes if association exists' do
-      lambda { Book.should have_many(:tags).through(:taggings) }.should_pass
+      lambda { expect(Book).to have_many(:tags).through(:taggings) }.should_pass
     end
 
     it 'fails if association does not exist' do
-      lambda { Author.should have_many(:books).through(:something) }.should fail_with "expected to have many books through something"
-      lambda { Book.should have_many(:tags).through(:author) }.should fail_with "expected to have many tags through author"
+      expect { expect(Author).to have_many(:books).through(:something) }.to fail_with "expected to have many books through something"
+      expect { expect(Book).to have_many(:tags).through(:author) }.to fail_with "expected to have many tags through author"
     end
   end
 
   context '#should_not' do
     it 'fails if association exists' do
-      lambda { Book.should_not have_many(:tags).through(:taggings) }.should fail_with "expected to not have many tags through taggings"
+      expect { expect(Book).not_to have_many(:tags).through(:taggings) }.to fail_with "expected to not have many tags through taggings"
     end
   end
 
   context 'instance of model' do
     it "should pass" do
-      lambda{ Book.new.should have_many(:tags).through(:taggings)}.should_pass
+      lambda{ expect(Book.new).to have_many(:tags).through(:taggings)}.should_pass
     end
   end
 end

data/spec/dm/matchers/have_one_spec.rb

@@ -3,23 +3,23 @@ require 'spec_helper'
 describe DataMapper::Matchers::HaveOne do
   context '#should' do
     it 'passes if association exists' do
-      lambda { Book.should have_one :foreword}.should_pass
+      lambda { expect(Book).to have_one :foreword}.should_pass
     end
 
     it 'fails if association does not exist' do
-      lambda { Author.should have_one :book}.should fail_with "expected to have one book"
+      expect { expect(Author).to have_one :book}.to fail_with "expected to have one book"
     end
   end
 
   context '#should_not' do
     it 'fails if association exists' do
-      lambda { Book.should_not have_one :foreword}.should fail_with "expected not to have one foreword"
+      expect { expect(Book).not_to have_one :foreword}.to fail_with "expected not to have one foreword"
     end
   end
 
   context 'instance of model' do
     it 'should pass' do
-      lambda { Book.new.should have_one :foreword}.should_pass
+      lambda { expect(Book.new).to have_one :foreword}.should_pass
     end
   end
 end

data/spec/dm/matchers/have_property_spec.rb

@@ -4,23 +4,23 @@ require 'spec_helper'
 describe DataMapper::Matchers::HaveProperty do
   context '#should' do
     it 'passes if property exists' do
-      lambda {Book.should have_property :name}.should_pass
+      lambda {expect(Book).to have_property :name}.should_pass
     end
 
     it 'fails if property does not exist' do
-      lambda {Book.should have_property :bad_property}.should fail_with "expected to have property bad_property"
+      expect {expect(Book).to have_property :bad_property}.to fail_with "expected to have property bad_property"
     end
   end
 
   context '#should_not' do
     it 'fails if property exists' do
-      lambda {Book.should_not have_property :name}.should fail_with "expected to not have property name"
+      expect {expect(Book).not_to have_property :name}.to fail_with "expected to not have property name"
     end
   end
 
   context 'instance of model' do
     it "should pass" do
-      lambda{ Book.new.should have_property :name}.should_pass
+      lambda{ expect(Book.new).to have_property :name}.should_pass
     end
   end
 end

data/spec/dm/matchers/validate_format_of_spec.rb

@@ -5,19 +5,19 @@ describe 'validate_format_of' do
   context 'without message' do
     context '#should 'do
       it 'passes if validatation exists' do
-        lambda { Tag.should validate_format_of(:name).with(/\w+/) }.should_pass
+        lambda { expect(Tag).to validate_format_of(:name).with(/\w+/) }.should_pass
       end
 
       it 'fails if validation does not exist' do
-        lambda { Tag.should validate_format_of(:id).with(/\w+/) }.
-          should fail_with 'expected to validate format of id with /\w+/'
+        expect { expect(Tag).to validate_format_of(:id).with(/\w+/) }.
+          to fail_with 'expected to validate format of id with /\w+/'
       end
     end
 
     context '#should_not' do
       it 'fails if validation exists' do
-        lambda { Tag.should_not validate_format_of(:name).with(/\w+/) }.
-          should fail_with 'expected to not validate format of name with /\w+/'
+        expect { expect(Tag).not_to validate_format_of(:name).with(/\w+/) }.
+          to fail_with 'expected to not validate format of name with /\w+/'
       end
     end
   end
@@ -27,30 +27,30 @@ describe 'validate_format_of' do
   context 'with message' do
     context '#should' do
       it 'passes if messages are the same' do
-        lambda{ Genre.should validate_format_of(:name).with(/\w+/).
+        lambda{ expect(Genre).to validate_format_of(:name).with(/\w+/).
           with_message('Bad format of genre')
         }.should_pass
       end
 
       it 'fails if messages are different' do
-        lambda{ Genre.should validate_format_of(:name).with(/\w+/).
+        expect{ expect(Genre).to validate_format_of(:name).with(/\w+/).
           with_message('Different message')
-        }.should fail_with 'expected to validate format of name with /\w+/ and message "Different message"'
+        }.to fail_with 'expected to validate format of name with /\w+/ and message "Different message"'
       end
     end
 
     context '#should_not' do
       it 'fails if validation message exists and it is the same' do
-        lambda{ Genre.should_not validate_format_of(:name).with(/\w+/).
+        expect{ expect(Genre).not_to validate_format_of(:name).with(/\w+/).
           with_message('Bad format of genre')
-        }.should fail_with 'expected to not validate format of name with /\w+/ and message "Bad format of genre"'
+        }.to fail_with 'expected to not validate format of name with /\w+/ and message "Bad format of genre"'
       end
     end
   end
 
   context 'instance of model' do
     it 'should pass' do
-      lambda { Tag.new.should validate_format_of(:name).with(/\w+/) }.should_pass
+      lambda { expect(Tag.new).to validate_format_of(:name).with(/\w+/) }.should_pass
     end
   end
 end

data/spec/dm/matchers/validate_length_of_spec.rb

@@ -3,48 +3,48 @@ require 'spec_helper'
 describe 'validate_length_of' do
   context '#should' do
     it 'validates length' do
-      lambda { Publisher.should validate_length_of(:name).length(128) }.should_pass
-      lambda { Publisher.should validate_length_of(:name).length(129) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:name).length(128) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:name).length(129) }.should_fail
     end
     it 'validates maximum' do
-      lambda { Publisher.should validate_length_of(:name).maximum(128) }.should_pass
-      lambda { Publisher.should validate_length_of(:name).maximum(129) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:name).maximum(128) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:name).maximum(129) }.should_fail
               
-      lambda { Publisher.should validate_length_of(:address).maximum(2000) }.should_pass
-      lambda { Publisher.should validate_length_of(:address).maximum(1024) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:address).maximum(2000) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:address).maximum(1024) }.should_fail
     end
     it 'validates max' do
-      lambda { Publisher.should validate_length_of(:name).max(128) }.should_pass
-      lambda { Publisher.should validate_length_of(:name).max(129) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:name).max(128) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:name).max(129) }.should_fail
     end
     
     it 'validates minimum' do
-      lambda { Publisher.should validate_length_of(:city).minimum(2) }.should_pass
-      lambda { Publisher.should validate_length_of(:city).minimum(3) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:city).minimum(2) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:city).minimum(3) }.should_fail
     end
     it 'validates min' do
-      lambda { Publisher.should validate_length_of(:city).min(2) }.should_pass
-      lambda { Publisher.should validate_length_of(:city).min(1) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:city).min(2) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:city).min(1) }.should_fail
     end
     
     it 'validates within' do
-      lambda { Publisher.should validate_length_of(:phone).within(5..15) }.should_pass
-      lambda { Publisher.should validate_length_of(:phone).within(4..15) }.should_fail
-      lambda { Publisher.should validate_length_of(:phone).within(5..14) }.should_fail
-      lambda { Publisher.should validate_length_of(:phone).within(5) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:phone).within(5..15) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:phone).within(4..15) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:phone).within(5..14) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:phone).within(5) }.should_fail
     end
     it 'validates in' do
-      lambda { Publisher.should validate_length_of(:phone).in(5..15) }.should_pass
-      lambda { Publisher.should validate_length_of(:phone).in(4..16) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:phone).in(5..15) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:phone).in(4..16) }.should_fail
     end
     
     it 'validates equals' do
-      lambda { Publisher.should validate_length_of(:zip).equals(6) }.should_pass
-      lambda { Publisher.should validate_length_of(:zip).equals(7) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:zip).equals(6) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:zip).equals(7) }.should_fail
     end
     it 'validates is' do
-      lambda { Publisher.should validate_length_of(:zip).is(6) }.should_pass
-      lambda { Publisher.should validate_length_of(:zip).is(7) }.should_fail
+      lambda { expect(Publisher).to validate_length_of(:zip).is(6) }.should_pass
+      lambda { expect(Publisher).to validate_length_of(:zip).is(7) }.should_fail
     end
   end
 end

data/spec/dm/matchers/validate_presence_of_spec.rb

@@ -5,19 +5,19 @@ describe 'validate_presence_of' do
   context "without message" do
     context '#should' do
       it 'passes if validation exists' do
-        lambda{ Person.should validate_presence_of :last_name}.should_pass
+        lambda{ expect(Person).to validate_presence_of :last_name}.should_pass
       end
 
       it 'fails if validation does not exist' do
-        lambda{ Person.should validate_presence_of :age}.
-          should fail_with "expected to validate presence of age"
+        expect{ expect(Person).to validate_presence_of :age}.
+          to fail_with "expected to validate presence of age"
       end
     end
 
     context '#should_not' do
       it 'fails if validation exists' do
-        lambda{ Person.should_not validate_presence_of :last_name}.
-          should fail_with "expected to not validate presence of last_name"
+        expect{ expect(Person).not_to validate_presence_of :last_name}.
+          to fail_with "expected to not validate presence of last_name"
       end
     end
   end
@@ -26,30 +26,30 @@ describe 'validate_presence_of' do
   context 'with message' do
     context '#should' do
       it 'passes if messages are the same' do
-        lambda{ Person.should validate_presence_of(:first_name).
+        lambda{ expect(Person).to validate_presence_of(:first_name).
           with_message('Where is the first name?')
         }.should_pass
       end
 
       it 'fails if messages are different' do
-        lambda{ Person.should validate_presence_of(:first_name).
+        expect{ expect(Person).to validate_presence_of(:first_name).
           with_message('Different message')
-        }.should fail_with 'expected to validate presence of first_name with message "Different message"'
+        }.to fail_with 'expected to validate presence of first_name with message "Different message"'
       end
     end
 
     context '#should_not' do
       it 'fails if validation message exists' do
-        lambda{ Person.should_not validate_presence_of(:first_name).
+        expect{ expect(Person).not_to validate_presence_of(:first_name).
           with_message('Where is the first name?')
-        }.should fail_with 'expected to not validate presence of first_name with message "Where is the first name?"'
+        }.to fail_with 'expected to not validate presence of first_name with message "Where is the first name?"'
       end
     end
   end
 
   context 'instance of model' do
     it "should pass" do
-      lambda{ Person.new.should validate_presence_of :last_name}.should_pass
+      lambda{ expect(Person.new).to validate_presence_of :last_name}.should_pass
     end
   end
 end

data/spec/dm/matchers/validate_uniquness_of_spec.rb

@@ -5,19 +5,19 @@ describe 'validate_uniqueness_of' do
   context 'without message' do
     context '#should 'do
       it 'passes if validatation exists' do
-        lambda { Author.should validate_uniqueness_of :last_name}.should_pass
+        lambda { expect(Author).to validate_uniqueness_of :last_name}.should_pass
       end
 
       it 'fails if validation does not exist' do
-        lambda { Author.should validate_uniqueness_of :first_name}.
-          should fail_with "expected to validate uniqueness of first_name"
+        expect { expect(Author).to validate_uniqueness_of :first_name}.
+          to fail_with "expected to validate uniqueness of first_name"
       end
     end
 
     context '#should_not' do
       it 'fails if validation exists' do
-        lambda { Author.should_not validate_uniqueness_of :last_name}.
-          should fail_with "expected to not validate uniqueness of last_name"
+        expect { expect(Author).not_to validate_uniqueness_of :last_name}.
+          to fail_with "expected to not validate uniqueness of last_name"
       end
     end
   end
@@ -27,23 +27,23 @@ describe 'validate_uniqueness_of' do
   context 'with message' do
     context '#should' do
       it 'passes if messages are the same' do
-        lambda{ Genre.should validate_uniqueness_of(:name).
+        lambda{ expect(Genre).to validate_uniqueness_of(:name).
           with_message('Genre name must be unique!')
         }.should_pass
       end
 
       it 'fails if messages are different' do
-        lambda{ Genre.should validate_uniqueness_of(:name).
+        expect{ expect(Genre).to validate_uniqueness_of(:name).
           with_message('Different message')
-        }.should fail_with 'expected to validate uniqueness of name with message "Different message"'
+        }.to fail_with 'expected to validate uniqueness of name with message "Different message"'
       end
     end
 
     context '#should_not' do
       it 'fails if validation message exists and it is the same' do
-        lambda{ Genre.should_not validate_uniqueness_of(:name).
+        expect{ expect(Genre).not_to validate_uniqueness_of(:name).
           with_message('Genre name must be unique!')
-        }.should fail_with 'expected to not validate uniqueness of name with message "Genre name must be unique!"'
+        }.to fail_with 'expected to not validate uniqueness of name with message "Genre name must be unique!"'
       end
     end
   end
@@ -51,7 +51,7 @@ describe 'validate_uniqueness_of' do
 
   context 'instance of model' do
     it "should pass" do
-      lambda { Author.new.should validate_uniqueness_of :last_name}.should_pass
+      lambda { expect(Author.new).to validate_uniqueness_of :last_name}.should_pass
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'dm-migrations'
 require 'dm-sqlite-adapter'
 
 require 'dm-rspec'
+require 'pry'
 
 
 DataMapper.setup(:default, "sqlite3::memory:")
@@ -34,10 +35,12 @@ end
 class Proc
   include ::RSpec::Matchers
   def should_pass
-    lambda { self.call }.should_not raise_error
+    expect{ self.call  }.to_not raise_error
+    #lambda { self.call }.should_not raise_error
   end
   def should_fail
-    lambda { self.call }.should raise_error
+    expect{self.call}.to raise_error
+    #lambda { self.call }.should raise_error
   end
 end
 

metadata

@@ -1,190 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: dm-rspec
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Potapov Sergey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-validations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: libnotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RSpec matchers for DataMapper
@@ -194,7 +157,7 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- .rspec
+- ".rspec"
 - CHANGELOG.markdown
 - Gemfile
 - Gemfile.lock
@@ -232,26 +195,26 @@ files:
 homepage: http://github.com/greyblake/dm-rspec
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: It's a set of matchers for DataMapper. Something similar to rspec-rails gem.
 test_files: []
+has_rdoc: