mostash 0.0.5 → 0.1.0

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.3.0"
+  gem "bundler", "~> 1.0.21"
+  gem "jeweler", "~> 1.6.4"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.21)
+  jeweler (~> 1.6.4)
+  rcov
+  rspec (~> 2.3.0)

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Joel Friedman
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,19 @@
+= mostash
+
+Description goes here.
+
+== Contributing to mostash
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 Joel Friedman. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -1,25 +1,49 @@
-require 'rubygems'
-require 'spec/rake/spectask'
+# encoding: utf-8
 
+require 'rubygems'
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "mostash"
-    gemspec.summary = "A combo of OpenStruct and a ruby hash"
-    gemspec.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"
-    gemspec.email = "asher.friedman@gmail.com"
-    #gemspec.homepage = "http://github.com/technicalpickles/the-perfect-gem"
-    gemspec.authors = ["Joel Friedman"]
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "mostash"
+  gem.homepage = "http://github.com/joelash/mostash"
+  gem.license = "MIT"
+  gem.summary = "A combo of OpenStruct and a ruby hash"
+  gem.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"
+  gem.email = "asher.friedman@gmail.com"
+  gem.authors = ["Joel Friedman"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
 
-    gemspec.add_development_dependency "rspec"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-desc "run all specs"
-Spec::Rake::SpecTask.new( "spec" ) do |t|
-  t.spec_files = FileList["spec/**/*_spec.rb"]
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
 task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "mostash #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/mostash.rb

@@ -3,8 +3,11 @@ require 'ostruct'
 require File.join(File.dirname(__FILE__), "mostash", "mostash")
 MoStash = Mostash
 
-def dbg( msg )
+def dbg(obj, msg=nil)
   file, line, method_raw = caller[0].split('/').last.split(':')
   method = method_raw.match(/^in `(.+)'/)[1] 
-  puts "#{method} (#{file}##{line}): #{msg}"
+  #puts "#{method} (#{file}##{line}): #{msg}"
+  msg += " " if msg
+  puts "#{msg}#{obj.inspect}"
+  obj
 end

data/lib/mostash/mostash.rb

@@ -1,75 +1,60 @@
-class Mostash < OpenStruct
-  def initialize(init={})
-    super({})
-    @initial_hash = init
-    __init__ init
-  end
-
-  def new_ostruct_member(name)
-    name = name.to_sym
-    unless self.respond_to?(name)
+class Mostash < Hash
+  alias_method :orig_init, :initialize
+  def initialize(init={}, &def_proc)
+    if init.is_a? Hash
+      __init__ init
+      self.send(:default=, init.default) if init.default
+      self.send(:default_proc=, init.default_proc) if init.default_proc
+    else
       super
-      eigenclass.class_eval do
-        remove_method("#{name}") if self.respond_to?(name)
-        define_method("#{name}=") { |x| modifiable[name] = __adjusted_value__ x }
-      end
     end
-    name
+    self.send(:default_proc=, def_proc) if block_given?
   end
 
+  def clone
+    Mostash.new(self)
+  end
+  alias_method :dup, :clone
+
   def method_missing(method_name, *args, &block)
     #dbg "#{method_name} was sent #{args.inspect}, and block #{block.inspect}"
-    if @table.respond_to? method_name
-      @table.send method_name, *args, &block
-    elsif __is_setter__( method_name )
-      super method_name, __adjusted_value__( args.first )
+    if __is_setter__( method_name )
+      method_name = method_name.to_s.gsub! '=', ''
+      self[method_name] = args.first
     else
-      super || @initial_hash.send(:[], method_name, *args, &block)
+      self[method_name]
     end
   end
 
+  alias_method :__set__, :[]=
   def []=(key, value)
-    self.send "#{key.to_s}=", __adjusted_value__(value)
+    __set__ key.to_sym, __adjusted_value__(value)
   end
 
+  alias_method :__get__, :[]
   def [](key)
-    self.send "#{key.to_s}"
+    __get__ key.to_sym
   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
+  def merge!(from={})
+    from.each_pair do |key, value|
+      new_value = case value
+                  when Hash then Mostash.new(self[key] || {}).merge(value)
+                  else value
+                  end
+      self[key] = new_value
     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
+  def merge(from={})
+    self.clone.merge! from
   end
 
   private
-
   def __init__(hash)
     hash.each_pair do |key, value|
-      self.send "#{key.to_s}=", __adjusted_value__( value )
+      self[key] =  __adjusted_value__( value )
     end
   end
 
@@ -78,7 +63,7 @@ class Mostash < OpenStruct
     when Hash then Mostash.new( value )
     when Array then value.map{ |v| __adjusted_value__( v ) }
     else value
-    end
+    end#.tap { |ret| dbg "calc adj value for #{value.inspect} = #{ret}" }
   end
 
   def __is_setter__(method_name)

data/spec/as_hash_spec.rb

@@ -17,6 +17,18 @@ describe 'MoStash as Hash' do
   end
 
   context 'initialization' do
+    it "should support initializtion from default value" do
+      mo = Mostash.new 123
+
+      mo.doesnt_exist.should == 123
+    end
+
+    it "should support initialzation from default proc" do
+      mo = Mostash.new { |hash, key| hash[key] = "Go Fish: #{key}" }
+
+      mo.doesnt_exist.should == "Go Fish: doesnt_exist"
+    end
+
     it "should support initialzation from hash with default value" do
       mo = Mostash.new(Hash.new(123))
 
@@ -84,6 +96,15 @@ describe 'MoStash as Hash' do
     end
 
     context 'merge' do
+      it "should not change without bang" do
+        mo = MoStash.new :foo => 'bar', :hello => 'world'
+
+        new_mo = mo.merge( :hello => 'tester' )
+
+        new_mo.hello.should == 'tester'
+        mo.hello.should == 'world'
+      end
+
       it "should support merge when single level" do
         mo = MoStash.new :foo => 'bar', :hello => 'world'
 

data/spec/mostash_spec.rb

@@ -60,11 +60,4 @@ describe MoStash do
     mo.foo[1].oh.should == 'hai'
   end
 
-  it "should create method when new method called" do
-    mo = Mostash.new
-    mo.foo = "bar"
-
-    mo.methods.should include(:foo)
-  end
-
 end

data/spec/spec_helper.rb

@@ -1,4 +1,11 @@
 require File.join(File.dirname(__FILE__), "..", "lib", "mostash")
 
-require 'rubygems'
-require 'spec'
+require 'rspec'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  
+end

metadata

@@ -1,45 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mostash
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Joel Friedman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-21 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-31 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70178437964520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *70178437964520
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70178437964040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.21
+  type: :development
+  prerelease: false
+  version_requirements: *70178437964040
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70178437963560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70178437963560
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70178437958980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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
+  prerelease: false
+  version_requirements: *70178437958980
+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: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
-- README.markdown
+extra_rdoc_files:
+- LICENSE.txt
+- README.rdoc
+files:
+- .rspec
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.rdoc
 - Rakefile
 - VERSION
 - lib/mostash.rb
@@ -47,39 +76,32 @@ files:
 - spec/as_hash_spec.rb
 - spec/mostash_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: 
-licenses: []
-
+homepage: http://github.com/joelash/mostash
+licenses:
+- MIT
 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 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3141743245854038340
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A combo of OpenStruct and a ruby hash
-test_files: 
-- spec/as_hash_spec.rb
-- spec/mostash_spec.rb
-- spec/spec_helper.rb
+test_files: []