polygallery 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fabe9747e2178faa7af123d824736b7258cf2718
-  data.tar.gz: b8d626a8c4691873937826adcda97073d50de55d
+  metadata.gz: 47b217d27d6e5bc745682fea19ee2edba9c352e8
+  data.tar.gz: 65dc16aa4afa698c787e179a09ab285789163a99
 SHA512:
-  metadata.gz: e758648eeaeb6e2dc71a5c62f6ffc3dcbc845987e0fd4480a41022a74fef2566f88bf5431a0a3cd773489aab6bd011dce1f56add26757b789116e1b785cca63c
-  data.tar.gz: beca903a3da3946582a63e25233cee6ab551a98ab94421e2d61495e8e86f7d8cef456c78891025f59eb467a672c5d90f653bca66b6d2a7dd4a1db20363cb43d7
+  metadata.gz: 680d22bf90e327e3d62a86a759489dff856e7f0aa75cb9601a07a93e4556caf44fc87398c4b9dae584aa7e4f8e5ae34e930a6b497534f89d88d77b4915e80657
+  data.tar.gz: 2ecce0e9a173a882458f7df4304e58edcbf64737082d55222bf2075b9b2d7ea9078d7d442158b8972f3272dfd988f3dd4e35d9aec237d5e751a1afc2f5927815

data/lib/polygallery/has_polygallery.rb

@@ -82,7 +82,8 @@ module Polygallery
         accepts_nested_attributes_for settings[:association_names][:gallery],
                                       settings[:nested_attributes][:gallery]
         accepts_nested_attributes_for settings[:association_names][:photos],
-                                      settings[:nested_attributes][:photos]
+          settings[:nested_attributes][:photos].deep_merge({
+            :source => settings[:association_names][:photos] })
 
         after_initialize :build_galleries
 

data/lib/polygallery/has_polyphotos.rb

@@ -20,6 +20,11 @@ module Polygallery
 
         settings = defaults.deep_merge options
 
+        has_many association_names[:photos],
+                 settings[:associations][:photos].deep_merge({})
+        accepts_nested_attributes_for association_names[:photos],
+                 settings[:nested_attributes][:photos]
+
         after_initialize do
           @polygallery_settings = settings if settings == HasPolygallery::DEFAULTS
           self.initialize_polygallery
@@ -54,10 +59,10 @@ module Polygallery
       def initialize_polygallery
         settings = self.polygallery_settings
         association_names = settings[:association_names]
-        self.class.has_many association_names[:photos],
-          settings[:associations][:photos].deep_merge({})
-        self.class.accepts_nested_attributes_for association_names[:photos],
-                                      settings[:nested_attributes][:photos]
+        # self.class.has_many association_names[:photos],
+        #   settings[:associations][:photos].deep_merge({})
+        # self.class.accepts_nested_attributes_for association_names[:photos],
+        #                               settings[:nested_attributes][:photos]
       end
 
       def build_first_photo

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/polygallery/view_helpers.rb

@@ -18,4 +18,4 @@ module Polygallery
     end
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails