moonshine 0.1.0.pre → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f5558c94202fe30b961a00b82bd32f526282f02
-  data.tar.gz: a514229cee0d1d404dffd55c7a554ffa47d165ff
+  metadata.gz: 54b627ff20527b42c4931ca04f2d0fb952feb496
+  data.tar.gz: 9c715207747d8e3669c398534e22ed649cc9c712
 SHA512:
-  metadata.gz: 31c49e76e3032ef4ab86ccdc5de41dac75ba949679ab88653386b2429263bf6da1c956fc10fdefd459aedd13c35b656684b4123098beb4c1febfd53fd66c017e
-  data.tar.gz: b478a9067cbc6bccb3202ea6aabc35561593f3537ede04cf3ec6b8488f5f41341c40869b2ef0892e7489903b33f55db158c94d2f179a9c183a2b6d5ee7f2b279
+  metadata.gz: 65703b07dc3896796d67aa220a35543e0335faeccaf5904cb68699a051444aa78066d98f985d63fa4a4437336f98aefd0c4313591415887436cc8e7f7cb4487d
+  data.tar.gz: 246a7a139e67869f86ab9f5b72747d2f38700787919611b8c170f80c316736a7e0688aeb61beed676a07160150afd93a8081c8671b57dcadbc3de952062c6662

data/lib/moonshine/base.rb

@@ -29,7 +29,7 @@ module Moonshine
 
       def param name, call: nil, transform: nil, default: nil, as_boolean: nil
         self.default_chain ||= []
-        self.default_chain << Moonshine::Filter.new(name, method: call || name, transform: transform, default: default, as_boolean: as_boolean)
+        self.default_chain << Moonshine::Filter.new(name, method_name: call || name, transform: transform, default: default, as_boolean: as_boolean)
       end
     end
   end

data/lib/moonshine/filter.rb

@@ -1,33 +1,34 @@
 module Moonshine
   class Filter
 
-    attr_accessor :name, :method, :transform, :default, :as_boolean
+    attr_accessor :name, :method_name, :transform, :default, :as_boolean
 
-    def initialize(name, method: nil, transform: nil, default: nil, as_boolean: nil)
+    def initialize(name, method_name: nil, transform: nil, default: nil, as_boolean: nil, &block)
       @name = name
-      @method = method
+      @method_name = method_name || block
       @transform = transform
       @default = default
       @as_boolean = as_boolean
     end
 
     def execute(klass)
-      if klass.filters[name] || default
-        if as_boolean
-          if klass.filters[name]
-            return klass.subject.send(method)
-          else
-            return klass.subject.send(method) if default
-          end
-        else
-          return klass.subject.send(method, set_transform(klass, set_default(klass.filters[name])))
-        end
+      unless as_boolean
+         args = set_transform(klass, set_default(klass.filters[name]))
       end
+      return method_call(klass, args) if klass.filters[name] || default
       klass.subject
     end
 
     private
 
+    def method_call(klass, *args)
+      if method_name.is_a? Proc
+        method_name.call(klass, *args)
+      else
+        klass.subject.send(method_name, *args)
+      end
+    end
+
     def set_default value
       value || default
     end

data/lib/moonshine/version.rb

@@ -1,3 +1,3 @@
 module Moonshine
-  VERSION = "0.1.0.pre"
+  VERSION = "0.2.0.pre"
 end

data/test/lib/moonshine/base_test.rb

@@ -32,15 +32,23 @@ describe Moonshine::Base do
 
   describe '.param' do
     it 'instantiates a Moonshine::Filter class' do
-      Moonshine::Filter.expects(:new).with(:filter_name, method: :method, transform: nil, default: nil, as_boolean: nil)
+      Moonshine::Filter.expects(:new).with(:filter_name, method_name: :method, transform: nil, default: nil, as_boolean: nil)
       @chain_builder.param :filter_name, call: :method
     end
 
     describe 'when :call is not given' do
       it 'instantiates a Moonshine::Filter class with call same as first param' do
-        Moonshine::Filter.expects(:new).with(:filter_name, method: :filter_name, transform: nil, default: nil, as_boolean: nil)
+        Moonshine::Filter.expects(:new).with(:filter_name, method_name: :filter_name, transform: nil, default: nil, as_boolean: nil)
         @chain_builder.param :filter_name
       end
+
+      describe 'and a block is given' do
+        it 'instantiates a Moonshine::Filter call with block as call' do
+          block = Proc.new{ |subject| subject }
+          Moonshine::Filter.expects(:new).with(:filter_name, &block)
+          @chain_builder.param :filter_name, &block
+        end
+      end
     end
 
     it 'adds filter to default_chain' do

data/test/lib/moonshine/filter_test.rb

@@ -6,11 +6,14 @@ describe Moonshine::Filter do
     @chain_builder = Class.new(Moonshine::Base) do
       subject default_subject
       param :name, call: :scope
+      param :block do |subject, value|
+        subject.some_method(value)
+      end
     end
   end
 
   describe '#execute' do
-    let(:filter) { Moonshine::Filter.new(:filter, method: :filter) }
+    let(:filter) { Moonshine::Filter.new(:filter, method_name: :filter) }
     let(:chain_builder_instance) { @chain_builder.new({ filter: 1 }) }
 
     it 'sends scope to klass' do
@@ -24,6 +27,16 @@ describe Moonshine::Filter do
       filter.execute(chain_builder_instance).must_equal chain_builder_instance.subject
     end
 
+    describe 'when block is given' do
+      it 'calls block' do
+        block = Proc.new { |subject, value| subject.some_method(value) }
+        filter = Moonshine::Filter.new(:filter, &block)
+        chain_builder_instance = @chain_builder.new({ filter: 1 })
+        filter.method_name.expects(:call)
+        filter.execute(chain_builder_instance)
+      end
+    end
+
     describe 'options' do
       describe 'transform' do
         it 'changes value with transform method from klass' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshine
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - Alessio Rocco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler