polygallery 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10c17c8dd4f7ed052502b8dd890e82a04c4665c
-  data.tar.gz: 7af3e71db31b091b5f1ed4feebd3dbe1ccb5db9a
+  metadata.gz: 8829251245b28dc2aad475352c43d7b87e53c421
+  data.tar.gz: 65d64fa087c79cb6b302adb49b467a6be196d705
 SHA512:
-  metadata.gz: f71bae3a031023407dced43ca0316f3f96bdf8bf3f8f3df8624cbd368a6e89c35320eca0143522f4eaaca798a1f919e2bbb7d4388bde00946c1ba8bc03d2e04b
-  data.tar.gz: e3d8ad0b667cbe225c7b37fc74017c3994638a46e7f3ed65fc79f483404a8820f9c463c84830eef7c1688f92bfaf6579874c908923a40b0db1feee5efdfcdde0
+  metadata.gz: db78604c051a6e545e94b1e39ff7aafa12479b35f976c6040a7f3205ee460ac048d819d42a5c5bd6ecc173e44ed9dccf288425d3b1ac73e78159ff7c0304e718
+  data.tar.gz: bbf0ea8af4cd065796f21c5e297f050668228f368e2d59df8ed36b941ec199b69a3b4ed8cb413d5e16f010c52f6efc45375acab5670e8b2d33a05f13fa8b533b

data/app/assets/javascripts/polygallery/polygallery.js.coffee

@@ -1,4 +1,5 @@
 (($)->
-  $('.polygallery-cocoon-table').on 'cocoon:after-insert', (e, insertedItem)->
-    $(insertedItem).find('input[type=file]').bootstrapFileInput()
-)(jQuery)
+  $(document).ready ->
+    $('.polygallery-cocoon-table').on 'cocoon:after-insert', (e, insertedItem)->
+      $(insertedItem).find('input[type=file]').bootstrapFileInput()
+)(jQuery)

data/app/models/polygallery/photo.rb

@@ -1,6 +1,5 @@
 module Polygallery
   class Photo < ActiveRecord::Base
-    include ActsAsPolyphoto
     acts_as_polyphoto
   end
 end

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

@@ -1,23 +1,18 @@
-- 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
+- photo_association_name = f.object.polygallery_settings[:association_names][:photos]
+= f.input_field :title, :as => :hidden, :value => f.object.title
+= f.input_field :galleryable_id, :as => :hidden
+= f.input_field :galleryable_type, :as => :hidden
 
-  - if options[:label]
-    %h3.lead
-      = 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
-        = options[:label].titleize
-  .polygallery-cocoon-table{:id => photo_association_name.to_s}
-    %table.table.table-bordered.table-striped.table-condensed.polygallery-photos-table
-      %thead
-        %tr
-          %th.text-center{:style => 'width:85px;'} Photo
-          %th File
-          %th.text-center Actions
-      %tbody.photo-receptacle
-        = ff.simple_fields_for :photos do |pf| # photo_association_name do |pf|
-          = render 'polygallery/photos/simple_fields_for', :f => pf
+%h3.lead
+  = link_to_add_association 'Add Photo', f, :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'}
+  = f.object.title.titleize
+.polygallery-cocoon-table{:id => photo_association_name.to_s}
+  %table.table.table-bordered.table-striped.table-condensed.polygallery-photos-table
+    %thead
+      %tr
+        %th.text-center{:style => 'width:85px;'} Photo
+        %th File
+        %th.text-center Actions
+    %tbody.photo-receptacle
+      = f.simple_fields_for :photos do |pf| # photo_association_name do |pf|
+        = render 'polygallery/photos/simple_fields_for', f: pf

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

@@ -1,6 +1,8 @@
-%tr.nested-fields{:data => {:new => f.object.new_record?}}
+%tr{class: "nested-fields #{f.object.new_record? ? 'new-polyphoto' : ''}",
+    data: { new: f.object.new_record? }}
   %td.text-center
     = f.input_field :gallery_title, :as => :hidden
+    = f.input_field :gallery_id, :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'

data/config/routes.rb

@@ -1,6 +1,4 @@
 Polygallery::Engine.routes.draw do
   resources :photos
-
   resources :galleries
-
 end

data/lib/polygallery/acts_as_polygallery.rb

@@ -0,0 +1,6 @@
+require 'polygallery'
+
+module Polygallery
+  module ActsAsPolygallery
+  end
+end

data/{app/models/concerns → lib}/polygallery/acts_as_polyphoto.rb

@@ -1,10 +1,8 @@
+require 'polygallery'
+
 module Polygallery
   module ActsAsPolyphoto
     extend ActiveSupport::Concern
-
-    included do
-    end
-
     module ClassMethods
       def acts_as_polyphoto(options={})
         defaults = self.polygallery_settings
@@ -16,7 +14,17 @@ module Polygallery
         init_attachment settings[:paperclip]
         init_associations settings
 
-        before_validation :process_photo_to_upload
+        before_validation do
+          # self.polygallery_options = nil
+          # self.polygallery_options = self.polygallery_settings
+          # self.class.init_attachment self.polygallery_options
+          if gallery.present?
+            self.gallery_title = gallery.title if gallery_title.blank?
+            self.galleryable ||= gallery.galleryable
+            initialize_polyphoto
+          end
+          process_photo_to_upload
+        end
         # before_save {
         #   # puts "Photo changes: #{self.changes.inspect}"
         #   puts 'SAVING PHOTO!' }
@@ -30,7 +38,7 @@ module Polygallery
       end
 
       def polygallery_settings
-        HasPolygallery::DEFAULTS
+        DEFAULT_SETTINGS
       end
 
       def init_attachment(paperclip_settings)
@@ -44,7 +52,7 @@ module Polygallery
         validates_attachment_presence(:photo) if validations[:presence]
       end
 
-      def init_associations(settings=HasPolygallery::DEFAULTS)
+      def init_associations(settings=DEFAULT_SETTINGS)
         belongs_to settings[:association_names][:gallery],
           :class_name => settings[:associations][:gallery][:class_name],
           :foreign_key => :gallery_id
@@ -76,14 +84,14 @@ module Polygallery
                   .send(:"#{self.gallery_title}_settings")
               end
           return s if s.present?
-        # elsif respond_to?(:gallery) && gallery.present?
-        #   return gallery.polygallery_settings
-        # elsif self.gallery_id.present?
-        #   g = Kernel.const_get(self.galleryable_type).find(self.gallery_id)
-        #   if g.present?
-        #     self.gallery_title = g.title
-        #     return self.polygallery_settings
-        #   end
+        elsif respond_to?(:gallery) && gallery.present?
+          return gallery.polygallery_settings
+        elsif self.gallery_id.present?
+          g = Polygallery::Gallery.find(self.gallery_id)
+          if g.present?
+            self.gallery_title = g.title
+            return self.polygallery_settings
+          end
         end
         self.class.polygallery_settings
         # if gallery_title.present? && galleryable_type.present?
@@ -94,7 +102,7 @@ module Polygallery
         # elsif self.gallery.present? && gallery.polygallery_settings.present?
         #   self.gallery.polygallery_settings 
         # else
-        #   HasPolygallery::DEFAULTS
+        #   DEFAULT_SETTINGS
         # end
       end
 
@@ -103,13 +111,29 @@ module Polygallery
       end
 
       def process_photo_to_upload
+        # As crazy as this looks, it's necessary to assign paperclip's
+        # dynamic styles through an association.  It would be great if we
+        # could find a better way, though...
+        #
+        # This part runs the second try.
+        if photo_updated_at_changed? && gallery.present? &&
+            photo_to_upload.present? && File.exists?(photo_to_upload)
+          # puts 'Running the swaparoo!'
+          File.open(photo_to_upload, 'rb') {|h| self.photo = h }
+          # self.photo_to_upload = nil
+        end
+        # This part runs the first try.
         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
+          # if self.new_record? || self.photo_file_name_changed?
+          if self.photo.staged?
+            # puts "#{photo_file_name} is staged!"
+            if File.exists? self.photo.staged_path
+              # puts "Setting photo to upload to #{photo_file_name}"
+              self.photo_to_upload = self.photo.staged_path
+              # self.photo = nil
+            end
           end
         end
-        self.photo = File.open(photo_to_upload) if photo_to_upload.present?
       end
 
       def init_attachment

data/lib/polygallery/capybara_helpers.rb

@@ -19,7 +19,7 @@ module Polygallery
         attrs = table_id; table_id = 'photos' end
       attrs ||= build :polygallery_photo
       trs = polyphoto_trs(table_id); last_tr = trs.last
-      unless trs.length == 1 && last_tr.find('input[id$="_photo"]').value.blank?
+      unless last_tr[:class].include?('new-polyphoto') && last_tr.find('input[id$="_photo"]').value.blank?
         page.execute_script "$('#{add_polyphoto_btn_selector table_id}').click();"
         last_tr = polyphoto_trs(table_id).last
       end

data/lib/polygallery/controller_helpers.rb

@@ -0,0 +1,13 @@
+require 'polygallery'
+require 'polygallery/strong_params_helper'
+
+module Polygallery
+  module ControllerHelpers
+    extend ActiveSupport::Concern
+
+    included do
+      include StrongParamsHelper
+    end
+
+  end
+end

data/lib/polygallery/engine.rb

@@ -1,9 +1,38 @@
+require 'polygallery'
+require 'polygallery/controller_helpers'
+require 'polygallery/model_helpers'
+require 'polygallery/view_helpers'
+require 'polygallery/simple_form_helper'
+require 'polygallery/glue'
+
 module Polygallery
   class Engine < ::Rails::Engine
     isolate_namespace Polygallery
+
+    initializer 'polygallery.assets' do
+      Rails.application.config.assets.precompile +=
+        %w( polygallery/thumbnail-missing.jpg )
+    end
     initializer 'polygallery_engine.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
-
+        ActionController::Base.send :include, ControllerHelpers
+      end
+    end
+    initializer 'polygallery.model_helpers' do
+      ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.send :include, ModelHelpers
+        ActiveRecord::Base.send :include, Polygallery::Glue
+      end
+    end
+    initializer "polygallery.view_helpers" do
+      ActiveSupport.on_load :action_view do
+        ActionView::Base.send :include, ViewHelpers
+        if defined? SimpleForm
+          ActionView::Base.send :include, SimpleFormHelper
+          SimpleForm::FormBuilder.send :define_method, 'simple_fields_for_polygallery' do |*args, &block|
+            template.simple_fields_for_polygallery self, *args, &block
+          end
+        end
       end
     end
     initializer :append_migrations do |app|

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

@@ -7,6 +7,7 @@ FactoryGirl.define do
 
   factory :polygallery_photo, :class => Polygallery::Photo do
     caption { [nil, MFaker::BaconIpsum.paragraph].sample }
-    photo   { File.new get_random_photo }
+    photo { File.new get_random_photo }
+    # photo_to_upload { get_random_photo }
   end
 end

data/lib/polygallery/has_polygallery.rb

@@ -1,46 +1,8 @@
+require 'polygallery'
+
 module Polygallery
   module HasPolygallery
     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,
-                :foreign_key => :gallery_id
-            }
-        },
-        :association_names => {
-            :gallery => :gallery,
-            :photos => :photos
-        },
-        :nested_attributes => {
-            :gallery => { :reject_if => :all_blank },
-            :photos => {
-              :allow_destroy => true,
-              :reject_if => proc {|attributes|
-                !attributes.key?('id') && attributes['photo'].nil? } }
-        },
-        :validates => {},
-        :paperclip => {
-          :styles => {:medium => '300x300#', :thumb => '100x100#'},
-          :default_url => 'polygallery/thumbnail-missing.jpg'
-        },
-        :paperclip_validations => {
-          :content_type => /\Aimage\/.*\Z/,
-          :presence => false
-        }
-    }
-
-    included do
-    end
-
     module ClassMethods
       def has_polygallery(title='gallery', options={})
         if title.is_a? Hash
@@ -48,19 +10,18 @@ module Polygallery
           title = 'gallery'
         end
 
-        defaults = HasPolygallery::DEFAULTS
+        defaults = DEFAULT_SETTINGS
         if options[:association_names].nil? && title.to_s != 'gallery'
           options[:association_names] = {
             :gallery => :"#{title}",
-            :photos => :"#{title.to_s.gsub('_gallery', '')}_photos"
-          }
+            :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)
         attr_accessor :"#{title}_attributes", :galleries_built
 
-        has_one title.to_sym, -> { where(:title => title.to_s) }, settings[:associations][:gallery]
+        has_one title.to_sym, -> { where(title: title.to_s) }, settings[:associations][:gallery]
         has_many settings[:association_names][:photos],
                  :through => :"#{title}",
                  :source => :photos, # settings[:association_names][:photos],
@@ -74,8 +35,8 @@ module Polygallery
           # puts "GA: #{self.gallery_attributes.inspect}"
           if self.gallery_attributes.nil?
             # puts 'BUILDING FIRST PHOTOS ON INIT!'
+            build_gallery_associations
             build_first_photos
-            # build_gallery_associations
           end
         end
           # puts instance.inspect
@@ -213,4 +174,4 @@ module Polygallery
   end
 end
 
-ActiveRecord::Base.send :include, Polygallery::HasPolygallery
+# ActiveRecord::Base.send :include, Polygallery::HasPolygallery

data/lib/polygallery/has_polyphotos.rb

@@ -1,10 +1,8 @@
+require 'polygallery'
+
 module Polygallery
   module HasPolyphotos
     extend ActiveSupport::Concern
-
-    included do
-    end
-
     module ClassMethods
       def has_polyphotos(title=nil, options={})
         attr_accessor :polygallery_options
@@ -20,13 +18,16 @@ module Polygallery
         attr_accessor :photos_attributes, :photos_built
 
         settings = defaults.deep_merge options
-        init_associations settings
+        # init_associations settings
+        belongs_to :galleryable, polymorphic: true
+        # photos_name = settings[:association_names][:photos]
+        has_many :photos, settings[:associations][:photos].symbolize_keys
 
         after_initialize do
           self.polygallery_options ||= self.polygallery_settings
           self.initialize_polygallery
         end
-        after_initialize :build_polygallery_photos, :if => :new_record?
+        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
@@ -35,10 +36,10 @@ module Polygallery
       end
 
       def polygallery_settings
-        HasPolygallery::DEFAULTS
+        DEFAULT_SETTINGS
       end
 
-      def init_associations(settings=HasPolygallery::DEFAULTS)
+      def init_associations(settings=DEFAULT_SETTINGS)
         belongs_to :galleryable, :polymorphic => true
         photos_name = settings[:association_names][:photos]
         has_many :photos, settings[:associations][:photos].symbolize_keys
@@ -77,8 +78,6 @@ module Polygallery
         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?
       end
 
@@ -102,11 +101,11 @@ module Polygallery
         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
+        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
@@ -149,10 +148,10 @@ module Polygallery
       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!
+          if pp.new_record? && !pp.photo.file? && pp.photo_to_upload.nil?
             # puts 'Marking photo for destruction'
             pp.mark_for_destruction
+            polygallery_photos.delete pp
           end }
       end
 
@@ -163,8 +162,15 @@ module Polygallery
         photos.first || Photo.new
       end
 
+      def method_missing(m, *args, &block)
+        if m == :photos
+          self.initialize_polygallery
+          return send(m, *args, &block) if self.respond_to? m
+          Photo.where('1 = 0')
+        else super end
+      end
     end
   end
 end
 
-ActiveRecord::Base.send :include, Polygallery::HasPolyphotos
+# ActiveRecord::Base.send :include, Polygallery::HasPolyphotos

data/lib/polygallery/model_helpers.rb

@@ -0,0 +1,14 @@
+require 'polygallery'
+require 'polygallery/has_polygallery'
+require 'polygallery/has_polyphotos'
+require 'polygallery/acts_as_polyphoto'
+
+module Polygallery
+  module ModelHelpers
+    extend ActiveSupport::Concern
+
+    include HasPolygallery
+    include HasPolyphotos
+    include ActsAsPolyphoto
+  end
+end

data/lib/polygallery/railtie.rb

@@ -1,32 +1,18 @@
-require 'polygallery/view_helpers'
+require 'polygallery'
 require 'polygallery/glue'
 
 module Polygallery
   require 'rails'
-
   class Railtie < Rails::Railtie
-    # initializer "polygallery.configure_rails_initialization" do |app|
-    #   app.middleware.use Railtie::
-    # end
     initializer "polygallery.insert_into_active_record" do |app|
       ActiveSupport.on_load :active_record do
         Polygallery::Railtie.insert
       end
-
       if app.config.respond_to?(:polygallery_defaults)
         Polygallery::Gallery.default_options.merge!(app.config.polygallery_defaults)
       end
     end
-    initializer "polygallery.view_helpers" do
-      ActionView::Base.send :include, ViewHelpers
-    end
-    initializer 'polygallery.assets' do
-      Rails.application.config.assets.precompile +=
-        %w( polygallery/thumbnail-missing.jpg )
-    end
-  end
 
-  class Railtie
     def self.insert
       if defined?(ActiveRecord)
         ActiveRecord::Base.send(:include, Polygallery::Glue)

data/lib/polygallery/simple_form_helper.rb

@@ -0,0 +1,19 @@
+require 'polygallery'
+
+module Polygallery
+  module SimpleFormHelper
+
+    def self.simple_fields_for_polygallery(fb, title=:gallery, *args, &block)
+      ( '<div class="polygallery-fields">' <<
+          fb.simple_fields_for(title, *args, &block) << '</div>' ).html_safe
+    end
+    def simple_fields_for_polygallery(fb, title=:gallery, *args, &block)
+      new_block = block_given? ? block : ->(fb2) {
+        render partial: 'polygallery/galleries/simple_fields_for',
+               locals: { f: fb2 } }
+      Polygallery::SimpleFormHelper.simple_fields_for_polygallery(
+        fb, title, *args, &new_block)
+    end
+
+  end
+end

data/lib/polygallery/strong_params_helper.rb

@@ -0,0 +1,21 @@
+require 'polygallery'
+
+module Polygallery
+  module StrongParamsHelper
+    def self.polygallery_params(title=:gallery, photos_title=:photos)
+      {:"#{title}_attributes" => [:id, :title, :galleryable_id, :galleryable_type,
+                                     :_destroy, polyphoto_params(photos_title) ] }
+    end
+    def self.polyphoto_params(title=:photos)
+      {:"#{title}_attributes" => [:id, :photo, :title, :caption, :gallery_title,
+                                  :gallery_id,
+                                  :galleryable_id, :galleryable_type, :_destroy] }
+    end
+    def polygallery_params(title=:gallery, photos_title=:photos)
+      Polygallery::StrongParamsHelper.polygallery_params title, photos_title end
+    def polyphoto_params(title=:photos)
+      Polygallery::StrongParamsHelper.polyphoto_params title
+    end
+
+  end
+end

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/lib/polygallery/view_helpers.rb

@@ -8,14 +8,5 @@ module Polygallery
       render :partial => 'polygallery/galleries/fields_for', :locals => {:f => f, :gallery => gallery, :options => options}
     end
 
-    def simple_fields_for_polygallery(title, f, options={})
-      options = {
-          :label => true,
-          :input_html => {}
-      }.merge(options)
-      gallery = f.object.send(title)
-      render :partial => 'polygallery/galleries/simple_fields_for', :locals => {:f => f, :gallery => gallery, :options => options}
-    end
-
   end
 end

data/lib/polygallery.rb

@@ -1,8 +1,41 @@
-require "polygallery/engine"
-require "polygallery/has_polygallery"
-require "polygallery/has_polyphotos"
-require "polygallery/paperclip_integration" 
-require "polygallery/railtie" if defined? Rails
+require 'polygallery/engine'
+require 'polygallery/paperclip_integration' # <-- Try removing this monstrosity
+# require 'polygallery/railtie' if defined? Rails
 
 module Polygallery
+  DEFAULT_SETTINGS = {
+    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 },
+      photos: {
+        allow_destroy: true,
+        reject_if: proc {|attributes|
+          !attributes.key?('id') && attributes['photo'].nil? } }
+    },
+    validates: {},
+    paperclip: {
+      styles: {medium: '300x300#', thumb: '100x100#'},
+      default_url: 'polygallery/thumbnail-missing.jpg'
+    },
+    paperclip_validations: {
+      content_type: /\Aimage\/.*\Z/,
+      presence: false
+    }
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -272,22 +286,17 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/assets/javascripts/polygallery/application.js
-- app/assets/javascripts/polygallery/galleries.js
 - app/assets/javascripts/polygallery/init.js
-- app/assets/javascripts/polygallery/photos.js
 - app/assets/javascripts/polygallery/polygallery.js.coffee
 - app/assets/stylesheets/polygallery/application.css
 - app/assets/stylesheets/polygallery/galleries.css
 - app/assets/stylesheets/polygallery/photos.css
-- app/controllers/concerns/polygallery/strong_params.rb
 - app/controllers/polygallery/application_controller.rb
 - app/controllers/polygallery/galleries_controller.rb
 - app/controllers/polygallery/photos_controller.rb
 - app/helpers/polygallery/application_helper.rb
 - app/helpers/polygallery/galleries_helper.rb
 - app/helpers/polygallery/photos_helper.rb
-- app/models/concerns/polygallery/acts_as_polyphoto.rb
 - app/models/concerns/polygallery/customized_gallery.rb
 - app/models/concerns/polygallery/customized_photo.rb
 - app/models/polygallery/gallery.rb
@@ -305,7 +314,10 @@ files:
 - lib/generators/polygallery/install/templates/add_gallery_title.rb
 - lib/generators/polygallery/install/templates/polygallery_migration.rb
 - lib/polygallery.rb
+- lib/polygallery/acts_as_polygallery.rb
+- lib/polygallery/acts_as_polyphoto.rb
 - lib/polygallery/capybara_helpers.rb
+- lib/polygallery/controller_helpers.rb
 - lib/polygallery/engine.rb
 - lib/polygallery/factories.rb
 - lib/polygallery/factories/polygallery/galleries.rb
@@ -313,8 +325,11 @@ files:
 - lib/polygallery/glue.rb
 - lib/polygallery/has_polygallery.rb
 - lib/polygallery/has_polyphotos.rb
+- lib/polygallery/model_helpers.rb
 - lib/polygallery/paperclip_integration.rb
 - lib/polygallery/railtie.rb
+- lib/polygallery/simple_form_helper.rb
+- lib/polygallery/strong_params_helper.rb
 - lib/polygallery/validators.rb
 - lib/polygallery/validators/polygallery_presence_validator.rb
 - lib/polygallery/version.rb

data/app/assets/javascripts/polygallery/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/app/assets/javascripts/polygallery/galleries.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/javascripts/polygallery/photos.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

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

@@ -1,19 +0,0 @@
-module Polygallery::StrongParams
-  extend ActiveSupport::Concern
-
-  included do
-  end
-
-  def self.polygallery_params(association='photos')
-    [:id, :title, :galleryable_id, :galleryable_type,
-     :_destroy, {:photos_attributes => polyphoto_params(association) } ]
-  end
-  def self.polyphoto_params(association='photos')
-    [:id, :photo, :title, :caption, :gallery_title,
-     :galleryable_id, :galleryable_type, :_destroy]
-  end
-  def polygallery_params(association='photos')
-    self.class.polygallery_params association end
-  def polyphoto_params(association='photos')
-    self.class.polyphoto_params association end
-end