polygallery 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c91e60af4f41c8aaa0976ae64ec0f5efa6e17d
-  data.tar.gz: 07821da031205f67c63918a383c16f418062055a
+  metadata.gz: 25d5c9ade4354ddb3dbcafc73c1c1b8fa58938b0
+  data.tar.gz: 090a53144dc49d3bf55986a9f4c8297fded6fa99
 SHA512:
-  metadata.gz: 9460848c90ebe20ba08478f4a91968f22ed8258497179a88f97a388faac6c20ed256d6afb53b73e2494b024a64674a97c256501b0877dc61f808965bea68870b
-  data.tar.gz: b0db985ec4ef235896cebda1165d6671af5e8cda43d1875cd05f1547ef655b2d1bfd53c64d60f9059e72089c250d50e5569cfeb75bf7ad89fcd3d65c85319ead
+  metadata.gz: 28a884204618b068b18a3da042cbfb875459ef77bd3664de5f42a10ea5188ecdc3f4fb584a1b2f7380dcebcecf93f4b0193efcbfd843898f88fecd37d72188f4
+  data.tar.gz: 4007b88ef0b9d873797b135e444313b97169671cff1d1252f0f27d5dafd1103f69430fc3ad08554a3f80f02bdbe9b4c95c651f9529087a340e8e12ca360c2908

data/app/controllers/concerns/polygallery/strong_params.rb

@@ -5,8 +5,9 @@ module Polygallery::StrongParams
   end
 
   def polygallery_params(association='photos')
-    [:id, :title, :_destroy, {:"#{association}_attributes" => 
-                              [:id, :photo, :title, :caption, 
-                               :gallery_title, :_destroy]}]
+    [:id, :title, :galleryable_id, :galleryable_type,
+     :_destroy, {:"#{association}_attributes" => 
+        [:id, :photo, :title, :caption, :gallery_title,
+         :galleryable_id, :galleryable_type, :_destroy]}]
   end
 end

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

@@ -29,7 +29,8 @@ module Polygallery
 
       def init_attachment(paperclip_settings)
         has_attached_file :photo,
-          :styles => ->(a) { a.instance.paperclip_settings[:styles] },
+          :styles => ->(a) {
+              a.instance.paperclip_settings[:styles] },
           :default_url => paperclip_settings[:default_url]
         validations = polygallery_settings[:paperclip_validations]
         validates_attachment_content_type(:photo, :content_type =>
@@ -96,6 +97,12 @@ module Polygallery
       end
 
       def process_photo_to_upload
+        if self.photo.present? && self.photo_to_upload.nil?
+          if self.new_record? || self.photo_file_name_changed?
+            self.photo_to_upload = self.photo.staged_path
+            self.photo = nil
+          end
+        end
         self.photo = File.open(photo_to_upload) if photo_to_upload.present?
       end
 

data/app/views/polygallery/galleries/_simple_fields_for.html.haml

@@ -1,6 +1,8 @@
 - photo_association_name = gallery.polygallery_settings[:association_names][:photos]
 = f.simple_fields_for gallery.title.to_sym do |ff|
   = ff.input_field :title, :as => :hidden, :value => gallery.title
+  = ff.input_field :galleryable_id, :as => :hidden
+  = ff.input_field :galleryable_type, :as => :hidden
 
   - if options[:label]
     %h3.lead

data/app/views/polygallery/photos/_simple_fields_for.html.haml

@@ -1,6 +1,8 @@
 %tr.nested-fields{:data => {:new => f.object.new_record?}}
   %td.text-center
-    -# = f.input_field :gallery_title
+    = f.input_field :gallery_title, :as => :hidden
+    = f.input_field :galleryable_id, :as => :hidden
+    = f.input_field :galleryable_type, :as => :hidden
     = image_tag f.object.photo.file? ? f.object.photo.url(:thumb) : 'polygallery/thumbnail-missing.jpg', :class => 'img-responsive' # image_path('polygallery/thumbnail-missing.jpg')
   %td
     = f.input_field :photo

data/lib/polygallery/has_polygallery.rb

@@ -23,7 +23,7 @@ module Polygallery
         :nested_attributes => {
             :gallery => { :reject_if => :all_blank },
             :photos => {
-              :reject_if => proc {|attributes| !attributes.key?('photo') },
+              :reject_if => proc {|attributes| !attributes.key?('id') && attributes['photo'].nil? },
               :allow_destroy => true }
         },
         :validates => {},
@@ -47,14 +47,10 @@ module Polygallery
           title = 'gallery'
         end
 
-        associations = options[:associations]
-        gallery_association = options[:associations][:gallery] if associations.present?
-        gallery_class_name =  gallery_association[:class_name] if gallery_association.present?
-        defaults = if gallery_class_name.present? && gallery_class_name != 'Polygallery::Gallery'
-                     Kernel.const_get(gallery_class_name)::POLYGALLERY_DEFAULTS
-                   else
-                     HasPolygallery::DEFAULTS
-                   end
+        # associations = options[:associations]
+        # gallery_association = options[:associations][:gallery] if associations.present?
+        # gallery_class_name =  gallery_association[:class_name] if gallery_association.present?
+        defaults = HasPolygallery::DEFAULTS
         if options[:association_names].nil? && title.to_s != 'gallery'
           options[:association_names] = {
             :gallery => :"#{title}",
@@ -76,6 +72,7 @@ module Polygallery
                                       settings[:nested_attributes][:photos]
 
         after_initialize :build_galleries
+        before_save :ensure_galleryable_set
 
         include HasPolygallery::LocalInstanceMethods
       end
@@ -89,6 +86,11 @@ module Polygallery
         return polygalleries.any? if gallery_title.nil?
         polygalleries.include?(gallery_title)
       end
+
+      # def new(*args)
+      #   super(*args)
+      # end
+
     end
 
     module LocalInstanceMethods
@@ -110,7 +112,7 @@ module Polygallery
         self.class.polygalleries.each do |pg|
           gallery_association = send pg
           next if gallery_association.present?
-          gallery_settings = send :"#{pg.to_s}_settings"
+          gallery_settings = self.send :"#{pg.to_s}_settings"
           if gallery_association.nil?
             built_gallery = send :"build_#{pg.to_s}",
                                  :polygallery_options => gallery_settings
@@ -138,6 +140,17 @@ module Polygallery
         end
         first_p || Photo.new.photo
       end
+
+      def ensure_galleryable_set
+        self.class.polygalleries.each do |pg|
+          gallery_association = self.send :"#{pg}"
+          gallery_association.galleryable ||= self
+          gallery_association.polygallery_photos.each do |pp|
+            pp.galleryable ||= self
+          end
+        end
+      end
+
     end
   end
 end

data/lib/polygallery/has_polyphotos.rb

@@ -46,10 +46,13 @@ module Polygallery
 
     module LocalInstanceMethods
       def set_nest(photo)
-        photo.send(:"#{title}=", self) if photo.send(:"#{title}").nil?
         photo.galleryable_id ||= galleryable_id
         photo.galleryable_type ||= galleryable_type
+        photo.galleryable ||= galleryable
         photo.gallery_title ||= title
+        photo.polygallery_options = self.polygallery_settings
+        photo.initialize_polyphoto
+        photo.send(:"#{title}=", self) if photo.send(:"#{title}").nil?
       end
 
       def include_polygallery_settings(settings)
@@ -66,6 +69,7 @@ module Polygallery
         photo_association = self.polygallery_photos
         photo_association.build(
           :polygallery_options => self.polygallery_settings,
+          :galleryable => self.galleryable,
           :galleryable_id => self.galleryable_id,
           :galleryable_type => self.galleryable_type,
           :gallery_title => self.title ) unless photo_association.any?