rash 0.3.2 → 0.4.0

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "http://rubygems.org"
 gemspec

data/README.rdoc

@@ -27,16 +27,16 @@ You will now be able to access those keys through underscored key names (camelCa
     }
   })
   
-  @rash.var_one               # => 1
-  @rash.two                   # => 2
-  @rash.three                 # => 3
-  @rash.var_four              # => 4
-  @rash.five_hump_humps       # => 5
-  @rash.nested.nested_one     # => "One"
-  @rash.nested.two            # => "two"
-  @rash.nested.nested_three   # => "three"
-  @rash.nested_two.nested_two # => 22
-  @rash.nested_two            # => 23
+  @rash.var_one                 # => 1
+  @rash.two                     # => 2
+  @rash.three                   # => 3
+  @rash.var_four                # => 4
+  @rash.five_hump_humps         # => 5
+  @rash.nested.nested_one       # => "One"
+  @rash.nested.two              # => "two"
+  @rash.nested.nested_three     # => "three"
+  @rash.nested_two.nested_two   # => 22
+  @rash.nested_two.nested_three # => 23
 
 == Note on Patches/Pull Requests
  

data/lib/hashie/rash.rb

@@ -5,23 +5,39 @@ module Hashie
 
     protected
 
-      def convert_key(key) #:nodoc:
-        underscore_string(key.to_s)
-      end
+    def convert_key(key) #:nodoc:
+      underscore_string(key.to_s)
+    end
 
-      # converts a camel_cased string to a underscore string
-      # subs spaces with underscores, strips whitespace
-      # Same way ActiveSupport does string.underscore
-      def underscore_string(str)
-        str.to_s.strip.
-          gsub(' ', '_').
-          gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
-          tr("-", "_").
-          squeeze("_").
-          downcase
+    # Unlike its parent Mash, a Rash will convert other Hashie::Hash values to a Rash when assigning
+    # instead of respecting the existing subclass
+    def convert_value(val, duping=false) #:nodoc:
+      case val
+      when self.class
+        val.dup
+      when ::Hash
+        val = val.dup if duping
+        self.class.new(val)
+      when Array
+        val.collect{ |e| convert_value(e) }
+      else
+        val
       end
+    end
+
+    # converts a camel_cased string to a underscore string
+    # subs spaces with underscores, strips whitespace
+    # Same way ActiveSupport does string.underscore
+    def underscore_string(str)
+      str.to_s.strip.
+        gsub(' ', '_').
+        gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        squeeze("_").
+        downcase
+    end
 
   end
 end

data/lib/rash/version.rb

@@ -1,3 +1,3 @@
 module Rash
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/rash.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.version = Rash::VERSION
 
-  s.add_dependency 'hashie', '~> 1.2.0'
+  s.add_dependency 'hashie', '~> 2.0.0'
   s.add_development_dependency 'rake', '~> 0.9'
   s.add_development_dependency 'rdoc', '~> 3.9'
   s.add_development_dependency 'rspec', '~> 2.5'
@@ -23,4 +23,3 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 end
-

data/spec/rash_spec.rb

@@ -57,6 +57,20 @@ describe Hashie::Rash do
   end
 
   it "should merge well with a Mash" do
+    merged = subject.merge Hashie::Mash.new(
+      :nested => {:fourTimes => "a charm"},
+      :nested3 => {:helloWorld => "hi"}
+    )
+
+    merged.nested.four_times.should == "a charm"
+    merged.nested.fourTimes.should == "a charm"
+    merged.nested3.should be_a(Hashie::Rash)
+    merged.nested3.hello_world.should == "hi"
+    merged.nested3.helloWorld.should == "hi"
+    merged[:nested3][:helloWorld].should == "hi"
+  end
+
+  it "should update well with a Mash" do
     subject.update Hashie::Mash.new(
       :nested => {:fourTimes => "a charm"},
       :nested3 => {:helloWorld => "hi"}
@@ -64,8 +78,33 @@ describe Hashie::Rash do
 
     subject.nested.four_times.should == "a charm"
     subject.nested.fourTimes.should == "a charm"
+    subject.nested3.should be_a(Hashie::Rash)
+    subject.nested3.hello_world.should == "hi"
+    subject.nested3.helloWorld.should == "hi"
+    subject[:nested3][:helloWorld].should == "hi"
+  end
+
+  it "should merge well with a Hash" do
+    merged = subject.merge({
+      :nested => {:fourTimes => "work like a charm"},
+      :nested3 => {:helloWorld => "hi"}
+    })
+
+    merged.nested.four_times.should == "work like a charm"
+    merged.nested.fourTimes.should == "work like a charm"
+    merged.nested3.should be_a(Hashie::Rash)
+    merged.nested3.hello_world.should == "hi"
+    merged.nested3.helloWorld.should == "hi"
+    merged[:nested3][:helloWorld].should == "hi"
+  end
+
+  it "should handle assigning a new Hash and convert it to a rash" do
+    subject.nested3 = {:helloWorld => "hi"}
+
+    subject.nested3.should be_a(Hashie::Rash)
     subject.nested3.hello_world.should == "hi"
     subject.nested3.helloWorld.should == "hi"
+    subject[:nested3][:helloWorld].should == "hi"
   end
 
   it "should allow initializing reader" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rash
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - tcocca
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 -05:00
+date: 2013-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,16 +24,16 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
-        - 1
         - 2
         - 0
-        version: 1.2.0
-  version_requirements: *id001
+        - 0
+        version: 2.0.0
   name: hashie
   type: :runtime
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,10 +45,10 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  version_requirements: *id002
   name: rake
   type: :development
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,10 +60,10 @@ dependencies:
         - 3
         - 9
         version: "3.9"
-  version_requirements: *id003
   name: rdoc
   type: :development
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,10 +75,10 @@ dependencies:
         - 2
         - 5
         version: "2.5"
-  version_requirements: *id004
   name: rspec
   type: :development
   prerelease: false
+  version_requirements: *id004
 description: simple extension to Hashie::Mash for rubyified keys, all keys are converted to underscore to eliminate horrible camelCasing
 email: tom.cocca@gmail.com
 executables: []