dm-core 0.9.7 → 0.9.8

data/History.txt

@@ -1,145 +1,16 @@
+=== 0.9.8 / 2008-12-07
 
-== 0.3.0
-* HasManyAssociation::Set now has a nil? method, so we can do stuff like cage.animal.nil?
+* 3 minor enhancements:
 
-== 0.2.5
-* has_one bugfixes
-* Added syntax for setting CHECK-constraints directly in your properties (Postgres)
-* You can now set indexes with :index => true and :index => :unique
-* Support for composite indexes (thanks to Jeffrey Gelens)
-* Add composite scope to validates_uniqueness
-* Added private/protected properties
-* Remove HasOneAssociation, Make HasManyAssociation impersonate has_one relationships
-* Added #get method
-* Persistence module added, inheriting from DataMapper::Base no longer necessary
+  * Updated Resource#inspect to not lazy-load unloaded attributes.
+  * Updated ManyToOne::Proxy to delegate #class to parent.  This will
+    allow the Merb resource() route helper method to use the association
+    proxy to generate the URL.
+  * Updated Resource#attributes= to respect method visibility.  This means
+    that only public mutators will set the attribute value.
 
-== 0.2.4
-* Bug fixes
-* Added paranoia
+* 1 bug fix:
 
-== 0.2.3
-* Added String#t for translation and overrides for default validation messages
-* Give credit where it's due: zapnap, not pimpmaster, submitted the String#blank? patch. My bad. :-(
-* MAJOR: Resolve issue with non-unique-hash values and #dirty?; now frozen original values are stored instead
-* Added Base#update_attributes
-* MAJOR: Queries are now passed to the database drivers in a parameterized fashion
-* Updated PostgreSQL driver and adapter to current
-
-== 0.2.2
-* Removed C extension bundles and log files from package
-
-== 0.2.1
-* Added :float column support
-* Added association proxies: ie: Zoo.first.exhibits.animals
-* Columns stored in SortedSet
-* Swig files are no longer RDOCed
-* Added :date column support
-* BUG: Fixed UTC issues with datetimes
-* Added #to_yaml method
-* Added #to_xml method
-* Added #to_json method
-* BUG: Fixed HasManyAssociation::Set#inspect
-* BUG: Fixed #reload!
-* BUG: Column copy for STI moved into Table#initialize to better handle STI with multiple mapped databases
-* BUG: before_create callbacks moved in the execution flow since they weren't guaranteed to fire before
-* Threading enhancements: Removed single_threaded_mode, #database block form adjusted for thread-safety
-* BUG: Fixed String#blank? when a multi-line string contained a blank line (thanks zapnap!)
-* Performance enhancements: (thanks wycats!)
-
-== 0.2.0
-* AdvancedHasManyAssociation now functional for fetches
-* AdvancedHasManyAssociation renamed to HasNAssociation
-* HasManyAssociation refactored to use HasNAssociation superclass
-* Slight spec tweaks to accomodate the updates
-* HasOneAssociation refactored to use HasNAssociation superclass
-* Added HasAndBelongsToManyAssociation, using HasNAssociation as a basis; Need to add corresponding SQL generation code in AdvancedLoadCommand
-* Added spec for habtm query generation
-* HasNAssociation#foreign_key returns a DataMapper::Adapters::Sql::Mappings::Column instance instead of a raw String now
-* Added table, association, association_table and to_sql methods to HasNAssociation
-* Added associations_spec.rb
-* Added a forced table-recreation to spec_helper.rb so the tests could run with a clean version of the database, including any new columns added to the models
-* Added HasAndBelongsToManyAssociation#to_sql (all current specs pass now!)
-* Minor tweaks to Callbacks
-* Added CallbacksHelper to declare class-method ::callbacks on DataMapper::Base
-* Implemented before_validate and after_validate hooks in ValidationHelper
-* Minor documentation additions in callbacks.rb
-* Added callbacks_spec
-* Moved class-method declarations for built-in callbacks to the callbacks helper instead of DataMapper::Base
-* Renamed :before/after_validate callback to :before/after_validation to match ActiveRecord
-* Callbacks#add now accepts a Symbol which maps a callback to a method call on the targetted instance, also added a spec to verify this behavior
-* Documented callbacks.rb
-* Added DataMapper::Associations::Reference class
-* Documented DataMapper::Associations::Reference class
-* Upgraded BelongsToAssociation to new style
-* Added AssociationsSet to handle simple "last-in" for association bindings
-* Fixed extra spec loading
-* Added *Association#columns
-* Some refactoring in AdvancedLoadCommand regarding :include options
-* Added support for class-less Mappings::Table instances, with just a string name
-* HasAndBelongsToManyAssociation#join_table #left_foreign_key and #right_foreign_key reference actual Table or Column objects now
-* Added :shallow_include option for HABTM joins in AdvancedLoadCommand and corresponding spec
-* Added Commands::AdvancedConditions
-* Added ORDER, LIMIT, OFFSET and WHERE support to AdvancedLoadCommand
-* Renamed spec/has_many.rb to spec/has_many_spec.rb
-* Tweaked the loading of has_many relationships; big performance boost; got rid of an extra query
-* Added EmbeddedValue support, and accompanying spec
-* Fleshed out AdvancedConditions a bit; added conditions_spec.rb
-* Added more AdvancedConditions specs
-* Added Loader to handle multi-instanced rows
-* AdvancedLoadCommand replaced LoadCommand; down to 3 failing specs
-* All specs pass
-* Added :intercept_load finder option and accompanying spec
-* Modified :intercept_load block signature to |instance,columns,row|
-* HasAndBelongsToMany works, all specs pass
-* Fixed a couple bugs with keys; Added DataMapper::Base#key= method
-* Made DataMapper::Base#lazy_load! a little more flexible
-* Removed LoadCommand overwrites from MysqlAdapter
-* Default Database#single_threaded mode is true now
-* Removed MysqlAdapter#initialize, which only served to setup the connections, moved to SqlAdapter
-* Added SqlAdapter#create_connection and SqlAdapter#close_connection abstract methods
-* Added MysqlAdapter#create_connection and MysqlAdapter#close_connection concrete methods
-* Made SqlAdapter#connection a concrete method (instead of abstract), with support for single_threaded operation
-* Database#setup now takes a Hash of options instead of a block-initializer
-* Validation chaining should work for all association types
-* Save chaining should work for has_many associations
-* Added benchmarks for in-session performance to performance.rb
-* Removed block conditions; They're slower and don't offer any real advantages
-* Removed DeleteCommand
-* Removed SaveCommand
-* Removed TableExistsCommand
-* Session renamed to Context
-* Most command implementations moved to methods in SqlAdapter
-* Removed UnitOfWork module, instead moving a slightly refactored implementation into Base
-
-== 0.1.1
-* Removed /lib/data_mapper/extensions
-* Moved ActiveRecordImpersonation into DataMapper::Support module
-* Moved CallbackHelper methods into DataMapper::Base class
-* Moved ValidationHelper into DataMapper::Validations module
-* Removed LoadedSet since it's not necessary for it to reference the Database, so it's nothing more than an array now; Replaced with Array
-* Modified data_mapper.rb to load DataMapper::Support::Enumerable
-* Modified example.rb and performance.rb to require 'lib/data_mapper' instead of modifying $LOADPATH
-* Created SqlAdapter base-class
-* Refactored MysqlAdapter to use SqlAdapter superclass
-* Refactored Sqlite3Adapter to use SqlAdapter superclass
-* Moved /lib/data_mapper/queries to /lib/data_mapper/adapters/sql/queries
-* Moved Connection, Result and Reader classes along with Coersion and Quoting modules to DataMapper::Adapters::Sql module
-* Moved DataMapper::Adapters::Sql::Queries to ::Commands
-* Moved Mappings to SqlAdapter
-* Added monolithic DeleteCommand
-* Added monolithic SaveCommand
-* Added TableExistsCommand
-* Moved save/delete logic out of Session
-* Added create-table functionality to SaveCommand
-* Cleaned up Session; #find no longer supported, use #all or #first
-* Moved object materialization into LoadCommand
-* Migrated Sqlite3Adapter::Commands
-* Added Session#query support back in
-* Removed Connection/Reader/Result classes
-* Set DataMapper::Base#key on load to avoid double-hit against Schema
-* Added DataMapper::Support::Struct for increased Session#query performance
-* Added AdvancedHasManyAssociation (preview status)
-* Added benchmarks comparing ActiveRecord::Base::find_by_sql with Session#query
-
-== 0.1.0
-* Initial Public Release
+  * Fixed regression where an update to a resource with a lazy property
+    could cause the record to reload when accessing the lazy property,
+    clobbering any changes made prior.

data/QUICKLINKS

@@ -1,7 +1,7 @@
 = Quick Links
 
 * Setup and Configuration - DataMapper
-* Finders and CRUD - 
+* Finders and CRUD -
 * Properties - DataMapper::Property
 * FAQ[link:/files/FAQ.html]
 * Contact Us
@@ -9,4 +9,3 @@
   * Bug Reports - http://wm.lighthouseapp.com/projects/4819-datamapper/overview
   * IRC Channel - <tt>##datamapper</tt> on irc.freenode.net
   * Mailing List - http://groups.google.com/group/datamapper/
-

data/Rakefile

@@ -13,9 +13,9 @@ AUTHOR = "Sam Smoot"
 EMAIL  = "ssmoot@gmail.com"
 GEM_NAME = "dm-core"
 GEM_VERSION = DataMapper::VERSION
-GEM_DEPENDENCIES = ["data_objects", "~>0.9.7"], ["extlib", "~>0.9.8"],
-                   ["rspec", ">=1.1.3"], ["addressable", "~>2.0"]
-
+GEM_DEPENDENCIES = ["data_objects", "~>0.9.9"],
+                   ["extlib", "~>0.9.9"],
+                   ["addressable", "~>2.0.1"]
 
 PROJECT_NAME = "datamapper"
 PROJECT_DESCRIPTION = "Faster, Better, Simpler."

data/SPECS

@@ -2,14 +2,14 @@ Reading Specs
 =============
 
   Blah blah blah...
-  
+
 Writing Specs
 =============
 
   Here are some general dos and don'ts
-  
+
   = DO:
-  
+
   * Write more specs for error conditions than clean conditions.
   * Write specs with readability in mind. Somebody knew to DataMapper should be
     able to read specs to learn how something works.
@@ -18,14 +18,14 @@ Writing Specs
   * Limit a describe block to 10 - 15 examples.
   * Group specs by method being tested. (See the 'Ordering Specs' section)
   * Use custom matchers.
-  
+
   = DON'T:
-  
+
   * Spec more than one unit of functionality in an example. An example should be
     as short as possible (while still remaining readable).
   * Spec implementation. Refactoring code should not break specs.
   * Declare models in the spec file.
-  
+
   And a final do: Do go against the guidelines if your best judgement tells you
   to. These are just guidelines and are obviously not fast rules.
 
@@ -39,7 +39,7 @@ Models
   few simple metaphors, such as a zoo, a blog implementation, etc... Following
   metaphors makes it easier for a reader to guess what is going on with respect
   to the models.
-  
+
   The second reason is to allow the spec environment to be as pristine as
   possible going into an example. Models being loaded from the model directory
   are tracked and reloaded before each example. Any changes that might be made
@@ -51,13 +51,12 @@ Mocks and Stubs
   Obviously, mocks and stubs are a powerful feature when it comes to BDD;
   however, remember that you are writing specs for behavior and NOT
   implementation.
-  
+
 Ordering Specs
 ==============
 
   Specs aren't much use if nobody can find where anything is, so keeping specs
   well organized is critical. Currently, we are trying out the following
   structure:
-  
+
     * List guidelines here...
-  

data/dm-core.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "0.9.7"
+  s.version = '0.9.8'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Smoot"]
@@ -22,20 +22,17 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if current_version >= 3 then
-      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.7"])
-      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.8"])
-      s.add_runtime_dependency(%q<rspec>, [">= 1.1.3"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.9"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.9"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.0.1"])
     else
-      s.add_dependency(%q<data_objects>, ["~> 0.9.7"])
-      s.add_dependency(%q<extlib>, ["~> 0.9.8"])
-      s.add_dependency(%q<rspec>, [">= 1.1.3"])
-      s.add_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_dependency(%q<data_objects>, ["~> 0.9.9"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.9"])
+      s.add_dependency(%q<addressable>, ["~> 2.0.1"])
     end
   else
-    s.add_dependency(%q<data_objects>, ["~> 0.9.7"])
-    s.add_dependency(%q<extlib>, ["~> 0.9.8"])
-    s.add_dependency(%q<rspec>, [">= 1.1.3"])
-    s.add_dependency(%q<addressable>, ["~> 2.0"])
+    s.add_dependency(%q<data_objects>, ["~> 0.9.9"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.9"])
+    s.add_dependency(%q<addressable>, ["~> 2.0.1"])
   end
 end

data/lib/dm-core.rb

@@ -11,20 +11,20 @@
 
 require 'date'
 require 'pathname'
+require 'rubygems'
 require 'set'
 require 'time'
 require 'yaml'
 
-require 'rubygems'
-
-gem 'addressable', '~>2.0'
+gem 'addressable', '~>2.0.1'
 require 'addressable/uri'
 
-gem 'extlib', '~>0.9.8'
+gem 'extlib', '~>0.9.9'
 require 'extlib'
-require "extlib/inflection"
+require 'extlib/inflection'
 
 begin
+  gem 'fastthread', '~>1.0.1'
   require 'fastthread'
 rescue LoadError
   # fastthread not installed

data/lib/dm-core/adapters/data_objects_adapter.rb

@@ -1,4 +1,4 @@
-gem 'data_objects', '~>0.9.7'
+gem 'data_objects', '~>0.9.9'
 require 'data_objects'
 
 module DataMapper

data/lib/dm-core/adapters/mysql_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_mysql', '~>0.9.7'
+gem 'do_mysql', '~>0.9.9'
 require 'do_mysql'
 
 module DataMapper

data/lib/dm-core/adapters/postgres_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_postgres', '~>0.9.7'
+gem 'do_postgres', '~>0.9.9'
 require 'do_postgres'
 
 module DataMapper

data/lib/dm-core/adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '~>0.9.7'
+gem 'do_sqlite3', '~>0.9.9'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/associations/many_to_one.rb

@@ -48,7 +48,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         def replace(parent)
           @parent = parent

data/lib/dm-core/associations/one_to_many.rb

@@ -72,7 +72,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         # FIXME: remove when RelationshipChain#get_children can return a Collection
         def all(query = {})
@@ -306,11 +306,8 @@ module DataMapper
         end
 
         def method_missing(method, *args, &block)
-          results = children.__send__(method, *args, &block) if children.respond_to?(method)
-
-          return self if LazyArray::RETURN_SELF.include?(method) && results.kind_of?(Array)
-
-          results
+          results = children.send(method, *args, &block)
+          results.equal?(children) ? self : results
         end
       end # class Proxy
     end # module OneToMany

data/lib/dm-core/query.rb

@@ -51,11 +51,10 @@ module DataMapper
       @limit        = other.limit         unless other.limit         == nil
       @order        = other.order         unless other.order         == model.default_order
       @add_reversed = other.add_reversed? unless other.add_reversed? == false
+      @fields       = other.fields        unless other.fields        == @properties.defaults
       @links        = other.links         unless other.links         == []
       @includes     = other.includes      unless other.includes      == []
 
-      @fields == @properties.defaults ? @fields = other.fields : @fields |= other.fields
-
       update_conditions(other)
 
       self
@@ -574,7 +573,7 @@ module DataMapper
     class Path
       include Assertions
 
-   %w[ id type ].each { |m| undef_method m }
+      instance_methods.each { |m| undef_method m if %w[ id type ].include?(m.to_s) }
 
       attr_reader :relationships, :model, :property, :operator
 

data/lib/dm-core/resource.rb

@@ -198,7 +198,7 @@ module DataMapper
       attrs = []
 
       properties.each do |property|
-        value = if property.lazy? && !attribute_loaded?(property.name) && !new_record?
+        value = if !attribute_loaded?(property.name) && !new_record?
           '<not loaded>'
         else
           send(property.getter).inspect
@@ -491,13 +491,13 @@ module DataMapper
     # --
     # @api public
     def attributes=(values_hash)
-      values_hash.each_pair do |k,v|
-        setter = "#{k.to_s.sub(/\?\z/, '')}="
+      values_hash.each do |name, value|
+        name = name.to_s.sub(/\?\z/, '')
 
-        if respond_to?(setter)
-          send(setter, v)
+        if self.class.public_method_defined?(setter = "#{name}=")
+          send(setter, value)
         else
-          raise NameError, "#{setter} is not a public property"
+          raise ArgumentError, "The property '#{name}' is not a public property."
         end
       end
     end

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.9.7' unless defined?(DataMapper::VERSION)
+  VERSION = '0.9.8' unless defined?(DataMapper::VERSION)
 end

data/script/performance.rb

@@ -3,18 +3,16 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core')
 require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core', 'version')
 
-require 'rubygems'
 require 'ftools'
+require 'rubygems'
 
-# sudo gem install rbench
-# OR git clone git://github.com/somebee/rbench.git , rake install
-gem 'rbench', '>=0.2.2'
+gem 'rbench', '~>0.2.3'
 require 'rbench'
 
-gem 'faker', '>=0.3.1'
+gem 'faker', '~>0.3.1'
 require 'faker'
 
-gem 'activerecord', '>=2.1.0'
+gem 'activerecord', '~>2.2.2'
 require 'active_record'
 
 socket_file = Pathname.glob(%w[

data/script/profile.rb

@@ -4,10 +4,10 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core')
 
 require 'rubygems'
 
-gem 'ruby-prof', '>=0.6.0'
+gem 'ruby-prof', '~>0.7.1'
 require 'ruby-prof'
 
-gem 'faker', '>=0.3.1'
+gem 'faker', '~>0.3.1'
 require 'faker'
 
 OUTPUT = DataMapper.root / 'profile_results.txt'

data/spec/integration/property_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-gem 'fastercsv', '>=1.2.3'
+gem 'fastercsv', '~>1.4.0'
 require 'fastercsv'
 
 if ADAPTER

data/spec/integration/resource_spec.rb

@@ -21,6 +21,12 @@ if ADAPTER
       lambda { @zoo.destroy.should be_true }.should_not raise_error
     end
 
+    it 'should not overwrite attributes when lazy loading' do
+      zoo = Zoo.first
+      zoo.name = 'San Diego'
+      lambda { zoo.description }.should_not change(zoo, :name)
+    end
+
     describe '#attribute_get' do
       it 'should provide #attribute_get' do
         Zoo.new.should respond_to(:attribute_get)

data/spec/integration/type_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-gem 'fastercsv', '>=1.2.3'
+gem 'fastercsv', '~>1.4.0'
 require 'fastercsv'
 
 if ADAPTER

data/spec/models/zoo.rb

@@ -7,6 +7,7 @@ class Zoo
   property :inception,    DateTime
   property :open,         Boolean,  :default => false
   property :size,         Integer
+  property :mission,      Text, :writer => :protected
 
   has n, :animals
 

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
 
 SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
 require SPEC_ROOT.parent + 'lib/dm-core'

data/spec/unit/associations/many_to_one_spec.rb

@@ -30,6 +30,13 @@ describe DataMapper::Associations::ManyToOne::Proxy do
     @association.should respond_to(:replace)
   end
 
+  describe '#class' do
+    it 'should be forwarded to parent' do
+      @parent.should_receive(:class).and_return(Manufacturer)
+      @association.class.should == Manufacturer
+    end
+  end
+
   describe '#replace' do
     before do
       @other = mock('other parent')

data/spec/unit/query_spec.rb

@@ -219,17 +219,6 @@ describe DataMapper::Query do
       @query.update(other).should == @query
     end
 
-    it "should merge #fields if :fields != model.properties.defaults" do
-      other = DataMapper::Query.new(@repository, Article, :fields => [ :blog_id ])
-      @query.update(other).fields.should == Article.properties.slice(:id, :author, :blog_id)
-    end
-
-    it "should replace #fields if fields == model.properties.defaults" do
-      query = DataMapper::Query.new(@repository, Article, :fields => Article.properties.defaults.map { |property| property.name })
-      other = DataMapper::Query.new(@repository, Article, :fields => [ :blog_id ])
-      query.update(other).fields.should == Article.properties.slice(:blog_id)
-    end
-
     describe 'should overwrite the attribute' do
       it '#reload? with other reload?' do
         other = DataMapper::Query.new(@repository, Article, :reload => true)
@@ -314,6 +303,11 @@ describe DataMapper::Query do
         end
       end
 
+      it "#fields with other fields unique values" do
+        other = DataMapper::Query.new(@repository, Article, :fields => [ :blog_id ])
+        @query.update(other).fields.should == Article.properties.slice(:blog_id)
+      end
+
       it '#conditions with other conditions when they are unique' do
         # set the initial conditions
         @query.update(:title => 'On DataMapper')

data/spec/unit/resource_spec.rb

@@ -11,7 +11,7 @@ describe DataMapper::Resource do
       zoo.description = "This is a pretty awesome zoo"
       zoo.attributes.should == {
         :name => "San Francisco", :description => "This is a pretty awesome zoo",
-        :id => nil, :inception => nil, :open => false, :size => nil
+        :id => nil, :inception => nil, :open => false, :size => nil, :mission => nil
       }
     end
 
@@ -24,6 +24,20 @@ describe DataMapper::Resource do
     end
   end
 
+  describe "#attributes=" do
+    before(:each) do
+      @zoo = Zoo.new(:name => "San Francisco", :size => 10)
+      @zoo.attributes = {:size => 12 }
+    end
+    it "should change a public property" do
+      @zoo.size.should == 12
+    end
+    it "should raise when attempting to change a property with a non-public writer" do
+      lambda { @zoo.attributes = {:mission => "Just keep some odd
+        critters, y'know?" } }.should raise_error
+    end
+  end
+
 # ---------- REPOSITORY WRITE METHODS ---------------
 
   describe '#save' do
@@ -348,7 +362,7 @@ describe DataMapper::Resource do
   it "should not be able to set private attributes" do
     lambda {
       jupiter = Planet.new({ :core => "Molten Metal" })
-    }.should raise_error(NameError)
+    }.should raise_error(ArgumentError)
   end
 
   it "should not mark attributes dirty if they are similar after update" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -30,17 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -50,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 2.0.1
     version: 
 description: Faster, Better, Simpler.
 email: