polygallery 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72813f5132c7b168ccabc2c5f262be7d29ef1bb2
-  data.tar.gz: 200c89fe2ea23f1a2fa0d59c271e31738587071b
+  metadata.gz: 88e9534f1c61c15956c2e2739dd6a2a655769ef9
+  data.tar.gz: 2908cdc1082c6ddbe40b1d7ae98e17af7963384e
 SHA512:
-  metadata.gz: da025e187f685c868b63417c2ebf3ec40ac57d91139480de6d12e694a07030dc3300db4e4ffab9b511d7dc901063f243524df3617493f9a5065cf54db899de58
-  data.tar.gz: 01fbbc77fdf06e12a4091ad9541aadd1b9ffb9512827d8ffc87adb920067b099df0badcf04a9b9e250e6865976cb7d4abfc36a935c907709657234697a3b8655
+  metadata.gz: 08fa013c59768b511455e4eaf601cc303bc67da57c662a077ffcb5c015627b2e490c9b15af7bda88fd01881acf98b32fb486e87fe4c78b286e566a177284676c
+  data.tar.gz: 0f7a7ceb4f0a4a5483872ba2bc675f70e2e506330d90d691a92c85c2d4bd7a69a471c8cb463eba8b7ebb8e3d878ba29ffbb6b681dfbd0355cc13d5fcb66f73b1

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

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

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

@@ -0,0 +1,8 @@
+module Polygallery::CustomizedGallery
+  extend ActiveSupport::Concern
+
+  included do
+    self.inheritance_column = :class_name
+  end
+
+end

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

@@ -0,0 +1,8 @@
+module Polygallery::CustomizedPhoto
+  extend ActiveSupport::Concern
+
+  included do
+    self.inheritance_column = :class_name
+  end
+
+end

data/app/models/polygallery/gallery.rb

@@ -1,24 +1,27 @@
 module Polygallery
   class Gallery < ActiveRecord::Base
     DEFAULTS = {
-        :association => {
-            :class_name => 'Polygallery::Gallery',
-            :as => :galleryable,
-            :dependent => :destroy
+        :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},
-            :photo => {:reject_if => lambda{|attributes| attributes['photo'].nil? }, :allow_destroy => true}
+            :photos => {:reject_if => lambda{|attributes| attributes['photo'].nil? }, :allow_destroy => true}
         },
-        :validates => {},
-        :paperclip => {
-            :styles => {:medium => '300x300#', :thumb => '100x100#'},
-            :default_url => '/images/:style/missing.png'
-        }
+        :validates => {}
     }
 
     belongs_to :galleryable, :polymorphic => true
-    has_polyphotos
+    has_polyphotos DEFAULTS
 
     def settings
       if galleryable.present?
@@ -31,10 +34,20 @@ module Polygallery
           klass.find(galleryable_id).send("#{title}_settings".to_sym)
         else
           puts 'Galleryable still not found.'
-          DEFAULTS
+          defaults
         end
+      elsif galleryable_type.present?
+        Object.const_get(galleryable_type).send("#{title}_settings".to_sym)
       else
         puts 'WARNING: Galleryable not found!  Using default paperclip settings...'
+        defaults
+      end
+    end
+
+    def defaults
+      if self.class_name.present?
+        Kernel.const_get(self.class_name)::DEFAULTS
+      else
         DEFAULTS
       end
     end

data/app/models/polygallery/photo.rb

@@ -1,31 +1,28 @@
 module Polygallery
   class Photo < ActiveRecord::Base
 
-    attr_accessor :photo_to_upload
+    PAPERCLIP_SETTINGS = {
+        :styles => {:medium => '300x300#', :thumb => '100x100#'},
+        :default_url => '/images/:style/missing.png'
+    }
+    has_attached_file :photo,
+                      :styles => ->(a) { if a.instance.class_name then raise a.instance.class_name else PAPERCLIP_SETTINGS[:styles] end },# PAPERCLIP_SETTINGS[:styles],
+                      :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
-    after_initialize :init_attachment
 
     def paperclip_settings
-      if gallery.present?
-        gallery.settings[:paperclip]
-      else
-        puts 'WARNING: Gallery not found!  Using default paperclip settings...'
-        Gallery::DEFAULTS[:paperclip]
-      end
+      PAPERCLIP_SETTINGS
     end
 
     def process_photo_to_upload
       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/db/migrate/20141001192141_add_sti_to_galleries_and_photos.rb

@@ -0,0 +1,6 @@
+class AddStiToGalleriesAndPhotos < ActiveRecord::Migration
+  def change
+    add_column :polygallery_galleries, :class_name, :string
+    add_column :polygallery_photos, :class_name, :string
+  end
+end

data/lib/generators/polygallery/install/templates/polygallery_migration.rb

@@ -5,6 +5,7 @@ class CreatePolygallery < ActiveRecord::Migration
       t.integer :default_photo_id
       t.integer :galleryable_id
       t.string :galleryable_type
+      t.string :class_name
 
       t.timestamps
     end
@@ -13,6 +14,7 @@ class CreatePolygallery < ActiveRecord::Migration
       t.attachment :photo
       t.string :title
       t.text :caption
+      t.string :class_name
 
       t.timestamps
     end

data/lib/polygallery/has_polygallery.rb

@@ -12,17 +12,31 @@ module Polygallery
           options = title
           title = 'gallery'
         end
-        defaults = Gallery::DEFAULTS
+
+        defaults = if options[:associations] && options[:associations][:class_name] && options[:associations][:class_name] != 'Polygallery::Gallery'
+                     Kernel.const_get(options[:associations][:class_name])::DEFAULTS
+                   else
+                     Gallery::DEFAULTS
+                   end
         settings = defaults.deep_merge(options)
-        has_one title.to_sym, -> { where(:title => title.to_s) }, settings[:association]
+        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,
                  :source => :photos,
-                 :class_name => 'Polygallery::Photo'
-        attr_accessor "#{title}_settings".to_sym
+                 :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("#{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
@@ -49,6 +63,7 @@ module Polygallery
       def has_polygallery?(title)
         polygalleries.include?(title)
       end
+
     end
   end
 end

data/lib/polygallery/has_polyphotos.rb

@@ -3,16 +3,30 @@ module Polygallery
     extend ActiveSupport::Concern
 
     included do
+      def defaults
+        klass = self.class_name.present? ? Kernel.const_get(self.class_name) : Gallery
+        klass::DEFAULTS
+      end
     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
+        if title.is_a? Hash
+          options = title
+          title = 'photos'
+        end
+
+        # raise 'BOOM' if options.keys.any?
+        settings = options
+        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
         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 }
+          # raise galleryable_type if galleryable_type.present?
+          send(title.to_sym).build(
+              :galleryable_id => galleryable_id,
+              :galleryable_type => galleryable_type,
+              :gallery_title => self.title
+          ) unless send(title.to_sym).any?
         end
         include HasPolyphotos::LocalInstanceMethods
       end
@@ -21,6 +35,9 @@ module Polygallery
     module LocalInstanceMethods
       def set_nest(photo)
         photo.gallery ||= self
+        photo.galleryable_id ||= galleryable_id
+        photo.galleryable_type ||= galleryable_type
+        photo.gallery_title ||= title
       end
     end
   end

data/lib/polygallery/version.rb

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

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

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

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

@@ -1,20 +1,55 @@
 class EventsController < ApplicationController
   include Polygallery::StrongParams
+  before_filter :fetch_event, :only => [:show, :edit, :update, :destroy]
+
+  def new
+    @event = Event.new
+  end
 
   def create
-    raise 'BOOM'
     @event = Event.new event_params
     if @event.save
       flash[:success] = 'Your event has been saved!'
     else
       flash[:error] = 'Your event could not be saved!'
     end
-    redirect_to root_path
+    redirect_to event_path(@event)
+  end
+
+  def index
+    @events = Event.includes(:gallery => [:photos]).order(:updated_at => :desc)
+  end
+
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    if @event.update_attributes event_params
+      flash[:success] = 'Your event has been saved!'
+    else
+      flash[:error] = 'Your event could not be saved!'
+    end
+    redirect_to event_path(@event)
+  end
+
+  def destroy
+    if @event.destroy
+      flash[:success] = 'Your event has been deleted!'
+    else
+      flash[:error] = 'Your event could not be deleted!'
+    end
+    redirect_to events_path
   end
 
   private
   def event_params
-    params.require(:event).permit(:title, :gallery_attributes => polygallery_params)
+    params.require(:event).permit(:title, :gallery_attributes => polygallery_params, :custom_gallery_attributes => polygallery_params)
+  end
+  def fetch_event
+    @event = Event.find(params[:id])
   end
 
 end

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

@@ -0,0 +1,24 @@
+class CustomGallery < Polygallery::Gallery
+  include Polygallery::CustomizedGallery
+
+  DEFAULTS = {
+      :associations => {
+          :gallery => {
+              :class_name => 'CustomGallery',
+              :as => :galleryable,
+              :dependent => :destroy
+          },
+          :photos => {
+              :class_name => 'CustomPhoto',
+              :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 => {}
+  }
+
+end

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

@@ -0,0 +1,11 @@
+class CustomPhoto < Polygallery::Photo
+  include Polygallery::CustomizedPhoto
+
+  PAPERCLIP_SETTINGS = {
+      :styles => {:large => '1200x400#', :medium => '300x300#', :thumb => '100x100#'},
+      :default_url => '/images/:style/missing.png'
+  }
+
+  belongs_to :gallery, :class_name => 'CustomGallery'
+
+end

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

@@ -1,5 +1,9 @@
 class Event < ActiveRecord::Base
 
   has_polygallery
+  has_polygallery :custom_gallery, :associations => {
+      :gallery => { :class_name => '::CustomGallery' },
+      :photos => { :class_name => '::CustomPhoto' }
+  }
 
 end

data/test/dummy/app/views/events/_form.html.haml

@@ -0,0 +1,6 @@
+= form_for @event do |f|
+  .form-group
+    %label.control-label Title
+    .controls= f.text_field :title, :class => 'form-control'
+  = fields_for_polygallery :gallery, f
+  = f.submit :class => 'btn btn-success btn-lg btn-block'

data/test/dummy/app/views/events/_simple_form.html.haml

@@ -0,0 +1,6 @@
+= simple_form_for @event, :multipart => true do |f|
+  = f.error_notification
+  = f.input :title, :autofocus => true
+  = simple_fields_for_polygallery :gallery, f
+  = simple_fields_for_polygallery :custom_gallery, f
+  = f.submit :class => 'btn btn-success btn-lg btn-block'

data/test/dummy/app/views/events/edit.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h1 Edit an Event
+
+.col-md-6.col-md-offset-3
+  = render 'simple_form'

data/test/dummy/app/views/events/index.html.haml

@@ -0,0 +1,33 @@
+.page-header
+  %h1
+    = link_to 'New Event', new_event_path, :class => 'btn btn-success pull-right'
+    Events
+
+- if @events.any?
+  .table-responsive
+    %table.table.table-bordered.table-striped
+      %thead
+        %tr
+          %th Title
+          %th.text-center Photos
+          %th.text-center Actions
+      %tbody
+        - @events.each do |e|
+          %tr
+            %td= link_to e.title, e
+            %td.text-center
+              %span.badge
+                = e.gallery.photos.count
+                Regular
+              %span.badge
+                = e.custom_gallery.photos.count
+                Custom
+            %td.text-center
+              = link_to edit_event_path(e), :class => 'btn btn-default btn-xs' do
+                %span.glyphicon.glyphicon-edit
+              = link_to e, :class => 'btn btn-default btn-xs', :method => :delete, :data => {:confirm => 'Are you sure?'} do
+                %span.glyphicon.glyphicon-trash
+- else
+  .jumbotron.text-center
+    %h1 Nothing to show.
+    %p There are no events yet!

data/test/dummy/app/views/events/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h1 Add an Event
+
+.col-md-6.col-md-offset-3
+  = render 'simple_form'

data/test/dummy/app/views/events/show.html.haml

@@ -0,0 +1,23 @@
+.page-header
+  %h1
+    .pull-right
+      = link_to edit_event_path(@event), :class => 'btn btn-default' do
+        %span.glyphicon.glyphicon-edit
+      = link_to @event, :class => 'btn btn-danger', :method => :delete, :data => {:confirm => 'Are you sure?'} do
+        %span.glyphicon.glyphicon-trash
+    Events
+    %small= @event.title
+
+- if @event.gallery.photos.any?
+  %h2 Gallery
+  .text-center
+    - @event.gallery.photos.each do |p|
+      = image_tag p.photo.url, :class => 'img-responsive img-thumbnail'
+      %br
+
+- if @event.custom_gallery.photos.any?
+  %h2 Custom Gallery
+  .text-center
+    - @event.custom_gallery.photos.each do |p|
+      = image_tag p.photo.url(:large), :class => 'img-responsive img-thumbnail'
+      %br

data/test/dummy/app/views/home/index.html.haml

@@ -14,19 +14,10 @@
       .panel-body
         %h2.lead New Event (with SimpleForm)
         %hr
-        = simple_form_for @event, :url => events_path, :method => :post, :multipart => true do |f|
-          = f.error_notification
-          = f.input :title, :autofocus => true
-          = simple_fields_for_polygallery :gallery, f
-          = f.submit :class => 'btn btn-success btn-lg btn-block'
+        = render 'events/simple_form'
   .col-md-6
     .panel.panel-default
       .panel-body
         %h2.lead New Event (without SimpleForm)
         %hr
-        = form_for @event do |f|
-          .form-group
-            %label.control-label Title
-            .controls= f.text_field :title, :class => 'form-control'
-          = fields_for_polygallery :gallery, f
-          = f.submit :class => 'btn btn-success btn-lg btn-block'
+        = render 'events/form'

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

@@ -17,15 +17,5 @@
 
     = csrf_meta_tags
   %body
-    .container-fluid
-      #flash-display
-        - if flash.any? && @slides.present? && @slides.any?
-          %br
-        - flash.each do |type, msg|
-          - type = 'danger' if type == 'error'
-          - type = 'info' if type == 'notice'
-          %div{:class => "alert alert-#{type} fadeout", :data => {:dismiss => "alert"}, :style => 'margin-top:25px;margin-bottom:0px;'}
-            %button.close ×
-            = msg if msg.is_a?(String)
-      = yield
+    .container-fluid= yield
     = javascript_include_tag 'application'

data/test/dummy/config/application.rb

@@ -21,6 +21,6 @@ module Dummy
 
     # config.eager_load_paths += ["#{Rails.root}/lib"]
 
-    config.assets.prefix = ''
+    # config.assets.prefix = ''
   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: 20140803171534) do
+ActiveRecord::Schema.define(version: 20141001192141) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -29,6 +29,7 @@ ActiveRecord::Schema.define(version: 20140803171534) do
     t.string   "galleryable_type"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "class_name"
   end
 
   create_table "polygallery_photos", force: true do |t|
@@ -41,6 +42,7 @@ ActiveRecord::Schema.define(version: 20140803171534) do
     t.text     "caption"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "class_name"
   end
 
 end