attached 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f81c42cd479108c958a84a9966d008bb2c87a75
-  data.tar.gz: bb75fc41644ec18ca88bd54f52410e568682ebfc
+  metadata.gz: e04c7e6d4ae5b9e01aa1bf4e2e6d9f2d7450561f
+  data.tar.gz: 96a3e72f4edd2adff2a8245ba0e761971219025a
 SHA512:
-  metadata.gz: e807e3176e5c10caa1c6903377162bf1382ed32ae5b4131a2c2bbe108ab13aa4d413667ef3af308b129d2713c4f951cd060097562ce075b72c8ecd1905dd9db1
-  data.tar.gz: 11498ab85fb206aea6194167645181a9187be4ececbd5605c95616d05664da8907e8bed2ce68480ab83d8a72566647d688e506b6275d7bdb124682da3d2193cf
+  metadata.gz: 13c9e025f9b53c7eff234b0cf64daf44e24ee4b1c1e1a41735f485d4c7e872472c9391653730ae4427f0ca38e6400d9beae15085b8912395f8d1ed085061be7e
+  data.tar.gz: ecee752043b0387cec8b7090cacde98876c185692dda2f2ad8076d3533ef989647d02d81e091ba95bad3609b6bfd1d7610df1b315fc62078e35bdae88d9a0c2f

data/README.rdoc

@@ -6,6 +6,7 @@ Attached is a Ruby on Rails file attachment tool that lets users upload to the c
 
 The gem is tested with:
 
+* Ruby on Rails 4.0.0.rc
 * Ruby on Rails 3.1.9
 * Ruby on Rails 3.2.10
 * Ruby (MRI) 2.0.0
@@ -159,7 +160,7 @@ View:
 === Aliases
 
   # app/initializer/attached.rb
-  Attached::Attachment.options[:alias] = https://storage.ksylvest.com/
+  Attached::Attachment.options[:alias] = "https://storage.ksylvest.com/"
 
   # app/initializer/attached.rb
   Attached::Attachment.options[:aliases] = %w(
@@ -169,6 +170,11 @@ View:
     https://d.storage.ksylvest.com/
   )
 
+=== Metadata
+
+  # app/initializers/attached.rb
+  Attached::Attachment.options[:metadata] = { 'Cache-Control' => 'max-age=3153600' }
+
 == Status
 
 {<img src="https://travis-ci.org/ksylvest/attached.png" />}[https://travis-ci.org/ksylvest/attached]

data/lib/attached/attachment.rb

@@ -47,6 +47,7 @@ module Attached
         :default     => :original,
         :medium      => :local,
         :credentials => {},
+        :metadata    => { 'Cache-Control' => 'max-age=3153600' }
       }
     end
 

data/lib/attached/storage/aws.rb

@@ -1,18 +1,11 @@
-require 'attached/storage/base'
-
-begin
-  require 'fog'
-rescue LoadError
-  raise "installation of 'fog' is required before using 'aws' for storage"
-end
+require 'attached/storage/fog'
+require 'fog'
 
 
 module Attached
   module Storage
-    class AWS < Base
-
+    class AWS < Fog
 
-      attr_reader :permissions
 
       attr_reader :bucket
       attr_reader :access_key_id
@@ -27,9 +20,9 @@ module Attached
       #   Attached::Storage::AWS.new("aws.yml")
 
       def initialize(credentials)
-        credentials = parse(credentials)
+        super
 
-        @permissions       = { :public => true }
+        credentials = parse(credentials)
 
         @bucket            = credentials[:bucket]            || credentials['bucket']
         @access_key_id     = credentials[:access_key_id]     || credentials['access_key_id']
@@ -50,71 +43,16 @@ module Attached
       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 = connection.directories.get(self.bucket)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-
-        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file)))
-
-        file.close
-      end
-
-
-      # Retrieve a file from a given path.
-      #
-      # Parameters:
-      #
-      # * path - The path to retrieve.
-
-      def retrieve(path)
-        directory = connection.directories.get(self.bucket)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-
-        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 = connection.directories.get(self.bucket)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-
-        file = directory.files.get(path)
-        file.destroy if file
-      end
+    private
 
 
-    private
+    def directory()
+      connection.directories.get(self.bucket) || connection.directories.create(self.defaults.merge(:key => self.bucket))
+    end
 
 
       def connection
-        @connection ||= Fog::Storage.new(
+        @connection ||= ::Fog::Storage.new(
           :aws_secret_access_key => self.secret_access_key,
           :aws_access_key_id     => self.access_key_id,
           :provider => 'AWS'
@@ -124,4 +62,4 @@ module Attached
 
     end
   end
-end
+end

data/lib/attached/storage/fog.rb

@@ -0,0 +1,98 @@
+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] }
+      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)))
+        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,18 +1,10 @@
-require 'attached/storage/base'
-
-begin
-  require 'fog'
-rescue LoadError
-  raise "installation of 'fog' is required before using 'google' for storage"
-end
+require 'attached/storage/fog'
 
 
 module Attached
   module Storage
-    class Google < Base
-
+    class Google < Fog
 
-      attr_reader :permissions
 
       attr_reader :bucket
       attr_reader :access_key_id
@@ -27,9 +19,10 @@ module Attached
       #   Attached::Storage::Google.new("google.yml")
 
       def initialize(credentials)
+        super
+
         credentials = parse(credentials)
 
-        @permissions       = { :public => true }
 
         @bucket            = credentials[:bucket]            || credentials['bucket']
         @access_key_id     = credentials[:access_key_id]     || credentials['access_key_id']
@@ -50,71 +43,16 @@ module Attached
       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 = connection.directories.get(self.bucket)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-
-        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file)))
-
-        file.close
-      end
-
-
-      # Retrieve a file from a given path.
-      #
-      # Parameters:
-      #
-      # * path - The path to retrieve.
-
-      def retrieve(path)
-        directory = connection.directories.get(self.bucket)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-
-        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.
+    private
 
-      def destroy(path)
-        directory = connection.directories.get(self.bucket)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
 
-        file = directory.files.get(path)
-        file.destroy if file
+      def directory()
+        connection.directories.get(self.bucket) || connection.directories.create(self.defaults.merge(:key => self.bucket))
       end
 
 
-    private
-
-
       def connection
-        @connection ||= Fog::Storage.new(
+        @connection ||= ::Fog::Storage.new(
           :google_storage_secret_access_key => self.secret_access_key,
           :google_storage_access_key_id     => self.access_key_id,
           :provider => 'Google'

data/lib/attached/storage/local.rb

@@ -1,5 +1,6 @@
 require 'attached/storage/base'
 
+
 module Attached
   module Storage
     class Local < Base

data/lib/attached/storage/rackspace.rb

@@ -1,18 +1,12 @@
 require 'attached/storage/base'
-
-begin
-  require 'fog'
-rescue LoadError
-  raise "installation of 'fog' is required before using 'rackspace' for storage"
-end
+require 'fog'
 
 
 module Attached
   module Storage
-    class Rackspace < Base
+    class Rackspace < Fog
 
 
-      attr_reader :permissions
       attr_reader :container
       attr_reader :username
       attr_reader :api_key
@@ -26,9 +20,9 @@ module Attached
       #   Attached::Storage::Rackspace.new("rackspace.yml")
 
       def initialize(credentials)
-        credentials = parse(credentials)
+        super
 
-        @permissions  = { :public => true }
+        credentials = parse(credentials)
 
         @container    = credentials[:container] || credentials['container']
         @username     = credentials[:username]  || credentials['username']
@@ -49,71 +43,16 @@ module Attached
       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 = connection.directories.get(self.container)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.container))
-
-        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file)))
-
-        file.close
-      end
-
-
-      # Retrieve a file from a given path.
-      #
-      # Parameters:
-      #
-      # * path - The path to retrieve.
-
-      def retrieve(path)
-        directory = connection.directories.get(self.bucket)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-
-        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 = connection.directories.get(self.container)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.container))
-
-        file = directory.files.get(path)
-        file.destroy if file
-      end
+    private
 
 
-    private
+    def directory()
+      connection.directories.get(self.container) || connection.directories.create(self.defaults.merge(:key => self.container))
+    end
 
 
       def connection
-        @connection ||= Fog::Storage.new(
+        @connection ||= ::Fog::Storage.new(
           :rackspace_username => self.username,
           :rackspace_api_key  => self.api_key,
           :provider => 'Rackspace'