context-filters 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd686f4da29b6833e989c2fbf4511bf23d99c2b
-  data.tar.gz: ed9ca9da7754db99621a9e12737b6f593107ab11
+  metadata.gz: 72b337b95267065dd3e8871ef42ad22fd7311322
+  data.tar.gz: cc77744a86f4e924bd30170faf0d412c58110a4d
 SHA512:
-  metadata.gz: 1b253abc8dfbd195feb542a6441d0ab977aff2e7b1de80aa0152158de59218525438078280496a979231e479713779d0d28d015b3299288cf1a3387d1f1a995d
-  data.tar.gz: e91836fa6d5a557b96b019769ddacf8b9030942c9766f24ce5cf9ec619c2dd5038c403af9110f0c3f376062c673930e678050a2a517fb1aef3de10f71ae026b2
+  metadata.gz: 21860acb146a459728f2fe625f0730f1d85e9c97e4e96baef3cf1ce194b444f238d6adedc903b23339bff2711e17fe96ec3fb1d2774127242c09e7d779aa368f
+  data.tar.gz: 2dfa1be389f8301ec671bfab1c55e922472d5ba825a68ec6c5849a99d6fd22dda1c9329c2baecec5ae30ebd79318887e2de92791e57cda01abccac978abe10b4

data/lib/context-filters/filters.rb

@@ -63,8 +63,16 @@ class ContextFilters::Filters
   # @param options [Object] a filter for selecting matching blocks
   def select_filters(target, options)
     found = @filters.fetch(options, [])
-    if   Hash === options || options.nil?
-    then found += @filters.fetch((options||{}).merge(:target => target), [])
+    if
+      Hash === options || options.nil?
+    then
+      options ||={}
+      options.merge!(:target => target)
+      found +=
+      # can not @filters.fetch(options, []) to allow filters provide custom ==()
+      @filters.select do |filter_options, filters|
+        options == filter_options
+      end.map(&:last).flatten
     end
     found
   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.9.1"
+  VERSION = "0.9.2"
 end

data/test/context-filters/filter_test_subject.rb

@@ -5,11 +5,18 @@ See the file LICENSE for copying permission.
 =end
 
 class FilterTestSubject
-  attr_accessor :value
+  attr_accessor :value, :initial_value
   def initialize(value)
     @value = value
+    @initial_value = value
   end
   def change(&block)
     @value = block.call(@value)
   end
+  def ==(other)
+    if self.class === other
+    then self.initial_value == other.initial_value
+    else self.initial_value == other
+    end
+  end
 end

data/test/context-filters/filters_test.rb

@@ -102,6 +102,48 @@ describe ContextFilters::Filters do
       apply_test_subject.value.must_equal("dont test me")
     end
 
+    it "applies only one target filter by value" do
+      subject.store({x: 1, target: "test me"}) { |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
 
+  describe "#select_filters" do
+
+    let(:apply_test_subject) do
+      FilterTestSubject.new("test me")
+    end
+
+    it "selects non target filters" do
+      change_method1 = Proc.new {}
+      change_method2 = Proc.new {}
+      subject.store({x: 1}, &change_method1)
+      subject.store({x: 2}, &change_method2)
+      subject.select_filters(apply_test_subject, {x: 1}).must_equal([change_method1])
+    end
+
+    it "selects target filters" do
+      change_method1 = Proc.new {}
+      change_method2 = Proc.new {}
+      subject.store({x: 1, target: apply_test_subject}, &change_method1)
+      subject.store({x: 2, target: apply_test_subject}, &change_method2)
+      subject.select_filters(apply_test_subject, {x: 2}).must_equal([change_method2])
+    end
+
+
+    it "selects target filters by value" do
+      change_method1 = Proc.new {}
+      change_method2 = Proc.new {}
+      subject.store({x: 1, target: apply_test_subject.initial_value}, &change_method1)
+      subject.store({x: 2, target: apply_test_subject.initial_value}, &change_method2)
+      subject.select_filters(apply_test_subject, {x: 2}).must_equal([change_method2])
+    end
+
+  end #select_filters
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: context-filters
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Michal Papis
@@ -141,10 +141,10 @@ specification_version: 4
 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/filter_test_subject.rb
+- test/context-filters/filters_test.rb
 has_rdoc: