carrierwave-dropbox 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf125a486688f3865f77935c3be9adf0a865dd55
-  data.tar.gz: 5b0ae6e6ea47bde7f0d9b4cd6d39f385ab9e1530
+  metadata.gz: b0763586e9d58c582df0487f3046d125dc12e006
+  data.tar.gz: 35f64d9d57608842700f94ecda9f6441f9e344f0
 SHA512:
-  metadata.gz: 11aab1f8f4cba4c7b3b4e50e2c1fafcf9a8bcacd78af6668f719794330fad4c668f5b982bf69f0472ed4d8e589c1fb1c27960c007bd877b54c251eace1eeb39e
-  data.tar.gz: 333ab9b4199c5d6ce7240c0c36657f90c8b0dbcebab9f34192737d37700ad4617ef83a409e72eda9910d5fd3e06ecb616daa439a7f5040316fe0e82c9402c564
+  metadata.gz: ef093d3338a4cbe370e6d07948c29936894a04aef7e5f4cd932fd40e128a95118dbe56d790adce00ac650482c3a5617e901ddf58fa1784371c33ba6475b659ce
+  data.tar.gz: 4c2e198bcabed3e665594f4f42c6d3ba4227a184e68e9c5337227b7d3e3e9a10c487a9b17be3adcf4226881bd6a4a433b4bb77555c0c766210fef38483d715b3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.2.0 (January 12, 2014)
+
+* Make the `dropbox_client` method public
+
+  You can now easily access to the `dropbox_client` method to get
+  information about the current connection or check if the latter is
+  active or not.
+
+* Use the root path instead of the `Public` directory by default
+
 ## 1.1.1 (October 5, 2013)
 
 * Fix deletion when using app_folder accounts

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in carrierwave-dropbox.gemspec
 gemspec
-
-gem 'rubyzip', require: 'zip/zip'

data/README.md

@@ -24,7 +24,7 @@ If you are using Rails, the Rake task is automatically loaded. Otherwise, if you
 aren't running a Rails application, first load the task in your `Rakefile`:
 
 ~~~ruby
-load "carrierwave/dropbox/tasks.rake"
+load "carrierwave/dropbox/authorize.rake"
 ~~~
 
 Then you have to run this task:

data/carrierwave-dropbox.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "mini_magick"
-  spec.add_development_dependency "selenium-webdriver", "~> 2.35.1"
+  spec.add_development_dependency "capybara-webkit", "~> 1.0"
   spec.add_development_dependency "rails", ">= 3.2.14", "< 5.0"
 end

data/lib/carrierwave/dropbox/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Dropbox
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/lib/carrierwave/storage/dropbox.rb

@@ -10,9 +10,7 @@ module CarrierWave
 
       # Store a single file
       def store!(file)
-        location = uploader.store_path
-        location = "/Public/#{location}" if config[:access_type] == "dropbox"
-
+        location = (config[:access_type] == "dropbox") ? "/#{location}" : uploader.store_path
         dropbox_client.put_file(location, file.to_file)
       end
 
@@ -21,8 +19,6 @@ module CarrierWave
         CarrierWave::Storage::Dropbox::File.new(uploader, config, uploader.store_path(file), dropbox_client)
       end
 
-      private
-
       def dropbox_client
         @dropbox_client ||= begin
           session = DropboxSession.new(config[:app_key], config[:app_secret])
@@ -31,6 +27,8 @@ module CarrierWave
         end
       end
 
+      private
+
       def config
         @config ||= {}
 
@@ -53,17 +51,12 @@ module CarrierWave
         end
 
         def url
-          user_id, path = @config[:user_id], @path
-          if @config[:access_type] == "dropbox"
-            "https://dl.dropboxusercontent.com/u/#{user_id}/#{path}"
-          else
-            @client.media(path)["url"]
-          end
+          @client.media(@path)["url"]
         end
 
         def delete
           path = @path
-          path = "/Public/#{path}" if @config[:access_type] == "dropbox"
+          path = "/#{path}" if @config[:access_type] == "dropbox"
           begin
             @client.file_delete(path)
           rescue DropboxError

data/spec/spec_helper.rb

@@ -6,10 +6,11 @@ require 'dummy/config/environment'
 require 'carrierwave'
 require 'carrierwave/dropbox'
 
+require 'capybara-webkit'
 require 'capybara/rspec'
 
 RSpec.configure do |config|
   Capybara.app = Dummy::Application
-  Capybara.current_driver = :selenium
+  Capybara.current_driver = :webkit
   config.order = 'random'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-dropbox
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Robin Dupret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.35.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.35.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Dropbox integration for CarrierWave