paperclip-dropbox 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82a48be0e2e60062a9c7f14d8e9faa635d977597
-  data.tar.gz: f688b640ae8720ef011108d7cafd4ff66d4d1aaf
+  metadata.gz: 2dc05c507ab4911452e94f9c9a8fbc95254c9472
+  data.tar.gz: 014650ee8b6e82eef6bdb8a93e659cf409d632e1
 SHA512:
-  metadata.gz: c4c2d9339e53b4eb35e7ec6da664a381a37dabb636065534e59c404fd7e7983599e8db9489b2e5da6e10e967ffc6dc0eccb4f8ebc61d3ff1615eb4f9a971e060
-  data.tar.gz: 56014bbbd22588a2cab44275f895ac04ff38310dd00235d836084b05d23e3435230d9fc486dba4defba0ba6da6a7b9a9120c5f3b8dee8c8bf9174eb31f856065
+  metadata.gz: 101c4d07cd070ee970bebeabd082b9d8c202f57ee06f7b06b2722b0c0f35a9efa4ed65487fd15e42c161338498a97decb60b075c5cb84e6bf48fd9cf487f90c9
+  data.tar.gz: 107be6c531a3534f1e7bdacdb354c2835a76aa5cdd23cac02ed59106ab03edfa49614fa85f8669039396af6c0af976beed86cb9e194a6d7d2fd91ae16fd8ff27

data/README.md

@@ -31,6 +31,9 @@ user_id: "..."
 access_type: "dropbox|app_folder"
 ```
 
+You can also pass a `Proc` to `:dropbox_credentials`, if you want the
+credentials to be dynamically evaluated.
+
 In order to fill these in, you must [create a Dropbox app](https://www.dropbox.com/developers/apps)
 and authorize it. There are two types of Dropbox apps: **App folder** or **Full Dropbox**. You can read
 about the differences and gotchas in [this wiki](https://github.com/janko-m/paperclip-dropbox/wiki/Access-types).

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

@@ -5,9 +5,10 @@ module Paperclip
     module Dropbox
       module GeneratorFactory
         def self.build_url_generator(storage, options)
-          if options[:dropbox_credentials][:access_type] == "app_folder" || options[:dropbox_visibility] == "private"
+          credentials = storage.try(:dropbox_credentials) || options[:dropbox_credentials]
+          if credentials[:access_type] == "app_folder" || options[:dropbox_visibility] == "private"
             PrivateUrlGenerator.new(storage, options)
-          elsif options[:dropbox_credentials][:access_type]
+          elsif credentials[:access_type]
             PublicUrlGenerator.new(storage, options)
           end
         end

data/lib/paperclip/storage/dropbox.rb

@@ -11,14 +11,12 @@ module Paperclip
       def self.extended(base)
         base.instance_eval do
           @options[:dropbox_options] ||= {}
-          @options[:dropbox_credentials] = fetch_credentials
           @options[:path] = nil if @options[:path] == self.class.default_options[:path]
           @options[:dropbox_visibility] ||= "public"
 
           @path_generator = PathGenerator.new(self, @options)
-          @url_generator = GeneratorFactory.build_url_generator(self, @options)
 
-          dropbox_client # Force creation of dropbox_client
+          #dropbox_client # Force creation of dropbox_client
         end
       end
 
@@ -40,7 +38,7 @@ module Paperclip
       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)
+        url_generator.generate(style, options)
       end
 
       def path(style = default_style)
@@ -65,25 +63,37 @@ module Paperclip
 
       def dropbox_client
         @dropbox_client ||= begin
-          @options[:dropbox_credentials][:access_type] ||= "dropbox"
-          credentials = @options[:dropbox_credentials]
+          credentials = 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])
         end
       end
 
+      def dropbox_credentials
+        @dropbox_credentials ||= begin
+          creds = fetch_credentials
+          creds[:access_type] ||= 'dropbox'
+          creds
+        end
+      end
+
+      def url_generator
+        @url_generator = GeneratorFactory.build_url_generator(self, @options)
+      end
+
       def public_dropbox?
-        @options[:dropbox_credentials][:access_type] == "dropbox" &&
+        dropbox_credentials[:access_type] == "dropbox" &&
           @options[:dropbox_visibility] == "public"
       end
 
-
       private
 
       def fetch_credentials
+        credentials = @options[:dropbox_credentials].respond_to?('call') ? @options[:dropbox_credentials].call(self) : @options[:dropbox_credentials]
+
         environment = defined?(Rails) ? Rails.env : @options[:dropbox_options][:environment]
-        Credentials.new(@options[:dropbox_credentials]).fetch(environment)
+        Credentials.new(credentials).fetch(environment)
       end
 
       class FileExists < RuntimeError

data/paperclip-dropbox.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "paperclip-dropbox"
-  gem.version       = "1.2.2"
+  gem.version       = "1.3.0"
 
   gem.homepage      = "https://github.com/janko-m/paperclip-dropbox"
   gem.description   = %q{Extends Paperclip with Dropbox storage.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-dropbox
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Extends Paperclip with Dropbox storage.