spree_multi_slideshow 1.0.0 → 1.0.1

data/README.md

@@ -1,7 +1,7 @@
 SpreeMultiSlideshow
 ===================
 
-Add multiple slideshow for Spree Commerce Shop
+Add multiple slideshow for Spree Commerce Shop [compatible with Amazon S3]
 
 
 Basic Installation
@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_multi_slideshow', '~> 1.0.0'
+  gem 'spree_multi_slideshow', '~> 1.0.1'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:

data/app/controllers/spree/admin/slides_controller.rb

@@ -1,28 +1,28 @@
 module Spree
   module Admin
     class SlidesController < ResourceController
-      before_filter :load_data
-
-      def load_data
-        @slideshow_type = Spree::SlideshowType.find(params[:slideshow_type_id])
-      end
-
+      before_filter :load_data, :only => [:index, :new, :show, :edit]
+      
       def update_positions
         params[:positions].each do |id, index|
           Spree::Slide.update_all(['position=?', index], ['id=?', id])
         end
 
         respond_to do |format|
-          format.html { redirect_to admin_slideshow_type_slides_url(params[:slideshow_type_id]) }
+          format.html { redirect_to admin_slideshow_type_slides_url(@slideshow_type) }
           format.js  { render :text => 'Ok' }
         end
       end
 
-      private
+      protected
 
       def location_after_save
         admin_slideshow_type_slides_url(@slideshow_type)
       end
+      
+      def load_data
+        @slideshow_type = Spree::SlideshowType.find(params[:slideshow_type_id].to_i)
+      end
 
     end
   end

data/app/helpers/spree/slideshow_types_helper.rb

@@ -23,7 +23,7 @@ module Spree
         slides = Spree::Slide.where("slideshow_type_id = ?", slideshow.first.id).limit(max).sort_by { |slide| slide.position }
 
         slides.map do |slide|
-          content_tag(:li, raw(link_to(image_tag(slide.image.url(style.to_sym)), slide.url, { :title => slide.title })) + raw(content_tag(:div, content_tag(:strong, raw(slide.title)) + content_tag(:p, raw(slide.content)), :class => "text-holder")))
+          content_tag(:li, raw(link_to(image_tag(slide.attachment.url(style.to_sym)), slide.url, { :title => slide.title })) + raw(content_tag(:div, content_tag(:strong, raw(slide.title)) + content_tag(:p, raw(slide.content)), :class => "text-holder")))
         end.join
       else
         false

data/app/models/spree/slide.rb

@@ -1,19 +1,20 @@
 module Spree
   class Slide < ActiveRecord::Base
-  
-    has_many :slideshow_types
+    
+    belongs_to :slideshow_type
     validates_presence_of :slideshow_type_id
-  
-    has_attached_file :image,
+    
+    attr_accessor :attachment_width, :attachment_height
+    
+    has_attached_file :attachment,
             :url  => "/spree/slides/:id/:style_:basename.:extension",
             :path => ":rails_root/public/spree/slides/:id/:style_:basename.:extension",
-            #:default_url => "/missing/:style.jpg",
             :styles => {
                   :thumbnail => "100x33#",
                   :small => "300x100#",
                   :medium => "600x200#",
                   :slide => "900x300#",
-                  :custom => Proc.new { |instance| "#{SlideshowType.find(instance.slideshow_type_id).slide_width}x#{SlideshowType.find(instance.slideshow_type_id).slide_height}#" }
+                  :custom => lambda {|instance| "#{instance.attachment_width}x#{instance.attachment_height}#"}
             },
             :convert_options => {
                   :thumbnail => "-gravity center",
@@ -21,10 +22,31 @@ module Spree
                   :medium => "-gravity center",
                   :slide => "-gravity center",
                   :custom => "-gravity center"
-            }
-
+            } 
+    
     #process_in_background :image UTILE MA OCCORRE ATTIVARE ANCHE LA GEMMA DELAYED-PAPERCLIP
-
+    
+    # Load S3 settings
+    if (!YAML.load_file(Rails.root.join('config', 's3.yml'))[Rails.env].blank?)
+      S3_OPTIONS = {
+              :storage => 's3',
+              :s3_credentials => Rails.root.join('config', 's3.yml')
+            }
+    elsif (!ENV['S3_KEY'].blank? && !ENV['S3_SECRET'].blank? && !ENV['S3_BUCKET'].blank?)
+      S3_OPTIONS = {
+              :storage => 's3',
+              :s3_credentials => {
+                :access_key_id     => ENV['S3_KEY'],
+                :secret_access_key => ENV['S3_SECRET']
+              },
+              :bucket => ENV['S3_BUCKET']
+            }
+    else
+      S3_OPTIONS = { :storage => 'filesystem' }
+    end
+    
+    attachment_definitions[:attachment] = (attachment_definitions[:attachment] || {}).merge(S3_OPTIONS)
+    
     def initialize(*args)
       super(*args)
       last_slide = Slide.last

data/app/models/spree/slideshow_type.rb

@@ -1,7 +1,7 @@
 module Spree
   class SlideshowType < ActiveRecord::Base
 
-    belongs_to :slide
+    has_many :slides
 
     validates :slide_number, :slide_width, :slide_height, :presence => true
     validates_uniqueness_of :category

data/app/views/spree/admin/slides/_form.html.erb

@@ -1,7 +1,9 @@
 <%= f.inputs do %>
 	<%= f.input :title %>
 	<%= f.input :url %>
+	<%= f.input :attachment_width, :input_html => { :value => @slideshow_type.slide_width}, :as => :hidden %>
+	<%= f.input :attachment_height, :input_html => { :value => @slideshow_type.slide_height}, :as => :hidden %>
 	<%= f.cktext_area :content, :input_html => { :value => @slide.content }, :label => t("slideshow_type.slide.content") %>
-	<%= f.input :image, :as => :file, :label => I18n.t("slideshow_type.slide.image.one").capitalize, :hint => f.object.image.blank? ? f.template.content_tag(:span, "No Image Yet") : f.template.image_tag(f.object.image.url(:thumbnail)) %>
+	<%= f.input :attachment, :as => :file, :label => I18n.t("slideshow_type.slide.image.one").capitalize, :hint => f.object.attachment.blank? ? f.template.content_tag(:span, "No Image Yet") : f.template.image_tag(f.object.attachment.url(:thumbnail)) %>
 	<%= f.input :slideshow_type_id, :as => :hidden, :value => params[:slideshow_type_id] %>
 <% end %>

data/app/views/spree/admin/slides/edit.html.erb

@@ -6,7 +6,7 @@
   <table class="basic-table" data-hook="edit_image">
     <tr data-hook="thumbnail">
       <td><%= t(:thumbnail) %>:</td>
-      <td><%= link_to image_tag(@slide.image.url(:small)), @slide.image.url(:medium) %></td>
+      <td><%= link_to image_tag(@slide.attachment.url(:small)), @slide.attachment.url(:medium) %></td>
     </tr>
     <%= render :partial => 'form', :locals => { :f => f } %>
   </table>

data/app/views/spree/admin/slides/index.html.erb

@@ -19,7 +19,7 @@
 	<tr id="<%= dom_id(slide) %>" data-hook="images_row">
 		<td>
 			<span class="handle"></span>
-			<%= link_to image_tag(slide.image.url(:thumbnail)), slide.image.url(:medium) %>
+			<%= link_to image_tag(slide.attachment.url(:thumbnail)), slide.attachment.url(:medium) %>
 		</td>
 		<td><%= slide.title %></td>
 		<td><%= slide.position %></td>

data/db/migrate/20120116081431_create_slideshow_types.rb

@@ -2,11 +2,11 @@ class CreateSlideshowTypes < ActiveRecord::Migration
   def change
     create_table :slideshow_types do |t|
       t.string :category
-      t.boolean :enabled, :default => 0
+      t.boolean :enabled, :default => false
       t.integer :slide_height, :default => 400
       t.integer :slide_width, :default => 900
       t.integer :slide_number, :default => 4
-      t.boolean :enable_navigation, :default => 1
+      t.boolean :enable_navigation, :default => true
       
       t.timestamps
     end

data/db/migrate/20120116083546_create_slides.rb

@@ -4,9 +4,9 @@ class CreateSlides < ActiveRecord::Migration
       t.string :title, :url
       t.text :content
       
-      t.string   :image_content_type, :image_file_name, :image_content_type
-      t.datetime :image_updated_at
-      t.integer  :image_size, :position
+      t.string   :attachment_content_type, :attachment_file_name, :attachment_content_type
+      t.datetime :attachment_updated_at
+      t.integer  :attachment_size, :position
       t.string   :type, :limit => 75
 
       t.references :slideshow_type

metadata

@@ -1,121 +1,99 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Damiano Giacomello
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70353872815020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70353872815020
+- !ruby/object:Gem::Dependency
   name: spree_auth
+  requirement: &70353872812420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70353872812420
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: &70353872810580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70353872810580
+- !ruby/object:Gem::Dependency
+  name: formtastic
+  requirement: &70353872810040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: paperclip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70353872810040
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: &70353872809440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ckeditor
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70353872809440
+- !ruby/object:Gem::Dependency
+  name: ckeditor
+  requirement: &70353872808520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424003
-        segments: 
-        - 3
-        - 7
-        - 0
-        - rc
-        - 3
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.7.0.rc3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70353872808520
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70353872808020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70353872808020
 description: 
 email: damiano.giacomello@diginess.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - LICENSE
 - lib/generators/spree_multi_slideshow/install/install_generator.rb
@@ -156,33 +134,23 @@ files:
 - config/routes.rb
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -190,4 +158,3 @@ signing_key:
 specification_version: 3
 summary: Extension to manage multi slideshow for Spree Shop
 test_files: []
-