polygallery 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa9f9f989f87f7a55dd5a9174add48b1947727ae
-  data.tar.gz: 52d22be3a15e569dc030f43b7bb31cc59b07f094
+  metadata.gz: 748c58237c3287c39ed71c22b4d610f9930d16fe
+  data.tar.gz: 4679777b8785fb32c0e997c6083c441dffa80ba9
 SHA512:
-  metadata.gz: 3bda03dccc7bbc3cc2e53b1db97e539e6b886886299bb1472b79e85ebe8469b57b5f7007c5a0cd6e98414da14f4e0ca9a13aa74dda482ee7572bbf725695bcbe
-  data.tar.gz: 780269277ba55672bb7602c42dfa0d83e8f68f543f98aee61e68c152f2c24055053d437d89b871a55a1041120d74ae8c2840a472c4e6712fdc88bb2ed91566e1
+  metadata.gz: 778e7320a67042cd19d166f52c824002790aa3141061609069af9d1f2970993d3cef86623640a1b611a98df0f6b67b7019e65f652742afb4db525c8a0e138cb1
+  data.tar.gz: c2d0c55787f5f5e3f2a60f83b28ab953d16e093cf89f743361f2e1da3074a6219c965e8d2e0c426b073877e06a3e2cb1d1ab546cfbbe106dfbccc6e08a667b39

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

@@ -4,7 +4,9 @@ module Polygallery::StrongParams
   included do
   end
 
-  def polygallery_params
-    [:id, :title, :_destroy, {:photos_attributes => [:id, :photo, :title, :caption, :_destroy]}]
+  def polygallery_params(association='photos')
+    [:id, :title, :_destroy, {:"#{association}_attributes" => 
+                              [:id, :photo, :title, :caption, 
+                               :gallery_title, :_destroy]}]
   end
-end
+end

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

@@ -2,47 +2,79 @@ module Polygallery
   module ActsAsPolyphoto
     extend ActiveSupport::Concern
 
-    DEFAULTS = {
-      :paperclip => {
-        :styles => {:medium => '300x300#', :thumb => '100x100#'},
-        :default_url => '/images/:style/missing.png'
-      }
-    }
-
     included do
-      attr_accessor :photo_to_upload,
+      attr_accessor :photo_to_upload, :polygallery_options,
                     :galleryable_id, :galleryable_type, :gallery_title
-
-      # has_attached_file :photo,
-      #                   :styles => PAPERCLIP_SETTINGS[:styles], # ->(a) { if a.instance.class.name then raise a.instance.class.name else PAPERCLIP_SETTINGS[:styles] end },
-      #                   :default_url => PAPERCLIP_SETTINGS[:default_url]
-      # validates_attachment_content_type :photo, :content_type => /\Aimage\/.*\Z/
-      # validates_attachment_presence :photo # TODO: make this a setting
-      
-      belongs_to :gallery, :class_name => 'Polygallery::Gallery'
-
-      after_initialize :init_attachment
-      before_save :process_photo_to_upload
+      acts_as_polyphoto
     end
 
     module ClassMethods
-    end
+      def acts_as_polyphoto(options={})
+        defaults = self.polygallery_settings
+        settings = defaults.deep_merge(options)
+        
+        after_initialize do
+          @polygallery_settings = settings if settings == HasPolygallery::DEFAULTS
+          self.initialize_polyphoto
+        end
 
-    def paperclip_settings
-      return self.gallery.polygallery_settings[:paperclip] if self.gallery.present?
-      DEFAULTS[:paperclip]
-    end
+        include ActsAsPolyphoto::LocalInstanceMethods
+      end
 
-    def process_photo_to_upload
-      self.photo = File.open(photo_to_upload) if photo_to_upload.present?
+      def polygallery_settings
+        @polygallery_settings || HasPolygallery::DEFAULTS
+      end
     end
 
-    def init_attachment
-      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
+    module LocalInstanceMethods
+      def include_polygallery_settings(settings)
+        @polygallery_settings = settings
+        self.initialize_polyphoto
+      end
+
+      def initialize_polyphoto
+        settings = self.polygallery_settings
+        
+        self.class.belongs_to settings[:association_names][:gallery],
+                              :class_name => settings[:associations][:gallery][:class_name],
+                              :foreign_key => :gallery_id
+
+        self.init_attachment
+        self.class.before_save :process_photo_to_upload
+      end
+
+      def polygallery_settings
+        polygallery_options || @polygallery_settings || HasPolygallery::DEFAULTS
+        # if gallery_title.present? && galleryable_type.present?
+        #   galleryable_class = Kernel.const_get(galleryable_type)
+        #   galleryable_class.send :"#{gallery_title}_settings"
+        # elsif gallery_title.present?
+        #   self.send(gallery_title.to_sym).polygallery_settings
+        # elsif self.gallery.present? && gallery.polygallery_settings.present?
+        #   self.gallery.polygallery_settings 
+        # else
+        #   HasPolygallery::DEFAULTS
+        # end
+      end
+
+      def paperclip_settings
+        self.polygallery_settings[:paperclip]
+      end
+
+      def process_photo_to_upload
+        self.photo = File.open(photo_to_upload) if photo_to_upload.present?
+      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]
+      end
+
     end
   end
 end

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

@@ -1,14 +1,15 @@
+- 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
 
   - if options[:label]
     %h3.lead
-      = link_to_add_association 'Add Photo', ff, gallery.class.polygallery_settings[:association_names][:photos], :partial => 'polygallery/photos/simple_fields_for', :class => 'btn btn-default btn-sm pull-right', :data => {:association_insertion_node => '.photo-receptacle', :association_insertion_method => 'append'}
+      = link_to_add_association 'Add Photo', ff, photo_association_name, :partial => 'polygallery/photos/simple_fields_for', :class => 'btn btn-default btn-sm pull-right', :data => {:association_insertion_node => "##{photo_association_name} .photo-receptacle", :association_insertion_method => 'append'}
       - if options[:label] == true
         = gallery.title.titleize
       - else
         = options[:label].titleize
-  .polygallery-cocoon-table{:id => gallery.class.polygallery_settings[:association_names][:photos].to_s}
+  .polygallery-cocoon-table{:id => photo_association_name.to_s}
     %table.table.table-bordered.table-striped.table-condensed.polygallery-photos-table
       %thead
         %tr
@@ -16,8 +17,8 @@
           %th File
           %th.text-center Actions
       %tbody.photo-receptacle
-        = ff.simple_fields_for :photos do |pf|
-          = render :partial => 'polygallery/photos/simple_fields_for', :locals => {:f => pf}
+        = ff.simple_fields_for photo_association_name do |pf|
+          = render 'polygallery/photos/simple_fields_for', :f => pf
 
   -#- if !options[:label]
   -#  = ff.input_field :content, options[:input_html].merge({:as => :ckeditor})

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

@@ -1,9 +1,10 @@
 %tr.nested-fields{:data => {:new => f.object.new_record?}}
   %td.text-center
+    -# = f.input_field :gallery_title
     = 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
     = f.input_field :caption, :placeholder => "Caption... (optional)", :style => "margin-top:5px;", :as => :string
   %td.text-center{:style => "width:51px;"}
     = link_to_remove_association f, :class => 'btn btn-default btn-sm' do
-      %span.glyphicon.glyphicon-trash
+      %span.glyphicon.glyphicon-trash

data/lib/polygallery/has_polygallery.rb

@@ -2,8 +2,51 @@ module Polygallery
   module HasPolygallery
     extend ActiveSupport::Concern
 
-    included do
+    DEFAULTS = {
+        :associations => {
+            :gallery => {
+                :class_name => '::Polygallery::Gallery',
+                :as => :galleryable,
+                :dependent => :destroy
+            },
+            :photos => {
+                :class_name => '::Polygallery::Photo',
+                :before_add => :set_nest,
+                :dependent => :destroy,
+                :foreign_key => :gallery_id
+            }
+        },
+        :association_names => {
+            :gallery => :gallery,
+            :photos => :photos
+        },
+        :nested_attributes => {
+            :gallery => {
+              :reject_if => :all_blank
+                # proc {|attributes| false }
+                # photo_attr_sets = attributes
+                #   .select{|k, _| k.include? 'photos_attributes' }
+                # photo_attr_sets.select{|_, photo_sets|
+                #   photo_sets.select{|_, photo_attrs|
+                #     puts photo_attrs
+                #     photo_attrs.key? 'photo' }.empty? }.empty? }
+            },
+            :photos => {
+              :reject_if => proc {|attributes| !attributes.key?('photo') },
+              :allow_destroy => true}
+        },
+        :validates => {},
+        :paperclip => {
+          :styles => {:medium => '300x300#', :thumb => '100x100#'},
+          :default_url => ActionController::Base.helpers.image_path('polygallery/thumbnail-missing.png')
+        },
+        :paperclip_validations => {
+          :content_type => /\Aimage\/.*\Z/,
+          :presence => false
+        }
+    }
 
+    included do
     end
 
     module ClassMethods
@@ -17,49 +60,77 @@ module Polygallery
         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)::DEFAULTS
+                     Kernel.const_get(gallery_class_name)::POLYGALLERY_DEFAULTS
                    else
-                     Gallery::DEFAULTS
+                     HasPolygallery::DEFAULTS
                    end
+        if options[:association_names].nil? && title.to_s != 'gallery'
+          options[:association_names] = {
+            :gallery => title.to_sym,
+            :photos => :"#{title.to_s.gsub('_gallery', '')}_photos"
+          }
+        end
         settings = defaults.deep_merge(options)
         cattr_accessor "#{title}_settings".to_sym
         send("#{title}_settings=".to_sym, settings)
 
         has_one title.to_sym, -> { where(:title => title.to_s) }, settings[:associations][:gallery]
-        accepts_nested_attributes_for title.to_sym, settings[:nested_attributes][:gallery]
-        has_many "#{title}_photos".to_sym,
-                 :through => title.to_sym,
+        has_many settings[:association_names][:photos],
+                 :through => :"#{title}",
                  :source => settings[:association_names][:photos],
                  :class_name => settings[:associations][:photos][:class_name]
+        accepts_nested_attributes_for settings[:association_names][:gallery],
+                                      settings[:nested_attributes][:gallery]
+        accepts_nested_attributes_for settings[:association_names][:photos],
+                                      settings[:nested_attributes][:photos]
+
+        after_initialize :build_galleries
 
-        after_initialize do
-          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 polygalleries
-        self.reflect_on_all_associations(:has_one).select{|a| a.foreign_key == 'galleryable_id'}.map(&:name)
+        self.reflect_on_all_associations(:has_one)
+            .select{|a| a.foreign_key == 'galleryable_id'}.map(&:name)
       end
 
-      def has_polygallery?(title)
-        self.polygalleries.include?(title)
+      def has_polygallery?(title=nil)
+        return polygalleries.any? if title.nil?
+        polygalleries.include?(title)
       end
     end
 
     module LocalInstanceMethods
       def polygalleries
+        # TODO: use association reflections instead of direct class selection
         Gallery.select('polygallery_galleries.title')
           .where(:galleryable => self)
           .group('polygallery_galleries.title')
           .map(&:title)
       end
 
-      def has_polygallery?(title)
+      def has_polygallery?(title=nil)
+        return polygalleries.any? if title.nil?
         polygalleries.include?(title)
       end
 
+      def build_galleries
+        return unless self.class.has_polygallery?
+        self.class.polygalleries.each do |pg|
+          gallery_association = send pg
+          next if gallery_association.present?
+          gallery_settings = send :"#{pg.to_s}_settings"
+          gallery_association ||= send :"build_#{pg.to_s}",
+                                       :polygallery_options => gallery_settings
+          gallery_association.galleryable ||= self
+        end
+      end
+
+      def build_first_photos
+        build_galleries(&:build_first_photo)
+        return unless self.class.has_polygallery?
+        self.class.polygalleries.each {|pg| send(pg).build_first_photo }
+      end
     end
   end
 end

data/lib/polygallery/has_polyphotos.rb

@@ -1,87 +1,78 @@
 module Polygallery
   module HasPolyphotos
     extend ActiveSupport::Concern
-    
-    DEFAULTS = {
-        :associations => {
-            :gallery => {
-                :class_name => 'Polygallery::Gallery',
-                :as => :galleryable,
-                :dependent => :destroy
-            },
-            :photos => {
-                :class_name => 'Polygallery::Photo',
-                :before_add => :set_nest,
-                :dependent => :destroy
-            }
-        },
-        :association_names => {
-            :gallery => :gallery,
-            :photos => :photos
-        },
-        :nested_attributes => {
-            :gallery => {:reject_if => :all_blank},
-            :photos => {:reject_if => lambda{|attributes| attributes['photo'].nil? }, :allow_destroy => true}
-        },
-        :validates => {},
-        :paperclip => {
-          :styles => {:medium => '300x300#', :thumb => '100x100#'},
-          :default_url => ActionController::Base.helpers.asset_path('polygallery/thumbnail-missing.png')
-        }
-    }
 
     included do
-      # def defaults
-      #   klass = self.class_name.present? ? Kernel.const_get(self.class_name) : Gallery
-      #   klass::DEFAULTS
-      # end
+      attr_accessor :polygallery_options
     end
 
     module ClassMethods
-      def has_polyphotos(title='photos', options={})
+      def has_polyphotos(title=nil, options={})
+        defaults = self.polygallery_settings
+        association_names = (options[:association_names].present? ? 
+                             options : defaults)[:association_names]
+        title ||= association_names[:photos].to_s
         if title.is_a? Hash
           options = title
-          title = 'photos'
+          title = association_names[:photos].to_s
         end
 
-        # puts reflect_on_all_associations(:belongs_to).map{|a| a.table_name }
-        settings = HasPolyphotos::DEFAULTS.deep_merge(options)
-        cattr_accessor :polygallery_settings
-        send(:polygallery_settings=, settings)
-        puts HasPolyphotos::DEFAULTS
-        has_many title.to_sym, settings[:associations][:photos]
-        accepts_nested_attributes_for title.to_sym, settings[:nested_attributes][:photos] # TODO: get the actual @settings somehow
+        settings = defaults.deep_merge options
+
         after_initialize do
-          # raise galleryable_type if galleryable_type.present?
-          send(title.to_sym).build(
-              :galleryable_id => galleryable_id,
-              :galleryable_type => galleryable_type,
-              :"#{settings[:association_names][:gallery]}_title" => self.title
-          ) unless send(title.to_sym).any?
+          @polygallery_settings = settings if settings == HasPolygallery::DEFAULTS
+          self.initialize_polygallery
         end
-        after_initialize :do_something
+
         include HasPolyphotos::LocalInstanceMethods
       end
 
-      # def polygallery_settings
-      #   @settings
-      # end
+      def polygallery_settings
+        @polygallery_settings || HasPolygallery::DEFAULTS
+      end
     end
 
 
     module LocalInstanceMethods
       def set_nest(photo)
-        photo.gallery ||= self
+        photo.send(:"#{title}=", self) if photo.send(:"#{title}").nil?
         photo.galleryable_id ||= galleryable_id
         photo.galleryable_type ||= galleryable_type
         photo.gallery_title ||= title
       end
 
-      def do_something
-        @polygallery_settings = Kernel.const_get(self.galleryable_type)
-                                      .send :"#{self.title}_settings"
+      # def polygallery_settings
+      #   Kernel.const_get(self.galleryable_type).send :"#{self.title}_settings"
+      # end
+
+      def include_polygallery_settings(settings)
+        @polygallery_settings = settings
+        self.initialize_polygallery
+      end
+
+      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]
       end
 
+      def build_first_photo
+        settings = polygallery_settings
+        photo_association = send settings[:association_names][:photos]
+        photo_association.build(
+            :polygallery_options => settings,
+            :galleryable_id => galleryable_id,
+            :galleryable_type => galleryable_type,
+            :gallery_title => self.title
+        ) unless photo_association.any?
+      end
+
+      def polygallery_settings
+        polygallery_options || @polygallery_settings || HasPolygallery::DEFAULTS
+      end
     end
   end
 end