spree_multi_slideshow 0.70.5 → 0.70.6

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_multi_slideshow', :git => 'git://github.com/damianogiacomello/spree_multi_slideshow'
+  gem 'spree_multi_slideshow', '~> 0.70.6'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:

data/app/assets/stylesheets/admin/spree_multi_slideshow.css

@@ -1,3 +1,17 @@
 /*
  *= require admin/spree_core
+ *= require formtastic
 */
+
+.formtastic input, .formtastic textarea, .formtastic select {
+	font-size: 100%;
+	padding: 5px;
+}
+
+.formtastic button {
+	margin: 0;
+	padding: 0 20px 0 0;
+}
+.formtastic button:hover {
+	text-shadow: #FFFFFF -1px -1px 0px;
+}

data/app/controllers/admin/slides_controller.rb

@@ -1,21 +1,21 @@
 class Admin::SlidesController < Admin::ResourceController
-  before_filter :load_data
-
-  def load_data
-    @slideshow_type = 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|
-      Image.update_all(['position=?', index], ['id=?', id])
+      Slide.update_all(['position=?', index], ['id=?', id])
     end
 
     respond_to do |format|
+      format.html { redirect_to admin_slideshow_type_slides_url(@slideshow_type) }
       format.js  { render :text => 'Ok' }
     end
   end
 
   private
+  def load_data
+    @slideshow_type = SlideshowType.find(params[:slideshow_type_id])
+  end
 
   def location_after_save
     admin_slideshow_type_slides_url(@slideshow_type)

data/app/helpers/slideshow_types_helper.rb

@@ -22,7 +22,7 @@ module SlideshowTypesHelper
       slides = 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)), :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)), :class => "text-holder")))
       end.join
     else
       false

data/app/models/slide.rb

@@ -1,9 +1,10 @@
 class Slide < ActiveRecord::Base
-  
   has_many :slideshow_types
-  validates_presence_of :slideshow_type_id
   
-  has_attached_file :image,
+  attr_accessor :attachment_width, :attachment_height
+  attr_accessible :title, :url, :slideshow_type_id, :attachment, :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",
@@ -12,7 +13,7 @@ class Slide < ActiveRecord::Base
                   :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 => Proc.new {|instance| "#{instance.attachment_width}x#{instance.attachment_height}#"}
             },
             :convert_options => {
                   :thumbnail => "-gravity center",
@@ -22,7 +23,9 @@ class Slide < ActiveRecord::Base
                   :custom => "-gravity center"
             }
 
-  #process_in_background :image UTILE MA OCCORRE ATTIVARE ANCHE LA GEMMA DELAYED-PAPERCLIP
+  validates_presence_of :slideshow_type_id
+  validates_attachment_presence :attachment
+  validates_attachment_content_type :attachment, :content_type => ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/x-png', 'image/pjpeg'], :message => "deve essere JPG, JPEG, PNG o GIF"
 
   def initialize(*args)
     super(*args)

data/app/models/slideshow_type.rb

@@ -1,7 +1,8 @@
 class SlideshowType < ActiveRecord::Base
-
   belongs_to :slide
-
+  
+  attr_accessible :category, :slide_width, :slide_height, :slide_number, :enable_navigation, :enabled
+  
   validates :slide_number, :slide_width, :slide_height, :presence => true
   validates_uniqueness_of :category
   validates_numericality_of :slide_number, :only_integer => true

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

@@ -1,6 +1,8 @@
 <%= f.inputs do %>
-  <%= f.input :title %>
-  <%= f.input :url %>
-  <%= 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 :slideshow_type_id, :as => :hidden, :value => params[:slideshow_type_id] %>
+	<%= 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.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/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.image.url(:medium) %></td>
     </tr>
     <%= render :partial => 'form', :locals => { :f => f } %>
   </table>

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

@@ -6,7 +6,7 @@
     <%= link_to icon('add') + ' ' + t("slideshow_type.slide.new_page"), new_admin_slideshow_type_slide_url(@slideshow_type), :id => 'new_slide_link' %>
 </p>
 
-<table class="index sortable" data-hook="slide_table">
+<table class="index sortable" data-hook="slide_table" data-hook data-sortable-link="<%= update_positions_admin_slideshow_type_slides_url %>">
   <tr data-hook="images_header">
     <th><%= t("slideshow_type.slide.thumbnail") %></th>
     <th><%= t("slideshow_type.slide.title") %></th>
@@ -18,7 +18,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.url %></td>

data/db/migrate/20120116083546_create_slides.rb

@@ -3,7 +3,7 @@ class CreateSlides < ActiveRecord::Migration
     create_table :slides do |t|
       t.string :title, :url
       
-      t.string   :image_content_type, :image_file_name, :image_content_type
+      t.string   :image_content_type, :image_file_name
       t.datetime :image_updated_at
       t.integer  :image_size, :position
       t.string   :type, :limit => 75

data/db/migrate/20120719112245_rename_image_to_attachment.rb

@@ -0,0 +1,15 @@
+class RenameImageToAttachment < ActiveRecord::Migration
+  def up
+    rename_column :slides, :image_content_type, :attachment_content_type
+    rename_column :slides, :image_file_name, :attachment_file_name
+    rename_column :slides, :image_updated_at, :attachment_updated_at
+    rename_column :slides, :image_size, :attachment_size
+  end
+  
+  def down
+    rename_column :slides, :attachment_content_type, :image_content_type
+    rename_column :slides, :attachment_file_name, :image_file_name
+    rename_column :slides, :attachment_updated_at, :image_updated_at
+    rename_column :slides, :attachment_size, :image_size
+  end
+end

data/lib/generators/spree_multi_slideshow/install/install_generator.rb

@@ -1,10 +1,19 @@
 module SpreeMultiSlideshow
   module Generators
     class InstallGenerator < Rails::Generators::Base
-
+      
+      def add_formtastic
+        res = ask "Would you like to run the formtastic install now? [Y/n]"
+        if res == "" || res.downcase == "y"
+          run 'rails generate formtastic:install'
+        else
+          puts "Skiping rails generate formtastic:install, don't forget to run it!"
+        end
+      end
+      
       def add_javascripts
         append_file "app/assets/javascripts/store/all.js", "//= require store/spree_multi_slideshow\n"
-        #append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_multi_slideshow\n"
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_multi_slideshow\n"
       end
 
       def add_stylesheets

metadata

@@ -1,107 +1,86 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
-version: !ruby/object:Gem::Version 
-  hash: 269
+version: !ruby/object:Gem::Version
+  version: 0.70.6
   prerelease: 
-  segments: 
-  - 0
-  - 70
-  - 5
-  version: 0.70.5
 platform: ruby
-authors: 
+authors:
 - Damiano Giacomello
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 269
-        segments: 
-        - 0
-        - 70
-        - 5
-        version: 0.70.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: spree_auth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 269
-        segments: 
-        - 0
-        - 70
-        - 5
-        version: 0.70.5
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: formtastic
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !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: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: !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: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !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: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -136,38 +115,29 @@ files:
 - app/views/admin/slideshow_types/new.html.erb
 - db/migrate/20120116081431_create_slideshow_types.rb
 - db/migrate/20120116083546_create_slides.rb
+- db/migrate/20120719112245_rename_image_to_attachment.rb
 - config/locales/en.yml
 - config/locales/it.yml
 - 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.22
@@ -175,4 +145,3 @@ signing_key:
 specification_version: 3
 summary: Extension to manage multi slideshow for Spree Shop
 test_files: []
-