pothoven-attachment_fu 3.2.7 → 3.2.8

data/CHANGELOG

@@ -1,6 +1,6 @@
 * Apr 10, 2013 *
 * Ruby 2 compatibility fix
-* Removed some lingering occurrences of RAILS_ROOT
+* Removed some lingering occurrences of RAILS_ROOT and RAILS_ENV
 * clean up of gemspec file
 * no longer package unnecessary files like the test files
 

data/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb

@@ -13,7 +13,7 @@ module Technoweenie # :nodoc:
       #
       # == Configuration
       #
-      # Configuration is done via <tt>Rails.root.to_s/config/rackspace_cloudfiles.yml</tt> and is loaded according to the <tt>RAILS_ENV</tt>.
+      # Configuration is done via <tt>Rails.root.to_s/config/rackspace_cloudfiles.yml</tt> and is loaded according to the <tt>#{Rails.env}</tt>.
       # The minimum connection options that you must specify are a container name, your Mosso login name and your Mosso API key.
       # You can sign up for Cloud Files and get access keys by visiting https://www.mosso.com/buy.htm
       #
@@ -117,7 +117,7 @@ module Technoweenie # :nodoc:
 
           begin
             @@cloudfiles_config_path = base.attachment_options[:cloudfiles_config_path] || (Rails.root.to_s + '/config/rackspace_cloudfiles.yml')
-            @@cloudfiles_config = @@cloudfiles_config = YAML.load(ERB.new(File.read(@@cloudfiles_config_path)).result)[RAILS_ENV].symbolize_keys
+            @@cloudfiles_config = @@cloudfiles_config = YAML.load(ERB.new(File.read(@@cloudfiles_config_path)).result)[Rails.env].symbolize_keys
           rescue
             #raise ConfigFileNotFoundError.new('File %s not found' % @@cloudfiles_config_path)
           end

data/lib/technoweenie/attachment_fu/backends/file_system_backend.rb

@@ -20,12 +20,12 @@ module Technoweenie # :nodoc:
         # The optional thumbnail argument will output the thumbnail's filename.
         def full_filename(thumbnail = nil)
           file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:path_prefix].to_s
-          Rails.root.join( file_system_path, *partitioned_path(thumbnail_name_for(thumbnail))).to_s
+          File.join(Rails.root, file_system_path, *partitioned_path(thumbnail_name_for(thumbnail)))
         end
 
         # Used as the base path that #public_filename strips off full_filename to create the public path
         def base_path
-          @base_path ||= Rails.root.join('public').to_s
+          @base_path ||= File.join(Rails.root, 'public')
         end
 
         # The attachment ID used in the full path of a file

data/lib/technoweenie/attachment_fu/backends/s3_backend.rb

@@ -12,7 +12,7 @@ module Technoweenie # :nodoc:
       #
       # == Configuration
       #
-      # Configuration is done via <tt>#{Rails.root}/config/amazon_s3.yml</tt> and is loaded according to the <tt>RAILS_ENV</tt>.
+      # Configuration is done via <tt>#{Rails.root}/config/amazon_s3.yml</tt> and is loaded according to the <tt>#{Rails.env}</tt>.
       # The minimum connection options that you must specify are a bucket name, your access key id and your secret access key.
       # If you don't already have your access keys, all you need to sign up for the S3 service is an account at Amazon.
       # You can sign up for S3 and get access keys by visiting http://aws.amazon.com/s3.
@@ -184,7 +184,7 @@ module Technoweenie # :nodoc:
 
           begin
             @@s3_config_path = base.attachment_options[:s3_config_path] || (Rails.root.to_s + '/config/amazon_s3.yml')
-            @@s3_config = @@s3_config = YAML.load(ERB.new(File.read(@@s3_config_path)).result)[RAILS_ENV].symbolize_keys
+            @@s3_config = @@s3_config = YAML.load(ERB.new(File.read(@@s3_config_path)).result)[Rails.env].symbolize_keys
           #rescue
           #  raise ConfigFileNotFoundError.new('File %s not found' % @@s3_config_path)
           end
@@ -286,7 +286,7 @@ module Technoweenie # :nodoc:
         #
         # The optional thumbnail argument will output the thumbnail's filename (if any).
         def cloudfront_url(thumbnail = nil)
-          "http://" + cloudfront_distribution_domain + "/" + full_filename(thumbnail)
+          s3_protocol + cloudfront_distribution_domain + "/" + full_filename(thumbnail)
         end
 
         def public_filename(*args)

data/lib/technoweenie/attachment_fu.rb

@@ -1,7 +1,7 @@
 module Technoweenie # :nodoc:
   module AttachmentFu # :nodoc:
     @@default_processors = %w(ImageScience Rmagick MiniMagick Gd2 CoreImage)
-    @@tempfile_path      = Rails.root.join( 'tmp', 'attachment_fu')
+    @@tempfile_path      = File.join(Rails.root, 'tmp', 'attachment_fu')
     @@content_types      = [
       'image/jpeg',
       'image/pjpeg',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pothoven-attachment_fu
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ bindir: bin
 cert_chain: []
 date: 2013-04-10 00:00:00.000000000 Z
 dependencies: []
-description: This is a fork of Rick Olson’s attachment_fu adding Ruby 1.9 and Rails
+description: This is a fork of Rick Olson's attachment_fu adding Ruby 1.9 and Rails
   3.2 support as well as some other enhancements.
 email: steven@pothoven.net
 executables: []