dive 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -1,2 +1,6 @@
 ## 0.0.1 (17/1/12)
- - Initial release
+ - Initial release
+
+## 0.0.2 (21/1/12)
+ - Ruby 1.8.7 compatibility
+ - Made recognition of dive locations stricter - fixed issues identified while testing with Rspec build

data/README.md

@@ -2,7 +2,9 @@
 
 Dive is a gem for accessing values within nested Hashes.
 
-Why? Well, it all started when I was mapping human readable names taken from a Cucumber table to fields in a JSON response:
+## Why?
+
+Well, it all started when I was mapping human readable names taken from a Cucumber table to fields in a JSON response:
 
 ```cucumber
 Given I have some sausages with
@@ -76,7 +78,9 @@ So I did.
 
 Check out the specs for how it behaves.
 
-### Installation and usage
+Dive has been tested with ruby 1.9.2 and 1.8.7.
+
+## Installation and usage
 
 ```ruby
 gem install dive
@@ -91,4 +95,12 @@ Or if you become squeamish at the idea of overriding Hash's [] method:
 ```ruby
 require 'dive/noninvasive'
 foods.dive ':sausages[:pork_and_fennel]'
-```
+```
+
+## A Note on Dive Keys
+
+Anything containing square brackets can be parsed as a Dive key, for example 
+```ruby
+'first[second]'
+```
+If you are experiencing strange behaviour while using dive to override Hash methods, please check that none of your keys are unintentionally being recognised as such. A test case for the unusual ones would be much appreciated.

data/dive.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Brent Snook"]
   s.email       = ["brent@fuglylogic.com"]
   s.homepage    = "http://github.com/brentsnook/dive"
-  s.summary     = %q{A gem for accessing values within nested Hashes}
-  s.description = %q{For example: {:sausages => {:pork_and_fennel => 'DELICIOUS'}}[':sausages[:pork_and_fennel]']}
+  s.summary     = %q{For deep hash access. Read and write values within nested hashes.}
+  s.description = %q{For accessing values within nested Hashes. For example: {:sausages => {:pork_and_fennel => 'DELICIOUS'}}[':sausages[:pork_and_fennel]']}
 
   s.rubyforge_project = "dive"
 

data/lib/dive/dive.rb

@@ -7,9 +7,17 @@ module Dive
     clazz.send :include, Write
   end
   
+  def as_symbol key
+    key_string = key.to_s
+    (key_string[0, 1] == ':') ? key_string[1..-1].to_sym : key
+  end
+  
   def symbolise key
-    is_symbol = key.respond_to?(:to_sym) && key[0] == ':'
-    is_symbol ? key[1..-1].to_sym : key
+    key.is_a?(Symbol) ? key : as_symbol(key)
+  end
+  
+  def split_dive location
+    location.to_s.match /^([^\[\]]+)\[(.+)\]\s*$/ #(key)[(remainder)]
   end
     
   module Read
@@ -33,8 +41,8 @@ module Dive
     end 
     
     def attempt_dive location
-      matches = location.to_s.match /([^\[\]]*)\[(.*)\]/ #(key)[(remainder)]
-      matches ? dive_to_next_level(matches[1].strip, matches[2].strip) : default_value(location)
+      split_location = split_dive location
+      split_location ? dive_to_next_level(split_location[1].strip, split_location[2].strip) : default_value(location)
     end
     
     def dive_to_next_level key, remainder
@@ -50,8 +58,8 @@ module Dive
     end
     
     def dive_store location, value
-      matches = location.to_s.match /([^\[\]]*)\[(.*)\]/
-      matches ? store_at_next_level(matches[1], matches[2], value): old_store(symbolise(location), value)
+      split_location = split_dive location
+      split_location ? store_at_next_level(split_location[1], split_location[2], value) : old_store(symbolise(location), value)
     end
     
     private

data/lib/dive/version.rb

@@ -1,3 +1,3 @@
 module Dive
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/invasive/hash_spec.rb

@@ -21,4 +21,11 @@ describe Hash, 'when extended' do
     hash = {:x => :y}
     hash[nil].should == hash.default    
   end
+  
+  # real example from rspec build that made everything explode
+  it "doesn't retrieve top level hash keyed with an empty string" do
+    # location of :[]= was resolving to first and second level key of ''
+    # rspec had actual values keyed against this so it exploded
+    { "" => {"" =>'empty keyed value'}}[:[]=].should_not == 'empty keyed value'
+  end
 end

data/spec/noninvasive/read_spec.rb

@@ -49,7 +49,9 @@ describe Dive, 'when reading' do
     describe 'when that hash was created with a default proc' do
       
       before do
-        @hash['first'].default_proc = proc { |hash, key| "default proc: #{key}"}
+        first = Hash.new { |hash, key| "default proc: #{key}"}
+        first['second'] = 'cantdive'
+        @hash['first'] = first
         @result = @hash.dive('first[second[cantdive[fourth]]]')
       end
     

data/todo.txt

@@ -1,11 +1,5 @@
-
-- exploratory testing
-- test with 1.8.7
-- update change log
-- publish to gem repo
-
 -- LATER --
 
+- add support for arrays
 - add can_dive? method - checks if there is a key
 - normal override overrides has_key? also
-- add support for arrays

metadata

@@ -1,34 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dive
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Brent Snook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2152401600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
   type: :development
-  prerelease: false
-  version_requirements: *2152401600
-description: ! 'For example: {:sausages => {:pork_and_fennel => ''DELICIOUS''}}['':sausages[:pork_and_fennel]'']'
-email:
+  version_requirements: *id001
+description: "For accessing values within nested Hashes. For example: {:sausages => {:pork_and_fennel => 'DELICIOUS'}}[':sausages[:pork_and_fennel]']"
+email: 
 - brent@fuglylogic.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -46,29 +59,38 @@ files:
 - todo.txt
 homepage: http://github.com/brentsnook/dive
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: dive
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A gem for accessing values within nested Hashes
-test_files:
+summary: For deep hash access. Read and write values within nested hashes.
+test_files: 
 - spec/invasive/hash_spec.rb
 - spec/noninvasive/read_spec.rb
 - spec/noninvasive/spec_helper.rb