dm-maker 1.1.1 → 1.2.0

data/README

@@ -11,6 +11,9 @@ API
 when using references (see below), order of occurrence matters; instances must
 be defined before they can be referenced
 
+if any errors occur, the respective instance is stored in an "_errors" member
+of the returned hash (unless `raise_on_save_failure` is used)
+
 
 Examples
 ========
@@ -39,7 +42,7 @@ associations:
         manufacturer:
           name: Knight Industries
 
-(note that associated instances can include a `$class` attribute, which might be
+(note that associated instances may include a `$class` attribute, which might be
 required due to Single Table Inheritance)
 
 ERB expansion:

data/README.md

@@ -11,6 +11,9 @@ API
 when using references (see below), order of occurrence matters; instances must
 be defined before they can be referenced
 
+if any errors occur, the respective instance is stored in an "_errors" member
+of the returned hash (unless `raise_on_save_failure` is used)
+
 
 Examples
 ========
@@ -39,7 +42,7 @@ associations:
         manufacturer:
           name: Knight Industries
 
-(note that associated instances can include a `$class` attribute, which might be
+(note that associated instances may include a `$class` attribute, which might be
 required due to Single Table Inheritance)
 
 ERB expansion:

data/lib/dm-maker.rb

@@ -18,14 +18,20 @@ module DataMapper
           DataMapper::Associations::OneToMany::Relationship]
     }
 
+    # returns a hash of instances by class
+    # if any errors occur, the respective instances are stored in a special
+    # "_errors" member
     def self.make(data)
       data = load_yaml(data) if data.class == String
 
       cache = {}
-      return data.each_with_object({}) do |(class_name, instances), hsh|
+      res = { "_errors" => [] }
+      return data.each_with_object(res) do |(class_name, instances), hsh|
         klass = class_name.constantize
         hsh[class_name] = instances.map { |instance_data|
-          create_instance(klass, instance_data, cache)
+          instance = create_instance(klass, instance_data, cache)
+          hsh["_errors"] << instance unless instance.save
+          instance
         }
       end
     end
@@ -63,11 +69,6 @@ module DataMapper
       }
 
       instance = klass.new(data)
-      begin
-        instance.save
-      rescue DataMapper::SaveFailureError
-        # rely on parent saving -- FIXME: hacky!?
-      end
 
       cache[id] = instance if id
       return instance

data/lib/dm-maker/version.rb

@@ -2,6 +2,6 @@
 
 module DataMapper
   module Maker
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/test/models.rb

@@ -4,7 +4,7 @@ class Person
   include DataMapper::Resource
 
   property :id, Serial
-  property :name, String
+  property :name, String, :required => true
   property :age, Integer
 
   belongs_to :family, :required => false

data/test/test_basics.rb

@@ -63,7 +63,8 @@ class BasicsTest < Test::Unit::TestCase
     EOF
     data = DataMapper::Maker.make(yaml)
 
-    assert_equal 2, data.length
+    assert_equal 3, data.length # includes "_errors"
+    assert_equal 0, data["_errors"].length
     assert_equal 2, data["Person"].length
     assert_equal "John", data["Person"][0].name
     assert_equal 11, data["Person"][0].age

data/test/test_errors.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+
+require "helper"
+
+class ErrorsTest < Test::Unit::TestCase
+
+  def setup
+    reset_database
+    @raise_setting = DataMapper::Model.raise_on_save_failure
+
+    @yaml = <<-EOF
+      Person:
+      -
+        name: John Doe
+        age: 11
+      -
+        age: 17
+      -
+        name: Jane Doe
+        age: 13
+    EOF
+  end
+
+  def teardown
+    DataMapper::Model.raise_on_save_failure = @raise_setting
+  end
+
+  def test_reports_silent_errors
+    DataMapper::Model.raise_on_save_failure = false
+
+    data = DataMapper::Maker.make(@yaml)
+
+    assert_equal 2, Person.count
+    assert_equal "John Doe", Person.first.name
+    assert_equal "Jane Doe", Person.last.name
+
+    assert_equal 1, data["_errors"].length
+    assert_equal "Person", data["_errors"].first.class.name
+    assert (not data["_errors"].first.saved?)
+  end
+
+  def test_does_not_swallow_exceptions
+    DataMapper::Model.raise_on_save_failure = true
+
+    assert_raise DataMapper::SaveFailureError do
+      data = DataMapper::Maker.make(@yaml)
+    end
+    assert_equal 1, Person.count
+    assert_equal "John Doe", Person.first.name
+    # Jane Doe was never processed
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-maker
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - FND
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 Z
+date: 2011-12-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
@@ -158,6 +158,7 @@ files:
 - test/models.rb
 - test/test_associations.rb
 - test/test_basics.rb
+- test/test_errors.rb
 - test/test_references.rb
 homepage: 
 licenses: []
@@ -195,4 +196,5 @@ summary: DataMapper extension to generate instances from YAML
 test_files: 
 - test/test_associations.rb
 - test/test_basics.rb
+- test/test_errors.rb
 - test/test_references.rb