spree_multi_slideshow 1.0.5 → 1.1.0

data/README.md

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

data/app/models/spree/slide.rb

@@ -1,19 +1,21 @@
 module Spree
-  class Slide < ActiveRecord::Base    
+  class Slide < ActiveRecord::Base
     belongs_to :slideshow_type
     
     attr_accessor :attachment_width, :attachment_height
-    attr_accessible :title, :url, :attachment_width, :attachment_height, :content, :slideshow_type_id, :attachment, :position    
+    attr_accessible :title, :url, :attachment_width, :attachment_height, :content, :slideshow_type_id, :attachment
     
     has_attached_file :attachment,
             :url  => "/spree/slides/:id/:style_:basename.:extension",
             :path => ":rails_root/public/spree/slides/:id/:style_:basename.:extension",
-            :styles => {
+            :styles => lambda {|a|
+              {
                   :thumbnail => "100x33#",
-                  :small => "300x100#",
+                  :small =>  "300x100#",
                   :medium => "600x200#",
-                  :slide => "900x300#",
-                  :custom => Proc.new {|instance| "#{instance.attachment_width}x#{instance.attachment_height}#"}
+                  :slide =>  "900x300#",
+                  :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
+              }
             },
             :convert_options => {
                   :thumbnail => "-gravity center",
@@ -28,12 +30,12 @@ module Spree
     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"
     
     # Load S3 settings
-    if (FileTest.exist?(Rails.root.join('config', 's3.yml')) && !YAML.load_file(Rails.root.join('config', 's3.yml'))[Rails.env].blank?)
+    if ( FileTest.exist?(Rails.root.join('config', 's3.yml')) && !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 (FileTest.exist?(Rails.root.join('config', 's3.yml')) && !ENV['S3_KEY'].blank? && !ENV['S3_SECRET'].blank? && !ENV['S3_BUCKET'].blank?)
+    elsif (FileTest.exist?(Rails.root.join('config', 's3.yml')) &&!ENV['S3_KEY'].blank? && !ENV['S3_SECRET'].blank? && !ENV['S3_BUCKET'].blank?)
       S3_OPTIONS = {
               :storage => 's3',
               :s3_credentials => {

data/app/models/spree/slideshow_type.rb

@@ -2,8 +2,8 @@ module Spree
   class SlideshowType < ActiveRecord::Base
     has_many :slides
     
-    attr_accessible :category, :enabled, :slide_height, :slide_width, :slide_number, :enable_navigation
-
+    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/lib/spree_multi_slideshow.rb

@@ -1,4 +1,2 @@
 require 'spree_core'
-require 'ckeditor'
-require 'formtastic'
 require 'spree_multi_slideshow/engine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core