smart_rspec 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56204d08a3ee3d45091216ca50b197a4d9b08095
-  data.tar.gz: dd3431e077d7ef0a94d6df2e8df66779f14c1705
+  metadata.gz: 48b874a311311e784f28124875c47496d24341a4
+  data.tar.gz: 58bcf16c460903b3c77fb796bd62e95ce37ef177
 SHA512:
-  metadata.gz: b5a735e0e33fb63863c343ad17b3a5daeb0282cc759d7a1852cc2a7c734db2d69cb58cea1724548841abe331b1b1d9261eb38d0a8099a08f679c13b8c33d5be6
-  data.tar.gz: 3afea96381aeb7aed7dedf20eabd1814e07e9cb08731760deba0fd8b10aef4de2447f41f4244b45e35445264107a1377763584badc84cd5ad903247ed12db72b
+  metadata.gz: 28623faa3ad5c10172b668672598cfaf0da6725bb4532fb3e7ad40043ddeb390ccbbf5252115b3874edadd374023d96acd30ff4cf2a59fdd479dc84846630f17
+  data.tar.gz: 65f2a44c1f27a69ac5ac9ead3b7e88d97ef1e471b5dba36c0121a6f229a6d2157383f740bb7a111bf0f8962c8ae7d46578e38b5da735114a1c1e94b18e519ccf

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0

data/README.md

@@ -1,6 +1,11 @@
 # SmartRspec
 
-It's time to make your specs even more awesome! SmartRspec adds useful macros and matchers into the RSpec's test suite, this way you can quickly define specs for your Rails app and get focused on making things turn into green.
+[![Build Status](https://travis-ci.org/tiagopog/smart_rspec.svg)](https://travis-ci.org/tiagopog/smart_rspec)
+[![Code Climate](https://codeclimate.com/github/tiagopog/smart_rspec/badges/gpa.svg)](https://codeclimate.com/github/tiagopog/smart_rspec)
+[![Dependency Status](https://gemnasium.com/tiagopog/smart_rspec.svg)](https://gemnasium.com/tiagopog/smart_rspec)
+[![Gem Version](https://badge.fury.io/rb/smart_rspec.svg)](http://badge.fury.io/rb/smart_rspec)
+
+It's time to make your specs even more awesome! SmartRspec adds useful macros and matchers into the RSpec's test suite, so you can quickly define specs for your Rails app and get focused on making things turn into green.
 
 ## Installation
 
@@ -192,7 +197,7 @@ it { expect(%w(foo bar foobar)).to include_items(%w(foo bar foobar)) }
 # TODO
 
 - Create macros for model scopes;
-- Create macros for controllers and requests;
+- Create macros for controllers;
 - Add more matchers.
 
 ## Contributing
@@ -204,3 +209,4 @@ it { expect(%w(foo bar foobar)).to include_items(%w(foo bar foobar)) }
 4. Commit your changes (`git commit -am 'Add some feature'`);
 5. Push to the branch (`git push origin my-new-feature`);
 6. Create new Pull Request.
+

data/Rakefile

@@ -1,2 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec
 

data/lib/smart_rspec/macros.rb

@@ -8,7 +8,7 @@ module SmartRspec::Macros
   end
 
   def has_attributes(*attrs)
-    options = attrs.last.is_a?(Hash) && attrs.last.has_key?(:type) ? attrs.pop : nil
+    options = attrs.last.is_a?(Hash) && attrs.last.key?(:type) ? attrs.pop : nil
     assert_has_attributes(attrs, options)
   end
 

data/lib/smart_rspec/matchers.rb

@@ -1,13 +1,11 @@
 require 'rspec/matchers'
-require 'rspec/expectations'
 require 'rspec/collection_matchers'
 require 'smart_rspec/support/regexes'
 
-include SmartRspec::Support::Regexes
-
 module SmartRspec
   module Matchers
     extend RSpec::Matchers::DSL
+    include SmartRspec::Support::Regexes
 
     matcher :be_boolean do
       match { |actual| [true, false].include?(actual) }
@@ -29,8 +27,8 @@ module SmartRspec
       match { |actual| actual.errors.keys.include?(attr) }
     end
 
-    matcher :include_items do |*items|
-      match { |actual| (items.flatten - [actual].flatten).empty? }
+    matcher :include_items do |items|
+      match { |actual| (items - actual).empty? }
     end
 
     matcher :be_ascending do
@@ -38,7 +36,9 @@ module SmartRspec
     end
 
     matcher :be_descending do
-      match { |actual| actual.each_cons(2).all? { |i, j| i >= j  } }
+      match do |actual|
+        actual.each_cons(2).all? { |i, j| i >= j  }
+      end
     end
   end
 end

data/lib/smart_rspec/support/assertions.rb

@@ -6,14 +6,14 @@ module SmartRspec
       def validates_email_of(attr, validation)
         it 'has an invalid format' do
           %w(foobar foobar@ @foobar foo@bar).each do |e|
-            assert_validation(attr, e)
+            validation_expectation(attr, e)
           end
         end
       end
 
       def validates_exclusion_of(attr, validation)
         it 'has a reserved value' do
-          assert_validation(attr, validation[:in].sample)
+          validation_expectation(attr, validation[:in].sample)
         end
       end
 
@@ -24,7 +24,7 @@ module SmartRspec
             validation.values_at(:with).first
 
           if mock && with && with !~ mock
-            assert_validation(attr, mock)
+            validation_expectation(attr, mock)
           else
             raise ArgumentError, ':with and :mock are required when using the :format validation'
           end
@@ -36,64 +36,54 @@ module SmartRspec
           begin
             value = SecureRandom.hex
           end while validation[:in].include?(value)
-          assert_validation(attr, value)
+          validation_expectation(attr, value)
         end
       end
 
       def validates_length_of(attr, validation)
         validation.each do |key, value|
-          next unless %i(in is maximum minimum within).include?(key)
+          next unless [:in, :is, :maximum, :minimum, :within].include?(key)
           txt, n = build_length_validation(key, value)
           it txt do
-            assert_validation(attr, 'x' * n)
+            validation_expectation(attr, 'x' * n)
           end
         end
       end
 
       def validates_presence_of(attr, validation)
         it 'is blank' do
-          assert_validation(attr, nil)
+          validation_expectation(attr, nil)
         end
       end
 
       def validates_uniqueness_of(attr, validation)
-        scoped = scoped_validation?(validation)
-        scope = scoped ? validation[:scope] : nil
+        scoped, scope =
+          scoped_validation?(validation),
+          validation.values_at(:scope).first
 
         it "is already in use#{" (scope: #{scope})" if scoped}" do
-          mock = (validation[:mock] rescue nil) || subject.dup
-          scoped && mock.send("#{scope}=", subject.send(scope))
-
-          assert_validation(attr, subject.send(attr), mock)
+          mock = validation.values_at(:mock).first || subject.dup
+          scoped && mock.send("#{validation[:scope]}=", subject.send(validation[:scope]))
+          validation_expectation(attr, subject.send(attr), mock)
         end
       end
 
       def assert_has_attributes(attrs, options)
         type_str = build_type_str(options)
-        default, enum, type = options.values_at(:default, :enum, :type)
 
         attrs.each do |attr|
           it %Q(has an attribute named "#{attr}"#{type_str}) do
             expect(subject).to respond_to(attr)
-            default && (expect(subject.send(attr)).to eq(default))
-            enum && (expect(enum).to include(subject.send(attr).to_sym))
-            type && assert_attr_type(attr, type, options)
+            has_attributes_expectation(attr, options)
           end
         end
       end
 
-      def assert_association(assoc_type, associations)
-        associations.each do |association|
-          it "#{assoc_type.to_s.gsub('_', ' ')} #{association}" do
-            expect(subject).to respond_to(association)
-            case assoc_type
-            when :belongs_to
-              %W(#{association}= #{association}_id #{association}_id=).each do |method|
-                expect(subject).to respond_to(method)
-              end
-            when :has_many
-              expect(subject).to respond_to("#{association.to_s.singularize}_ids")
-            end
+      def assert_association(type, associations)
+        associations.each do |model|
+          it "#{type.to_s.gsub('_', ' ')} #{model}" do
+            expect(subject).to respond_to(model)
+            association_expectation(type, model)
           end
         end
       end
@@ -117,7 +107,7 @@ module SmartRspec
       end
 
       def scoped_validation?(validation)
-        validation.is_a?(Hash) && (%i(scope mock) - validation.keys).empty?
+        validation.is_a?(Hash) && ([:scope, :mock] - validation.keys).empty?
       end
     end
   end

data/lib/smart_rspec/support/expectations.rb

@@ -1,18 +1,41 @@
 module SmartRspec
   module Support
     module Expectations
-      def assert_attr_type(attr, type, other)
-        assert_type = type == :Boolean ? be_boolean : be_kind_of(Kernel.const_get(type))
-        expect(subject.send(attr)).to assert_type
-      end
-
-      def assert_validation(attr, value = nil, mock = nil)
+      def validation_expectation(attr, value = nil, mock = nil)
         mock ||= subject
         mock.send("#{attr}=", value)
 
         expect(mock).not_to be_valid
         expect(mock).to have_error_on(attr)
       end
+
+      def default_expectation(attr, value)
+        expect(subject.send(attr)).to eq(value)
+      end
+
+      def enum_expectation(attr, value)
+        expect(value).to include(subject.send(attr).to_sym)
+      end
+
+      def type_expectation(attr, value)
+        assert_type = value != :Boolean ? be_kind_of(Kernel.const_get(value)) : be_boolean
+        expect(subject.send(attr)).to assert_type
+      end
+
+      def has_attributes_expectation(attr, options) options.each do |key, value|
+          send("#{key}_expectation", attr, value)
+        end
+      end
+
+      def association_expectation(type, model)
+        if type == :has_many
+          expect(subject).to respond_to("#{model.to_s.singularize}_ids")
+        elsif type == :belongs_to
+          %W(#{model}= #{model}_id #{model}_id=).each do |method|
+            expect(subject).to respond_to(method)
+          end
+        end
+      end
     end
   end
 end

data/lib/smart_rspec/support/regexes.rb

@@ -1,22 +1,29 @@
 module SmartRspec
   module Support
     module Regexes
+      @@uri_regexes =
+        { protocol: /((ht|f)tp[s]?)/i,
+          uri: %r{^(
+                (((ht|f)tp[s]?://)|([a-z0-9]+\.))+
+                (?<!@)
+                ([a-z0-9\_\-]+)
+                (\.[a-z]+)+
+                ([\?/\:][a-z0-9_=%&@\?\./\-\:\#\(\)]+)?
+                /?
+              )$}ix }
+
       def build_regex(type, *args)
-        type = type.to_sym unless type.is_a? Symbol
-        case type
-        when :email
-          /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
-        when :image
-          build_img_regex(args.flatten)
-        else
-          build_uri_regex[type]
+        case type.to_sym
+        when :email then /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+        when :image then build_img_regex(args)
+        else @@uri_regexes[type]
         end
       end
 
       private_class_method
 
       def build_img_regex(exts = [])
-        exts = [exts].flatten unless exts.is_a?(Array)
+        exts = [exts].flatten
         if exts.nil? || exts.empty?
           exts = %w(jpg jpeg png gif)
         elsif exts.include?(:jpg) && !exts.include?(:jpeg)
@@ -24,20 +31,6 @@ module SmartRspec
         end
         %r{(^http{1}[s]?://([w]{3}\.)?.+\.(#{exts.join('|')})(\?.+)?$)}i
       end
-
-      def build_uri_regex
-        {
-          uri: %r{^(
-                (((ht|f)tp[s]?://)|([a-z0-9]+\.))+
-                (?<!@)
-                ([a-z0-9\_\-]+)
-                (\.[a-z]+)+
-                ([\?/\:][a-z0-9_=%&@\?\./\-\:\#\(\)]+)?
-                /?
-              )$}ix,
-          protocol: /((ht|f)tp[s]?)/i
-        }
-      end
     end
   end
 end

data/lib/smart_rspec/version.rb

@@ -1,3 +1,3 @@
 module SmartRspec
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/smart_rspec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 4.1'
   spec.add_runtime_dependency 'rspec-collection_matchers', '~> 1.1', '>= 1.1.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'faker', '~> 1.4'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.2'

data/spec/factories/user.rb

@@ -36,7 +36,7 @@ module Factories
     end
 
     def locale=(locale)
-      %i(en pt).include?(locale) && @locale = locale
+      [:en, :pt].include?(locale) && @locale = locale
     end
 
     def valid?
@@ -59,7 +59,7 @@ module Factories
     end
 
     def check_locale
-      unless %i(en pt).include?(locale)
+      unless [:en, :pt].include?(locale)
         @errors.merge!({ locale: @@error_message[:inclusion] })
       end
     end

data/spec/smart_rspec/macros_spec.rb

@@ -29,7 +29,7 @@ describe SmartRspec::Macros do
       has_attributes :email, :name, :username, type: :String
       has_attributes :is_admin, type: :Boolean
       has_attributes :score, type: :Integer, default: 0
-      has_attributes :locale, type: :String, enum: %i(en pt), default: 'en'
+      has_attributes :locale, type: :String, enum: [:en, :pt], default: 'en'
     end
 
     context 'when it receives multiple args' do

data/spec/smart_rspec/matchers_spec.rb

@@ -73,7 +73,7 @@ describe 'SmartRspec Matchers' do
       it { expect('http://foobar.com/foo.jpg').to be_image_url(:jpg) }
       it { expect('http://foobar.com/foo.gif').to be_image_url(:gif) }
       it { expect('http://foobar.com/foo.png').to be_image_url(:png) }
-      it { expect('http://foobar.com/foo.png').to be_image_url(%i(jpg png)) }
+      it { expect('http://foobar.com/foo.png').to be_image_url([:jpg, :png]) }
       it { expect('http://foobar.com/foo/bar?image=foo.jpg').to be_image_url }
     end
 
@@ -82,7 +82,7 @@ describe 'SmartRspec Matchers' do
       it { expect('http://foobar.com/foo.jpg').not_to be_image_url(:gif) }
       it { expect('http://foobar.com/foo.gif').not_to be_image_url(:png) }
       it { expect('http://foobar.com/foo.png').not_to be_image_url(:jpg) }
-      it { expect('http://foobar.com/foo.gif').not_to be_image_url(%i(jpg png)) }
+      it { expect('http://foobar.com/foo.gif').not_to be_image_url([:jpg, :png]) }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tiago Guedes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md