polygallery 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 137ce1705597829ac39367ead7a49ef91ffc0c40
-  data.tar.gz: 19220503a1da5878e6e1e5f69c15008e7a4d320a
+  metadata.gz: fa9f9f989f87f7a55dd5a9174add48b1947727ae
+  data.tar.gz: 52d22be3a15e569dc030f43b7bb31cc59b07f094
 SHA512:
-  metadata.gz: ec69cdbe7ead12a9b70dcb56345fc57f15bc952a8889d42694219ffe386e4c1cb40dba1aa8a5e1e135449b3dff4c378715c1eedcf26934ef8bd214bae788b4c5
-  data.tar.gz: 4389199fc43be31caddfe97df80494970c609c9f24638742d99163cdadc0ff4081c02baafec46a448204733432f995a89ebb87ceadcdc9de2b63d72bf17b7521
+  metadata.gz: 3bda03dccc7bbc3cc2e53b1db97e539e6b886886299bb1472b79e85ebe8469b57b5f7007c5a0cd6e98414da14f4e0ca9a13aa74dda482ee7572bbf725695bcbe
+  data.tar.gz: 780269277ba55672bb7602c42dfa0d83e8f68f543f98aee61e68c152f2c24055053d437d89b871a55a1041120d74ae8c2840a472c4e6712fdc88bb2ed91566e1

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

@@ -0,0 +1,48 @@
+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,
+                    :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
+    end
+
+    module ClassMethods
+    end
+
+    def paperclip_settings
+      return self.gallery.polygallery_settings[:paperclip] if self.gallery.present?
+      DEFAULTS[: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]
+      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/app/models/polygallery/gallery.rb

@@ -1,27 +1,8 @@
 module Polygallery
   class Gallery < ActiveRecord::Base
-    DEFAULTS = {
-        :associations => {
-            :gallery => {
-                :class_name => 'Polygallery::Gallery',
-                :as => :galleryable,
-                :dependent => :destroy
-            },
-            :photos => {
-                :class_name => 'Polygallery::Photo',
-                :before_add => :set_nest,
-                :dependent => :destroy
-            }
-        },
-        :nested_attributes => {
-            :gallery => {:reject_if => :all_blank},
-            :photos => {:reject_if => lambda{|attributes| attributes['photo'].nil? }, :allow_destroy => true}
-        },
-        :validates => {}
-    }
 
     belongs_to :galleryable, :polymorphic => true
-    has_polyphotos DEFAULTS
+    has_polyphotos
 
     def settings
       if galleryable.present?

data/app/models/polygallery/photo.rb

@@ -1,28 +1,5 @@
 module Polygallery
   class Photo < ActiveRecord::Base
-
-    PAPERCLIP_SETTINGS = {
-        :styles => {:medium => '300x300#', :thumb => '100x100#'},
-        :default_url => '/images/:style/missing.png'
-    }
-    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'
-
-    attr_accessor :photo_to_upload, :galleryable_id, :galleryable_type, :gallery_title
-    before_save :process_photo_to_upload
-
-    def paperclip_settings
-      PAPERCLIP_SETTINGS
-    end
-
-    def process_photo_to_upload
-      self.photo = File.open(photo_to_upload) if photo_to_upload.present?
-    end
-
+    include ActsAsPolyphoto
   end
 end

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

@@ -3,12 +3,12 @@
 
   - 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-receptacle', :association_insertion_method => 'append'}
+      = 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'}
       - if options[:label] == true
         = gallery.title.titleize
       - else
         = options[:label].titleize
-  #photos.polygallery-cocoon-table
+  .polygallery-cocoon-table{:id => gallery.class.polygallery_settings[:association_names][:photos].to_s}
     %table.table.table-bordered.table-striped.table-condensed.polygallery-photos-table
       %thead
         %tr
@@ -22,4 +22,4 @@
   -#- 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]
+    -#= 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/lib/polygallery/has_polygallery.rb

@@ -13,8 +13,11 @@ module Polygallery
           title = 'gallery'
         end
 
-        defaults = if options[:associations] && options[:associations][:class_name] && options[:associations][:class_name] != 'Polygallery::Gallery'
-                     Kernel.const_get(options[:associations][:class_name])::DEFAULTS
+        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)::DEFAULTS
                    else
                      Gallery::DEFAULTS
                    end
@@ -26,16 +29,9 @@ module Polygallery
         accepts_nested_attributes_for title.to_sym, settings[:nested_attributes][:gallery]
         has_many "#{title}_photos".to_sym,
                  :through => title.to_sym,
-                 :source => :photos,
+                 :source => settings[:association_names][:photos],
                  :class_name => settings[:associations][:photos][:class_name]
 
-        # if settings[:paperclip] != defaults[:paperclip]
-        #   after_create do
-            # raise 'CREATE BOOM'
-            # send(title.to_sym).photos.each{|p| p.photo.reprocess! }
-          # end
-        # end
-
         after_initialize do
           send("build_#{title.to_s}".to_sym) if send(title.to_sym).nil?
           send(title.to_sym).send(:galleryable=, self)
@@ -68,4 +64,4 @@ module Polygallery
   end
 end
 
-ActiveRecord::Base.send :include, Polygallery::HasPolygallery
+ActiveRecord::Base.send :include, Polygallery::HasPolygallery

data/lib/polygallery/has_polyphotos.rb

@@ -1,12 +1,40 @@
 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
+      # def defaults
+      #   klass = self.class_name.present? ? Kernel.const_get(self.class_name) : Gallery
+      #   klass::DEFAULTS
+      # end
     end
 
     module ClassMethods
@@ -16,22 +44,31 @@ module Polygallery
           title = 'photos'
         end
 
-        # raise 'BOOM' if options.keys.any?
-        settings = options
+        # 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
+        accepts_nested_attributes_for title.to_sym, settings[:nested_attributes][:photos] # TODO: get the actual @settings somehow
         after_initialize do
           # raise galleryable_type if galleryable_type.present?
           send(title.to_sym).build(
               :galleryable_id => galleryable_id,
               :galleryable_type => galleryable_type,
-              :gallery_title => self.title
+              :"#{settings[:association_names][:gallery]}_title" => self.title
           ) unless send(title.to_sym).any?
         end
+        after_initialize :do_something
         include HasPolyphotos::LocalInstanceMethods
       end
+
+      # def polygallery_settings
+      #   @settings
+      # end
     end
 
+
     module LocalInstanceMethods
       def set_nest(photo)
         photo.gallery ||= self
@@ -39,8 +76,14 @@ module Polygallery
         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"
+      end
+
     end
   end
 end
 
-ActiveRecord::Base.send :include, Polygallery::HasPolyphotos
+ActiveRecord::Base.send :include, Polygallery::HasPolyphotos

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/dummy/app/assets/javascripts/application.js

@@ -13,4 +13,5 @@
 //= require jquery
 //= require bootstrap.min
 //= require polygallery/init
+//= require simple_form_fileinput/init
 //= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -13,5 +13,6 @@
  *= require_tree .
  *= require bootstrap.min
  *= require bootstrap-theme.min
+ *= require simple_form_fileinput/enhancements
  *= require_self
  */

data/test/dummy/app/controllers/events_controller.rb

@@ -13,7 +13,8 @@ class EventsController < ApplicationController
     else
       flash[:error] = 'Your event could not be saved!'
     end
-    redirect_to event_path(@event)
+    # redirect_to event_path(@event)
+    redirect_to root_path
   end
 
   def index
@@ -46,7 +47,7 @@ class EventsController < ApplicationController
 
   private
   def event_params
-    params.require(:event).permit(:title, :gallery_attributes => polygallery_params, :custom_gallery_attributes => polygallery_params)
+    params.require(:event).permit(:title, :gallery_attributes => polygallery_params, :custom_gallery_attributes => [:id, :title, :_destroy, {:photos_attributes => [:id, :photo, :title, :caption, :_destroy]}])
   end
   def fetch_event
     @event = Event.find(params[:id])

data/test/dummy/app/models/custom_gallery.rb

@@ -1,8 +1,7 @@
 class CustomGallery < Polygallery::Gallery
-  include Polygallery::CustomizedGallery
+  # include Polygallery::CustomizedGallery
 
-  DEFAULTS = {
-      :associations => {
+  has_polyphotos :associations => {
           :gallery => {
               :class_name => 'CustomGallery',
               :as => :galleryable,
@@ -14,11 +13,19 @@ class CustomGallery < Polygallery::Gallery
               :dependent => :destroy
           }
       },
+      :association_names => {
+          :gallery => :custom_gallery,
+          :photos => :custom_photos
+      },
       :nested_attributes => {
           :gallery => {:reject_if => :all_blank},
           :photos => {:reject_if => lambda{|attributes| attributes['photo'].nil? }, :allow_destroy => true}
       },
-      :validates => {}
-  }
+      :validates => {},
+      :paperclip => {
+        :styles => {:medium => '300x300#', :thumb => '100x100#'},
+        :default_url => '/images/:style/missing.png'
+      }
+
 
-end
+end

data/test/dummy/app/models/event.rb

@@ -1,9 +1,10 @@
 class Event < ActiveRecord::Base
 
   has_polygallery
-  has_polygallery :custom_gallery, :associations => {
-      :gallery => { :class_name => '::CustomGallery' },
-      :photos => { :class_name => '::CustomPhoto' }
-  }
+  has_polygallery :custom_gallery, :paperclip => {:styles => ['500x500#']}
+  #   :associations => {
+  #     :gallery => { :class_name => '::CustomGallery' },
+  #     :photos => { :class_name => '::CustomPhoto' }
+  # }
 
 end

data/test/dummy/app/views/layouts/application.html.haml

@@ -17,5 +17,10 @@
 
     = csrf_meta_tags
   %body
-    .container-fluid= yield
-    = javascript_include_tag 'application'
+    .container-fluid
+      - flash.each do |name, msg|
+        = content_tag :div, :class => "alert alert-#{name == :error ? "danger" : "success" } alert-dismissable" do
+          %button.close{:type => "button", :data => {:dismiss => "alert"}, :aria => {:hidden => "true"} } ×
+          = msg
+      = yield
+    = javascript_include_tag 'application'

data/test/dummy/config/application.rb

@@ -22,5 +22,6 @@ module Dummy
     # config.eager_load_paths += ["#{Rails.root}/lib"]
 
     # config.assets.prefix = ''
+    config.eager_load_paths += %W(#{File.expand_path(Rails.root.join('..', '..', 'lib'))})
   end
-end
+end

data/test/dummy/config/initializers/simple_form_fileinput.rb

@@ -1,15 +1,17 @@
 module SimpleForm
   module Inputs
     class FileInput < Base
-      def input
-        input_html_options[:title] = 'Drop a file here, or click to browse...'
-        if input_html_options.key?(:data)
-          input_html_options[:data][:filename_placement] = 'inside'
+      def input(wrapper_options)
+        merged_input_options = merge_wrapper_options input_html_options, wrapper_options
+        merged_input_options[:data] ||= {}
+        if Rails.env.test?
+          merged_input_options[:data][:bfi_disabled] = true
         else
-          input_html_options[:data] = {:filename_placement => 'inside'}
+          merged_input_options[:title] = 'Drop a file here, or click to browse...'
+          merged_input_options[:data][:filename_placement] = 'inside'
         end
-        @builder.file_field(attribute_name, input_html_options)
+        @builder.file_field(attribute_name, merged_input_options)
       end
     end
   end
-end
+end

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+
   resources :events
 
   root 'home#index'

data/test/dummy/db/migrate/20150320165705_create_polygalleries.rb

@@ -0,0 +1,22 @@
+class CreatePolygalleries < ActiveRecord::Migration
+  def change
+    create_table :polygallery_galleries do |t|
+      t.string :title, :default => 'gallery'
+      t.integer :default_photo_id
+      t.integer :galleryable_id
+      t.string :galleryable_type
+      t.string :class_name
+
+      t.timestamps
+    end
+    create_table :polygallery_photos do |t|
+      t.integer :gallery_id
+      t.attachment :photo
+      t.string :title
+      t.text :caption
+      t.string :class_name
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141001192141) do
+ActiveRecord::Schema.define(version: 20150320165705) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -27,9 +27,9 @@ ActiveRecord::Schema.define(version: 20141001192141) do
     t.integer  "default_photo_id"
     t.integer  "galleryable_id"
     t.string   "galleryable_type"
+    t.string   "class_name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "class_name"
   end
 
   create_table "polygallery_photos", force: true do |t|
@@ -40,9 +40,9 @@ ActiveRecord::Schema.define(version: 20141001192141) do
     t.datetime "photo_updated_at"
     t.string   "title"
     t.text     "caption"
+    t.string   "class_name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "class_name"
   end
 
 end