miloops-attachment_fu 3.2.6 → 3.2.7

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

@@ -9,15 +9,15 @@ module Technoweenie # :nodoc:
       #
       # == Requirements
       #
-      # Requires the {Cloud Files Gem}[http://www.mosso.com/cloudfiles.jsp] by Rackspace 
+      # Requires the {Cloud Files Gem}[http://www.mosso.com/cloudfiles.jsp] by Rackspace
       #
       # == Configuration
       #
-      # Configuration is done via <tt>RAILS_ROOT/config/rackspace_cloudfiles.yml</tt> and is loaded according to the <tt>RAILS_ENV</tt>.
+      # Configuration is done via <tt>Rails.root/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 
+      # You can sign up for Cloud Files and get access keys by visiting https://www.mosso.com/buy.htm
       #
-      # Example configuration (RAILS_ROOT/config/rackspace_cloudfiles.yml)
+      # Example configuration (Rails.root/config/rackspace_cloudfiles.yml)
       #
       #   development:
       #     container_name: appname_development
@@ -36,7 +36,7 @@ module Technoweenie # :nodoc:
       #
       # You can change the location of the config path by passing a full path to the :cloudfiles_config_path option.
       #
-      #   has_attachment :storage => :cloud_files, :cloudfiles_config_path => (RAILS_ROOT + '/config/mosso.yml')
+      #   has_attachment :storage => :cloud_files, :cloudfiles_config_path => (Rails.root + '/config/mosso.yml')
       #
       # === Required configuration parameters
       #
@@ -116,8 +116,8 @@ module Technoweenie # :nodoc:
           end
 
           begin
-            @@cloudfiles_config_path = base.attachment_options[:cloudfiles_config_path] || (RAILS_ROOT + '/config/rackspace_cloudfiles.yml')
-            @@cloudfiles_config = @@cloudfiles_config = YAML.load(ERB.new(File.read(@@cloudfiles_config_path)).result)[RAILS_ENV].symbolize_keys
+            @@cloudfiles_config_path = base.attachment_options[:cloudfiles_config_path] || (Rails.root + '/config/rackspace_cloudfiles.yml')
+            @@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
@@ -125,7 +125,7 @@ module Technoweenie # :nodoc:
           @@container_name = @@cloudfiles_config[:container_name]
           @@cf = CloudFiles::Connection.new(@@cloudfiles_config[:username], @@cloudfiles_config[:api_key])
           @@container = @@cf.container(@@container_name)
-          
+
           base.before_update :rename_file
         end
 

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

@@ -9,12 +9,12 @@ module Technoweenie # :nodoc:
         def self.included(base) #:nodoc:
           base.before_update :rename_file
         end
-      
+
         # Gets the full path to the filename in this format:
         #
         #   # This assumes a model name like MyModel
-        #   # public/#{table_name} is the default filesystem path 
-        #   RAILS_ROOT/public/my_models/5/blah.jpg
+        #   # public/#{table_name} is the default filesystem path
+        #   Rails.root/public/my_models/5/blah.jpg
         #
         # Overwrite this method in your model to customize the filename.
         # The optional thumbnail argument will output the thumbnail's filename.
@@ -22,17 +22,17 @@ module Technoweenie # :nodoc:
           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
         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
         end
-      
+
         # The attachment ID used in the full path of a file
         def attachment_path_id
           ((respond_to?(:parent_id) && parent_id) || id) || 0
         end
-      
+
         # Partitions the given path into an array of path components.
         #
         # For example, given an <tt>*args</tt> of ["foo", "bar"], it will return
@@ -42,10 +42,10 @@ module Technoweenie # :nodoc:
         # hashing the string value of the id with SHA-512, and splitting the result
         # into 4 components. If the id a 128-bit UUID (as set by :uuid_primary_key => true)
         # then it will be split into 2 components.
-        # 
+        #
         # To turn this off entirely, set :partition => false.
         def partitioned_path(*args)
-          if respond_to?(:attachment_options) && attachment_options[:partition] == false 
+          if respond_to?(:attachment_options) && attachment_options[:partition] == false
             args
           elsif attachment_options[:uuid_primary_key]
             # Primary key is a 128-bit UUID in hex format. Split it into 2 components.
@@ -65,13 +65,13 @@ module Technoweenie # :nodoc:
             end
           end
         end
-      
+
         # Gets the public path to the file
         # The optional thumbnail argument will output the thumbnail's filename.
         def public_filename(thumbnail = nil)
           full_filename(thumbnail).gsub %r(^#{Regexp.escape(base_path)}), ''
         end
-      
+
         def filename=(value)
           @old_filename = full_filename unless filename.nil? || @old_filename
           write_attribute :filename, sanitize_filename(value)
@@ -104,7 +104,7 @@ module Technoweenie # :nodoc:
             @old_filename =  nil
             true
           end
-          
+
           # Saves the file to the file system
           def save_to_storage
             if save_attachment?
@@ -116,7 +116,7 @@ module Technoweenie # :nodoc:
             @old_filename = nil
             true
           end
-          
+
           def current_data
             File.file?(full_filename) ? File.read(full_filename) : nil
           end

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.
@@ -20,7 +20,7 @@ module Technoweenie # :nodoc:
       # If you wish to use Amazon CloudFront to serve the files, you can also specify a distibution domain for the bucket.
       # To read more about CloudFront, visit http://aws.amazon.com/cloudfront
       #
-      # Example configuration (RAILS_ROOT/config/amazon_s3.yml)
+      # Example configuration (Rails.root/config/amazon_s3.yml)
       #
       #   development:
       #     bucket_name: appname_development
@@ -42,7 +42,7 @@ module Technoweenie # :nodoc:
       #
       # You can change the location of the config path by passing a full path to the :s3_config_path option.
       #
-      #   has_attachment :storage => :s3, :s3_config_path => (RAILS_ROOT + '/config/s3.yml')
+      #   has_attachment :storage => :s3, :s3_config_path => (Rails.root + '/config/s3.yml')
       #
       # === Required configuration parameters
       #
@@ -158,9 +158,9 @@ module Technoweenie # :nodoc:
       #
       # Niether <tt>base_path</tt> or <tt>full_filename</tt> include the bucket name as part of the path.
       # You can retrieve the bucket name using the <tt>bucket_name</tt> method.
-      # 
+      #
       # === Accessing CloudFront URLs
-      # 
+      #
       # You can get an object's CloudFront URL using the cloudfront_url accessor.  Using the example from above:
       # @postcard.cloudfront_url # => http://XXXX.cloudfront.net/photos/1/mexico.jpg
       #
@@ -183,7 +183,7 @@ module Technoweenie # :nodoc:
           end
 
           begin
-            @@s3_config_path = base.attachment_options[:s3_config_path] || (RAILS_ROOT + '/config/amazon_s3.yml')
+            @@s3_config_path = base.attachment_options[:s3_config_path] || (Rails.root + '/config/amazon_s3.yml')
             @@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)
@@ -216,7 +216,7 @@ module Technoweenie # :nodoc:
         def self.port_string
           @port_string ||= (s3_config[:port].nil? || s3_config[:port] == (s3_config[:use_ssl] ? 443 : 80)) ? '' : ":#{s3_config[:port]}"
         end
-        
+
         def self.distribution_domain
           @distribution_domain = s3_config[:distribution_domain]
         end
@@ -233,7 +233,7 @@ module Technoweenie # :nodoc:
           def s3_port_string
             Technoweenie::AttachmentFu::Backends::S3Backend.port_string
           end
-          
+
           def cloudfront_distribution_domain
             Technoweenie::AttachmentFu::Backends::S3Backend.distribution_domain
           end
@@ -269,26 +269,26 @@ module Technoweenie # :nodoc:
         #
         # The resulting url is in the form: <tt>http(s)://:server/:bucket_name/:table_name/:id/:file</tt> where
         # the <tt>:server</tt> variable defaults to <tt>AWS::S3 URL::DEFAULT_HOST</tt> (s3.amazonaws.com) and can be
-        # set using the configuration parameters in <tt>RAILS_ROOT/config/amazon_s3.yml</tt>.
+        # set using the configuration parameters in <tt>Rails.root/config/amazon_s3.yml</tt>.
         #
         # The optional thumbnail argument will output the thumbnail's filename (if any).
         def s3_url(thumbnail = nil)
           File.join(s3_protocol + s3_hostname + s3_port_string, bucket_name, full_filename(thumbnail))
         end
-        
+
         # All public objects are accessible via a GET request to CloudFront. You can generate a
         # url for an object using the cloudfront_url method.
         #
         #   @photo.cloudfront_url
         #
         # The resulting url is in the form: <tt>http://:distribution_domain/:table_name/:id/:file</tt> using
-        # the <tt>:distribution_domain</tt> variable set in the configuration parameters in <tt>RAILS_ROOT/config/amazon_s3.yml</tt>.
+        # the <tt>:distribution_domain</tt> variable set in the configuration parameters in <tt>Rails.root/config/amazon_s3.yml</tt>.
         #
         # The optional thumbnail argument will output the thumbnail's filename (if any).
         def cloudfront_url(thumbnail = nil)
           "http://" + cloudfront_distribution_domain + "/" + full_filename(thumbnail)
         end
-        
+
         def public_filename(*args)
           if attachment_options[:cloudfront]
             cloudfront_url(args)
@@ -347,7 +347,7 @@ module Technoweenie # :nodoc:
         def s3_port_string
           Technoweenie::AttachmentFu::Backends::S3Backend.port_string
         end
-        
+
         def cloudfront_distribution_domain
           Technoweenie::AttachmentFu::Backends::S3Backend.distribution_domain
         end

data/test/test_helper.rb

@@ -2,10 +2,10 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..'
+ENV['Rails.root'] ||= File.dirname(__FILE__) + '/../../../..'
 
 require 'test/unit'
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
+require File.expand_path(File.join(ENV['Rails.root'], 'config/environment.rb'))
 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
@@ -13,7 +13,7 @@ ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 db_adapter = ENV['DB']
 
 # no db passed, try one of these fine config-free DBs before bombing.
-db_adapter ||= 
+db_adapter ||=
   begin
     require 'rubygems'
     require 'sqlite'
@@ -52,7 +52,7 @@ class Test::Unit::TestCase #:nodoc:
     DbFile.transaction { [Attachment, FileAttachment, OrphanAttachment, MinimalAttachment, DbFile].each { |klass| klass.delete_all } }
     attachment_model self.class.attachment_model
   end
-  
+
   def teardown
     FileUtils.rm_rf File.join(File.dirname(__FILE__), 'files')
     # Files generated by random_tempfile_filename
@@ -63,7 +63,7 @@ class Test::Unit::TestCase #:nodoc:
   #self.use_instantiated_fixtures  = false
 
   def self.attachment_model(klass = nil)
-    @attachment_model = klass if klass 
+    @attachment_model = klass if klass
     @attachment_model
   end
 
@@ -97,7 +97,7 @@ class Test::Unit::TestCase #:nodoc:
         return att
       end
     end
-    
+
     def use_temp_file(fixture_filename)
       temp_path = File.join('/tmp', File.basename(fixture_filename))
       temp_dir = File.join(FIXTURE_PATH, 'tmp')
@@ -121,10 +121,10 @@ class Test::Unit::TestCase #:nodoc:
       end
     end
 
-    def assert_valid(record) 
+    def assert_valid(record)
       assert record.valid?, record.errors.full_messages.join("\n")
-    end 
-    
+    end
+
     def assert_file_jpeg_quality(model, thumbnail, expected)
       filename = if model.respond_to?(:full_filename)
         model.full_filename(thumbnail)
@@ -145,11 +145,11 @@ class Test::Unit::TestCase #:nodoc:
         STDERR.puts "ImageMagick's identify not found / not in PATH: can't quickly check produced image quality."
       end
     end
-    
+
     def assert_not_created
       assert_created(0) { yield }
     end
-    
+
     def should_reject_by_size_with(klass)
       attachment_model klass
       assert_not_created do
@@ -159,22 +159,22 @@ class Test::Unit::TestCase #:nodoc:
         assert_nil attachment.db_file if attachment.respond_to?(:db_file)
       end
     end
-    
+
     def assert_difference(object, method = nil, difference = 1)
       initial_value = object.send(method)
       yield
       assert_equal initial_value + difference, object.send(method)
     end
-    
+
     def assert_no_difference(object, method, &block)
       assert_difference object, method, 0, &block
     end
-    
+
     def attachment_model(klass = nil)
-      @attachment_model = klass if klass 
+      @attachment_model = klass if klass
       @attachment_model
     end
 end
 
 require File.join(File.dirname(__FILE__), 'fixtures/attachment')
-require File.join(File.dirname(__FILE__), 'base_attachment_tests')
+require File.join(File.dirname(__FILE__), 'base_attachment_tests')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miloops-attachment_fu
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
   prerelease: 
 platform: ruby
 authors: