spree_banner 1.1.1 → 1.1.2

data/app/helpers/spree/banners_helper.rb

@@ -22,6 +22,6 @@ module Spree
         
       end
     end
-
+    
   end
 end

data/app/models/spree/banner.rb

@@ -5,13 +5,13 @@ module Spree
     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 => lambda {|a|
-                      :thumbnail => "80x80#",
-                      :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
-                },
+                :styles => lambda {|a| {
+                  :thumbnail => "80x80#",
+                  :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
+                }},
                 :convert_options => {
-                      :thumbnail => "-gravity center"
+                  :thumbnail => "-gravity center",
+                  :custom => "-gravity center"
                 }
     
     after_post_process :find_dimensions
@@ -22,27 +22,22 @@ module Spree
     
     scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
     
-    # 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')
-            }
-    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' }
+    # Load user defined paperclip settings
+    if Spree::Config[:use_s3]
+      s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
+      Spree::Banner.attachment_definitions[:attachment][:storage] = :s3
+      Spree::Banner.attachment_definitions[:attachment][:s3_credentials] = s3_creds
+      Spree::Banner.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+      Spree::Banner.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+      Spree::Banner.attachment_definitions[:attachment][:s3_protocol] = Spree::Config[:s3_protocol] unless Spree::Config[:s3_protocol].blank?
     end
-    
-    attachment_definitions[:attachment] = (attachment_definitions[:attachment] || {}).merge(S3_OPTIONS)
-    
+
+    Spree::Banner.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+    Spree::Banner.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+    Spree::Banner.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
+    Spree::Banner.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
+    Spree::Banner.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
+        
     def initialize(*args)
       super(*args)
       last_banner = Banner.last
@@ -50,12 +45,14 @@ module Spree
     end
     
     def find_dimensions
-      temporary = attachment.queued_for_write[:original]
-      filename = temporary.path unless temporary.nil?
-      filename = attachment.path if filename.blank?
-      geometry = Paperclip::Geometry.from_file(filename)
-      self.attachment_width  = geometry.width
-      self.attachment_height = geometry.height
+      if self.attachment_width.blank? && self.attachment_height.blank?
+        temporary = attachment.queued_for_write[:original]
+        filename = temporary.path unless temporary.nil?
+        filename = attachment.path if filename.blank?
+        geometry = Paperclip::Geometry.from_file(filename)
+        self.attachment_width  = geometry.width
+        self.attachment_height = geometry.height
+      end
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_banner
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core