uploadcare-ruby 1.0.6 → 1.1.0

data/spec/rest/auth/secure_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Uploadcare::Connections::Auth::Secure do
+  describe '#apply' do
+    let(:env){ Faraday::Env.new(:get, nil, URI::HTTP.build(host: 'example.com'), nil, {}) }
+    subject{ env.request_headers }
+
+    before(:each) do
+      described_class.new(public_key: 'pub', private_key: 'priv').apply(env)
+    end
+
+    it "adds Authorization header to env's request_headers" do
+      expect(subject).to include('Authorization')
+    end
+
+    it "adds Date header to env's request_headers" do
+      expect(subject).to include('Date')
+    end
+
+    it "uses secure authorization" do
+      expect(subject['Authorization']).to match /Uploadcare pub:.+/
+    end
+  end
+
+  describe 'signature' do
+    let(:uri){ URI::HTTP.build(host: 'example.com', path: '/path', query: 'test=1') }
+    let(:headers){ {'Content-Type' => 'application/x-www-form-urlencoded'} }
+    let(:env){ Faraday::Env.new(:post, 'url=encoded&test=body', uri, nil, headers) }
+
+    subject{ env.request_headers }
+
+    before(:each) do
+      allow(Time).to receive(:now).and_return(Time.parse('2017.02.02 12:58:50 +0000'))
+      described_class.new(public_key: 'pub', private_key: 'priv').apply(env)
+    end
+
+    it "counts signature correctly" do
+      expected = '71b61ed67d16f48d2e46a4ee72ca12025aeb8d1f'
+      expect(subject['Authorization']).to eq "Uploadcare pub:#{expected}"
+    end
+  end
+
+
+  describe 'integration' do
+    let(:api){ Uploadcare::Api.new(auth_scheme: :secure) }
+    let(:file){ api.upload IMAGE_URL }
+
+    before(:each) do
+      # ensure that secure auth is being used
+      expect_any_instance_of(described_class).to receive(:apply).at_least(4).times.and_call_original
+    end
+
+    it 'auth works with real requests' do
+      # request with url params
+      expect{ api.get('/files/', limit: 1) }.not_to raise_error
+      # request with an url-encoded body
+      expect{
+        retry_if(Uploadcare::Error::RequestError::BadRequest) do
+          api.post('/files/', source: file.uuid)
+        end
+      }.not_to raise_error
+      # request with an empty body and a redirect
+      expect{ api.delete("/files/#{file.uuid}/storage/") }.not_to raise_error
+    end
+  end
+end

data/spec/rest/auth/simple_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Uploadcare::Connections::Auth::Simple do
+  let(:env){ Faraday::Env.new(nil, nil, nil, nil, {}) }
+  subject{ described_class.new(public_key: 'pub', private_key: 'priv') }
+
+  describe 'apply' do
+    it "adds Authorization header to env's request_headers" do
+      subject.apply(env)
+      expect(env.request_headers).to include('Authorization')
+    end
+
+    it "sets Authorization header's value correctly" do
+      subject.apply(env)
+      expect(env.request_headers['Authorization']).to eq "Uploadcare.Simple pub:priv"
+    end
+  end
+
+  describe 'integration' do
+    let(:api){ Uploadcare::Api.new(auth_scheme: :simple) }
+
+    before(:each) do
+      # ensure that simple auth is being used
+      expect_any_instance_of(described_class).to receive(:apply).and_call_original
+    end
+
+    it 'auth works with real requests' do
+      expect{ api.get('/files/') }.not_to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,7 +7,10 @@ require 'rspec'
 require 'uploadcare'
 require 'yaml'
 
-CONFIG = Uploadcare.default_settings
+CONFIG = Uploadcare.default_settings.merge!(
+  public_key: ENV['UPLOADCARE_PUBLIC_KEY'] || 'demopublickey',
+  private_key: ENV['UPLOADCARE_SECRET_KEY'] || 'demoprivatekey',
+)
 UUID_REGEX = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
 
 API = Uploadcare::Api.new(CONFIG)
@@ -22,3 +25,17 @@ config_file = File.join(File.dirname(__FILE__), 'config.yml')
 if File.exists?(config_file)
   CONFIG.update Hash[YAML.parse_file(config_file).to_ruby.map{|a, b| [a.to_sym, b]}]
 end
+
+if CONFIG[:public_key] == 'demopublickey'
+  RSpec.configure do |c|
+    c.before(:example, :payed_feature){ skip "Unavailable for demo account" }
+  end
+end
+
+def retry_if(error, retries=5, &block)
+  block.call
+rescue error
+  raise if retries <= 0
+  sleep 0.2
+  retry_if(error, retries-1, &block)
+end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
-- "@rastyagaev (Vadim Rastyagaev)"
-- "@dimituri (Dimitry Solovyov)"
-- "@romanonthego (Roman Dubinin)"
+- '@rastyagaev (Vadim Rastyagaev)'
+- '@dimituri (Dimitry Solovyov)'
+- '@romanonthego (Roman Dubinin)'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '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: pry
   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'
 description: "                        Ruby wrapper for Uploadcare service API. \n
@@ -119,9 +119,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
-- ".gitignore"
-- ".travis.yml"
+- .DS_Store
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -142,8 +142,12 @@ files:
 - lib/uploadcare/resources/group.rb
 - lib/uploadcare/resources/group_list.rb
 - lib/uploadcare/resources/project.rb
+- lib/uploadcare/rest/auth/auth.rb
+- lib/uploadcare/rest/auth/secure.rb
+- lib/uploadcare/rest/auth/simple.rb
 - lib/uploadcare/rest/connections/api_connection.rb
 - lib/uploadcare/rest/connections/upload_connection.rb
+- lib/uploadcare/rest/middlewares/auth_middleware.rb
 - lib/uploadcare/rest/middlewares/parse_json_middleware.rb
 - lib/uploadcare/rest/middlewares/raise_error_middleware.rb
 - lib/uploadcare/utils/parser.rb
@@ -156,6 +160,8 @@ files:
 - spec/resources/operations_spec.rb
 - spec/resources/project_spec.rb
 - spec/rest/api_connection_spec.rb
+- spec/rest/auth/secure_spec.rb
+- spec/rest/auth/simple_spec.rb
 - spec/rest/errors_spec.rb
 - spec/rest/upload_connection_spec.rb
 - spec/spec_helper.rb
@@ -178,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby gem for Uploadcare
@@ -201,6 +207,8 @@ test_files:
 - spec/resources/operations_spec.rb
 - spec/resources/project_spec.rb
 - spec/rest/api_connection_spec.rb
+- spec/rest/auth/secure_spec.rb
+- spec/rest/auth/simple_spec.rb
 - spec/rest/errors_spec.rb
 - spec/rest/upload_connection_spec.rb
 - spec/spec_helper.rb