defog 0.6.1 → 0.7.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+notifications:
+  recipients:
+    - ronen@barzel.org

data/README.rdoc

@@ -1,5 +1,8 @@
 = defog
 
+{<img src="https://secure.travis-ci.org/ronen/defog.png"/>}[http://travis-ci.org/ronen/defog]
+{<img src="https://gemnasium.com/ronen/defog.png" alt="Dependency Status" />}[https://gemnasium.com/ronen/defog]
+
 Defog wraps the fog[https://rubygems.org/gems/fog] gem (specifically,
 {Fog::Storage}[http://fog.io/1.3.1/storage/]), providing access to files
 stored in the cloud via proxy files on the local file system.
@@ -19,12 +22,6 @@ Defog also provides a few simple remote-file management methods to minimize
 the need to dig down into the Fog layer; but full access to the underlying
 fog objects is available should it be needed.
 
-<b>NOTE:</b>  Currently the only supported providers are :local and :AWS since
-those are what the author currently uses.  Please fork and add others!
-(There's just a very small amount of provider-specific code in {one
-file}[https://github.com/ronen/defog/blob/master/lib/defog/fog_wrapper.rb],
-plus spec examples.)
-
 == Usage Summary
 
 Full Rdoc is available at http://rubydoc.info/gems/defog
@@ -216,8 +213,23 @@ Gemfile:
 
 == Compatibility
 
-Defog has (so far) been tested on MRI 1.9.3 using
-fog[https://rubygems.org/gems/fog] storage providers :local and :AWS
+Defog is currently known to work on:
+
+* Ruby:  MRI 1.9.2, MRI 1.9.3
+* Fog Storage: :local, :AWS
+
+The above storage providers are what the author uses.  Please fork and add
+others!  (There's just a very small amount of provider-specific code in {one
+ file}[https://github.com/ronen/defog/blob/master/lib/defog/fog_wrapper.rb],
+ plus spec examples.)
+
+== History
+
+Release Notes:
+
+* 0.7.0 - Add :query option to Handle#url
+* 0.6.1 - Bug fix (caching)
+* 0.6.0 - Add logging
 
 == Copyright
 

data/Rakefile

@@ -1,6 +1,8 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
+task :default => :spec
+
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = '-Ispec'

data/lib/defog/fog_wrapper.rb

@@ -89,7 +89,7 @@ module Defog #:nodoc: all
         Digest::MD5.hexdigest(fog_head(key).body)
       end
 
-      def url(key, expiry)
+      def url(key, options={})
         localpath = Pathname.new("#{@local_root}/#{@prefix}#{key}").expand_path
         if defined?(Rails)
           relative = localpath.relative_path_from Rails.root + "public" rescue nil
@@ -116,8 +116,10 @@ module Defog #:nodoc: all
         fog_head(key).etag
       end
 
-      def url(key, expiry)
-        fog_head(key).url(expiry)
+      def url(key, options={})
+        options = options.keyword_args(:expiry => :required, :query => :optional)
+        expiry = options.delete(:expiry)
+        fog_head(key).url(expiry, options)
       end
 
     end

data/lib/defog/handle.rb

@@ -60,19 +60,25 @@ module Defog
       fog_model.andand.last_modified
     end
 
-    # Returns a URL to access the remote cloud file.
+    # Returns a URL to access the remote cloud file.  The options are
+    # storage-specific.
     #
-    # The option
+    # For :AWS files, the option
     #    :expiry => time
-    # Specifies the expiration of time-limited URLS when using :AWS.  The default is
-    # <code>Time.now + 10.minutes</code>.  The expiry is ignored when using :local
+    # is required and specifies the expiration of time-limited URLS when
+    # using :AWS.  The default is <code>Time.now + 10.minutes</code>.
+    # The option
+    #    :query => { ... }
+    # is optional and is passed directly to fog.  Example usage might be
+    #    :query => {'response-content-disposition' => 'attachment'}
     #
-    # For :local cloud files, if Rails is defined and the file is in the
-    # Rails app's public directory, returns a site path relative to
-    # the public directory.  Otherwise returns a <code>"file://"</code> URL 
+    # For :local cloud files, all options are ignored.  If Rails is defined
+    # and the file is in Rails app's public directory, returns a path
+    # relative to the public directory.  Otherwise returns a
+    # <code>"file://"</code> URL 
     def url(opts={})
-      opts = opts.keyword_args(:expiry => Time.now + 10*60)
-      @proxy.fog_wrapper.url(@key, opts.expiry)
+      opts = opts.keyword_args(:expiry => Time.now + 10*60, :query => :optional)
+      @proxy.fog_wrapper.url(@key, opts)
     end
 
     # Returns the underlying Fog::Model, should you need it for something.

data/lib/defog/version.rb

@@ -1,3 +1,3 @@
 module Defog
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/file_spec.rb

@@ -51,9 +51,9 @@ shared_examples "read" do
 
   it "should pass encodings through" do
     create_remote("encode me")
-    @proxy.file(key, "#{@mode}:EUC-JP:UTF-16") do |file|
+    @proxy.file(key, "#{@mode}:EUC-JP:UTF-8") do |file|
       file.external_encoding.name.should == "EUC-JP"
-      file.internal_encoding.name.should == "UTF-16"
+      file.internal_encoding.name.should == "UTF-8"
     end
   end
 

data/spec/handle_spec.rb

@@ -116,6 +116,18 @@ describe Defog::Handle do
     args = {:provider => :AWS, :aws_access_key_id => "dummyid", :aws_secret_access_key => "dummysecret", :region => "eu-west-1", :bucket => "tester"}
     it_should_behave_like "a handle", args
 
+    it "should pass url query options to fog" do
+      @proxy = Defog::Proxy.new(args)
+
+      create_remote("reach out to me")
+      t = Time.now + 10*60
+      #Fog::Storage::AWS::File.any_instance.should_receive(:url).with(t, "response-content-disposition" => "attachment")
+      url = @proxy.file(key).url(:expiry => t, :query => {"response-content-disposition" => "attachment"})
+      puts url
+      url.should include "response-content-disposition=attachment"
+    end
+
+
   end
 
 end

data/spec/proxy_spec.rb

@@ -218,8 +218,8 @@ shared_examples "a proxy" do |args|
           proxy_path.should_not be_exist
           other_proxy_path("a").should be_exist
           other_proxy_path("b").should be_exist
-          other_proxy_path("r").should be_exist
-          other_proxy_path("s").should be_exist
+          other_proxy_path("R").should be_exist
+          other_proxy_path("S").should be_exist
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defog
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70295900380220 !ruby/object:Gem::Requirement
+  requirement: &70218300244080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295900380220
+  version_requirements: *70218300244080
 - !ruby/object:Gem::Dependency
   name: hash_keyword_args
-  requirement: &70295900379640 !ruby/object:Gem::Requirement
+  requirement: &70218300243200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295900379640
+  version_requirements: *70218300243200
 - !ruby/object:Gem::Dependency
   name: fastandand
-  requirement: &70295900379020 !ruby/object:Gem::Requirement
+  requirement: &70218300242260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295900379020
+  version_requirements: *70218300242260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70295900378340 !ruby/object:Gem::Requirement
+  requirement: &70218300241500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295900378340
+  version_requirements: *70218300241500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295900377800 !ruby/object:Gem::Requirement
+  requirement: &70218300240880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295900377800
+  version_requirements: *70218300240880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70295900376820 !ruby/object:Gem::Requirement
+  requirement: &70218300240200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295900376820
+  version_requirements: *70218300240200
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70295900362380 !ruby/object:Gem::Requirement
+  requirement: &70218300239480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295900362380
+  version_requirements: *70218300239480
 description: Wrapper to fog gem, proxying access to cloud files as local files.
 email:
 - ronen@barzel.org
@@ -96,6 +96,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc