polygallery 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a3c6b4e971bb81a4dd78e1a5ec302567ed4cb8
-  data.tar.gz: ec32be1af52c2330bc71e19c5c7fefe1661b4e30
+  metadata.gz: 49a28708abb8cca57bc55038fc319c6c282028cc
+  data.tar.gz: 7a743956ff2b910dae1c4bab9b569b4a6a9fa5e9
 SHA512:
-  metadata.gz: d1610028948fd06e4aef2f24ac1e827abe7d0a847d0f402b282ca59f308bf9d9ef947f60ea77a137a855a49d90f4b07cc29755d51fba5ca394412d2f59823d2c
-  data.tar.gz: 20abcb8fa59f46442c4ca5d998f917122d6f6b570d74bc9ff8dd870edbba9aabd804c5490c8f430d7ef4daadcb0d1163b5d68608db1060307e9c7034fadbb175
+  metadata.gz: f5372a9227768bb0c008a246487cd33cb0937a09826c6fa743acd0d76317605a3f64a82ebe2bc25e95aca814b0d0fe87205767cb7a9f69c38d4192a425ee4b07
+  data.tar.gz: 1a8a04395a265f4ba928cb833beafd2c8571ea5f9586b897e06810ba870a24238d181c3aca952eeab809b9994cfbf5904c9df921b9b305bb38268146f87ddf11

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

@@ -10,11 +10,17 @@ module Polygallery
         defaults = self.polygallery_settings
         settings = defaults.deep_merge(options)
 
-        attr_accessor :photo_to_upload, :polygallery_options
+        attr_accessor :photo_to_upload, :polygallery_options,
+                      :polyphoto_initialized
         
         init_attachment settings[:paperclip]
         init_associations settings
 
+        before_validation :process_photo_to_upload
+        # before_save {
+        #   # puts "Photo changes: #{self.changes.inspect}"
+        #   puts 'SAVING PHOTO!' }
+
         after_initialize do
           self.polygallery_options ||= self.polygallery_settings
           self.initialize_polyphoto
@@ -36,12 +42,6 @@ module Polygallery
         validates_attachment_content_type(:photo, :content_type =>
                    validations[:content_type]) if validations[:content_type]
         validates_attachment_presence(:photo) if validations[:presence]
-
-        before_validation :process_photo_to_upload
-        # TODO: figure out why save gets called so much!
-        # before_save {
-        #   # puts "Photo changes: #{self.changes.inspect}"
-        #   puts 'SAVING PHOTO!' }
       end
 
       def init_associations(settings=HasPolygallery::DEFAULTS)
@@ -60,8 +60,10 @@ module Polygallery
       end
 
       def initialize_polyphoto
+        return if self.polyphoto_initialized.present?
         self.class.init_associations(self.polygallery_settings)
         self.init_attachment
+        self.polyphoto_initialized = true
       end
 
       def polygallery_settings

data/lib/polygallery/has_polygallery.rb

@@ -11,7 +11,7 @@ module Polygallery
             },
             :photos => {
                 :class_name => '::Polygallery::Photo',
-                :before_add => :set_nest,
+                # :before_add => :set_nest,
                 :dependent => :destroy,
                 :foreign_key => :gallery_id
             }
@@ -125,7 +125,6 @@ module Polygallery
 
       def build_gallery_associations
         return [] unless self.class.has_polygallery?
-        # puts 'BUILDING GALLERIES!'
         gallery_associations = self.class.polygalleries.map{|pg|
           self.build_gallery_association pg }
         self.galleries_built = true

data/lib/polygallery/has_polyphotos.rb

@@ -25,7 +25,6 @@ module Polygallery
         after_initialize do
           self.polygallery_options ||= self.polygallery_settings
           self.initialize_polygallery
-          # self.build_polygallery_photos # if new_record? && !polygallery_photos_attributes.is_a?(Hash)
         end
         after_initialize :build_polygallery_photos, :if => :new_record?
         before_validation :set_nested_attributes_to_correct_gallery
@@ -58,7 +57,7 @@ module Polygallery
         photo.galleryable_type ||= galleryable_type
         photo.galleryable ||= galleryable
         photo.gallery_title ||= title
-        photo.polygallery_options = self.polygallery_settings
+        photo.polygallery_options ||= self.polygallery_settings
         photo.initialize_polyphoto
         photo.send(:"#{title}=", self) if photo.send(:"#{title}").nil?
       end
@@ -144,9 +143,9 @@ module Polygallery
           else
             # puts 'Building a new photo'
             # puts attrs_for_photo.inspect
-            # raise 'WOO' if self.polygallery_photos
-            built_photo = self.polygallery_photos.build attrs_for_photo
-            set_nest built_photo
+            # built_photo = 
+            self.polygallery_photos.build attrs_for_photo
+            # set_nest built_photo
             # self.polygallery_photos_attributes[index][:built] = true
           end
         end

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails