moonshine 0.2.0.pre → 0.2.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54b627ff20527b42c4931ca04f2d0fb952feb496
-  data.tar.gz: 9c715207747d8e3669c398534e22ed649cc9c712
+  metadata.gz: aae2eb56018f3507bd3d5f36ded77930c1b1c7e6
+  data.tar.gz: b240d7956adb487b96eee495552fe492ade864c4
 SHA512:
-  metadata.gz: 65703b07dc3896796d67aa220a35543e0335faeccaf5904cb68699a051444aa78066d98f985d63fa4a4437336f98aefd0c4313591415887436cc8e7f7cb4487d
-  data.tar.gz: 246a7a139e67869f86ab9f5b72747d2f38700787919611b8c170f80c316736a7e0688aeb61beed676a07160150afd93a8081c8671b57dcadbc3de952062c6662
+  metadata.gz: 47b2be0dd1bf28acf80a0bb3224e383398aaf6250e1047685089b9e41bef8a5950d9c9745ae37aeb3375e1bb51d350a8f27f31793c74851ef8daddd9f333c26e
+  data.tar.gz: 4867578bd37b75012ff1c23ca5e3f7da42b8d5db571dc511dda9fca2e5e382ba3ce4a5c9d831cae744a93adfd6771d635ebc9d81c1533156059c1753b107905f

data/lib/moonshine/base.rb

@@ -27,9 +27,9 @@ module Moonshine
         self.default_subject = subject
       end
 
-      def param name, call: nil, transform: nil, default: nil, as_boolean: nil
+      def param(name, call: nil, **options, &block)
         self.default_chain ||= []
-        self.default_chain << Moonshine::Filter.new(name, method_name: call || name, transform: transform, default: default, as_boolean: as_boolean)
+        self.default_chain << Moonshine::Filter.new(name, method_name: (call || name), **options, &block)
       end
     end
   end

data/lib/moonshine/filter.rb

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

data/lib/moonshine/version.rb

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

data/test/lib/moonshine/base_test.rb

@@ -32,13 +32,13 @@ describe Moonshine::Base do
 
   describe '.param' do
     it 'instantiates a Moonshine::Filter class' do
-      Moonshine::Filter.expects(:new).with(:filter_name, method_name: :method, transform: nil, default: nil, as_boolean: nil)
+      Moonshine::Filter.expects(:new).with(:filter_name, method_name: :method)
       @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_name: :filter_name, transform: nil, default: nil, as_boolean: nil)
+        Moonshine::Filter.expects(:new).with(:filter_name, method_name: :filter_name)
         @chain_builder.param :filter_name
       end
 

data/test/lib/moonshine/filter_test.rb

@@ -22,7 +22,7 @@ describe Moonshine::Filter do
     end
 
     it 'return subject when default and value are nil' do
-      filter.default = nil
+      filter.options[:default] = nil
       chain_builder_instance.filters = {}
       filter.execute(chain_builder_instance).must_equal chain_builder_instance.subject
     end
@@ -32,7 +32,7 @@ describe Moonshine::Filter 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.method_name.expects(:call).with(chain_builder_instance.subject, 1)
         filter.execute(chain_builder_instance)
       end
     end
@@ -40,7 +40,7 @@ describe Moonshine::Filter do
     describe 'options' do
       describe 'transform' do
         it 'changes value with transform method from klass' do
-          filter.transform = :transform_method
+          filter.options[:transform] = :transform_method
           chain_builder_instance.subject.stubs(:filter)
           chain_builder_instance.expects(:transform_method).with(1)
           filter.execute(chain_builder_instance)
@@ -49,21 +49,21 @@ describe Moonshine::Filter do
 
       describe 'default' do
         it 'uses default value if filter is nil' do
-          filter.default = 2
+          filter.options[:default] = 2
           chain_builder_instance.filters = {}
           chain_builder_instance.subject.expects(:filter).with(2)
           filter.execute(chain_builder_instance)
         end
 
         it 'not use default value if filter is not nil' do
-          filter.default = 2
+          filter.options[:default] = 2
           chain_builder_instance.filters = { filter: 1 }
           chain_builder_instance.subject.expects(:filter).with(1)
           filter.execute(chain_builder_instance)
         end
 
         it 'not sends filter if default and value are nil' do
-          filter.default = nil
+          filter.options[:default] = nil
           chain_builder_instance.filters = {}
           chain_builder_instance.subject.expects(:filter).never
           filter.execute(chain_builder_instance)
@@ -72,14 +72,14 @@ describe Moonshine::Filter do
 
       describe 'as_boolean' do
         it 'sends method without value when true' do
-          filter.as_boolean = true
+          filter.options[:as_boolean] = true
           chain_builder_instance.filters = { filter: true }
           chain_builder_instance.subject.expects(:filter)
           filter.execute(chain_builder_instance)
         end
 
         it 'sends method without value when false' do
-          filter.as_boolean = true
+          filter.options[:as_boolean] = true
           chain_builder_instance.filters = { filter: false }
           chain_builder_instance.subject.expects(:filter).never
           filter.execute(chain_builder_instance)

data/test/lib/moonshine/version_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 describe Moonshine::VERSION do
 
-  it 'is 0.1.0.pre' do
-    Moonshine::VERSION.must_equal '0.1.0.pre'
+  it 'is 0.2.1.pre' do
+    Moonshine::VERSION.must_equal '0.2.1.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moonshine
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.1.pre
 platform: ruby
 authors:
 - Alessio Rocco