yahm 0.2.3 → 0.3.0.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4e915094d842413c8efffc151a7712d74028793
-  data.tar.gz: 102b31ca857c9579be0b4c4548bb89ca5e07a47d
+  metadata.gz: 23e12da1dfb2df5bbd79002729fa6dd1f57e301e
+  data.tar.gz: f704060805ec94c85d7e40247409bf870f56e055
 SHA512:
-  metadata.gz: 6cc1e2686bda0a9c01497dcaf9755b348716893d1a87fdc4961913084aa3a95c5963d5f0f12c1c2f173c5067725eaa53a86d3ef63f400c3bdff8714530a98676
-  data.tar.gz: 80e598d1bfb4788bc6bfb7938e799a815b8bf0ca17bb7e1761d1f88e8843f5a33b888f1905c2272dde50969c7329802d601ba7c9b601904fa9403240b6813225
+  metadata.gz: 4ea59ad4041d7249db4eedf222b071e858bccc29e06c529c536541307414b5a5639cefb18c29e585289b069a36d5a60e6e8ee69358cb13a19fc6bbd6905d528b
+  data.tar.gz: bd125fa650cbc059bcf448b472cf0b34e7036b6d291fdc6e16db656203aea96897b73492c95f4ab85b5fadc5cc10003f54f96e32263b0a15d8d53e1a26b1d732

data/lib/yahm/mapping.rb

@@ -23,20 +23,35 @@ class Yahm::Mapping
 
       @rules.each do |rule|
         thread_pool.process do
-          apply_rule(rule, input_hash, @result, options)
+          apply_rule(rule, input_hash, @result)
         end
       end
     
       thread_pool.shutdown
     else
       @rules.each do |rule|
-        apply_rule(rule, input_hash, @result, options)
+        apply_rule(rule, input_hash, @result)
       end
     end
 
     @result
   end
 
+  #
+  # dynamic context method resolutuon
+  #
+  def method_missing(sym, *args, &block)
+    if @context.respond_to?(sym)
+      @context.send(sym, *args, &block)
+    else
+      super
+    end
+  end
+
+  def respond_to_missing?(sym, *)
+    @context.respond_to?(sym) || super
+  end
+
   private
 
   def map(path, options = {})
@@ -44,7 +59,7 @@ class Yahm::Mapping
     self
   end
 
-  def apply_rule(rule, input_hash, output_hash, options = {})
+  def apply_rule(rule, input_hash, output_hash)
     value =
     if rule[:path].is_a?(Array)
       rule[:path].inject({}) do |memo, _path|
@@ -58,10 +73,10 @@ class Yahm::Mapping
     value = rule[:default] && value.nil? ? rule[:default] : value
     value = rule[:force_array] ? (value.nil? ? [] : [value].flatten(1)) : value
     value = rule[:split_by] && value.is_a?(String) ? value.split(rule[:split_by]).map!(&:strip) : value
-    value = rule[:processed_by] ? (options[:context] || @context || self).instance_exec(value, &rule[:processed_by]) : value
+    value = rule[:processed_by] ? rule[:processed_by].call(value) : value
 
     if rule[:to].is_a?(Proc)
-      (options[:context] || @context || self).instance_exec(value, output_hash, &rule[:to])
+      instance_exec(output_hash, value, &rule[:to])
     else
       Hpath.set(output_hash, rule[:to], value)
     end

data/lib/yahm/version.rb

@@ -1,3 +1,3 @@
 class Yahm
-  VERSION = "0.2.3"
+  VERSION = "0.3.0-alpha1"
 end

data/spec/yahm/mapping_spec.rb

@@ -119,7 +119,7 @@ describe Yahm::Mapping do
     end
 
     it "accepts a lambda/proc as :to option" do
-      expect(Yahm::Mapping.new { map "/source", to: lambda { |v, result| result.merge!(target: true) } }.apply_to(foo: "bar"))
+      expect(Yahm::Mapping.new { map "/source", to: lambda { |result, v| result.merge!(target: true) } }.apply_to(foo: "bar"))
       .to eq({
         :target => true
       })
@@ -144,19 +144,5 @@ describe Yahm::Mapping do
         combined: "hello world"
       })
     end
-
-    it "can be called with a \"context\" option to set/overwrite the mapping context" do
-      mapping = Yahm::Mapping.new do
-        map "/source", to: "/target", processed_by: lambda { |v| process_value(v) }
-      end
-
-      context = Module.new do
-        def self.process_value(v)
-          v.to_i
-        end
-      end
-
-      expect(mapping.apply_to({source: "1"}, context: context)).to eq({target: 1})
-    end
   end
 end

data/yahm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "hpath",  "~> 0.1.0"
+  spec.add_dependency "hpath",  ">= 0.0.5"
   spec.add_dependency "thread", ">= 0.1.4"
 
   spec.add_development_dependency "bundler",               "~> 1.5"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: yahm
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0.pre.alpha1
 platform: ruby
 authors:
 - Michael Sievers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
@@ -115,9 +115,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0