polygallery 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b217d27d6e5bc745682fea19ee2edba9c352e8
-  data.tar.gz: 65dc16aa4afa698c787e179a09ab285789163a99
+  metadata.gz: 5f9abf3f0bd4b6b0b456186e42035e1c8e5eb303
+  data.tar.gz: 52b44ca2121ff52b0f69b67d834e878ec4edd402
 SHA512:
-  metadata.gz: 680d22bf90e327e3d62a86a759489dff856e7f0aa75cb9601a07a93e4556caf44fc87398c4b9dae584aa7e4f8e5ae34e930a6b497534f89d88d77b4915e80657
-  data.tar.gz: 2ecce0e9a173a882458f7df4304e58edcbf64737082d55222bf2075b9b2d7ea9078d7d442158b8972f3272dfd988f3dd4e35d9aec237d5e751a1afc2f5927815
+  metadata.gz: 582fdfffbac40a713ecf29ab2b927b2b342fea7e87a51ab236b0f44ad9f3c17f801874c568e4a161227ceb284ddcdfb665e190a2c939edbef4ed86d3df5a3551
+  data.tar.gz: f57230bd322d74bfd5a1f959260ca0337b73b8893e62bac7f339278eea7b5d754c1a660cb30a5e24b24b7fd0447004765300834f430df799524b3cfaaa27116b

data/app/models/concerns/polygallery/acts_as_polyphoto.rb

@@ -13,6 +13,8 @@ module Polygallery
         defaults = self.polygallery_settings
         settings = defaults.deep_merge(options)
         
+        init_attachment settings[:paperclip]
+
         after_initialize do
           @polygallery_settings = settings if settings == HasPolygallery::DEFAULTS
           self.initialize_polyphoto
@@ -24,6 +26,17 @@ module Polygallery
       def polygallery_settings
         @polygallery_settings || HasPolygallery::DEFAULTS
       end
+
+      def init_attachment(paperclip_settings)
+        has_attached_file :photo,
+                          :styles => paperclip_settings[:styles],
+                          :default_url => paperclip_settings[:default_url]
+        validations = polygallery_settings[:paperclip_validations]
+        validates_attachment_content_type(:photo, :content_type =>
+                   validations[:content_type]) if validations[:content_type]
+        validates_attachment_presence(:photo) if validations[:presence]
+      end
+
     end
 
     module LocalInstanceMethods
@@ -66,13 +79,7 @@ module Polygallery
       end
 
       def init_attachment
-        self.class.has_attached_file :photo,
-                          :styles => paperclip_settings[:styles],
-                          :default_url => paperclip_settings[:default_url]
-        validations = polygallery_settings[:paperclip_validations]
-        self.class.validates_attachment_content_type(:photo, :content_type =>
-                   validations[:content_type]) if validations[:content_type]
-        self.class.validates_attachment_presence(:photo) if validations[:presence]
+        self.class.init_attachment paperclip_settings
       end
 
     end

data/lib/polygallery/has_polygallery.rb

@@ -82,8 +82,7 @@ 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].deep_merge({
-            :source => settings[:association_names][:photos] })
+                                      settings[:nested_attributes][:photos]
 
         after_initialize :build_galleries
 

data/lib/polygallery/has_polyphotos.rb

@@ -20,10 +20,9 @@ module Polygallery
 
         settings = defaults.deep_merge options
 
-        has_many association_names[:photos],
-                 settings[:associations][:photos].deep_merge({})
+        has_many association_names[:photos], settings[:associations][:photos]
         accepts_nested_attributes_for association_names[:photos],
-                 settings[:nested_attributes][:photos]
+                           settings[:nested_attributes][:photos]
 
         after_initialize do
           @polygallery_settings = settings if settings == HasPolygallery::DEFAULTS
@@ -57,8 +56,8 @@ module Polygallery
       end
 
       def initialize_polygallery
-        settings = self.polygallery_settings
-        association_names = settings[:association_names]
+        # 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],

data/lib/polygallery/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - MacKinley Smith