polygallery 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 498466889ad29ec6561646661ebb6034617ccfd8
-  data.tar.gz: 35afdcbab075aae765308ce535853bff92f708c4
+  metadata.gz: c2220d771dc5f8a3fd23774aa1634b548b19cf7f
+  data.tar.gz: 59130d77b7a9a7911128fab5b9a43cd0a170b744
 SHA512:
-  metadata.gz: ff943059206c15033fda40513179917e33b5c60a2bb25442792f93a581576248bc8b271d0f693279c28f180f2e9b05fee8bb98cb02dd4561a7c8dabc3aac72ea
-  data.tar.gz: 858c812e8c2103186deac49fe8165f9d552a0d0d7c74e4c3805e74bb83b73cec678f2e041c66ec833a4c828e45d6c9f72e4a3ba1c2e2352de5e8da9536085623
+  metadata.gz: e0fca5ba2a6d89cd400816b01d69e27ce2b8511934094c2a1288051b9d02aa80b0b37329825bef633e5fd41c1c1bd9e88fe9d75d40e8317b29a463feefef8e34
+  data.tar.gz: eec43e1ed442f0790aa38e306797eef002dcba0b454b0accdeda9901bf453c8af681c068d6aa01769bbac7a31e9da09c66d34a559f5860161f8d2d6225ca54cb

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

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

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

@@ -38,6 +38,10 @@ module Polygallery
         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)

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

@@ -6,7 +6,7 @@
 
   - if options[:label]
     %h3.lead
-      = 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'}
+      = link_to_add_association 'Add Photo', ff, :photos, :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
@@ -19,10 +19,5 @@
           %th File
           %th.text-center Actions
       %tbody.photo-receptacle
-        = ff.simple_fields_for photo_association_name do |pf|
+        = ff.simple_fields_for :photos do |pf| # 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})
-  -#- else
-    -#= ff.input :content, :as => :ckeditor, :label => options[:label].is_a?(String) ? options[:label] : name.to_s.titleize, :input_html => name.is_a?(String) ? options[:input_html].merge({:value => pb.content}) : options[:input_html]

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

@@ -3,7 +3,7 @@
     = 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')
+    = image_tag f.object.photo.file? ? f.object.photo.url(:thumb) : 'polygallery/thumbnail-missing.jpg', class: 'img-responsive'
   %td
     = f.input_field :photo
     = f.input_field :caption, :placeholder => "Caption... (optional)", :style => "margin-top:5px;", :as => :string

data/lib/polygallery/capybara_helpers.rb

@@ -0,0 +1,22 @@
+require 'polygallery/factories'
+module Polygallery
+  module CapybaraHelpers
+    def add_photo_to_form(attrs=nil, table_id='photos')
+      attrs ||= build :polygallery_photo
+      tr_selector = ".polygallery-cocoon-table##{table_id} tr"
+      last_tr = all(tr_selector).last
+      if last_tr.find('input[id$="_photo"]').value.present?
+        page.execute_script <<-SCRIPT
+          $('.btn.add_fields[data-association-insertion-node="##{table_id} .photo-receptacle"]').click();
+        SCRIPT
+        last_tr = all(tr_selector).last
+      end
+      within last_tr do
+        random_photo = get_random_photo
+        find('input[id$="_photo"]').set random_photo
+        find('input[id$="_caption"]').set(attrs.caption)
+        yield if block_given?
+      end
+    end
+  end
+end

data/lib/polygallery/factories.rb

@@ -0,0 +1,9 @@
+MFaker = defined?(Faker) ? Faker : FFaker
+
+require 'polygallery/factories/polygallery/galleries'
+require 'polygallery/factories/polygallery/photos'
+
+def get_random_photo
+  photos_dir = Rails.root.join 'spec', 'upload_files'
+  Dir.glob(photos_dir.join('*.{jpg,png,gif}')).sample
+end

data/lib/polygallery/factories/polygallery/galleries.rb

@@ -1,13 +1,20 @@
-MFaker = defined?(Faker) ? Faker : FFaker
-
 FactoryGirl.define do
+  # to_create do |instance|
+  #   raise "Save failed for #{instance.class} (#{instance.errors.full_messages.inspect})" if !instance.save
+  # end
+
   factory :polygallery_gallery, :class => Polygallery::Gallery do
+    title 'gallery'
 
+    trait :with_photo do
+      photos_attributes { generate_photo_attributes } end
     trait :with_photos do
-      after(:create) do |gallery|
-        create :polygallery_photo, :gallery => gallery
-      end
-    end
-
+      photos_attributes { generate_photo_attributes 3 } end
+    trait :with_tons_of_photos do
+      photos_attributes { generate_photo_attributes 10 } end
   end
 end
+def generate_photo_attributes(count=1, attrs={})
+  if count.is_a? Hash; attrs = count; count = 1 end
+  (1..count).map{ attributes_for :polygallery_photo, attrs } 
+end

data/lib/polygallery/factories/polygallery/photos.rb

@@ -1,8 +1,12 @@
 include ActionDispatch::TestProcess
-MFaker = defined?(Faker) ? Faker : FFaker
 
 FactoryGirl.define do
+  # to_create do |instance|
+  #   raise "Save failed for #{instance.class} (#{instance.errors.full_messages.inspect})" if !instance.save
+  # end
+
   factory :polygallery_photo, :class => Polygallery::Photo do
     caption { [nil, MFaker::BaconIpsum.paragraph].sample }
+    photo   { File.new get_random_photo }
   end
 end

data/lib/polygallery/has_polygallery.rb

@@ -23,8 +23,9 @@ module Polygallery
         :nested_attributes => {
             :gallery => { :reject_if => :all_blank },
             :photos => {
-              :reject_if => proc {|attributes| !attributes.key?('id') && attributes['photo'].nil? },
-              :allow_destroy => true }
+              :allow_destroy => true,
+              :reject_if => proc {|attributes|
+                !attributes.key?('id') && attributes['photo'].nil? } }
         },
         :validates => {},
         :paperclip => {
@@ -47,9 +48,6 @@ 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 = HasPolygallery::DEFAULTS
         if options[:association_names].nil? && title.to_s != 'gallery'
           options[:association_names] = {
@@ -60,18 +58,35 @@ module Polygallery
         settings = defaults.deep_merge(options)
         cattr_accessor "#{title}_settings".to_sym
         send("#{title}_settings=".to_sym, settings)
+        attr_accessor :"#{title}_attributes", :galleries_built
 
         has_one title.to_sym, -> { where(:title => title.to_s) }, settings[:associations][:gallery]
         has_many settings[:association_names][:photos],
                  :through => :"#{title}",
-                 :source => settings[:association_names][:photos],
+                 :source => :photos, # 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 :if => :new_record? do
+          # puts "GA: #{self.gallery_attributes.inspect}"
+          if self.gallery_attributes.nil?
+            # puts 'BUILDING FIRST PHOTOS ON INIT!'
+            build_first_photos
+            # build_gallery_associations
+          end
+        end
+          # puts instance.inspect
+          # instance.new_record? && !instance.has_polygallery? }
+        before_validation do # , :on => :update # , :unless => :new_record?
+          # puts 'BUILDING GALLERIES ON VALIDATION'
+          # unless self.galleries_built?
+          build_gallery_associations
+          # end
+          prune_empty_photos
+        end
         before_save :ensure_galleryable_set
 
         include HasPolygallery::LocalInstanceMethods
@@ -87,19 +102,20 @@ module Polygallery
         polygalleries.include?(gallery_title)
       end
 
-      # def new(*args)
-      #   super(*args)
-      # 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)
+        self.class.polygalleries.each do |pg_name|
+          gallery_opts = self.send(:"#{pg_name}_settings")
+          gallery_classname = gallery_opts[:associations][:gallery][:class_name]
+          gallery_class = Object.const_get gallery_classname
+          table_name = gallery_class.table_name
+          gallery_class.select("#{table_name}.title")
+            .where(:galleryable => self)
+            .group("#{table_name}.title")
+            .map(&:title)
+        end
       end
 
       def has_polygallery?(gallery_title=nil)
@@ -107,32 +123,72 @@ module Polygallery
         polygalleries.include?(gallery_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 = self.send :"#{pg.to_s}_settings"
-          if gallery_association.nil?
-            built_gallery = send :"build_#{pg.to_s}",
-                                 :polygallery_options => gallery_settings
-            gallery_association = send :"#{pg.to_s}=", built_gallery
+      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
+        gallery_associations
+      end
+      def build_gallery_association(gallery_name=:gallery)
+        gallery_association = send gallery_name
+        attrs_for_this_gallery = send(:"#{gallery_name}_attributes") || {}
+        if gallery_association.present?
+          # if attrs_for_this_gallery.empty?
+          #   gallery_association.photos.each do |p|
+          #     if p.photo_to_upload.present?
+          #       p.photo = File.new p.photo_to_upload
+          #       p.photo_to_upload = nil
+          #     end
+          #     relevant_changes = p.changed -
+          #       %w(galleryable_type galleryable_id gallery_title)
+          #     if relevant_changes.any?
+          #       attrs_for_this_photo = Hash[*relevant_changes.map{|column|
+          #         [ column, p.send(column) ] }.flatten]
+          #       attrs_for_this_gallery[:photos_attributes] ||= {}
+          #       attrs_for_this_gallery[:photos_attributes][(p.id ||
+          #         attrs_for_this_gallery[:photos_attributes].length).to_s] = attrs_for_this_photo
+          #     end
+          #   end
+          #   # return gallery_association
+          # end
+          if attrs_for_this_gallery.empty?
+            # puts 'Returning due to empty attrs!'
+            return gallery_association 
+          end
+          if gallery_association.persisted?
+            # puts 'Updating an existing gallery!'
+            gallery_association.update_attributes attrs_for_this_gallery
+          else
+            attrs_for_this_gallery.each{|k, v|
+              gallery_association.send :"#{k}=", v }
           end
-          gallery_association.galleryable ||= self
+          return gallery_association
         end
+        settings_for_this_gallery = send :"#{gallery_name}_settings"
+        attrs_for_this_gallery[:polygallery_options] = settings_for_this_gallery
+        # puts "Building a new gallery: #{gallery_name}"
+        built_gallery = send :"build_#{gallery_name}", attrs_for_this_gallery
+        gallery_association = send :"#{gallery_name}=", built_gallery
+        gallery_association.galleryable ||= self
+        gallery_association
       end
 
       def build_first_photos
         return unless self.class.has_polygallery?
-        self.class.polygalleries.each {|pg| send(pg).build_first_photo }
+        # self.class.polygalleries.each{|pg|
+        #   build_gallery_association pg
+        #   send(pg.to_sym).build_first_photo }
+        build_gallery_associations.map(&:build_first_photo)
       end
 
       def first_photo
         return unless self.class.has_polygallery?
         first_p = nil
         self.class.polygalleries.each do |pg|
-          gallery_settings = send :"#{pg.to_s}_settings"
-          ptos = send(gallery_settings[:association_names][:photos])
+          settings_for_this_gallery = send :"#{pg.to_s}_settings"
+          ptos = send(settings_for_this_gallery[:association_names][:photos])
                   .select{|p| p.photo.file? }
           next if ptos.empty?
           first_p = ptos.first.photo
@@ -142,15 +198,19 @@ module Polygallery
       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
+        gallery_associations.each do |ga|
+          ga.galleryable ||= self
+          ga.polygallery_photos.each{|pp|
+            pp.galleryable ||= self }
         end
       end
 
+      def gallery_associations
+        self.class.polygalleries.map{|pg| send(pg) } end
+      def galleries_built?; self.galleries_built.present? end
+      def prune_empty_photos
+        gallery_associations.each(&:prune_empty_photos) end
+
     end
   end
 end

data/lib/polygallery/has_polyphotos.rb

@@ -17,6 +17,7 @@ module Polygallery
           options = title
           title = association_names[:photos].to_s
         end
+        attr_accessor :photos_attributes, :photos_built
 
         settings = defaults.deep_merge options
         init_associations settings
@@ -24,7 +25,12 @@ 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
+        before_validation :build_polygallery_photos, :unless => :photos_built? # , :on => :update
+        before_validation :prune_empty_photos
 
         include HasPolyphotos::LocalInstanceMethods
       end
@@ -36,9 +42,11 @@ module Polygallery
       def init_associations(settings=HasPolygallery::DEFAULTS)
         belongs_to :galleryable, :polymorphic => true
         photos_name = settings[:association_names][:photos]
-        has_many photos_name, settings[:associations][:photos]
-        accepts_nested_attributes_for photos_name,
-            settings[:nested_attributes][:photos]
+        has_many :photos, settings[:associations][:photos].symbolize_keys
+        # has_many photos_name, settings[:associations][:photos].symbolize_keys
+        accepts_nested_attributes_for :photos,
+            settings[:nested_attributes][:photos].symbolize_keys
+        attr_accessor :"#{photos_name.to_s}_attributes"
       end
 
     end
@@ -82,8 +90,79 @@ module Polygallery
         self.class.polygallery_settings
       end
 
-      def polygallery_photos
-        self.send self.polygallery_settings[:association_names][:photos]
+      def polygallery_photos_name
+        self.polygallery_settings[:association_names][:photos] end
+      def polygallery_photos; photos end # send self.polygallery_photos_name end
+      def polygallery_photos_attributes; self.photos_attributes end
+        # self.send :"#{polygallery_photos_name.to_s}_attributes" end
+      def polygallery_photos_attributes=(v); self.photos_attributes = v end
+        # self.send :"#{polygallery_photos_name.to_s}_attributes=", v end
+      def polygallery_photos_classname
+        self.polygallery_settings[:associations][:photos][:class_name] end
+      def polygallery_photos_class
+        Object.const_get polygallery_photos_classname end
+
+      def set_nested_attributes_to_correct_gallery
+        # if self.photos_attributes.present? &&
+        #    self.polygallery_photos_name.to_s != 'photos'
+        #   self.send :"#{polygallery_photos_name.to_s}_attributes=", self.photos_attributes
+        #   self.photos_attributes = nil
+        # end
+      end
+
+      def build_polygallery_photos
+        # puts "BUILDING PHOTOS for #{title}"
+        # puts "PHOTO ATTRS: #{self.photos_attributes.inspect}"
+        # Convert attributes to array if in hash form
+        # self.photos_attributes = 
+        #   self.photos_attributes.map{|_, v| v
+        #     } if self.photos_attributes.is_a? Hash
+
+        # Initialize a duplicate
+        attrs_for_photos = if self.photos_attributes.is_a? Hash
+          self.photos_attributes.values
+        else
+          ( self.photos_attributes || [] ).dup
+        end
+        return unless attrs_for_photos.any?
+        return if self.photos_built?
+
+        attrs_for_photos.each_with_index do |attrs_for_photo, index|
+          attrs_for_photo[:polygallery_options] = self.polygallery_settings
+          should_destroy = attrs_for_photo.delete(:_destroy) == 'true'
+          if attrs_for_photo.key? :id
+            existing_id = attrs_for_photo.delete(:id).to_i
+            existing_photo = self.polygallery_photos_class.find existing_id
+            if should_destroy
+              # puts 'Destroying a photo'
+              existing_photo.destroy
+            else
+              # puts 'Updating an existing photo'
+              existing_photo.update_attributes attrs_for_photo end
+          # elsif attrs_for_photo.key? :built
+          #   puts 'Photo already built'
+          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
+            # self.polygallery_photos_attributes[index][:built] = true
+          end
+        end
+        self.photos_built = true
+      end
+
+      def photos_built?; self.photos_built.present? end
+
+      def prune_empty_photos
+        # puts "#{title} is pruning empty photos..."
+        polygallery_photos.each {|pp|
+          if pp.new_record? && !pp.photo.file?
+            # TODO: find a way not to generate these photos in the first place!
+            # puts 'Marking photo for destruction'
+            pp.mark_for_destruction
+          end }
       end
 
     end

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -305,7 +305,9 @@ files:
 - lib/generators/polygallery/install/templates/add_gallery_title.rb
 - lib/generators/polygallery/install/templates/polygallery_migration.rb
 - lib/polygallery.rb
+- lib/polygallery/capybara_helpers.rb
 - lib/polygallery/engine.rb
+- lib/polygallery/factories.rb
 - lib/polygallery/factories/polygallery/galleries.rb
 - lib/polygallery/factories/polygallery/photos.rb
 - lib/polygallery/glue.rb