hash_filter 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ad60cf984134430e2f3acb77dce6e4fcde3463
-  data.tar.gz: 665bdf1afd2824c7fa82a9a35f36cfe935ae5ad6
+  metadata.gz: d0fd98b0f5b9de5021c6eb6d9f7d3b657017a633
+  data.tar.gz: 48aa07a8370204b8ec1303b0bfd0bcf0949cd741
 SHA512:
-  metadata.gz: 74bc5bb6a7becb715975987455c650dc1f07f277d728118a46644c698660391bbce21d46488231527c94e76f5471c0b96ab018d4058235abae603d86c63c963a
-  data.tar.gz: 21588d845ffdb2e0583ebd984e477ecd6772df745958d52fa73f0f6d868cbb317a330fcb84e5ffde6c4a07fb26de3c083f2b9048a1ba6c35d324597575d3e665
+  metadata.gz: 89aef08668e418b0b05a527679daadf24807fa03fa949af80ed9fcd5e7807419a6d53ca207fbb93dea199d9ea91baa8683fce9a333649dbccfeb4f0814d19267
+  data.tar.gz: 6ce702c885d18b18e8b75419c7c47ea875a245cf743e05d0da9ea11cbe5b17c0de483aae853a70df9e9ba76f2bef8ad4f396048abef5fb5913916044e2fcea5a

data/CHANGELOG.md

@@ -1,13 +1,22 @@
 # Changelog
 
-## v0.0.1
+## vX.X.X
 
 * Enhancements
-  * Initial implementation
-  * Implement `keep` operation
 
 * Bug fixes
 
 * Deprecations
 
 * Backwards incompatible changes
+
+## v0.1.0
+
+* Bug fixes
+  * Take over `keep` operations via `inject`
+
+## v0.0.1
+
+* Enhancements
+  * Initial implementation
+  * Implement `keep` operation

data/lib/hash_filter.rb

@@ -1,6 +1,8 @@
+require 'hash_filter/operation'
+
 class HashFilter
-  attr_reader :operations
-  protected :operations
+  attr_reader :operations, :keeps
+  protected :operations, :keeps
 
   def initialize(&block)
     @keeps      = []
@@ -17,6 +19,7 @@ class HashFilter
   end
 
   def inject(filter)
+    @keeps.concat filter.keeps
     @operations.concat filter.operations
   end
 
@@ -25,16 +28,7 @@ class HashFilter
   end
 
   def apply(hash)
-    dup = hash.dup
-    dup.keys.each do |key|
-      next if keep?(key)
-      @operations.each do |operation|
-        if operation.matches?(key)
-          operation.execute(dup, key)
-        end
-      end
-    end
-    dup
+    apply_operations(@operations, hash.dup)
   end
 
   def operation(class_name, *args)
@@ -43,41 +37,23 @@ class HashFilter
 
   private
 
-  def keep?(key)
-    @keeps.any? do |keep|
-      keep === key
+  def apply_operations(operations, hash)
+    hash.keys.each do |key|
+      next if keep?(key)
+      operations.each do |operation|
+        apply_operation(operation, hash, key)
+      end
     end
+    hash
   end
 
-  class Operation
-    def initialize(key)
-      @key = key
-    end
-
-    def execute(hash, key)
-      raise NotImplementedError
-    end
-
-    def matches?(key)
-      @key === key
-    end
-
-    class Rename < self
-      def initialize(from, to)
-        super(from)
-        @to = to
-      end
-
-      def execute(hash, old)
-        new = old.gsub(@key, @to)
-        hash[new] = hash.delete(old)
-      end
-    end
+  def keep?(key)
+    @keeps.any? { |keep| keep === key }
+  end
 
-    class Delete < self
-      def execute(hash, key)
-        hash.delete(key)
-      end
+  def apply_operation(operation, hash, key)
+    if operation.matches?(key)
+      operation.execute(hash, key)
     end
   end
 end

data/lib/hash_filter/operation.rb

@@ -0,0 +1,18 @@
+class HashFilter
+  class Operation
+    def initialize(key)
+      @key = key
+    end
+
+    def execute(hash, key)
+      raise NotImplementedError
+    end
+
+    def matches?(key)
+      @key === key
+    end
+  end
+end
+
+require 'hash_filter/operation/delete'
+require 'hash_filter/operation/rename'

data/lib/hash_filter/operation/delete.rb

@@ -0,0 +1,9 @@
+class HashFilter
+  class Operation
+    class Delete < self
+      def execute(hash, key)
+        hash.delete(key)
+      end
+    end
+  end
+end

data/lib/hash_filter/operation/rename.rb

@@ -0,0 +1,15 @@
+class HashFilter
+  class Operation
+     class Rename < self
+      def initialize(from, to)
+        super(from)
+        @to = to
+      end
+
+      def execute(hash, old)
+        new = old.gsub(@key, @to)
+        hash[new] = hash.delete(old)
+      end
+    end
+  end
+end

data/lib/hash_filter/version.rb

@@ -1,3 +1,3 @@
 class HashFilter
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/hash_filter_spec.rb

@@ -75,16 +75,21 @@ describe HashFilter do
   end
 
   describe "inject" do
-    let(:filter) do
-      filter1 = subject.new do
+    let(:filter1) do
+      subject.new do
         delete /foo/
         delete /FOO/
       end
-      filter2 = subject.new { rename /bar/, "baz" }
-
+    end
+    let(:filter2) do
       subject.new do
-        inject filter1
-        inject filter2
+        rename /bar/, "baz"
+      end
+    end
+    let(:filter) do
+      subject.new.tap do |filter|
+        filter.inject filter1
+        filter.inject filter2
       end
     end
 
@@ -97,6 +102,13 @@ describe HashFilter do
     it "injects operations from other filters" do
       assert_hash "baz" => 3
     end
+
+    it "injects keeps from other filters too" do
+      filter1.keep "foo2"
+      plain_hash["foo2"] = :kept
+
+      assert_hash "baz" => 3, "foo2" => :kept
+    end
   end
 
   describe "keep" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Peter Suschlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,9 @@ files:
 - Rakefile
 - hash_filter.gemspec
 - lib/hash_filter.rb
+- lib/hash_filter/operation.rb
+- lib/hash_filter/operation/delete.rb
+- lib/hash_filter/operation/rename.rb
 - lib/hash_filter/version.rb
 - spec/hash_filter_spec.rb
 - spec/spec_helper.rb
@@ -91,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Filters hashes