paperclip-dropbox 1.1.3 → 1.1.4

data/lib/paperclip/storage/dropbox/credentials.rb

@@ -0,0 +1,66 @@
+require "yaml"
+require "erb"
+require "pathname"
+require "active_support/core_ext/hash/keys"
+
+module Paperclip
+  module Storage
+    module Dropbox
+      class Credentials
+        def initialize(credentials)
+          @credentials = credentials
+        end
+
+        def fetch(namespace = nil)
+          parse!(namespace)
+          validate!
+          @credentials
+        end
+
+        def parse!(namespace = nil)
+          @credentials =
+            case @credentials
+            when File
+              YAML.load(ERB.new(File.read(@credentials.path)).result)
+            when String, Pathname
+              YAML.load(ERB.new(File.read(@credentials)).result)
+            when Hash
+              @credentials
+            else
+              raise ArgumentError, ":dropbox_credentials is not a path, file, nor a hash"
+            end
+
+          @credentials.stringify_keys!
+          @credentials = @credentials[namespace.to_s] || @credentials
+          @credentials.symbolize_keys!
+        end
+
+        def validate!
+          validate_presence!
+          validate_inclusion!
+        end
+
+        private
+
+        def validate_presence!
+          REQUIRED_KEYS.each do |key|
+            value = @credentials.fetch(key)
+            raise KeyError, ":#{key} credential is nil" if value.nil?
+          end
+        end
+
+        def validate_inclusion!
+          if @credentials[:access_type] and not %w[dropbox app_folder].include?(@credentials[:access_type])
+            raise KeyError, %(:access_type must be either "dropbox" or "app_folder" (was "#{@credentials[:access_type]}"))
+          end
+        end
+
+        REQUIRED_KEYS = [
+          :app_key, :app_secret,
+          :access_token, :access_token_secret,
+          :user_id
+        ]
+      end
+    end
+  end
+end

data/lib/paperclip/storage/dropbox/path_generator.rb

@@ -0,0 +1,59 @@
+require "active_support/core_ext/object/blank"
+require "active_support/core_ext/string/strip"
+
+module Paperclip
+  module Storage
+    module Dropbox
+      class PathGenerator
+        def initialize(attachment, attachment_options)
+          @attachment = attachment
+          @attachment_options = attachment_options
+        end
+
+        def generate(style)
+          path = if normal_path_style?
+                   generate_from_string(style)
+                 else
+                   generate_from_proc(style)
+                 end
+          path = File.join("Public", path) if @attachment.full_dropbox?
+          path
+        end
+
+        private
+
+        def normal_path_style?
+          @attachment_options[:path].present?
+        end
+
+        def generate_from_string(style)
+          @attachment_options[:interpolator].interpolate(@attachment.send(:path_option), @attachment, style)
+        end
+
+        def generate_from_proc(style)
+          path = @attachment.instance.instance_exec(style, &file_path_proc)
+          style_suffix = (style != @attachment.default_style ? "_#{style}" : "")
+
+          extension = File.extname(@attachment.original_filename)
+          if extension.present? and path =~ /#{extension}$/
+            path.sub(extension, style_suffix + extension)
+          else
+            path + style_suffix
+          end
+        end
+
+        # Oh my god, this is so ugly, why did I do ever do this? Ah, well, If nothing,
+        # it demonstrates what kind of evil things you can do in Ruby :)
+        def file_path_proc
+          return @attachment_options[:dropbox_options][:path] if @attachment_options[:dropbox_options][:path]
+
+          if @attachment_options[:dropbox_options][:unique_filename]
+            eval %(proc { |style| "\#{self.class.model_name.underscore}_\#{id}_\#{#{@attachment.name}.name}" })
+          else
+            eval %(proc { |style| #{@attachment.name}.original_filename })
+          end
+        end
+      end
+    end
+  end
+end

data/lib/paperclip/storage/dropbox/url_generator.rb

@@ -0,0 +1,43 @@
+require "uri"
+
+module Paperclip
+  module Storage
+    module Dropbox
+      class UrlGenerator
+        def initialize(attachment, attachment_options)
+          @attachment = attachment
+          @attachment_options = attachment_options
+        end
+
+        def generate(style, options)
+          if @attachment.present?
+            url = @attachment.full_dropbox? ? public_url(style) : private_url(style)
+            url = URI.parse(url)
+            url.query = [url.query, "dl=1"].compact.join("&") if options[:download]
+            url.to_s
+          else
+            @attachment_options[:default_url]
+          end
+        end
+
+        private
+
+        def private_url(style)
+          @attachment.dropbox_client.media(@attachment.path(style))["url"]
+        end
+
+        def public_url(style)
+          url = URI.parse("https://dl.dropboxusercontent.com/u/#{user_id}/")
+          path = @attachment.path(style)
+          path = path.match(/^Public\//).post_match
+          url.merge!(path)
+          url.to_s
+        end
+
+        def user_id
+          @attachment_options[:dropbox_credentials][:user_id]
+        end
+      end
+    end
+  end
+end

data/lib/paperclip/storage/dropbox.rb

@@ -1,154 +1,80 @@
-require 'dropbox_sdk'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/inflector/methods'
-require 'active_support/core_ext/object/blank'
-require 'yaml'
-require 'erb'
+require "dropbox_sdk"
+require "active_support/core_ext/hash/keys"
+require "paperclip/storage/dropbox/path_generator"
+require "paperclip/storage/dropbox/url_generator"
+require "paperclip/storage/dropbox/credentials"
 
 module Paperclip
   module Storage
     module Dropbox
       def self.extended(base)
         base.instance_eval do
-          @dropbox_credentials = parse_credentials(@options[:dropbox_credentials] || {})
-          @dropbox_options = @options[:dropbox_options] || {}
-          environment = defined?(Rails) ? Rails.env : @dropbox_options[:environment].to_s
-          @dropbox_credentials = (@dropbox_credentials[environment] || @dropbox_credentials).symbolize_keys
-          dropbox_client # Force validations of credentials
+          @options[:dropbox_options] ||= {}
+          @options[:dropbox_credentials] = fetch_credentials
+          @options[:path] = nil if @options[:path] == self.class.default_options[:path]
+          @path_generator = PathGenerator.new(self, @options)
+          @url_generator = UrlGenerator.new(self, @options)
         end
       end
 
       def flush_writes
         @queued_for_write.each do |style, file|
-          unless exists?(style)
-            dropbox_client.put_file(path(style), file.read)
-          else
-            raise FileExists, "file \"#{path(style)}\" already exists on Dropbox"
-          end
+          dropbox_client.put_file(path(style), file.read)
         end
         after_flush_writes
-        @queued_for_write = {}
+        @queued_for_write.clear
       end
 
       def flush_deletes
         @queued_for_delete.each do |path|
           dropbox_client.file_delete(path)
         end
-        @queued_for_delete = []
+        @queued_for_delete.clear
       end
 
-      def exists?(style = default_style)
-        metadata = dropbox_metadata(style)
-        !metadata.nil? && !metadata['is_deleted']
-      rescue DropboxError
-        false
+      def url(style_or_options = default_style, options = {})
+        options.merge!(style_or_options) if style_or_options.is_a?(Hash)
+        style = style_or_options.is_a?(Hash) ? default_style : style_or_options
+        @url_generator.generate(style, options)
       end
 
-      def url(*args)
-        if present?
-          style = args.first.is_a?(Symbol) ? args.first : default_style
-          options = args.last.is_a?(Hash) ? args.last : {}
-          query = options[:download] ? "?dl=1" : ""
-
-          if app_folder_mode
-            dropbox_client.media(path(style))['url'] + query
-          else
-            File.join("http://dl.dropbox.com/u/#{user_id}", path_for_url(style) + query)
-          end
-        else
-          @options[:default_url]
-        end
+      def path(style = default_style)
+        @path_generator.generate(style)
       end
 
-      def path(style)
-        if app_folder_mode
-          path_for_url(style)
-        else
-          File.join("Public", path_for_url(style))
+      def copy_to_local_file(style = default_style, destination_path)
+        File.open(destination_path, "wb") do |file|
+          file.write(dropbox_client.get_file(path(style)))
         end
       end
 
-      def path_for_url(style)
-        path = instance.instance_exec(style, &file_path)
-        style_suffix = (style != default_style ? "_#{style}" : "")
-
-        if original_extension.present? && path =~ /#{original_extension}$/
-          path.sub(original_extension, "#{style_suffix}#{original_extension}")
-        else
-          path + style_suffix + original_extension.to_s
-        end
-      end
-
-      def dropbox_metadata(style = default_style)
-        dropbox_client.metadata(path(style))
-      end
-
-      def copy_to_local_file(style, destination_path)
-        local_file = File.open(destination_path, "wb")
-        local_file.write(dropbox_client.get_file(path(style)))
-        local_file.close
+      def exists?(style = default_style)
+        metadata = dropbox_client.metadata(path(style))
+        not metadata.nil? and not metadata["is_deleted"]
+      rescue DropboxError
+        false
       end
 
       def dropbox_client
         @dropbox_client ||= begin
-          assert_required_keys
-          session = DropboxSession.new(@dropbox_credentials[:app_key], @dropbox_credentials[:app_secret])
-          session.set_access_token(@dropbox_credentials[:access_token], @dropbox_credentials[:access_token_secret])
-          DropboxClient.new(session, @dropbox_credentials[:access_type] || 'dropbox')
-        end
-      end
-
-      private
-
-      def original_extension
-        File.extname(original_filename)
-      end
-
-      def user_id
-        @dropbox_credentials[:user_id]
-      end
-
-      def app_folder_mode
-        @dropbox_credentials[:access_type] == 'app_folder'
-      end
-
-      def file_path
-        return @dropbox_options[:path] if @dropbox_options[:path]
-
-        if @dropbox_options[:unique_filename]
-          eval %(proc { |style| "\#{self.class.model_name.underscore}_\#{id}_\#{#{name}.name}" })
-        else
-          eval %(proc { |style| #{name}.original_filename })
+          credentials = @options[:dropbox_credentials]
+          session = DropboxSession.new(credentials[:app_key], credentials[:app_secret])
+          session.set_access_token(credentials[:access_token], credentials[:access_token_secret])
+          DropboxClient.new(session, credentials[:access_type] || "dropbox")
         end
       end
 
-      def assert_required_keys
-        [:app_key, :app_secret, :access_token, :access_token_secret, :user_id].each do |key|
-          value = @dropbox_credentials.fetch(key)
-          raise ":#{key} credential is nil" if value.nil?
-        end
-        if @dropbox_credentials[:access_type] and not ['dropbox', 'app_folder'].include?(@dropbox_credentials[:access_type])
-          raise KeyError, ":access_type must be 'dropbox' or 'app_folder'"
-        end
-      end
+      def app_folder?;   @options[:dropbox_credentials][:access_type] == "app_folder"; end
+      def full_dropbox?; @options[:dropbox_credentials][:access_type] == "dropbox";    end
 
-      def parse_credentials(credentials)
-        result =
-          case credentials
-          when File
-            YAML.load(ERB.new(File.read(credentials.path)).result)
-          when String, Pathname
-            YAML.load(ERB.new(File.read(credentials)).result)
-          when Hash
-            credentials
-          else
-            raise ArgumentError, ":dropbox_credentials are not a path, file, nor a hash"
-          end
+      private
 
-        result.stringify_keys
+      def fetch_credentials
+        environment = defined?(Rails) ? Rails.env : @options[:dropbox_options][:environment]
+        Credentials.new(@options[:dropbox_credentials]).fetch(environment)
       end
 
-      class FileExists < ArgumentError
+      class FileExists < RuntimeError
       end
     end
   end

data/paperclip-dropbox.gemspec

@@ -2,13 +2,12 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "paperclip-dropbox"
-  gem.version       = "1.1.3"
-  gem.platform      = Gem::Platform::RUBY
+  gem.version       = "1.1.4"
 
   gem.homepage      = "https://github.com/janko-m/paperclip-dropbox"
   gem.description   = %q{Extends Paperclip with Dropbox storage.}
   gem.summary       = gem.description
-  gem.authors       = ["Janko Marohnić"]
+  gem.authors       = ["Janko Marohnić"]
   gem.email         = ["janko.marohnic@gmail.com"]
 
   gem.files         = Dir["lib/**/*"] + ["README.md", "LICENSE", "paperclip-dropbox.gemspec"]
@@ -21,12 +20,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency "paperclip", "~> 3.1"
   gem.add_dependency "dropbox-sdk", "~> 1.3"
 
-  gem.add_development_dependency "rake", ">= 0.9"
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.11"
   gem.add_development_dependency "vcr", "~> 2.2"
-  gem.add_development_dependency "fakeweb", "~> 1.3"
-  gem.add_development_dependency "activerecord", "~> 3.2"
-  gem.add_development_dependency "rack-test", "~> 0.6"
-  gem.add_development_dependency "sqlite3", "~> 1.3"
-  gem.add_development_dependency "rest-client", "~> 1.6"
+  gem.add_development_dependency "webmock", ">= 1.8", "< 1.10"
+  gem.add_development_dependency "activerecord", ">= 3.2"
+  gem.add_development_dependency "activerecord-nulldb-adapter", ">= 0.2.3"
+  gem.add_development_dependency "rest-client", ">= 1.6"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-dropbox
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
-- Janko Marohnić
+- Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,27 +92,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
@@ -120,47 +126,31 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: activerecord-nulldb-adapter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
@@ -168,7 +158,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.6'
 description: Extends Paperclip with Dropbox storage.
@@ -180,6 +170,9 @@ extra_rdoc_files: []
 files:
 - lib/paperclip-dropbox.rb
 - lib/paperclip/storage/dropbox.rb
+- lib/paperclip/storage/dropbox/path_generator.rb
+- lib/paperclip/storage/dropbox/url_generator.rb
+- lib/paperclip/storage/dropbox/credentials.rb
 - lib/paperclip/dropbox.rb
 - lib/paperclip/dropbox/railtie.rb
 - lib/paperclip/dropbox/rake.rb
@@ -208,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 503150639
+      hash: 487816321
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23