nifty_scope 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0aa3cbcad77bb64485de13d8efcfd7c4afafe8
-  data.tar.gz: ea24b5f05443b66094468902b284efb579622a75
+  metadata.gz: 413d2743ff2f7a25c565f79561e840a69cf96c75
+  data.tar.gz: 1643762b2c0195271adcb4b6820c8e07f226a01f
 SHA512:
-  metadata.gz: de5afeb537ae8badb0d8a118dc2d1e83ea2aed2c973e6d59390a9034809814f43ce1a7ab17acd3184b506c440c9c7e12a84a8539182bf591df54e526ef1e75e5
-  data.tar.gz: b8ca5095cb673a3490a8fdaa9fce3b0193c7cdf3d52405f8f42c1e77617726d5e5401b12ba39279d77cbaa56dc0ac8ab09b27efb6a43d85bd542f3d2e94c2336
+  metadata.gz: d28cf65a4f73dd0ac69481924c17408b34f11d1892d2a20c0cd5419489fd4d539388e91ae95f80bcc8823fcf7176b68708fe826563d41fa27dbdf36374ca1c70
+  data.tar.gz: ea0e360afb95dbc9ba994c442d861e30f475950c923aa3e7a296f0dda28247eb4dc27822723d37976a1a390cb3cb55828156e7356d517d78251d3f441bc5bbdc

data/lib/nifty_scope.rb

@@ -1,44 +1,14 @@
-require "nifty_scope/version"
+require 'nifty_scope/scope'
+require 'nifty_scope/version'
 
 module NiftyScope
   extend ActiveSupport::Concern
 
   module ClassMethods
     def nifty_scope(params, options = {})
-      if options.has_key?(:only)
-        options[:only] = Array(options[:only])
-        params.slice!(*options[:only])
-      elsif options.has_key?(:except)
-        options[:except] = Array(options[:except])
-        params.except!(*options[:except])
-      end
-
-      mapping ||= options[:mapping] || {}
-      scope = where(nil)
-
-      params.each do |(key, value)|
-        key = key.to_sym
-        scope_method = if mapping.has_key?(key)
-          mapping[key]
-        else
-          key
-        end
-        if scope_method.is_a?(Symbol) && !scope.respond_to?(scope_method)
-          raise IrresponsibleScope, "#{scope.name} can't respond to ##{scope_method} method"
-        end
-
-        scope = if scope_method.is_a?(Proc)
-          scope.instance_exec(value, &scope_method)
-        else
-          scope.send(scope_method, value)
-        end
-      end
-      scope
+      Scope.new(where(nil), params, options).apply
     end
   end
-
-  class IrresponsibleScope < Exception
-  end
 end
 
 ActiveRecord::Base.class_eval do

data/lib/nifty_scope/irresponsible_scope.rb

@@ -0,0 +1,4 @@
+module NiftyScope
+  class IrresponsibleScope < Exception
+  end
+end

data/lib/nifty_scope/scope.rb

@@ -0,0 +1,52 @@
+require 'nifty_scope/irresponsible_scope'
+
+module NiftyScope
+  class Scope
+    def initialize(scope, params, options)
+      @scope = scope
+      @mapping = options[:mapping] || {}
+      @params = filter(params, options)
+    end
+
+    def apply
+      @params.each do |key, value|
+        scope_method = scope_method_for(key.to_sym)
+        ensure_scope_responds_to(scope_method)
+
+        @scope = eval_scope(scope_method, scope_args(value))
+      end
+
+      @scope
+    end
+
+    private
+
+    def eval_scope(method, args)
+      if method.is_a?(Proc)
+        @scope.instance_exec(*args, &method)
+      else
+        @scope.send(method, *args)
+      end
+    end
+
+    def scope_args(*args)
+      args.delete_if { |arg| !!arg == arg }
+    end
+
+    def scope_method_for(key)
+      @mapping[key] || key
+    end
+
+    def ensure_scope_responds_to(method)
+      if method.is_a?(Symbol) && !@scope.respond_to?(method)
+        raise IrresponsibleScope, "#{@scope.name} can't respond to ##{method} method"
+      end
+    end
+
+    def filter(params, options)
+      return params.slice(*options[:only])    if options.has_key?(:only)
+      return params.except(*options[:except]) if options.has_key?(:except)
+      params
+    end
+  end
+end

data/lib/nifty_scope/version.rb

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

data/spec/nifty_scope/nifty_scope_spec.rb

@@ -1,21 +1,44 @@
 require 'spec_helper'
 
 describe NiftyScope do
-
   before(:all) do
-    params = { name: 'cunt' }
-
-    create_list(:deer, 3)
+    create(:deer)
+    create(:deer, :dead => true)
     create(:deer, :name => 'cunt')
+  end
+
+  context 'with parametrized scope' do
+    let!(:params) { { name: 'cunt' } }
+    let!(:deers) do
+      Deer.nifty_scope(params,
+        mapping: {
+          name: ->(name) { with_name(name) }
+        }, only: [:name]
+      )
+    end
 
-    @deers = Deer.nifty_scope(params,
-      mapping: {
-        name: ->(name) { with_name(name) }
-      }, only: [:name]
-    )
+    it 'calls appropriate scope method' do
+      expect(deers.count).to eq(1)
+    end
   end
 
-  it 'calls appropriate scope method' do
-    expect(@deers.count).to eq(1)
+  context 'with parameterless scope' do
+    let!(:params) { { :dead => true } }
+
+    context 'when mapping is specified' do
+      let!(:deers) { Deer.nifty_scope(params, only: [:dead]) }
+
+      it 'calls appropriate scope method' do
+        expect(deers.count).to eq(1)
+      end
+    end
+
+    context 'when mapping is not specified' do
+      let!(:deers) { Deer.nifty_scope(params) }
+
+      it 'calls appropriate scope method' do
+        expect(deers.count).to eq(1)
+      end
+    end
   end
 end

data/spec/nifty_scope/support/models.rb

@@ -1,4 +1,7 @@
 class Deer < ActiveRecord::Base
-  scope :over_21, -> { where('age > 21') }
-  scope :with_name, ->(name) { where(:name => name) }
+  scope :over_21,   -> { where('age > 21') }
+  scope :with_name, ->(name) { where(name: name) }
+
+  scope :dead,  -> { where(dead: true) }
+  scope :alive, -> { where(dead: false) }
 end

data/spec/nifty_scope/support/schema.rb

@@ -5,6 +5,7 @@ ActiveRecord::Schema.define do
     t.string :name
     t.integer :age
     t.integer :weight
+    t.boolean :dead, null: false, default: false
 
     t.timestamps
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifty_scope
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vasiliy Yorkin, Alexandr Shuhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -149,6 +149,8 @@ files:
 - README.md
 - Rakefile
 - lib/nifty_scope.rb
+- lib/nifty_scope/irresponsible_scope.rb
+- lib/nifty_scope/scope.rb
 - lib/nifty_scope/version.rb
 - nifty_scope.gemspec
 - spec/nifty_scope/nifty_scope_spec.rb
@@ -186,3 +188,4 @@ test_files:
 - spec/nifty_scope/support/models.rb
 - spec/nifty_scope/support/schema.rb
 - spec/spec_helper.rb
+has_rdoc: