context-filters 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8430ac712eba84a90d2ab08862e6e0142da1b748
-  data.tar.gz: 126e1743e161e5fef693d9b7b5727b6c983d2cec
+  metadata.gz: a378eabd84a4a77fffc09011562666ec496ab827
+  data.tar.gz: 3c63a922769d75d58efd77748888a45520b72dc5
 SHA512:
-  metadata.gz: d8cdbf06f99de8383c8f58a3b43e632dd9ea6efce6da803059e3b1a370d4dcc94881bacce51aff79b1570ef9b90c928f3ab295e121928dd7389958b7c3d3d5f6
-  data.tar.gz: fb036b5357b25b824b63f577e5a3f897c80d2c015df1f46938f9849e966eda20626997ca8a60fb5d31c3d9aacb1d13f43f9d4a678ab33a8e9dd58d52a5dc88fb
+  metadata.gz: e0b7a8bc527aeca7a99e7fc0f6fd8cbb9a086cd3e06d07ede4f3003bd8fc08ac5b7853a88d13e90f96ac0f0fc659ff5f9fe1efd0e4e11a55a99946407479a034
+  data.tar.gz: 12184765863f24c3f73885d8ec33457d1d7f379649b3843d81d487da9aaf8b79de95718d054b1acd1c9cd4122d8de01be02b9c528a1dbbdd76112742cbe1fc42

data/lib/context-filters/context.rb

@@ -15,9 +15,9 @@ class ContextFilters::Context < ContextFilters::GlobalContext
 
   # run the given method on global and local filters
   # @param method [Proc] the method to evaluate for filters matching context
-  def evaluate_filters(method)
-    super(method) do
-      evaluate_local_filters(method)
+  def evaluate_filters(target, method)
+    super(target, method) do
+      evaluate_local_filters(target, method)
     end
   end
 

data/lib/context-filters/filters.rb

@@ -47,12 +47,26 @@ class ContextFilters::Filters
     @filters[options] << block
   end
 
-  # applies matching filters to the given method
-  # @param method  [Method] an object method that takes a transformation
+  # applies matching filters to the given target method, also uses
+  # filters matching extra +:target => target+ when options is a Hash
+  # @param target  [Object] an object to run the method on
+  # @param method  [symbol] method name that takes a transformation
   #                         block as param
   # @param options [Object] a filter for selecting matching blocks
-  def apply(method, options = {})
-    @filters.fetch(options, []).each{|block| method.call(&block) }
+  def apply(target, method, options = nil)
+    select_filters(target, options).each{|block| target.send(method, &block) }
+  end
+
+  # Select matching filters and filters including targets when
+  # options is a +Hash+
+  # @param target  [Object] an object to run the method on
+  # @param options [Object] a filter for selecting matching blocks
+  def select_filters(target, options)
+    found = @filters.fetch(options, [])
+    if   Hash === options
+    then found += @filters.fetch(options.merge(:target => target), [])
+    end
+    found
   end
 
   # Array of already defined filters

data/lib/context-filters/global_context.rb

@@ -59,12 +59,12 @@ class ContextFilters::GlobalContext
   # work for +priority.nil?+ or on the end of the priorities,
   # @param method [Proc] the method to evaluate with filters matching current context
   # @yield on first +priority.nil?+ or on the end when none
-  def evaluate_filters(method)
+  def evaluate_filters(target, method)
     local_called = false
 
     @priority_filters.each do |priority, filters|
 
-      @context.each { |options| filters.apply(method, options) }
+      @context.each { |options| filters.apply(target, method, options) }
 
       if priority.nil? && block_given? && !local_called
         yield

data/lib/context-filters/local_context.rb

@@ -34,8 +34,8 @@ module ContextFilters::LocalContext
   # @param method [Proc] a method to call with each filter stored in
   #                      +local_filters+
   # @api private
-  def evaluate_local_filters(method)
-    local_filters.each { |block| method.call(&block) }
+  def evaluate_local_filters(target, method)
+    local_filters.each { |block| target.send(method, &block) }
   end
 
 end

data/lib/context-filters/version.rb

@@ -1,5 +1,5 @@
 # Build command text based on multiple filters
 class ContextFilters
   # version of the context-filters gem
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/test/context-filters/context_test.rb

@@ -18,29 +18,24 @@ describe ContextFilters::Context do
     FilterTestSubject.new(3)
   end
 
-  let(:change_method) do
-    filter_test_subject.method(:change)
-  end
-
   describe "#evaluate_filters" do
 
     it "does not apply filters when no filters" do
       subject.priority_filters.expects(:apply).never
-      subject.evaluate_filters(Proc.new{})
+      subject.evaluate_filters(filter_test_subject, :change)
     end
 
     it "does apply global filters" do
-      method = Proc.new{}
       subject.context << :a
       subject.filter(nil, :b) { true }
-      subject.priority_filters.to_a[0][1].expects(:apply).once.with(method, nil)
-      subject.priority_filters.to_a[0][1].expects(:apply).once.with(method, :a)
-      subject.evaluate_filters(method)
+      subject.priority_filters.to_a[0][1].expects(:apply).once.with(filter_test_subject, :change, nil)
+      subject.priority_filters.to_a[0][1].expects(:apply).once.with(filter_test_subject, :change, :a)
+      subject.evaluate_filters(filter_test_subject, :change)
     end
 
     it "does apply local filters" do
       subject.stubs(:local_filters).returns([Proc.new{|value| value+4}])
-      subject.evaluate_filters(change_method)
+      subject.evaluate_filters(filter_test_subject, :change)
       filter_test_subject.value.must_equal(7)
     end
 
@@ -51,7 +46,7 @@ describe ContextFilters::Context do
 
       subject.filter(nil,&multiplication)
       subject.local_filter(addition) do
-        subject.evaluate_filters(change_method)
+        subject.evaluate_filters(filter_test_subject, :change)
       end
 
       filter_test_subject.value.must_equal(10)

data/test/context-filters/filters_test.rb

@@ -59,7 +59,7 @@ describe ContextFilters::Filters do
     it "does not apply filter" do
       subject.store({x: 1}) { |value| "better #{value}" }
 
-      subject.apply(apply_test_subject.method(:change), {x: 2})
+      subject.apply(apply_test_subject, :change, {x: 2})
 
       apply_test_subject.value.must_equal("test me")
     end
@@ -67,7 +67,7 @@ describe ContextFilters::Filters do
     it "applies single filter" do
       subject.store({x: 1}) { |value| "better #{value}" }
 
-      subject.apply(apply_test_subject.method(:change), {x: 1})
+      subject.apply(apply_test_subject, :change, {x: 1})
 
       apply_test_subject.value.must_equal("better test me")
     end
@@ -77,7 +77,7 @@ describe ContextFilters::Filters do
       subject.store({x: 1}) { |value| "#{value} please" }
       subject.store({x: 1}) { |value| "#{value}!" }
 
-      subject.apply(apply_test_subject.method(:change), {x: 1})
+      subject.apply(apply_test_subject, :change, {x: 1})
 
       apply_test_subject.value.must_equal("better test me please!")
     end
@@ -86,12 +86,22 @@ describe ContextFilters::Filters do
       subject.store({x: 1}) { |value| "dont #{value}" }
       subject.store({x: 2}) { |value| "#{value} now" }
 
-      subject.apply(apply_test_subject.method(:change), {x: 1})
-      subject.apply(apply_test_subject.method(:change), {x: 2})
+      subject.apply(apply_test_subject, :change, {x: 1})
+      subject.apply(apply_test_subject, :change, {x: 2})
 
       apply_test_subject.value.must_equal("dont test me now")
     end
 
+    it "applies only one target filter" do
+      subject.store({x: 1, target: apply_test_subject}) { |value| "dont #{value}" }
+      subject.store({x: 2, target: nil}) { |value| "#{value} now" }
+
+      subject.apply(apply_test_subject, :change, {x: 1})
+      subject.apply(apply_test_subject, :change, {x: 2})
+
+      apply_test_subject.value.must_equal("dont test me")
+    end
+
   end #apply
 
 end

data/test/context-filters/global_context_test.rb

@@ -6,6 +6,7 @@ See the file LICENSE for copying permission.
 
 require "test_helper"
 require "context-filters/global_context"
+require "context-filters/filter_test_subject"
 
 describe ContextFilters::GlobalContext do
 
@@ -13,6 +14,10 @@ describe ContextFilters::GlobalContext do
     ContextFilters::GlobalContext.new
   end
 
+  let(:filter_test_subject) do
+    FilterTestSubject.new(3)
+  end
+
   describe "#initialize" do
 
     it "sets up initial variables" do
@@ -32,16 +37,16 @@ describe ContextFilters::GlobalContext do
 
     it "does not apply filters when no filters" do
       subject.priority_filters.expects(:apply).never
-      subject.evaluate_filters(Proc.new{})
+      subject.evaluate_filters(filter_test_subject, :change)
     end
 
     it "does apply filters" do
       method = Proc.new{}
       subject.context << :a
       subject.filter(nil, :b) { true }
-      subject.priority_filters.to_a[0][1].expects(:apply).once.with(method, nil)
-      subject.priority_filters.to_a[0][1].expects(:apply).once.with(method, :a)
-      subject.evaluate_filters(method)
+      subject.priority_filters.to_a[0][1].expects(:apply).once.with(filter_test_subject, :change, nil)
+      subject.priority_filters.to_a[0][1].expects(:apply).once.with(filter_test_subject, :change, :a)
+      subject.evaluate_filters(filter_test_subject, :change)
     end
 
   end #evaluate_command

data/test/context-filters/local_context_test.rb

@@ -18,15 +18,12 @@ describe ContextFilters::LocalContext do
     FilterTestSubject.new(3)
   end
 
-  let(:change_method) do
-    filter_test_subject.method(:change)
-  end
-
   it "has default value for #local_filters" do
     subject.local_filters.must_equal([])
   end
 
   it "adds local filters" do
+    change_method = Proc.new {}
     subject.local_filter(change_method) do
       subject.local_filters.must_equal([change_method])
     end
@@ -36,7 +33,7 @@ describe ContextFilters::LocalContext do
   it "runs change" do
     method = Proc.new { |value| value+4 }
     subject.stubs(:local_filters).returns([method])
-    subject.evaluate_local_filters(change_method)
+    subject.evaluate_local_filters(filter_test_subject, :change)
     filter_test_subject.value.must_equal(7)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: context-filters
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -142,9 +142,9 @@ summary: Generic support for filters applied in context
 test_files:
 - test/test_helper.rb
 - test/context-filters/filter_test_subject.rb
+- test/context-filters/priority_filters_test.rb
+- test/context-filters/local_context_test.rb
 - test/context-filters/context_test.rb
-- test/context-filters/filters_test.rb
 - test/context-filters/global_context_test.rb
-- test/context-filters/local_context_test.rb
-- test/context-filters/priority_filters_test.rb
+- test/context-filters/filters_test.rb
 has_rdoc: