spree_multi_slideshow 1.0.2 → 1.0.3

data/README.md

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

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

@@ -15,7 +15,6 @@ module Spree
       end
 
       protected
-
       def location_after_save
         admin_slideshow_type_slides_url(@slideshow_type)
       end

data/app/models/spree/slide.rb

@@ -2,11 +2,8 @@ module Spree
   class Slide < ActiveRecord::Base    
     belongs_to :slideshow_type
     
-    attr_accessible :title, :url, :content, :attachment, :position
-    
-    validates_presence_of :slideshow_type_id
-    
     attr_accessor :attachment_width, :attachment_height
+    attr_accessible :title, :url, :content, :attachment, :position, :attachment_width, :attachment_height    
     
     has_attached_file :attachment,
             :url  => "/spree/slides/:id/:style_:basename.:extension",
@@ -16,7 +13,7 @@ module Spree
                   :small => "300x100#",
                   :medium => "600x200#",
                   :slide => "900x300#",
-                  :custom => lambda {|instance| "#{instance.attachment_width}x#{instance.attachment_height}#"}
+                  :custom => Proc.new {|instance| "#{instance.attachment_width}x#{instance.attachment_height}#"}
             },
             :convert_options => {
                   :thumbnail => "-gravity center",
@@ -26,7 +23,9 @@ module Spree
                   :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"
     
     # Load S3 settings
     if (!YAML.load_file(Rails.root.join('config', 's3.yml'))[Rails.env].blank?)

data/db/migrate/20120116083546_create_slides.rb

@@ -4,7 +4,7 @@ class CreateSlides < ActiveRecord::Migration
       t.string :title, :url
       t.text :content
       
-      t.string   :attachment_content_type, :attachment_file_name, :attachment_content_type
+      t.string   :attachment_content_type, :attachment_file_name
       t.datetime :attachment_updated_at
       t.integer  :attachment_size, :position
       t.string   :type, :limit => 75

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

@@ -1,7 +1,16 @@
 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: spree_auth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement