mash 0.0.3 → 0.0.5

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.0.5 / 2008-04-29
+
+* [bugfix] Mashes do not infinite loop when initialized with another Mash.
+
+=== 0.0.4 / 2008-04-25
+
+* Setting up for GitHub gem hosting instead of Rubyforge.
+
 === 0.0.3 / 2008-04-19
 
 * [] no longer defaults to a new Mash, will return nil if

data/README.txt

@@ -26,17 +26,28 @@ to JSON and XML parsed hashes.
 
 == INSTALL:
 
-RubyGem:
+Gem:
 
-  sudo gem install mash
+Mash is hosted on the GitHub gem repository, so if you haven't already:
+
+  gem sources -a http://gems.github.com/  
+  sudo gem install mbleigh-mash
   
 Git:
 
   git clone git://github.com/mbleigh/mash.git
+  
+== RESOURCES
+
+If you encounter any problems or have ideas for new features 
+please report them at the Lighthouse project for Mash: 
+
+http://mbleigh.lighthouseapp.com/projects/10112-mash
 
 == LICENSE:
 
-Copyright (c) 2008 Michael Bleigh
+Copyright (c) 2008 Michael Bleigh (http://mbleigh.com/) 
+and Intridea Inc. (http://intridea.com/), released under the MIT license
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,18 +1,8 @@
-# -*- ruby -*-
-
 require 'rubygems'
-require 'hoe'
 require './lib/mash.rb'
 require 'spec/rake/spectask'
 
-Hoe.new('mash', Mash::VERSION) do |p|
-  p.rubyforge_name = 'mash-hash' # if different than lowercase project name
-  p.developer('Michael Bleigh', 'michael@intridea.com')
-  p.remote_rdoc_dir = ''
-end
-
 desc "Run specs."
 Spec::Rake::SpecTask.new("spec") do |t|
   t.spec_files = "spec/*_spec.rb"
-end
-# vim: syntax=Ruby
+end

data/lib/mash.rb

@@ -128,14 +128,14 @@ class Mash < Hash
   # Recursively merges this mash with the passed
   # in hash, merging each hash in the hierarchy.
   def deep_update(other_hash)
-    stringified_hash = other_hash.stringify_keys
-    stringified_hash.each_pair do |k,v|
+    other_hash = other_hash.stringify_keys unless other_hash.is_a?(Mash)
+    other_hash.each_pair do |k,v|
       k = convert_key(k)
       self[k] = self[k].to_mash if self[k].is_a?(Hash) unless self[k].is_a?(Mash)
-      if self[k].is_a?(Hash) && stringified_hash[k].is_a?(Hash)
-        self[k].deep_merge!(stringified_hash[k])
+      if self[k].is_a?(Hash) && other_hash[k].is_a?(Hash)
+        self[k].deep_merge!(other_hash[k])
       else
-        self.send(k + "=", convert_value(stringified_hash[k]))
+        self.send(k + "=", convert_value(other_hash[k]))
       end
     end
   end

data/mash.gemspec

@@ -0,0 +1,14 @@
+Gem::Specification.new do |s|
+  s.name = "mash"
+  s.version = "0.0.5"
+  s.date = "2008-04-26"
+  s.summary = "An extended Hash that gives simple pseudo-object functionality that can be built from hashes and easily extended"  
+  s.email = "michael@intridea.com"
+  s.homepage = "http://github.com/mbleigh/mash"
+  s.summary = "Mash is an extended Hash that gives simple pseudo-object functionality that can be built from hashes and easily extended"  
+  s.has_rdoc = true
+  s.authors = ["Michael Bleigh"]
+  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "mash.gemspec", "lib/mash.rb", "spec/mash_spec.rb","spec/spec_helper.rb"]
+  s.rdoc_options = ["--main", "README.txt"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+end

data/spec/mash_spec.rb

@@ -88,6 +88,13 @@ describe Mash do
       converted.a.first.b.should == 12
       converted.a.last.should == 23
     end
+    
+    it "should convert an existing Mash into a Mash" do
+      initial = Mash.new(:name => 'randy')
+      copy = Mash.new(initial)
+      initial.name.should == copy.name      
+    end
+    
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mash
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,21 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-19 00:00:00 -04:00
+date: 2008-04-26 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
-    version: 
-description: Mash is an extended Hash that gives simple pseudo-object functionality that can be built from hashes and easily extended. It is designed to be used in RESTful API libraries to provide easy object-like access  to JSON and XML parsed hashes.
-email: 
-- michael@intridea.com
+dependencies: []
+
+description: 
+email: michael@intridea.com
 executables: []
 
 extensions: []
@@ -37,11 +28,14 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- mash.gemspec
 - lib/mash.rb
 - spec/mash_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/mbleigh/mash
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -62,10 +56,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: mash-hash
-rubygems_version: 1.1.1
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Mash is an extended Hash that gives simple pseudo-object functionality that can be built from hashes and easily extended
 test_files: []