minimapper-extras 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cc35405d6f7b7f30359b489d1f6752dc2c8c1a7
-  data.tar.gz: a57bf9bfd4470d7fed953cae1525ff16a4827b0b
+  metadata.gz: ee41db88d4c2c64577d469e09c24d8a350db3fd5
+  data.tar.gz: de05db712f656b5802d997637d0b73c2c4191a57
 SHA512:
-  metadata.gz: 756bd40e72e990aa5e4138ccb0057ce106fb54bde9b4b31ee6bbcb22aa1fa308fba534b50fa7711e7c47306d10d76aab7e9b0de660cee007293ff38596fc633a
-  data.tar.gz: 41cd71d233c1dcb8c8255da4722de18ef6444810f4ace5afd4fd9bb0f5d217104972f28e86f724845997eddf65609f28369a771705243c0156eecd445e36e00f
+  metadata.gz: 9b4d3bcf25b07ffbefcf1eab86250fff4a6faecf023576d4757aaa2a4fa4bd1d93ebb90b412a7f857e4b8c8f439c5e7450bb6b7e32499c51b4bbdd472fff2647
+  data.tar.gz: 22c327686c6c75bc6b8085d117dc7c67d33c03d42a5c7a8449a508c81ad0dd7467b21a48451ea5c8aa0d98055f8e6c7151c924c45be04c5c86241fc120eff6cb

data/lib/minimapper/entity/has_many.rb

@@ -3,18 +3,30 @@ require "minimapper/entity"
 module Minimapper
   module Entity
     module HasMany
-      def has_many(name)
-        attr_writer name
+      def has_many(name, opts = {})
+        serialize = opts.fetch(:serialize, false)
 
-        define_method(name) do
-          # @foo ||= []
-          ivar = instance_variable_get("@#{name}")
+        attr_writer name
 
-          if ivar
-            ivar
-          else
-            instance_variable_set("@#{name}", [])
+        if serialize
+          setup_has_many(name) do
+            attributes = send("#{name}_attributes")
+            entity_class = name.to_s.singularize.camelcase.constantize
+            (attributes || []).map { |attr| entity_class.new(attr) }
           end
+        else
+          setup_has_many(name) { [] }
+        end
+      end
+
+      private
+
+      def setup_has_many(name, &data)
+        # Basically does: @thename ||= data.call
+        # The data block is evaluated in the instance context.
+        define_method(name) do
+          instance_variable_get("@#{name}") ||
+            instance_variable_set("@#{name}", instance_eval(&data))
         end
       end
     end

data/lib/minimapper/extras/version.rb

@@ -1,5 +1,5 @@
 module Minimapper
   module Extras
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/minimapper-extras.gemspec

@@ -12,7 +12,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  # We bundle this gem within the app, having this leads
+  # to git errors when deploying.
+  if File.exists?(".git")
+    spec.files         = `git ls-files`.split($/)
+  end
+
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/spec/minimapper/entity/has_many_spec.rb

@@ -1,26 +1,60 @@
 require "spec_helper"
 require "minimapper/entity/has_many"
 
+class Address
+  include Minimapper::Entity
+
+  attribute :street
+end
+
 class Customer
   include Minimapper::Entity
 
   has_many :cars
+
+  attribute :addresses_attributes
+  has_many :addresses, :serialize => true
 end
 
 describe Minimapper::Entity::HasMany do
-  it "defaults to an empty array" do
-    Customer.new.cars.should be_empty
-  end
+  context "with serialize: false (the default)" do
+    it "defaults to an empty array" do
+      Customer.new.cars.should be_empty
+    end
+
+    it "can be added to" do
+      customer = Customer.new
+      customer.cars << :foo
+      customer.cars.should == [ :foo ]
+    end
 
-  it "can be added to" do
-    customer = Customer.new
-    customer.cars << :foo
-    customer.cars.should == [ :foo ]
+    it "can be set" do
+      customer = Customer.new
+      customer.cars = [ :foo ]
+      customer.cars.should == [ :foo ]
+    end
   end
 
-  it "can be set" do
-    customer = Customer.new
-    customer.cars = [ :foo ]
-    customer.cars.should == [ :foo ]
+  context "with serialize: true" do
+    it "returns an empty collection for a new instance" do
+      Customer.new.addresses.should be_empty
+    end
+
+    it "fills the collection using data in entities_attributes" do
+      addresses = Customer.new(:addresses_attributes => [ { :street => "Street 55" } ]).addresses
+      addresses.size.should == 1
+      addresses.first.street.should == "Street 55"
+    end
+
+    it "memoizes the collection" do
+      customer = Customer.new(:addresses_attributes => [ { :street => "Street 55" } ])
+      customer.addresses.should == customer.addresses
+    end
+
+    it "can be set" do
+      customer = Customer.new
+      customer.addresses = [ :foo ]
+      customer.addresses.should == [ :foo ]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimapper-extras
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joakim Kolsjö
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minimapper
@@ -128,7 +128,6 @@ files:
 - lib/minimapper/entity/conversions.rb
 - lib/minimapper/entity/has_many.rb
 - lib/minimapper/entity/serialized_association.rb
-- lib/minimapper/entity/serialized_collection.rb
 - lib/minimapper/extras.rb
 - lib/minimapper/extras/version.rb
 - lib/minimapper/factory_girl.rb
@@ -140,7 +139,6 @@ files:
 - spec/minimapper/entity/conversions_spec.rb
 - spec/minimapper/entity/has_many_spec.rb
 - spec/minimapper/entity/serialized_association_spec.rb
-- spec/minimapper/entity/serialized_collection_spec.rb
 - spec/minimapper/factory_girl_spec.rb
 - spec/minimapper/mapper/has_many_association_spec.rb
 - spec/spec_helper.rb
@@ -173,7 +171,6 @@ test_files:
 - spec/minimapper/entity/conversions_spec.rb
 - spec/minimapper/entity/has_many_spec.rb
 - spec/minimapper/entity/serialized_association_spec.rb
-- spec/minimapper/entity/serialized_collection_spec.rb
 - spec/minimapper/factory_girl_spec.rb
 - spec/minimapper/mapper/has_many_association_spec.rb
 - spec/spec_helper.rb

data/lib/minimapper/entity/serialized_collection.rb

@@ -1,27 +0,0 @@
-require "minimapper/entity"
-
-module Minimapper
-  module Entity
-    module SerializedCollection
-      def serialized_collection(name)
-        entity_class = name.to_s.singularize.camelcase.constantize
-
-        define_method(name) do
-          ivar = instance_variable_get("@#{name}")
-
-          if ivar
-            ivar
-          else
-            attributes = send("#{name}_attributes")
-            data = (attributes || []).map { |attr| entity_class.new(attr) }
-            instance_variable_set("@#{name}", data)
-          end
-        end
-      end
-    end
-
-    module Attributes
-      include SerializedCollection
-    end
-  end
-end

data/spec/minimapper/entity/serialized_collection_spec.rb

@@ -1,32 +0,0 @@
-require "spec_helper"
-require "minimapper/entity/serialized_collection"
-
-class Address
-  include Minimapper::Entity
-
-  attribute :street
-end
-
-class Customer
-  include Minimapper::Entity
-
-  attribute :addresses_attributes
-  serialized_collection :addresses
-end
-
-describe Minimapper::Entity::SerializedCollection do
-  it "returns an empty collection for a new instance" do
-    Customer.new.addresses.should be_empty
-  end
-
-  it "fills the collection using data in entities_attributes" do
-    addresses = Customer.new(:addresses_attributes => [ { :street => "Street 55" } ]).addresses
-    addresses.size.should == 1
-    addresses.first.street.should == "Street 55"
-  end
-
-  it "memoizes the collection" do
-    customer = Customer.new(:addresses_attributes => [ { :street => "Street 55" } ])
-    customer.addresses.should == customer.addresses
-  end
-end