nifty_scope 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413d2743ff2f7a25c565f79561e840a69cf96c75
-  data.tar.gz: 1643762b2c0195271adcb4b6820c8e07f226a01f
+  metadata.gz: c148c4b9f79230e3d26591f1e5dfe0e8f8371edf
+  data.tar.gz: 67278babca483409f837b6f3c2803f6c0dc3d1cd
 SHA512:
-  metadata.gz: d28cf65a4f73dd0ac69481924c17408b34f11d1892d2a20c0cd5419489fd4d539388e91ae95f80bcc8823fcf7176b68708fe826563d41fa27dbdf36374ca1c70
-  data.tar.gz: ea0e360afb95dbc9ba994c442d861e30f475950c923aa3e7a296f0dda28247eb4dc27822723d37976a1a390cb3cb55828156e7356d517d78251d3f441bc5bbdc
+  metadata.gz: 6cd20e6db68f1c20e02e067263ed3528aa47a326b8c771a89eefc18e70fe5864cf82d201d139de620eee89851b719139c69721c3752d534ee99d4e30cf6d19d5
+  data.tar.gz: b06f7f6b31a7c02fbb1be2be367870b28178bc77674a32d7959272b9253c86564d086994d60d1b2a1cabc2bac5d5e86739078021d32c1c4fd473aa480fe0ac65

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 memory
+tags

data/Gemfile

@@ -2,12 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'pry'
+gem 'byebug'
+gem 'pry-byebug'
+
 group :test, :development do
   gem 'pre-commit'
   gem 'cane'
 end
 
-group :development do
-  gem 'byebug'
-  gem 'pry-byebug'
+group :test do
+  gem 'coveralls', require: false
+  gem 'codeclimate-test-reporter', require: false
 end

data/lib/nifty_scope/scope.rb

@@ -13,7 +13,7 @@ module NiftyScope
         scope_method = scope_method_for(key.to_sym)
         ensure_scope_responds_to(scope_method)
 
-        @scope = eval_scope(scope_method, scope_args(value))
+        @scope = eval_scope(scope_method, value)
       end
 
       @scope
@@ -23,9 +23,15 @@ module NiftyScope
 
     def eval_scope(method, args)
       if method.is_a?(Proc)
-        @scope.instance_exec(*args, &method)
+        if method.arity > 0
+          @scope.instance_exec(*args, &method)
+        elsif args
+          @scope.instance_exec(&method)
+        else
+          @scope
+        end
       else
-        @scope.send(method, *args)
+        @scope.send(method, *scope_args(args))
       end
     end
 

data/lib/nifty_scope/version.rb

@@ -1,3 +1,3 @@
 module NiftyScope
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/nifty_scope/nifty_scope_spec.rb

@@ -1,3 +1,4 @@
+require 'pry-byebug'
 require 'spec_helper'
 
 describe NiftyScope do
@@ -22,6 +23,43 @@ describe NiftyScope do
     end
   end
 
+  context 'with mappings to boolean scope' do
+    let!(:paramsless_deers) do
+      Deer.nifty_scope(params, mapping: {
+        is_alive: -> { alive }
+      })
+    end
+    let!(:paramsfull_deers) do
+      Deer.nifty_scope(params, mapping: {
+        is_alive: ->(value) { value ? alive : dead }
+      })
+    end
+
+    describe 'show me alive deers' do
+      let!(:params) { { is_alive: true } }
+
+      it 'should return two alive deers with parameterfull mapping' do
+        expect(paramsfull_deers.count).to eq(2)
+      end
+
+      it 'should return two alive deers with parameterless mapping' do
+        expect(paramsless_deers.count).to eq(2)
+      end
+    end
+
+    describe 'show me dead deers' do
+      let!(:params) { { is_alive: false} }
+
+      it 'should return two alive deers with parameterfull mapping' do
+        expect(paramsfull_deers.count).to eq(1)
+      end
+
+      it 'should return two alive deers with parameterless mapping' do
+        expect(paramsless_deers.count).to eq(3)
+      end
+    end
+  end
+
   context 'with parameterless scope' do
     let!(:params) { { :dead => true } }
 

metadata

@@ -1,149 +1,149 @@
 --- !ruby/object:Gem::Specification
 name: nifty_scope
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vasiliy Yorkin, Alexandr Shuhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_sequences
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ' Provides an easy way to map request parameters to scopes '
+description: " Provides an easy way to map request parameters to scopes "
 email:
 - vasiliy.yorkin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -168,17 +168,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Provides an easy way to map request parameters to scopes