fetch_in 0.1.1 → 0.2.0

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "mccraigmccraig@googlemail.com"
     gem.homepage = "http://github.com/trampoline/fetch_in"
     gem.authors = ["mccraig mccraig of the clan mccraig"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", ">= 1.2.8"
     gem.add_development_dependency "rr", ">= 0.10.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/fetch_in.rb

@@ -1,29 +1,43 @@
 module FetchIn
-  def fetch_in(*keys)
-    keys.reduce(self) do |result,key|
-      return nil if !result
-      result[key]
+  class << self
+    def fetch_in(h, *keys)
+      keys.reduce(h) do |result,key|
+        return nil if !result
+        result[key]
+      end
+    end
+
+    # store_in stores a value in a nested associative structure
+    # new levels in the structure are created as required, by the supplied Proc.
+    # if no Proc is supplied, new levels are created with the same class as
+    # the previous level
+    def store_in(h, *keys_and_value, &proc)
+      proc ||= lambda{|rx_key_stack| rx_key_stack[-1][0].class.new}
+      keys = keys_and_value[0..-2]
+      value = keys_and_value[-1]
+
+      # find or create the last associative receiver in the chain to the value
+      last_rx = keys[0..-2].reduce([h,[]]) do |(rx,rx_key_stack),key|
+        rx_key_stack = rx_key_stack << [rx,key]
+        rx[key] = proc.call(rx_key_stack) if !rx[key]
+        [rx[key], rx_key_stack]
+      end[0]
+
+      # set the value
+      last_rx[keys[-1]]=value
     end
   end
 
+  def fetch_in(*keys)
+    FetchIn.fetch_in(self, *keys)
+  end
+
   # store_in stores a value in a nested associative structure
   # new levels in the structure are created as required, by the supplied Proc.
   # if no Proc is supplied, new levels are created with the same class as
   # the previous level
   def store_in(*keys_and_value, &proc)
-    proc ||= lambda{|rx_key_stack| rx_key_stack[-1][0].class.new}
-    keys = keys_and_value[0..-2]
-    value = keys_and_value[-1]
-
-    # find or create the last associative receiver in the chain to the value
-    last_rx = keys[0..-2].reduce([self,[]]) do |(rx,rx_key_stack),key|
-      rx_key_stack = rx_key_stack << [rx,key]
-      rx[key] = proc.call(rx_key_stack) if !rx[key]
-      [rx[key], rx_key_stack]
-    end[0]
-
-    # set the value
-    last_rx[keys[-1]]=value
+    FetchIn.store_in(self, *keys_and_value, &proc)
   end
 end
 

data/spec/fetch_in_spec.rb

@@ -37,6 +37,11 @@ describe "FetchIn" do
     it "should fetch from mixed array and hash nestings" do
       {:foo=>[nil,[nil,{:bar=>5}]]}.fetch_in(:foo,1,1,:bar).should == 5
     end
+
+    it "should permit direct class-method invocation" do
+      FetchIn.fetch_in({:foo=>[nil,[nil,{:bar=>5}]]},
+                       :foo,1,1,:bar).should == 5
+    end
   end
 
   describe "store_in" do
@@ -99,5 +104,11 @@ describe "FetchIn" do
       s.store_in(1,2,3){|rx_key_stack| {}}
       s.should == [nil,{2=>3}]
     end
+
+    it "should permit direct class-method invocation" do
+      s=[]
+      FetchIn.store_in(s,1,2,3){|rx_key_stack| {}}
+      s.should == [nil,{2=>3}]
+    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fetch_in
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - mccraig mccraig of the clan mccraig
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +01:00
+date: 2010-10-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 8
+        version: 1.2.8
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 10
@@ -75,23 +80,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: simple value fetching in nested associative structures