mostash 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/mostash.rb

@@ -3,6 +3,7 @@ require 'ostruct'
 require File.join(File.dirname(__FILE__), "mostash", "mostash")
 
 def dbg( msg )
-  file_name = __FILE__.split( '/' ).last
-  puts "#{file_name} ##{__LINE__}: #{msg}"
+  file, line, method_raw = caller[0].split('/').last.split(':')
+  method = method_raw.match(/^in `(.+)'/)[1] 
+  puts "#{method} (#{file}##{line}): #{msg}"
 end

data/lib/mostash/mostash.rb

@@ -21,6 +21,35 @@ class MoStash < OpenStruct
     self.send "#{key.to_s}"
   end
 
+  def merge(new_hash)
+    new_mo = @table.merge( new_hash ) do |key, oldval, newval|
+      if oldval.class == MoStash
+        oldval.merge newval
+      else
+        newval
+      end
+    end
+    MoStash.new( new_mo )
+  end
+
+  #TODO: HACK!!!!!
+  def merge!(new_hash)
+    @table = self.merge( new_hash ).instance_variable_get( '@table' )
+    self
+  end
+
+  def to_hash
+    hash = {}
+    @table.each_pair do |key, value|
+      hash[key] = if value.class == MoStash
+                    value.to_hash
+                  else
+                    value
+                  end
+    end
+    hash
+  end
+
   private
 
   def __init__(hash)

data/spec/as_hash_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe 'MoStash as Hash' do
+  it "should support merge when single level" do
+    mo = MoStash.new :foo => 'bar', :hello => 'world'
+    
+    new_mo = mo.merge( :hello => 'tester' )
+
+    new_mo[:foo].should == 'bar'
+    new_mo[:hello].should == 'tester'
+  end
+
+  it "should support merge of single level when multi leveled" do
+    mo = MoStash.new( { :foo => 'bar', :nested => { :hello => 'world' }} )
+    
+    new_mo = mo.merge( :foo => 'baz' )
+
+    new_mo[:foo].should == 'baz'
+    new_mo[:nested][:hello].should == 'world'
+  end
+
+  it "should support merge of multi levels when is multi leveled" do
+    mo = MoStash.new( { :foo => 'bar', :nested => { :hello => 'world' }} )
+    
+    new_mo = mo.merge( :nested => { :hello => 'tester' } )
+
+    new_mo[:foo].should == 'bar'
+    new_mo[:nested][:hello].should == 'tester'
+    new_mo[:nested].class.should == MoStash
+  end
+
+  it "should support merge!" do
+    mo = MoStash.new( :foo => 'bar' )
+
+    mo.merge!( :foo => 'baz' )
+    mo.foo.should == 'baz'
+  end
+
+  it "should support multi level merge!" do
+    mo = MoStash.new( { :foo => 'bar', :nested => { :hello => 'world' }} )
+    
+    mo.merge!( :nested => { :hello => 'tester' } )
+
+    mo[:foo].should == 'bar'
+    mo[:nested][:hello].should == 'tester'
+    mo[:nested].class.should == MoStash
+  end
+
+  it "should be able to return a hash for single level" do
+    mo = MoStash.new( :foo => 'bar' )
+
+    mo.to_hash.should == { :foo => 'bar' }
+  end
+
+  it "should be able to return a hash for multi level" do
+    mo = MoStash.new( :foo => 'bar', :nested => { :hello => 'world' } )
+
+    mo.to_hash.should == { :foo => 'bar', :nested => { :hello => 'world' } }
+  end
+end
+

metadata

@@ -3,32 +3,32 @@ name: mostash
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+    - 0
+    - 0
+    - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-- Joel Friedman
+  - Joel Friedman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 -05:00
+date: 2010-05-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id001
 description: You can treat an object as either a hash or as an OpenStruct. In additon to this you can create them nested, unlike OpenStruct
 email: asher.friedman@gmail.com
 executables: []
@@ -36,38 +36,39 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+  - README.markdown
 files: 
-- README.markdown
-- Rakefile
-- VERSION
-- lib/mostash.rb
-- lib/mostash/mostash.rb
-- spec/mostash_spec.rb
-- spec/spec_helper.rb
+  - README.markdown
+  - Rakefile
+  - VERSION
+  - lib/mostash.rb
+  - lib/mostash/mostash.rb
+  - spec/as_hash_spec.rb
+  - spec/mostash_spec.rb
+  - spec/spec_helper.rb
 has_rdoc: true
 homepage: 
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -76,5 +77,6 @@ signing_key:
 specification_version: 3
 summary: A combo of OpenStruct and a ruby hash
 test_files: 
-- spec/mostash_spec.rb
-- spec/spec_helper.rb
+  - spec/as_hash_spec.rb
+  - spec/mostash_spec.rb
+  - spec/spec_helper.rb