paperclip-aws 1.6.7 → 1.6.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9db8f66fe54a281f313100597d638d9efcfdde48
+  data.tar.gz: bc538a624cecaf537bd110e0a829c0a5c1c597f9
+SHA512:
+  metadata.gz: dc9137685e4e3a5711d29f49633e890d7ba49641bafd2f0685e8b97848389eb7cc8c77d7a37727be8369cf52662837120ff418d98719eb5da0ef55101e7e4034
+  data.tar.gz: 6bb08c519c95c3671e1f616d98617805bae2876d581fd31a2c1fd1c4e2ced2d991f2aaa93e6b7017b621c90eae99f6fd8f8767e6672a5f8395d2b61d82908cbd

data/Gemfile.lock

@@ -1,52 +1,83 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.0)
-    aws-sdk (1.3.4)
-      httparty (~> 0.7)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    atomic (1.1.14)
+    aws-sdk (1.31.3)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    builder (3.0.0)
-    cocaine (0.2.1)
-    git (1.2.5)
-    httparty (0.8.1)
-      multi_json
-      multi_xml
-    i18n (0.6.0)
-    jeweler (1.6.4)
+    builder (3.1.4)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.3)
+      climate_control (>= 0.0.3, < 1.0)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    httpauth (0.2.0)
+    i18n (0.6.9)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
-    json (1.6.5)
+      rdoc
+    json (1.8.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.4)
+    mime-types (2.0)
+    minitest (4.7.5)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    multi_xml (0.4.1)
-    nokogiri (1.5.0)
-    paperclip (2.6.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    paperclip (3.5.2)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
       mime-types
-    rake (0.9.2.2)
-    shoulda-context (1.0.0)
-    sqlite3 (1.3.5)
-    tzinfo (0.3.31)
-    uuidtools (2.1.2)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    shoulda-context (1.1.6)
+    sqlite3 (1.3.8)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.38)
+    uuidtools (2.1.4)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -34,7 +34,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.6.7
+1.6.8

data/lib/paperclip-aws.rb

@@ -47,13 +47,13 @@ module Paperclip
             :expires => 60*60,
             :action => :read
           })          
-          secure = ( self.choose_protocol(style, options) == 'https' )                   
+          secure = ( self.choose_protocol(style, options) == 'https:' )
           return self.s3.buckets[@s3_bucket].objects[path(style).gsub(%r{^/}, "")].url_for(options[:action], {  :secure => secure, :expires => options[:expires] }).to_s
         else
           if @s3_host_alias.present?
-            url = "#{choose_protocol(style, options)}://#{@s3_host_alias}/#{path(style).gsub(%r{^/}, "")}"
+            url = "#{choose_protocol(style, options)}//#{@s3_host_alias}/#{path(style).gsub(%r{^/}, "")}"
           else
-            url = "#{choose_protocol(style, options)}://#{@s3_endpoint}/#{@s3_bucket}/#{path(style).gsub(%r{^/}, "")}"
+            url = "#{choose_protocol(style, options)}//#{@s3_endpoint}/#{@s3_bucket}/#{path(style).gsub(%r{^/}, "")}"
           end    
           return URI.escape(url)
         end              
@@ -92,11 +92,13 @@ module Paperclip
       end
 
       def choose_protocol(style, options={})
-        if options[:protocol].present?
-          return options[:protocol].to_s
+        protocol = if options[:protocol].present?
+          options[:protocol].to_s
         else
-          return @s3_protocol.is_a?(Proc) ? @s3_protocol.call(style, self) : @s3_protocol
+          @s3_protocol.is_a?(Proc) ? @s3_protocol.call(style, self) : @s3_protocol
         end
+
+        "#{protocol}:" if protocol.present?
       end
 
       # Returns representation of the data of the file assigned to the given

data/paperclip-aws.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "paperclip-aws"
-  s.version = "1.6.7"
+  s.version = "1.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = "2013-02-22"
+  s.date = "2013-12-22"
   s.description = "'paperclip-aws' is a full featured storage module that supports all S3 locations (US, European and Tokio) without any additional hacking."
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [
@@ -28,18 +28,16 @@ Gem::Specification.new do |s|
     "paperclip-aws.gemspec",
     "test/aws_storage_test.rb",
     "test/database.yml",
-    "test/fixtures/5k.png",
-    "test/fixtures/spaced file.png",
     "test/helper.rb"
   ]
   s.homepage = "http://github.com/igor-alexandrov/paperclip-aws"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.3"
   s.summary = "Storage module to official 'aws-sdk' gem for Amazon S3"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<paperclip>, [">= 2.5.0"])

data/test/aws_storage_test.rb

@@ -105,6 +105,15 @@ class AwsStorageTest < Test::Unit::TestCase
       assert_match  /\Ahttps:\/\/.+/,  @dummy.avatar.url
     end
     
+    should "return a scheme-less url with empty protocol predefined" do
+      rebuild_model default_model_options(:s3_protocol => '')
+
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+
+      assert_match  /\A\/\/.+/,  @dummy.avatar.url
+    end
+
     should "return a correct protocol protocol based on s3_permissions" do
       rebuild_model default_model_options(:s3_permissions => :public_read)
       @dummy = Dummy.new

metadata

@@ -1,82 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-aws
 version: !ruby/object:Gem::Version
-  version: 1.6.7
-  prerelease: 
+  version: 1.6.8
 platform: ruby
 authors:
 - Igor Alexandrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '''paperclip-aws'' is a full featured storage module that supports
-  all S3 locations (US, European and Tokio) without any additional hacking.'
+description: '''paperclip-aws'' is a full featured storage module that supports all
+  S3 locations (US, European and Tokio) without any additional hacking.'
 email: igor.alexandrov@gmail.com
 executables: []
 extensions: []
@@ -95,35 +86,29 @@ files:
 - paperclip-aws.gemspec
 - test/aws_storage_test.rb
 - test/database.yml
-- test/fixtures/5k.png
-- test/fixtures/spaced file.png
 - test/helper.rb
 homepage: http://github.com/igor-alexandrov/paperclip-aws
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -990809500387272058
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Storage module to official 'aws-sdk' gem for Amazon S3
 test_files: []