hashie 0.4.0 → 1.0.0

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format=nested

data/Gemfile

@@ -8,5 +8,5 @@ group :development do
 end
 
 group :test do
-  gem 'rspec'
+  gem 'rspec', '~> 2.0'
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     gemcutter (0.6.1)
     git (1.2.5)
     jeweler (1.4.0)
@@ -10,7 +11,14 @@ GEM
     json (1.4.3)
     json_pure (1.4.3)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
 
@@ -21,4 +29,4 @@ DEPENDENCIES
   jeweler
   json
   rake
-  rspec
+  rspec (~> 2.0)

data/Rakefile

@@ -18,16 +18,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |spec|
+  # spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.4.0
+1.0.0

data/hashie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hashie}
-  s.version = "0.4.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-08-31}
+  s.date = %q{2011-01-27}
   s.description = %q{Hashie is a small collection of tools that make hashes more powerful. Currently includes Mash (Mocking Hash) and Dash (Discrete Hash).}
   s.email = %q{michael@intridea.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rspec",
      "Gemfile",
      "Gemfile.lock",
      "LICENSE",

data/lib/hashie/dash.rb

@@ -28,18 +28,20 @@ module Hashie
 
       self.properties << property_name
 
-      if options[:default] or self.defaults[property_name]
+      if options.has_key?(:default)
         self.defaults[property_name] = options[:default] 
+      elsif self.defaults.has_key?(property_name)
+        self.defaults.delete property_name
       end
 
       unless instance_methods.map { |m| m.to_s }.include?("#{property_name}=")
         class_eval <<-ACCESSORS
-          def #{property_name}
-            _regular_reader(#{property_name.to_s.inspect})
+          def #{property_name}(&block)
+            self.[](#{property_name.to_s.inspect}, &block)
           end
 
           def #{property_name}=(value)
-            _regular_writer(#{property_name.to_s.inspect}, value)
+            self.[]=(#{property_name.to_s.inspect}, value)
           end
         ACCESSORS
       end
@@ -74,11 +76,11 @@ module Hashie
       super(&block)
 
       self.class.defaults.each_pair do |prop, value|
-        self.send("#{prop}=", value)
+        self[prop] = value
       end
 
       attributes.each_pair do |att, value|
-        self.send("#{att}=", value)
+        self[att] = value
       end if attributes
     end
 
@@ -90,7 +92,9 @@ module Hashie
     # property's default value if it hasn't been set).
     def [](property)
       assert_property_exists! property
-      super(property.to_s)
+      value = super(property.to_s)
+      yield value if block_given?
+      value
     end
 
     # Set a value on the Dash in a Hash-like way. Only works

data/lib/hashie/mash.rb

@@ -67,7 +67,9 @@ module Hashie
     # Retrieves an attribute set in the Mash. Will convert
     # any key passed in to a string before retrieving.
     def [](key)
-      regular_reader(convert_key(key))
+      value = regular_reader(convert_key(key))
+      yield value if block_given?
+      value
     end
 
     # Sets an attribute in the Mash. Key will be converted to
@@ -85,6 +87,10 @@ module Hashie
       regular_reader(ck)
     end
 
+    def delete(key)
+      super(convert_key(key))
+    end
+
     alias_method :regular_dup, :dup
     # Duplicates the current mash as a new mash.
     def dup
@@ -141,7 +147,7 @@ module Hashie
    end
    
    def method_missing(method_name, *args, &blk)
-     return self[method_name] if key?(method_name)
+     return self.[](method_name, &blk) if key?(method_name)
      match = method_name.to_s.match(/(.*?)([?=!]?)$/)
      case match[2]
      when "="

data/spec/hashie/dash_spec.rb

@@ -54,6 +54,26 @@ describe DashTest do
       subject.first_name.should == 'Franklin'
     end
   end
+  
+  context 'reading from properties' do
+    it 'fails reading from a non-existent property using []' do
+      lambda { subject['nonexistent'] }.should raise_error(NoMethodError)
+    end
+    
+    it "should be able to retrieve properties through blocks" do
+      subject["first_name"] = "Aiden"
+      value = nil
+      subject.[]("first_name") { |v| value = v }
+      value.should == "Aiden"
+    end
+    
+    it "should be able to retrieve properties through blocks with method calls" do
+      subject["first_name"] = "Frodo"
+      value = nil
+      subject.first_name { |v| value = v }
+      value.should == "Frodo"
+    end
+  end
 
   describe '.new' do
     it 'fails with non-existent properties' do
@@ -134,6 +154,12 @@ describe Hashie::Dash, 'inheritance' do
     @bottom.properties.to_a.should == [:echo]
     @bottom.new.echo.should be_nil
   end
+
+  it 'should allow nil defaults' do
+    @bottom.property :echo, :default => nil
+    @bottom.new.should have_key('echo')
+  end
+
 end
 
 describe Subclassed do

data/spec/hashie/mash_spec.rb

@@ -18,6 +18,20 @@ describe Hashie::Mash do
     @mash["test"] = "abc"
     @mash.test.should == "abc"
   end
+  
+  it "should be able to retrieve set values through blocks" do
+    @mash["test"] = "abc"
+    value = nil
+    @mash.[]("test") { |v| value = v }
+    value.should == "abc"
+  end
+  
+  it "should be able to retrieve set values through blocks with method calls" do
+    @mash["test"] = "abc"
+    value = nil
+    @mash.test { |v| value = v }
+    value.should == "abc"
+  end
 
   it "should test for already set values when passed a ? method" do
     @mash.test?.should be_false
@@ -128,6 +142,20 @@ describe Hashie::Mash do
         duped.details.email.should be_nil
       end
     end
+
+    describe 'delete' do
+      it 'should delete with String key' do
+        subject.delete('details')
+        subject.details.should be_nil
+        subject.should_not be_respond_to :details
+      end
+
+      it 'should delete with Symbol key' do
+        subject.delete(:details)
+        subject.details.should be_nil
+        subject.should_not be_respond_to :details
+      end
+    end
   end
 
   it "should convert hash assignments into Hashie::Mashes" do

data/spec/spec_helper.rb

@@ -5,9 +5,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'hashie'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hashie
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 4
   - 0
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -05:00
+date: 2011-01-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -44,6 +42,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -79,7 +78,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -88,7 +86,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"