minimapper-extras 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed4608bcd50ac8efa3a679ce16b038d9afa6982
-  data.tar.gz: f51fe75fc87a6ab8227e3a13a7440e9ca2c7bf3e
+  metadata.gz: e25e9f439adce376313c1e6689e66aab2ee8591d
+  data.tar.gz: c927432be7676680810eccd2a0cbf5644cca82bb
 SHA512:
-  metadata.gz: 8af1efffe8ef6e20aafcae764e8494d88ced0d47f75e29b1864417f3c8f9489824672ed8575ec7f72dbcd81cc888b049338894b1292ab0eb1c3dc1e427ea0352
-  data.tar.gz: f3f3d09427adcbc1d83479253915ad64f0c3a86e6900404f8ff11d66d47dbfafc8490cd6a067c7c49b2676fa6a7db286684869c8927887c48400cd97bd960996
+  metadata.gz: 9efb298a73ed8bcd662356ca902600d8aad3f817a3ad1019ca3bb5a7815befa94eaf893132250ffd18d2ab68f20fd4cb0ec006d04e47b9cf58a699fc469707a3
+  data.tar.gz: 330bc3914da9714b3e2f7603d7fe6fd3be9aef610dcaf164f3fe253a9e8725666b2667874485143f57f89d8be36d5038241bb424be4d4f3d371c3310f34e67bb

data/lib/minimapper/entity/serialized_association.rb

@@ -1,18 +1,26 @@
 require "minimapper/entity"
+require "backports/1.9.1/kernel/public_send"
+require "backports/1.8.7/kernel/instance_exec"
 
 module Minimapper
   module Entity
     module SerializedAssociation
-      def serialized_association(name, entity_class = nil)
-        if entity_class
-          class_name = entity_class.name
-        else
-          class_name = name.to_s.camelcase
-        end
+      def serialized_association(name, entity_class_or_proc = nil)
+        define_method(name) do                                          # def foo
+          attributes = public_send("#{name}_attributes") || {}          #  attributes = foo_attributes
+          entity = instance_variable_get("@#{name}")                    #  entity = @foo
+
+          if entity_class_or_proc.is_a?(Proc)
+            entity ||= instance_exec(attributes, &entity_class_or_proc) # call proc in instance context
+          else
+            entity_class = entity_class_or_proc ||
+              name.to_s.camelcase.constantize
 
-        define_method(name) do                                                # def foo
-          eval("@#{name} ||= ::#{class_name}.new(#{name}_attributes || {})")  #   @foo ||= ::Foo.new(foo_attributes || {})
-        end                                                                   # end
+            entity ||= entity_class.new(attributes)                     # entity ||= Foo.new(attributes)
+          end
+
+          instance_variable_set("@#{name}", entity)                     # @foo = entity
+        end
       end
     end
 

data/lib/minimapper/extras/version.rb

@@ -1,5 +1,5 @@
 module Minimapper
   module Extras
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/minimapper/factory_girl.rb

@@ -20,7 +20,9 @@ class CreateThroughRepositoryStrategy
       # "customer { FactoryGirl.build(:customer) }" in factories.
       create_dependencies
 
-      if mapper_with_name(mapper_name).create(entity)
+      if entity.persisted?
+        entity
+      elsif mapper_with_name(mapper_name).create(entity)
         entity
       else
         errors = entity.errors.full_messages.join(", ")
@@ -35,8 +37,12 @@ class CreateThroughRepositoryStrategy
 
     def create_dependencies
       associated_entity_names.each do |name|
-        dependency_entity = self.class.new(entity.public_send(name)).create
-        entity.public_send("#{name}=", dependency_entity)
+        associated_entity = entity.public_send(name)
+
+        if associated_entity
+          dependency_entity = self.class.new(associated_entity).create
+          entity.public_send("#{name}=", dependency_entity)
+        end
       end
     end
 

data/spec/minimapper/entity/serialized_association_spec.rb

@@ -7,14 +7,32 @@ class Address
   attribute :street
 end
 
+class CustomerAddress
+  include Minimapper::Entity
+
+  def initialize(customer, attributes)
+    @customer = customer
+    super(attributes)
+  end
+
+  def customer_name
+    @customer.name
+  end
+
+  attribute :street
+end
+
 class Customer
   include Minimapper::Entity
 
+  attribute :name
   attribute :address_attributes
   attribute :visit_address_attributes
+  attribute :custom_address_attributes
 
   serialized_association :address
   serialized_association :visit_address, Address
+  serialized_association :custom_address, lambda { |attributes| CustomerAddress.new(self, attributes) }
 end
 
 describe Minimapper::Entity::SerializedAssociation do
@@ -38,4 +56,10 @@ describe Minimapper::Entity::SerializedAssociation do
     customer = Customer.new(:visit_address_attributes => { :street => "Street 66" })
     customer.visit_address.street.should == "Street 66"
   end
+
+  it "can use a lambda to construct addresses" do
+    customer = Customer.new(:name => "Joe", :custom_address_attributes => { :street => "Street 66" })
+    customer.custom_address.street.should == "Street 66"
+    customer.custom_address.customer_name.should == "Joe"
+  end
 end

data/spec/minimapper/factory_girl_spec.rb

@@ -68,4 +68,20 @@ describe CreateThroughRepositoryStrategy, "when there are belongs_to association
     evaluation = mock(:object => order)
     CreateThroughRepositoryStrategy.new.result(evaluation)
   end
+
+  it "does not create dependencies when not defined" do
+    order = Order.new(:payment => nil)
+    order_mapper.should_receive(:create).ordered.with(order).and_return(true)
+    evaluation = mock(:object => order)
+    CreateThroughRepositoryStrategy.new.result(evaluation)
+  end
+
+  it "does not create an entity when it's already persisted" do
+    payment = Payment.new(:id => 1)
+    order = Order.new(:payment => payment)
+    payment_mapper.should_not_receive(:create)
+    order_mapper.should_receive(:create).ordered.with(order).and_return(true)
+    evaluation = mock(:object => order)
+    CreateThroughRepositoryStrategy.new.result(evaluation)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimapper-extras
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joakim Kolsjö
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minimapper