smart_rspec 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff5716dab4e7adc48ce3d9a68f5ac08335c9447
-  data.tar.gz: e00030e125016a66de204b9d106ae68e60d39ab3
+  metadata.gz: 3f93d0876da7f46893ef2d4c9ab277d4e3914999
+  data.tar.gz: 5299cc3f8aa245f8091121b6927b20289372e90f
 SHA512:
-  metadata.gz: e84dac0dff7b0985a9a7925c61444e34bd26854ad5c354809932bfe74111207534dde371f239ed279af497afed89eb41520e4393cdf26cec96848031983c41b8
-  data.tar.gz: 2ff5953423af3958d6fda0586f1794927024569f1f8114fcfc5587a848685d4345510a43474da70e015e0b6e8c9705c493a59f074b46c66d3acab26f55925ad8
+  metadata.gz: d748af42e2e3a22be358857de32e4f55cabbef5a891e35de140aa0b5a19fd2da15a7f9a0fc706ad3f9ec8e35c89d53b69f261cdb0e0c0e29df906ea5b50fb8b3
+  data.tar.gz: 46687f5c6aaf73b51190d23e3fed62f8a8b36b693a398c62c5d7d1099dca8be10db640fc81e472cc42815a58050bd3a920be9176a20b46e30b0b62f7e7637fde

data/README.md

@@ -9,7 +9,10 @@ It's time to make your specs even more awesome! SmartRspec adds useful macros an
 
 ## Installation
 
-Compatible with Ruby 1.9+
+Compatible with:
+
+* Ruby 1.9+
+* ActiveRecord (model macros)
 
 Add this line to your application's Gemfile:
 
@@ -40,21 +43,21 @@ end
     * [belongs_to, has_one, has_many](#belongs_to-has_one-has_many)
     * [fails_validation_of](#fails_validation_of)
 * [Matchers](#matchers)
-  * ["Be" matchers](#)
-    * [be_ascending](#be_ascending)
-    * [be_a_bad_request](#be_a_bad_request)
-    * [be_a_list_of](#be_a_list_of)
+  * ["Be" matchers](#be-matchers)
     * [be_boolean](#be_boolean)
-    * [be_descending](#be_descending)
     * [be_email](#be_email)
-    * [be_image_url](#be_image_url)
     * [be_url](#be_url)
-  * ["Have" matchers](#)
+    * [be_image_url](#be_image_url)
+    * [be_a_list_of](#be_a_list_of)
+    * [be_ascending](#be_ascending)
+    * [be_descending](#be_descending)
+    * [be_a_bad_request](#be_a_bad_request)
+  * ["Have" matchers](#have-matchers)
     * [have](#have)
     * [have_at_least](#have_at_least)
     * [have_at_most](#have_at_most)
     * [have_error_on](#have_error_on)
-  * [Other matchers](#)
+  * [Other matchers](#other-matchers)
     * [include_items](#include_items)
 
 ### Macros
@@ -132,27 +135,31 @@ fails_validation_of :foo, format: { with: /foo/, mock: 'bar' }
 
 SmartRspec gathers a collection of custom useful matchers:
 
-#### "Be" matchers
+#### Be matchers
 
-##### be_ascending
+##### be_boolean
+``` ruby
+it { expect(true).to be_boolean }
+it { expect('true').not_to be_boolean }
+```
 
+##### be_email
 ``` ruby
-it { expect([1, 2, 3, 4]).to be_ascending }
-it { expect([1, 4, 2, 3]).not_to be_ascending }
+it { expect('tiagopog@gmail.com').to be_email }
+it { expect('tiagopog@gmail').not_to be_email }
 ```
 
-##### be_a_bad_request
+##### be_url
 ``` ruby
-context 'unauthenticated' do
-  subject { get :profile }
-  it { is_expected.to be_a_bad_request }
-end
+it { expect('http://adtangerine.com').to be_url }
+it { expect('adtangerine.com').not_to be_url }
+```
 
-context 'authenticated' do
-  before { sign_in user }
-  subject { get :profile }
-  it { is_expected.to_not be_a_bad_request }
-end
+##### be_image_url
+``` ruby
+it { expect('http://adtangerine.com/foobar.png').to be_image_url }
+it { expect('http://adtangerine.com/foobar.jpg').not_to be_image_url(:gif) }
+it { expect('http://adtangerine.com/foo/bar').not_to be_image_url }
 ```
 
 ##### be_a_list_of
@@ -160,10 +167,11 @@ end
 it { expect(Foo.fetch_api).to be_a_list_of(Foo)) }
 ```
 
-##### be_boolean
+##### be_ascending
+
 ``` ruby
-it { expect(true).to be_boolean }
-it { expect('true').not_to be_boolean }
+it { expect([1, 2, 3, 4]).to be_ascending }
+it { expect([1, 4, 2, 3]).not_to be_ascending }
 ```
 
 ##### be_descending
@@ -172,26 +180,21 @@ it { expect([4, 3, 2, 1]).to be_descending }
 it { expect([1, 2, 3, 4]).not_to be_descending }
 ```
 
-##### be_email
-``` ruby
-it { expect('tiagopog@gmail.com').to be_email }
-it { expect('tiagopog@gmail').not_to be_email }
-```
-
-##### be_image_url
+##### be_a_bad_request
 ``` ruby
-it { expect('http://adtangerine.com/foobar.png').to be_image_url }
-it { expect('http://adtangerine.com/foobar.jpg').not_to be_image_url(:gif) }
-it { expect('http://adtangerine.com/foo/bar').not_to be_image_url }
-```
+context 'unauthenticated' do
+  subject { get :profile }
+  it { is_expected.to be_a_bad_request }
+end
 
-##### be_url
-``` ruby
-it { expect('http://adtangerine.com').to be_url }
-it { expect('adtangerine.com').not_to be_url }
+context 'authenticated' do
+  before { sign_in user }
+  subject { get :profile }
+  it { is_expected.to_not be_a_bad_request }
+end
 ```
 
-#### "Have" matchers
+#### Have matchers
 
 ##### have(x).items
 ``` ruby

data/lib/smart_rspec/support/assertions.rb

@@ -57,13 +57,17 @@ module SmartRspec
       end
 
       def validates_uniqueness_of(attr, validation)
-        scoped, scope =
-          scoped_validation?(validation),
-          validation.values_at(:scope).first
-
-        it "is already in use#{" (scope: #{scope})" if scoped}" do
-          mock = validation.values_at(:mock).first || subject.dup
-          scoped && mock.send("#{validation[:scope]}=", subject.send(validation[:scope]))
+        scoped = scoped_validation?(validation)
+        it "is already in use#{" (scope: #{validation[:scope]})" if scoped}" do
+          mock =
+            if scoped
+              copy = subject.send(validation[:scope])
+              validation[:mock].send("#{validation[:scope]}=", copy)
+              validation[:mock]
+            else
+              subject.dup
+            end
+          subject.save unless subject.persisted?
           validation_expectation(attr, subject.send(attr), mock)
         end
       end

data/lib/smart_rspec/version.rb

@@ -1,3 +1,3 @@
 module SmartRspec
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/factories/user.rb

@@ -39,6 +39,8 @@ module Factories
       [:en, :pt].include?(locale) && @locale = locale
     end
 
+    def persisted?; true end
+
     def valid?
       %w(email father locale name username).each { |e| send("check_#{e}") }
       @errors.nil?

data/spec/smart_rspec/macros_spec.rb

@@ -61,7 +61,7 @@ describe SmartRspec::Macros do
     context 'when it receives a single arg' do
       user = User.new(email: Faker::Internet.email)
 
-      fails_validation_of :email, presence: true, email: true
+      fails_validation_of :email, presence: true, email: true, uniqueness: true
       fails_validation_of :name, length: { maximum: 80 }
       fails_validation_of :username, uniqueness: { scope: :name, mock: user }, exclusion: { in: %w(foo bar) }
       fails_validation_of :locale, inclusion: { in: %w(en pt) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tiago Guedes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport