spree_banner 1.0.8 → 1.1.0

data/README.md

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

data/app/models/spree/banner.rb

@@ -1,14 +1,14 @@
 module Spree
   class Banner < ActiveRecord::Base
     attr_accessible :title, :url, :category, :position, :enabled, :attachment, :attachment_width, :attachment_height
-        
+    
     has_attached_file :attachment,
                 :url  => "/spree/banner/:id/:style_:basename.:extension",
                 :path => ":rails_root/public/spree/banner/:id/:style_:basename.:extension",
                 #:default_url => "/missing/:style.jpg",
-                :styles => {
+                :styles => lambda {|a|
                       :thumbnail => "80x80#",
-                      :custom => Proc.new { |instance| "#{instance.attachment_width}x#{instance.attachment_height}#" }
+                      :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
                 },
                 :convert_options => {
                       :thumbnail => "-gravity center"
@@ -25,21 +25,21 @@ module Spree
     # Load S3 settings
     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')
-      }
+              :storage => 's3',
+              :s3_credentials => Rails.root.join('config', 's3.yml')
+            }
     elsif (FileTest.exist?(Rails.root.join('config', 's3.yml')) && ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET'])
       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
+              :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)
     

data/db/migrate/20120116204313_create_banners.rb

@@ -6,7 +6,7 @@ class CreateBanners < ActiveRecord::Migration
       t.integer :position
       t.boolean :enabled
       
-      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_width, :attachment_height, :default => 100
       t.integer  :attachment_size

data/lib/spree_banner.rb

@@ -1,3 +1,2 @@
 require 'spree_core'
-require 'formtastic'
 require 'spree_banner/engine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_banner
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  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