edr 0.0.4 → 0.0.5

data/.gitignore

@@ -18,3 +18,4 @@ Gemfile.lock
 .yardoc
 _yardoc
 doc/
+TAGS

data/edr.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.name          = "edr"
   gem.version       = Edr::VERSION
   gem.authors       = ["Victor Savkin", "Matt Briggs", "Clemens Park", "Justin Fitzsimmons"]
-  gem.email         = ["vsavkin@nulogy.com", "mbriggs@nulocy.com", "clemensp@nulogy.com", "justinf@nulogy.com"]
+  gem.email         = ["vsavkin@nulogy.com", "matt@mattbriggs.net", "clemensp@nulogy.com", "justinf@nulogy.com"]
   gem.description   = %q{Entity Data-object Repository framework}
   gem.summary       = %q{Separate persistence from the domain model.}
   gem.homepage      = ""

data/lib/edr/model.rb

@@ -7,15 +7,7 @@ module Edr
       base.extend ::Forwardable
     end
 
-    attr_accessor :_data
-
-    def initialize _data = _new_instance
-      if _data.kind_of?(Hash)
-        @_data = _new_instance _data
-      else
-        @_data = _data
-      end
-    end
+    attr_writer :_data
 
     def mass_assign(attributes)
       attributes.each do |k, v|
@@ -27,6 +19,10 @@ module Edr
       _data.as_json(options)
     end
 
+    def _data
+      @_data ||= self.class._new_instance
+    end
+
     protected
 
     def repository
@@ -49,15 +45,24 @@ module Edr
       else
         return nil if association.nil?
         model_class = Registry.model_class_for(association.class)
-        model_class.new association
+        model_class.build association
       end
     end
 
-    def _new_instance hash = {}
-      Registry.data_class_for(self.class).new hash
-    end
 
     module ClassMethods
+      def build(data = _new_instance)
+        instance = new
+
+        if data.kind_of?(Hash)
+          instance._data =  _new_instance(data)
+        else
+          instance._data = data
+        end
+
+        return instance
+      end
+
       def fields *field_names
         field_names.each do |field_name|
           def_delegators :_data, field_name
@@ -72,6 +77,10 @@ module Edr
           end
         end
       end
+
+      def _new_instance hash = {}
+        Registry.data_class_for(self).new hash
+      end
     end
   end
 end

data/lib/edr/repository.rb

@@ -23,7 +23,8 @@ module Edr
     protected
 
     def wrap data
-      model_class.new(data).tap do |m|
+      model_class.new.tap do |m|
+        m.send(:_data=, data)
         m.send(:repository=, self)
       end
     end

data/lib/edr/version.rb

@@ -1,3 +1,3 @@
 module Edr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/edr/data_validator_spec.rb

@@ -6,7 +6,7 @@ describe Edr::AR::DataValidator do
   describe "Using data validation for a saved model" do
     example do
       order_data = OrderData.create! amount: 10, deliver_at: Date.today
-      order = Order.new(order_data)
+      order = Order.build(order_data)
       order.amount = "blah"
       Edr::AR::DataValidator.validate(order).should be_present
     end
@@ -14,8 +14,8 @@ describe Edr::AR::DataValidator do
 
   describe "Using data validation for a new model" do
     example do
-      order = Order.new amount: "blah"
+      order = Order.build(amount: "blah")
       Edr::AR::DataValidator.validate(order).should be_present
     end
   end
-end
+end

data/spec/edr/model_spec.rb

@@ -23,24 +23,17 @@ describe Edr::Model do
     end
 
     it "uses hash to initialize fields" do
-      order = Order.new amount: 15
+      order = Order.build amount: 15
 
       order.amount.should == 15
     end
-
-    it "creating an aggregate with children" do
-      order = Order.new
-      item = order.add_item name: 'item1', amount: 10
-
-      item.name.should == 'item1'
-    end
   end
 
   describe "Using data structure instead of a data object" do
     example do
-      order = Order.new OpenStruct.new
+      order = Order.build OpenStruct.new
       order.amount = 99
       order.amount.should == 99
     end
   end
-end
+end

data/spec/edr/repository_spec.rb

@@ -4,7 +4,7 @@ require_relative '../test_data'
 describe Edr::Repository do
   describe "Persisting objects" do
     example do
-      order = Order.new amount: 10
+      order = Order.build amount: 10
 
       OrderRepository.persist order
 
@@ -12,18 +12,8 @@ describe Edr::Repository do
       order.amount.should == 10
     end
 
-    it "persists an aggregate with children" do
-      order = Order.new amount: 10
-      order.add_item name: 'item1', amount: 5
-
-      OrderRepository.persist order
-
-      from_db = OrderRepository.find(order.id)
-      from_db.items.first.amount.should == 5
-    end
-
     it "raises an exception when invalid data" do
-      order = Order.new amount: "invalid"
+      order = Order.build amount: "invalid"
 
       ->{OrderRepository.persist order}.should raise_error
     end
@@ -31,13 +21,13 @@ describe Edr::Repository do
 
   describe "Creating objects through the repository variable" do
     let(:order) do
-      order = Order.new(amount: 10)
+      order = Order.build(amount: 10)
       OrderRepository.persist order
       order
     end
 
     example do
-      order.add_item_through_repository name: 'item', amount: 10
+      order.add_item name: 'item', amount: 10
       order.items.first.name.should == 'item'
     end
 
@@ -71,7 +61,7 @@ describe Edr::Repository do
 
   describe "Deleting models" do
     let!(:order) do
-      order = Order.new amount: 10, deliver_at: Date.today
+      order = Order.build amount: 10, deliver_at: Date.today
       OrderRepository.persist order
       order
     end
@@ -90,4 +80,4 @@ describe Edr::Repository do
       ->{OrderRepository.delete_by_id 999}.should raise_error
     end
   end
-end
+end

data/spec/test_data.rb

@@ -52,10 +52,6 @@ class Order
   wrap_associations :items
 
   def add_item attrs
-    wrap association(:items).new(attrs)
-  end
-
-  def add_item_through_repository attrs
     repository.create_item self, attrs
   end
 end
@@ -103,7 +99,7 @@ module OrderRepository
     set_model_class Item
 
     def self.create_item order, attrs
-      item = Item.new(attrs)
+      item = Item.build(attrs)
       item.order_id = order.id
       persist item
     end
@@ -113,4 +109,4 @@ end
 
 
 # STEP5: Profit
-# --------------------------------------------------
+# --------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -113,7 +113,7 @@ dependencies:
 description: Entity Data-object Repository framework
 email:
 - vsavkin@nulogy.com
-- mbriggs@nulocy.com
+- matt@mattbriggs.net
 - clemensp@nulogy.com
 - justinf@nulogy.com
 executables: []