paperclip-dropbox 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cf29eabf601c976450ee9451a7f1507f7438b39
-  data.tar.gz: 1610e7c1b1c31e084d9a19b1589ebfa9ff1474c3
+  metadata.gz: 37ae3b2982b4e495d0ff1d022ced7c34f7fc4d48
+  data.tar.gz: 7f1e5a3e82be45d4afd68a7a9f680aab64112cf0
 SHA512:
-  metadata.gz: 8e97054c8acd45b12b43f8931e465fa089e6b24e1635655e03fd92a9bcea89a022d4c837a1f81bfb8a67807bec3ffbb79c1615b4ec613fbf1b1eadbf2b60608b
-  data.tar.gz: 80b71d4f7ea9ee4e348779e26fcd8d12bbe29797a20501da786d7d5a779683ee38b5f2e851dfaf3dcb076344cd30c3dfffee00df9a41a112743cbe5888176847
+  metadata.gz: 82c92a76e6e5bd9c5cd2e37d64a16ad2c1812214223acd917b65da8a509a2b3886a712b44eb591bcb815e3d217223a109025a9d7af3a591cc68b09d48eb75dc8
+  data.tar.gz: 058cbce37ecc26149108f7d12a8d855d89330d21aa265d06dcc87c3749ced8f1367e42eb888a0676576d91ef872081972a093e1c133a02a8a7e732327ca3b65e

data/README.md

@@ -6,7 +6,7 @@ This gem extends [Paperclip](https://github.com/thoughtbot/paperclip) with
 ## Setup
 
 ```ruby
-gem "paperclip-dropbox", ">= 1"
+gem "paperclip-dropbox", ">= 1.1.7"
 ```
 
 Example:
@@ -28,12 +28,14 @@ app_secret: "..."
 access_token: "..."
 access_token_secret: "..."
 user_id: "..."
-access_type: "..."
+access_type: "dropbox|app_folder"
 ```
 
 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).
+When you decide, don't forget to put `"dropbox"` or `"app_folder"` as the `:access_type`
+in your credentials.
 
 After you have created an app, you will be given the "App key" and "App secret". Provide
 these and the access type to the authorization Rake task:
@@ -89,6 +91,7 @@ This is a hash containing any of the following options:
 - `:environment` – String, the environment name to use for selecting namespaced
   credentials in a non-Rails app
 
+
 For example:
 
 ```ruby
@@ -102,6 +105,20 @@ end
 
 In Rails you don't need to specify it.
 
+### The `:dropbox_visilbility` option
+This is a string  "public" (default) or "private".
+- "public" - Files will be placed in your "Public" directory in dropbox and will the public urls will be used to access the files (not http request required to get a url for the file)
+- "private" - Files can be placed in any dropbox directory (set your :path attachment option) and private, expiring urls (4 hours) will be generated each time you access this file. Private can only be used with the 'dropbox' access type.
+
+```ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar,
+    :storage => :dropbox,
+    :dropbox_credentials => Rails.root.join("config/dropbox.yml"),
+    :dropbox_visibility: 'public'
+end
+```
+
 ### The `:path` option
 
 To change the path of the file, use Paperclip's `:path` option:
@@ -110,7 +127,7 @@ To change the path of the file, use Paperclip's `:path` option:
 :path => ":style/:id_:filename"  # Defaults to ":filename"
 ```
 
-In "Full Dropbox" mode it will automatically be searched in the `Public` folder,
+In "Full Dropbox" mode with "public" visibility it will automatically be searched in the `Public` folder,
 so there is not need to specify it.
 
 ### URL options

data/lib/paperclip/storage/dropbox.rb

@@ -1,9 +1,10 @@
 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/generator_factory"
 require "paperclip/storage/dropbox/credentials"
 
+
 module Paperclip
   module Storage
     module Dropbox
@@ -12,8 +13,12 @@ module Paperclip
           @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 = UrlGenerator.new(self, @options)
+          @url_generator = GeneratorFactory.build_url_generator(self, @options)
+
+          dropbox_client # Force creation of dropbox_client
         end
       end
 
@@ -39,7 +44,9 @@ module Paperclip
       end
 
       def path(style = default_style)
-        @path_generator.generate(style)
+        path = @path_generator.generate(style)
+        path = File.join("Public", path) if public_dropbox?
+        path
       end
 
       def copy_to_local_file(style = default_style, destination_path)
@@ -66,8 +73,11 @@ module Paperclip
         end
       end
 
-      def app_folder?;   @options[:dropbox_credentials][:access_type] == "app_folder"; end
-      def full_dropbox?; @options[:dropbox_credentials][:access_type] == "dropbox";    end
+      def public_dropbox?
+        @options[:dropbox_credentials][:access_type] == "dropbox" &&
+          @options[:dropbox_visibility] == "public"
+      end
+
 
       private
 

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

@@ -0,0 +1,18 @@
+require "paperclip/storage/dropbox/private_url_generator"
+require "paperclip/storage/dropbox/public_url_generator"
+module Paperclip
+  module Storage
+    module Dropbox
+      module GeneratorFactory
+        def self.build_url_generator(storage, options)
+          if options[:dropbox_credentials][:access_type] == "app_folder" || options[:dropbox_visibility] == "private"
+            PrivateUrlGenerator.new(storage, options)
+          elsif options[:dropbox_credentials][:access_type] == "dropbox"
+            PublicUrlGenerator.new(storage, options)
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -16,7 +16,6 @@ module Paperclip
                  else
                    generate_from_proc(style)
                  end
-          path = File.join("Public", path) if @attachment.full_dropbox?
           path
         end
 

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

@@ -0,0 +1,13 @@
+require "paperclip/storage/dropbox/url_generator"
+module Paperclip
+  module Storage
+    module Dropbox
+      class PrivateUrlGenerator < UrlGenerator
+        def file_url(style)
+          @attachment.dropbox_client.media(@attachment.path(style))["url"]
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,16 @@
+require "paperclip/storage/dropbox/url_generator"
+module Paperclip
+  module Storage
+    module Dropbox
+      class PublicUrlGenerator < UrlGenerator
+        def file_url(style)
+          url = URI.parse("https://dl.dropboxusercontent.com/u/#{user_id}/")
+          path = @attachment.path(style)
+          path = path.match(/^Public\//).try(:post_match)
+          url.merge!(path)
+          url.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require "uri"
 module Paperclip
   module Storage
     module Dropbox
+
       class UrlGenerator
         def initialize(attachment, attachment_options)
           @attachment = attachment
@@ -11,7 +12,7 @@ module Paperclip
 
         def generate(style, options)
           if @attachment.present?
-            url = @attachment.full_dropbox? ? public_url(style) : private_url(style)
+            url = file_url(style)
             url = URI.parse(url)
             url.query = [url.query, "dl=1"].compact.join("&") if options[:download]
             url.to_s
@@ -22,22 +23,11 @@ module Paperclip
 
         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/paperclip-dropbox.gemspec

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

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-dropbox
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 description: Extends Paperclip with Dropbox storage.
@@ -135,17 +135,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/paperclip-dropbox.rb
+- lib/paperclip/dropbox.rb
 - lib/paperclip/dropbox/railtie.rb
 - lib/paperclip/dropbox/rake.rb
 - lib/paperclip/dropbox/tasks.rake
-- lib/paperclip/dropbox.rb
+- lib/paperclip/storage/dropbox.rb
 - lib/paperclip/storage/dropbox/credentials.rb
+- lib/paperclip/storage/dropbox/generator_factory.rb
 - lib/paperclip/storage/dropbox/path_generator.rb
+- lib/paperclip/storage/dropbox/private_url_generator.rb
+- lib/paperclip/storage/dropbox/public_url_generator.rb
 - lib/paperclip/storage/dropbox/url_generator.rb
-- lib/paperclip/storage/dropbox.rb
-- lib/paperclip-dropbox.rb
-- README.md
-- LICENSE
 - paperclip-dropbox.gemspec
 homepage: https://github.com/janko-m/paperclip-dropbox
 licenses:
@@ -157,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Extends Paperclip with Dropbox storage.