dm-sweatshop 0.9.8 → 0.9.9

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.9.9 / 2009-01-04
+
+* 1 minor enhancement:
+
+  * Added #generate! method to create invalid fixture
+
+* 1 bug fix:
+
+  * Updated spec to use local dm-validations if possible
+
 === 0.9.8 / 2008-12-07
 
 * 1 minor enhancement:

data/README.textile

@@ -114,12 +114,12 @@ Person.gen(:valid)
 </code>
 </pre>
 
-@generate@ (or @gen@) method uses @create@ method of DataMapper models. What if
-we want just a new record? Use @make@ method instead:
+@generate@ (or @gen@) method uses @create@ method of DataMapper models. This means that validations are run on the model. There are two other methods you can use to creat data - @make@ to build a model that has not been saved, and @generate!@ to force saving of the model even if it is invalid (it uses @create!@ internally).
 
 <pre>
 <code>
 Person.make(:valid)
+Person.generate!(:invalid) # You can also use #gen!
 </code>
 </pre>
 

data/lib/dm-sweatshop.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.8'
+gem 'dm-core', '~>0.9.9'
 require 'dm-core'
 
 gem 'randexp', '~>0.1.4'

data/lib/dm-sweatshop/model.rb

@@ -40,6 +40,22 @@ module DataMapper
 
     alias_method :gen, :generate
 
+    # Same as generate except that it uses Model#create!. It
+    # forces invalid objects to be saved in the repository.
+    #
+    # @param     name        [Symbol]
+    # @param     attributes  [Hash]
+    #
+    # @api       public
+    #
+    # @returns   [DataMapper::Resource]    added instance
+    def generate!(name = default_fauxture_name, attributes = {})
+      name, attributes = default_fauxture_name, name if name.is_a? Hash
+      Sweatshop.create!(self, name, attributes)
+    end
+
+    alias_method :gen!, :generate!
+
     # Returns a Hash of attributes from the model map.
     #
     # @param     name     [Symbol]   name of the fauxture to use

data/lib/dm-sweatshop/sweatshop.rb

@@ -47,6 +47,20 @@ module DataMapper
       instance
     end
 
+    # Same as create but calls Model#create! and does save
+    # invalid models
+    #
+    # @param     klass       [Class, DataMapper::Resource]
+    # @param     name        [Symbol]
+    # @param     attributes  [Hash]
+    #
+    # @api       private
+    #
+    # @returns   [DataMapper::Resource]    added instance
+    def self.create!(klass, name, attributes = {})
+      record(klass, name, klass.create!(attributes(klass, name).merge(attributes)))
+    end
+
     # Creates an instance from given hash of attributes, saves it
     # and adds it to the record map.
     #

data/lib/dm-sweatshop/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Sweatshop
-    VERSION = '0.9.8'
+    VERSION = '0.9.9'
   end
 end

data/spec/dm-sweatshop/model_spec.rb

@@ -1,16 +1,17 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require 'dm-validations'
 
 describe DataMapper::Model do
 
   class Widget
     include DataMapper::Resource
-
     property :id, Integer, :serial => true
     property :type, Discriminator
     property :name, String
     property :price, Integer
 
     belongs_to :order
+    validates_present :price
   end
 
   class Wonket < Widget
@@ -117,6 +118,10 @@ describe DataMapper::Model do
       }}
 
       @widget = Widget.gen(:red)
+
+      Widget.fix(:blue) {{
+        :name  => "blue"
+      }}
     end
 
     it "creates an object from named attributes hash" do
@@ -127,8 +132,25 @@ describe DataMapper::Model do
     it "returns a saved object" do
       @widget.should_not be_new_record
     end
+
+    it "does not save invalid model" do
+      blue_widget = Widget.gen(:blue)
+      blue_widget.should be_new_record
+    end
   end
 
+  describe ".generate!" do
+    it "saves a model even if it is invalid" do
+      Widget.fix(:blue) {{
+        :name  => "blue"
+      }}
+
+      blue_widget = Widget.gen!(:blue)
+      blue_widget.should_not be_new_record
+    end
+  end
+
+
 
   describe ".pick" do
     before :each do

data/spec/spec_helper.rb

@@ -1,9 +1,16 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require 'pathname'
+require 'rubygems'
 
-require 'dm-sweatshop'
+gem 'dm-core', '~>0.9.8'
+require 'dm-core'
 
-DataMapper.setup(:default, 'sqlite3::memory:')
+ROOT = Pathname(__FILE__).dirname.parent.expand_path
+
+# use local dm-validations if running from dm-more directly
+lib = ROOT.parent.join('dm-validations', 'lib').expand_path
+$LOAD_PATH.unshift(lib) if lib.directory?
+require 'dm-validations'
 
-Spec::Runner.configure do |config|
-end
+require ROOT + 'lib/dm-sweatshop'
+
+DataMapper.setup(:default, 'sqlite3::memory:')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sweatshop
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Ben Burkert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-07 00:00:00 -08:00
+date: 2009-01-04 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.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: randexp