attached 1.0.4 → 1.0.5

data/lib/attached/railtie.rb

@@ -2,6 +2,7 @@ require 'attached'
 require 'rails'
 
 module Attached
+
   class Railtie < Rails::Railtie
 
     rake_tasks do
@@ -14,5 +15,7 @@ module Attached
         ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Attached::Definition
       end
     end
+
   end
-end
+
+end

data/lib/attached/storage.rb

@@ -7,7 +7,6 @@ require 'attached/storage/local'
 module Attached
   module Storage
 
-
     # Create a storage object given a medium and credentials.
     #
     # Usage:
@@ -19,19 +18,16 @@ module Attached
     #   Attached::Storage.storage(Attached::Storage::Custom.new)
 
     def self.storage(storage, credentials)
-
       return storage if storage.is_a? Attached::Storage::Base
-
       case storage
-        when :aws       then return Attached::Storage::AWS.new       credentials
-        when :google    then return Attached::Storage::Google.new    credentials
+        when :aws then return Attached::Storage::AWS.new credentials
+        when :google then return Attached::Storage::Google.new credentials
         when :rackspace then return Attached::Storage::Rackspace.new credentials
-        when :local     then return Attached::Storage::Local.new
+        when :local then return Attached::Storage::Local.new
         else raise "undefined storage '#{storage}'"
       end
-
     end
 
-
   end
-end
+
+end

data/lib/attached/storage/aws.rb

@@ -1,17 +1,14 @@
 require 'attached/storage/fog'
 require 'fog'
 
-
 module Attached
   module Storage
     class AWS < Fog
 
-
       attr_reader :bucket
       attr_reader :access_key_id
       attr_reader :secret_access_key
 
-
       # Create a new interface supporting save and destroy operations.
       #
       # Usage:
@@ -21,17 +18,13 @@ module Attached
 
       def initialize(credentials)
         super
-
         credentials = parse(credentials)
-
         @bucket            = credentials[:bucket]            || credentials['bucket']
         @access_key_id     = credentials[:access_key_id]     || credentials['access_key_id']
         @secret_access_key = credentials[:secret_access_key] || credentials['secret_access_key']
-
         raise "'bucket' must be specified if using 'aws' for storage" unless @bucket
       end
 
-
       # Access the host (e.g. bucket.s3.amazonaws.com) for a storage service.
       #
       # Usage:
@@ -42,24 +35,20 @@ module Attached
         "https://#{self.bucket}.s3.amazonaws.com/"
       end
 
-
     private
 
-
-    def directory()
-      connection.directories.get(self.bucket) || connection.directories.create(self.defaults.merge(:key => self.bucket))
-    end
-
+      def directory()
+        connection.directories.get(self.bucket) || connection.directories.create(self.defaults.merge(key: self.bucket))
+      end
 
       def connection
         @connection ||= ::Fog::Storage.new(
-          :aws_secret_access_key => self.secret_access_key,
-          :aws_access_key_id     => self.access_key_id,
-          :provider => 'AWS'
+          aws_secret_access_key: self.secret_access_key,
+          aws_access_key_id: self.access_key_id,
+          provider: 'AWS'
         )
       end
 
-
     end
   end
 end

data/lib/attached/storage/base.rb

@@ -2,7 +2,6 @@ module Attached
   module Storage
     class Base
 
-
       # Helper for parsing credentials from a hash, file, or string.
       #
       # Usage:
@@ -20,7 +19,6 @@ module Attached
         end
       end
 
-
       # Helper for determining options from a file
       #
       # Usage:
@@ -32,7 +30,6 @@ module Attached
 
       def options(path)
         options = {}
-
         options[:content_type] = case File.extname(path)
         when /tiff/ then "image/tiff"
         when /tif/  then "image/tiff"
@@ -58,11 +55,9 @@ module Attached
         when /txt/  then "text/plain"
         when /csv/  then "text/csv"
         end
-
         return options
       end
 
-
       # Create a new file system storage interface supporting save and destroy operations.
       #
       # Usage:
@@ -73,7 +68,6 @@ module Attached
         raise NotImplementedError.new
       end
 
-
       # Access the host for a storage service or return null if local.
       #
       # Usage:
@@ -84,7 +78,6 @@ module Attached
         raise NotImplementedError.new
       end
 
-
       # Save a file to a given path (abstract).
       #
       # Parameters:
@@ -96,7 +89,6 @@ module Attached
         raise NotImplementedError.new
       end
 
-
       # Retrieve a file from a given path.
       #
       # Parameters:
@@ -107,7 +99,6 @@ module Attached
         raise NotImplementedError.new
       end
 
-
       # Destroy a file at a given path (abstract).
       #
       # Parameters:
@@ -120,4 +111,4 @@ module Attached
 
     end
   end
-end
+end

data/lib/attached/storage/error.rb

@@ -3,4 +3,4 @@ module Attached
     class Error < StandardError
     end
   end
-end
+end

data/lib/attached/storage/fog.rb

@@ -1,98 +1,74 @@
 require 'attached/storage/base'
 require 'fog'
 
-
 module Attached
   module Storage
     class Fog < Base
 
-
       attr_reader :defaults
 
-      attr_reader :bucket
-      attr_reader :access_key_id
-      attr_reader :secret_access_key
-
-
       # Create a new interface supporting save and destroy operations (should be overridden and called).
-
       def initialize(credentials)
-        @defaults = { :public => true, :metadata => Attached::Attachment.options[:metadata] }
+        @defaults = { public: true, metadata: Attached::Attachment.options[:metadata] }
       end
 
-
       # Access the host for a storage service (must override).
       #
       # Usage:
       #
       #   storage.host
-
       def host()
         raise NotImplementedError.new
       end
 
-
       # Save a file to a given path.
       #
       # Parameters:
       #
       # * file - The file to save.
       # * path - The path to save.
-
       def save(file, path)
         file = File.open(file.path)
-        directory.files.create(self.options(path).merge(self.defaults.merge(:key => path, :body => file)))
+        directory.files.create(self.options(path).merge(self.defaults.merge(key: path, body: file)))
         file.close
       end
 
-
       # Retrieve a file from a given path.
       #
       # Parameters:
       #
       # * path - The path to retrieve.
-
       def retrieve(path)
         file = directory.files.get(path)
-
         body = file.body
-
         extname = File.extname(path)
         basename = File.basename(path, extname)
-
         file = Tempfile.new([basename, extname])
         file.binmode
         file.write(body)
         file.rewind
-
         file
       end
 
-
       # Destroy a file at a given path.
       #
       # Parameters:
       #
       # * path - The path to destroy.
-
       def destroy(path)
         directory.files.get(path).destroy if directory.files.head(path)
       end
 
-
     private
 
-
       def directory
         raise NotImplementedError.new
       end
 
-
       def connection
         raise NotImplementedError.new
       end
 
-
     end
   end
 end

data/lib/attached/storage/google.rb

@@ -1,65 +1,52 @@
 require 'attached/storage/fog'
 
-
 module Attached
   module Storage
     class Google < Fog
 
-
       attr_reader :bucket
       attr_reader :access_key_id
       attr_reader :secret_access_key
 
-
       # Create a new interface supporting save and destroy operations.
       #
       # Usage:
       #
       #   Attached::Storage::Google.new()
       #   Attached::Storage::Google.new("google.yml")
-
       def initialize(credentials)
         super
-
         credentials = parse(credentials)
 
-
         @bucket            = credentials[:bucket]            || credentials['bucket']
         @access_key_id     = credentials[:access_key_id]     || credentials['access_key_id']
         @secret_access_key = credentials[:secret_access_key] || credentials['secret_access_key']
-
         raise "'bucket' must be specified if using 'google' for storage" unless @bucket
       end
 
-
       # Access the host (e.g. https://attached.commondatastorage.googleapis.com/) for a storage service.
       #
       # Usage:
       #
       #   storage.host
-
       def host()
         "https://#{self.bucket}.commondatastorage.googleapis.com/"
       end
 
-
     private
 
-
       def directory()
-        connection.directories.get(self.bucket) || connection.directories.create(self.defaults.merge(:key => self.bucket))
+        connection.directories.get(self.bucket) || connection.directories.create(self.defaults.merge(key: self.bucket))
       end
 
-
       def connection
         @connection ||= ::Fog::Storage.new(
-          :google_storage_secret_access_key => self.secret_access_key,
-          :google_storage_access_key_id     => self.access_key_id,
-          :provider => 'Google'
+          google_storage_secret_access_key: self.secret_access_key,
+          google_storage_access_key_id: self.access_key_id,
+          provider: 'Google'
         )
       end
 
-
     end
   end
-end
+end

data/lib/attached/storage/local.rb

@@ -1,14 +1,11 @@
 require 'attached/storage/base'
 
-
 module Attached
   module Storage
     class Local < Base
 
-
       attr_reader :mode
 
-
       # Create a new interface supporting save and destroy operations.
       #
       # Usage:
@@ -19,7 +16,6 @@ module Attached
         @mode = 0644
       end
 
-
       # Access the host (e.g. /system/) for a storage service.
       #
       # Usage:
@@ -30,7 +26,6 @@ module Attached
         "/system/"
       end
 
-
       # Save a file to a given path.
       #
       # Parameters:
@@ -41,9 +36,7 @@ module Attached
       def save(file, path)
         path = "#{Rails.root}/public/system/#{path}"
         dirname, basename = File.split(path)
-
         return if file.path == path
-
         begin
           FileUtils.mkdir_p(dirname)
           FileUtils.cp(file.path, path)
@@ -52,7 +45,6 @@ module Attached
         end
       end
 
-
       # Retrieve a file from a given path.
       #
       # Parameters:
@@ -61,11 +53,9 @@ module Attached
 
       def retrieve(path)
         path = "#{Rails.root}/public/system/#{path}"
-
         File.open(path)
       end
 
-
       # Destroy a file at a given path.
       #
       # Parameters:
@@ -75,14 +65,12 @@ module Attached
       def destroy(path)
         path = "#{Rails.root}/public/system/#{path}"
         dirname, basename = File.split(path)
-
         begin
           FileUtils.rm(path)
         rescue Errno::ENOENT
         end
       end
 
-
     end
   end
-end
+end

data/lib/attached/storage/rackspace.rb

@@ -1,17 +1,14 @@
 require 'attached/storage/base'
 require 'fog'
 
-
 module Attached
   module Storage
     class Rackspace < Fog
 
-
       attr_reader :container
       attr_reader :username
       attr_reader :api_key
 
-
       # Create a new interface supporting save and destroy operations.
       #
       # Usage:
@@ -21,17 +18,13 @@ module Attached
 
       def initialize(credentials)
         super
-
         credentials = parse(credentials)
-
         @container    = credentials[:container] || credentials['container']
         @username     = credentials[:username]  || credentials['username']
         @api_key      = credentials[:api_key]   || credentials['api_key']
-
         raise "'container' must be specified if using 'rackspace' for storage" unless @container
       end
 
-
       # Access the host (e.g. https://storage.clouddrive.com/container) for a storage service.
       #
       # Usage:
@@ -42,24 +35,20 @@ module Attached
         "https://storage.clouddrive.com/#{self.container}/"
       end
 
-
     private
 
-
-    def directory()
-      connection.directories.get(self.container) || connection.directories.create(self.defaults.merge(:key => self.container))
-    end
-
+      def directory()
+        connection.directories.get(self.container) || connection.directories.create(self.defaults.merge(key: self.container))
+      end
 
       def connection
         @connection ||= ::Fog::Storage.new(
-          :rackspace_username => self.username,
-          :rackspace_api_key  => self.api_key,
-          :provider => 'Rackspace'
+          rackspace_username: self.username,
+          rackspace_api_key: self.api_key,
+          provider: 'Rackspace'
         )
       end
 
-
     end
   end
-end
+end