polygallery 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40b6058f68d72353fc34e17997936f3b1096063f
-  data.tar.gz: df9ed80c23c5ef9ef3bde7a272485e91c4390ca8
+  metadata.gz: 72813f5132c7b168ccabc2c5f262be7d29ef1bb2
+  data.tar.gz: 200c89fe2ea23f1a2fa0d59c271e31738587071b
 SHA512:
-  metadata.gz: 1cfb242774808827303b01187ab2daab6cc620f3d3b20ff5482a22729a2486f60412ef60a1a45d85212724791e58d533ab35ec833c8bb3dfcebe0f5538a7b735
-  data.tar.gz: 659c46c8f5bd5e817da3c11439b15afbf4e9a251670e0ecb7ae0529309ef3ed5c8b79e98d4cb820912a2309f30c41d280cda77a3002f7b08c971e00878d5b950
+  metadata.gz: da025e187f685c868b63417c2ebf3ec40ac57d91139480de6d12e694a07030dc3300db4e4ffab9b511d7dc901063f243524df3617493f9a5065cf54db899de58
+  data.tar.gz: 01fbbc77fdf06e12a4091ad9541aadd1b9ffb9512827d8ffc87adb920067b099df0badcf04a9b9e250e6865976cb7d4abfc36a935c907709657234697a3b8655

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

@@ -5,6 +5,6 @@ module Polygallery::StrongParams
   end
 
   def polygallery_params
-    [:id, :title, :_destroy, {:photos_attributes => [:photo, :title, :caption, :_destroy]}]
+    [:id, :title, :_destroy, {:photos_attributes => [:id, :photo, :title, :caption, :_destroy]}]
   end
 end

data/app/models/polygallery/gallery.rb

@@ -8,7 +8,7 @@ module Polygallery
         },
         :nested_attributes => {
             :gallery => {:reject_if => :all_blank},
-            :photo => {:reject_if => lambda{|attributes| attributes['photo'].nil? }}
+            :photo => {:reject_if => lambda{|attributes| attributes['photo'].nil? }, :allow_destroy => true}
         },
         :validates => {},
         :paperclip => {

data/app/models/polygallery/photo.rb

@@ -1,15 +1,9 @@
 module Polygallery
   class Photo < ActiveRecord::Base
 
-    belongs_to :gallery, :class_name => 'Polygallery::Gallery'
-    has_attached_file :photo,
-                      :styles => ->(p) { p.instance.paperclip_settings[:styles] },
-                      :default_url => ->(p) { p.instance.paperclip_settings[:default_url] }
-    validates_attachment_content_type :photo, :content_type => /\Aimage\/.*\Z/
-    # validates_attachment_presence :photo # TODO: make this a setting
-
     attr_accessor :photo_to_upload
     before_save :process_photo_to_upload
+    after_initialize :init_attachment
 
     def paperclip_settings
       if gallery.present?
@@ -24,5 +18,14 @@ module Polygallery
       self.photo = File.open(photo_to_upload) if photo_to_upload.present?
     end
 
+    def init_attachment
+      self.class.belongs_to :gallery, :class_name => 'Polygallery::Gallery'
+      self.class.has_attached_file :photo,
+                        :styles => paperclip_settings[:styles],
+                        :default_url => paperclip_settings[:default_url]
+      self.class.validates_attachment_content_type :photo, :content_type => /\Aimage\/.*\Z/
+      # self.class.validates_attachment_presence :photo # TODO: make this a setting
+    end
+
   end
 end

data/lib/polygallery/has_polygallery.rb

@@ -24,19 +24,11 @@ module Polygallery
         after_initialize do
           send("#{title}_settings=".to_sym, settings) if send("#{title}_settings".to_sym).nil?
           send("build_#{title.to_s}".to_sym) if send(title.to_sym).nil?
+          send(title.to_sym).send(:galleryable=, self)
         end
         include HasPolygallery::LocalInstanceMethods
       end
 
-      def has_polyphotos(title='photos')
-        has_many title.to_sym, :class_name => 'Polygallery::Photo'
-        accepts_nested_attributes_for title.to_sym, Gallery::DEFAULTS[:nested_attributes][:photo] # TODO: get the actual settings object somehow
-        attr_accessor :photos_to_upload
-        after_initialize do
-          send(title.to_sym).build unless send(title.to_sym).any?
-        end
-      end
-
       def polygalleries
         self.reflect_on_all_associations(:has_one).select{|a| a.foreign_key == 'galleryable_id'}.map(&:name)
       end

data/lib/polygallery/has_polyphotos.rb

@@ -0,0 +1,29 @@
+module Polygallery
+  module HasPolyphotos
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    module ClassMethods
+      def has_polyphotos(title='photos', options={})
+        has_many title.to_sym, :class_name => 'Polygallery::Photo', :before_add => :set_nest, :dependent => :destroy
+        accepts_nested_attributes_for title.to_sym, Gallery::DEFAULTS[:nested_attributes][:photo] # TODO: get the actual settings object somehow
+        attr_accessor :photos_to_upload
+        after_initialize do
+          send(title.to_sym).build unless send(title.to_sym).any?
+          # send(title.to_sym).each {|p| p.gallery_id ||= self.id }
+        end
+        include HasPolyphotos::LocalInstanceMethods
+      end
+    end
+
+    module LocalInstanceMethods
+      def set_nest(photo)
+        photo.gallery ||= self
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Polygallery::HasPolyphotos

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/polygallery.rb

@@ -1,5 +1,6 @@
 require "polygallery/engine"
 require "polygallery/has_polygallery"
+require "polygallery/has_polyphotos"
 require "polygallery/railtie" if defined? Rails
 
 module Polygallery

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - MacKinley Smith
@@ -179,6 +179,7 @@ files:
 - lib/polygallery/engine.rb
 - lib/polygallery/glue.rb
 - lib/polygallery/has_polygallery.rb
+- lib/polygallery/has_polyphotos.rb
 - lib/polygallery/railtie.rb
 - lib/polygallery/validators.rb
 - lib/polygallery/validators/polygallery_presence_validator.rb