uploadcare-ruby 1.2.2 → 2.0.0

data/spec/spec_helper.rb

@@ -32,10 +32,20 @@ if CONFIG[:public_key] == 'demopublickey'
   end
 end
 
-def retry_if(error, retries=5, &block)
+Dir[File.join(File.dirname(__FILE__), 'shared/*.rb')].each{|path| require path}
+
+def retry_if(error, retries=10, &block)
   block.call
 rescue error
   raise if retries <= 0
   sleep 0.2
   retry_if(error, retries-1, &block)
 end
+
+def wait_until_ready(file)
+  unless file.is_ready
+    sleep 0.2
+    file.load_data!
+    wait_until_ready(file)
+  end
+end

data/spec/uploadcare_spec.rb

@@ -1,43 +1,20 @@
 require 'spec_helper'
 
 describe Uploadcare do
-  around do |example|
-    orig_stderr = $stderr
-    $stderr = StringIO.new
-
-    example.call
-
-    $stderr = orig_stderr
-  end
 
   describe '::user_agent' do
-    subject(:user_agent) { described_class.user_agent(options) }
-    let(:options) { {user_agent: 'user/agent'} }
-    let(:user_agent_builder) { instance_double('Uploadcare::UserAgent') }
-
-    it 'returns user agent string' do
-      allow(Uploadcare::UserAgent).to receive(:new) { user_agent_builder }
-      expect(user_agent_builder).to receive(:call).with(options) { 'user/agent' }
-
-      expect(user_agent).to eq('user/agent')
+    context "if :user_agent is specified in method's options" do
+      it "returns it's stringified version" do
+        expect( Uploadcare.user_agent(user_agent: 123) ).to eq '123'
+      end
     end
 
-    it 'is deprecated' do
-      user_agent
-
-      $stderr.rewind
-      expect($stderr.string).to start_with('[DEPRECATION] `Uploadcare::user_agent`')
+    context "if user_agent is not specified in method's options" do
+      it 'builds user-agent from ruby version, gem version and public key' do
+        expected = /#{Gem.ruby_version}\/#{described_class::VERSION}\/test/
+        expect( Uploadcare.user_agent(public_key: 'test') ).to match(expected)
+      end
     end
   end
 
-  describe '::USER_AGENT' do
-    it { expect(described_class::USER_AGENT).not_to be_nil }
-
-    it 'is deprecated' do
-      described_class::USER_AGENT
-
-      $stderr.rewind
-      expect($stderr.string).to start_with('[DEPRECATION] `Uploadcare::USER_AGENT`')
-    end
-  end
 end

data/spec/utils/parser_spec.rb

@@ -13,11 +13,11 @@ describe Uploadcare::Parser do
     
     parsed = Uploadcare::Parser.parse(string)
     
-    parsed.should be_kind_of(Uploadcare::Parser::File)
-    parsed.uuid.should == @uuid
-    parsed.count.should be_nil
-    parsed.operations.should be_kind_of(Array)
-    parsed.operations.should be_empty
+    expect(parsed).to be_kind_of(Uploadcare::Parser::File)
+    expect(parsed.uuid).to eq @uuid
+    expect(parsed.count).to be_nil
+    expect(parsed.operations).to be_kind_of(Array)
+    expect(parsed.operations).to be_empty
   end
 
   it "should parse file cdn string without operations string" do
@@ -25,11 +25,11 @@ describe Uploadcare::Parser do
     
     parsed = Uploadcare::Parser.parse(string)
     
-    parsed.should be_kind_of(Uploadcare::Parser::File)
-    parsed.uuid.should == @uuid
-    parsed.count.should be_nil
-    parsed.operations.should be_kind_of(Array)
-    parsed.operations.should be_empty
+    expect(parsed).to be_kind_of(Uploadcare::Parser::File)
+    expect(parsed.uuid).to eq @uuid
+    expect(parsed.count).to be_nil
+    expect(parsed.operations).to be_kind_of(Array)
+    expect(parsed.operations).to be_empty
   end
 
   it "should parse file cdn string with operations string" do
@@ -37,11 +37,11 @@ describe Uploadcare::Parser do
     
     parsed = Uploadcare::Parser.parse(string)
     
-    parsed.should be_kind_of(Uploadcare::Parser::File)
-    parsed.uuid.should == @uuid
-    parsed.count.should be_nil
-    parsed.operations.should be_kind_of(Array)
-    parsed.operations.should_not be_empty
+    expect(parsed).to be_kind_of(Uploadcare::Parser::File)
+    expect(parsed.uuid).to eq @uuid
+    expect(parsed.count).to be_nil
+    expect(parsed.operations).to be_kind_of(Array)
+    expect(parsed.operations).not_to be_empty
   end
 
   it "should parse group uuid string" do
@@ -49,12 +49,12 @@ describe Uploadcare::Parser do
     
     parsed = Uploadcare::Parser.parse(string)
     
-    parsed.should be_kind_of(Uploadcare::Parser::Group)
-    parsed.uuid.should == "#{@uuid}~#{@count}"
-    parsed.count.should_not be_nil
-    parsed.count.should == @count
-    parsed.operations.should be_kind_of(Array)
-    parsed.operations.should be_empty
+    expect(parsed).to be_kind_of(Uploadcare::Parser::Group)
+    expect(parsed.uuid).to eq "#{@uuid}~#{@count}"
+    expect(parsed.count).not_to be_nil
+    expect(parsed.count).to eq @count
+    expect(parsed.operations).to be_kind_of(Array)
+    expect(parsed.operations).to be_empty
   end
 
   it "should parse file cdn string without operations string" do
@@ -62,12 +62,12 @@ describe Uploadcare::Parser do
     
     parsed = Uploadcare::Parser.parse(string)
     
-    parsed.should be_kind_of(Uploadcare::Parser::Group)
-    parsed.uuid.should == "#{@uuid}~#{@count}"
-    parsed.count.should_not be_nil
-    parsed.count.should == @count
-    parsed.operations.should be_kind_of(Array)
-    parsed.operations.should be_empty
+    expect(parsed).to be_kind_of(Uploadcare::Parser::Group)
+    expect(parsed.uuid).to eq "#{@uuid}~#{@count}"
+    expect(parsed.count).not_to be_nil
+    expect(parsed.count).to eq @count
+    expect(parsed.operations).to be_kind_of(Array)
+    expect(parsed.operations).to be_empty
   end
 
   it "should parse file cdn string with operations string" do
@@ -75,13 +75,11 @@ describe Uploadcare::Parser do
     
     parsed = Uploadcare::Parser.parse(string)
     
-    parsed.should be_kind_of(Uploadcare::Parser::Group)
-    parsed.uuid.should == "#{@uuid}~#{@count}"
-    parsed.count.should_not be_nil
-    parsed.count.should == @count
-    parsed.operations.should be_kind_of(Array)
-    parsed.operations.should_not be_empty
+    expect(parsed).to be_kind_of(Uploadcare::Parser::Group)
+    expect(parsed.uuid).to eq "#{@uuid}~#{@count}"
+    expect(parsed.count).not_to be_nil
+    expect(parsed.count).to eq @count
+    expect(parsed.operations).to be_kind_of(Array)
+    expect(parsed.operations).not_to be_empty
   end  
-
-
-end
+end

data/uploadcare-ruby.gemspec

@@ -5,18 +5,19 @@ Gem::Specification.new do |gem|
   gem.name          = "uploadcare-ruby"
   gem.authors       = ["@rastyagaev (Vadim Rastyagaev)",
                        "@dimituri (Dimitry Solovyov)",
-                       "@romanonthego (Roman Dubinin)"]
+                       "@romanonthego (Roman Dubinin)",
+                       "@vizvamitra (Dmitrii Krasnov)"]
   gem.email         = ["hello@uploadcare.com"]
   gem.summary       = "Ruby gem for Uploadcare"
   gem.description   = <<-EOF
-                        Ruby wrapper for Uploadcare service API. 
+                        Ruby wrapper for Uploadcare service API.
                         Full documentations on APIs can be found
                         at https://uploadcare.com/documentation/rest/
                         and https://uploadcare.com/documentation/upload/
                       EOF
-  gem.metadata       =  { 
-                          "github" => "https://github.com/uploadcare/uploadcare-ruby", 
-                          "issue_tracker" => "https://github.com/uploadcare/uploadcare-ruby/issues" 
+  gem.metadata       =  {
+                          "github" => "https://github.com/uploadcare/uploadcare-ruby",
+                          "issue_tracker" => "https://github.com/uploadcare/uploadcare-ruby/issues"
                         }
   gem.homepage      = "https://uploadcare.com/documentation/libs/"
   gem.license       = "MIT"
@@ -31,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'multipart-post'
   gem.add_runtime_dependency 'mime-types'
 
-  gem.add_development_dependency 'rspec', "~> 3"
+  gem.add_development_dependency 'rspec', "~> 3.6"
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'
 end

metadata

@@ -1,147 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
-- "@rastyagaev (Vadim Rastyagaev)"
-- "@dimituri (Dimitry Solovyov)"
-- "@romanonthego (Roman Dubinin)"
+- '@rastyagaev (Vadim Rastyagaev)'
+- '@dimituri (Dimitry Solovyov)'
+- '@romanonthego (Roman Dubinin)'
+- '@vizvamitra (Dmitrii Krasnov)'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2017-09-26 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'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.6'
 - !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
-  \                       Full documentations on APIs can be found\n                        at
-  https://uploadcare.com/documentation/rest/\n                        and https://uploadcare.com/documentation/upload/\n"
+description: |2
+                          Ruby wrapper for Uploadcare service API.
+                          Full documentations on APIs can be found
+                          at https://uploadcare.com/documentation/rest/
+                          and https://uploadcare.com/documentation/upload/
 email:
 - hello@uploadcare.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
-- ".gitignore"
-- ".travis.yml"
+- .DS_Store
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- UPGRADE_NOTES.md
 - lib/uploadcare.rb
 - lib/uploadcare/api.rb
 - lib/uploadcare/api/file_api.rb
 - lib/uploadcare/api/file_list_api.rb
+- lib/uploadcare/api/file_storage_api.rb
 - lib/uploadcare/api/group_api.rb
 - lib/uploadcare/api/group_list_api.rb
 - lib/uploadcare/api/project_api.rb
 - lib/uploadcare/api/raw_api.rb
 - lib/uploadcare/api/uploading_api.rb
+- lib/uploadcare/api/uploading_api/upload_params.rb
+- lib/uploadcare/api/validators/file_list_options_validator.rb
+- lib/uploadcare/api/validators/group_list_options_validator.rb
 - lib/uploadcare/errors/errors.rb
 - lib/uploadcare/resources/file.rb
 - lib/uploadcare/resources/file_list.rb
 - lib/uploadcare/resources/group.rb
 - lib/uploadcare/resources/group_list.rb
 - lib/uploadcare/resources/project.rb
+- lib/uploadcare/resources/resource_list.rb
 - lib/uploadcare/rest/auth/auth.rb
 - lib/uploadcare/rest/auth/secure.rb
 - lib/uploadcare/rest/auth/simple.rb
@@ -151,9 +161,13 @@ files:
 - lib/uploadcare/rest/middlewares/parse_json_middleware.rb
 - lib/uploadcare/rest/middlewares/raise_error_middleware.rb
 - lib/uploadcare/utils/parser.rb
-- lib/uploadcare/utils/user_agent.rb
 - lib/uploadcare/version.rb
+- spec/api/file_list_api_spec.rb
+- spec/api/file_storage_api_spec.rb
+- spec/api/group_list_api_spec.rb
 - spec/api/raw_api_spec.rb
+- spec/api/uploading_api/upload_params_spec.rb
+- spec/api/uploading_api_spec.rb
 - spec/resources/file_list_spec.rb
 - spec/resources/file_spec.rb
 - spec/resources/group_list_spec.rb
@@ -165,12 +179,10 @@ files:
 - spec/rest/auth/simple_spec.rb
 - spec/rest/errors_spec.rb
 - spec/rest/upload_connection_spec.rb
+- spec/shared/resource_list.rb
 - spec/spec_helper.rb
 - spec/uploadcare_spec.rb
-- spec/uploading/uploading_multiple_spec.rb
-- spec/uploading/uploading_spec.rb
 - spec/utils/parser_spec.rb
-- spec/utils/user_agent_spec.rb
 - spec/view.png
 - spec/view2.jpg
 - uploadcare-ruby.gemspec
@@ -186,22 +198,27 @@ 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.7.7
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby gem for Uploadcare
 test_files:
+- spec/api/file_list_api_spec.rb
+- spec/api/file_storage_api_spec.rb
+- spec/api/group_list_api_spec.rb
 - spec/api/raw_api_spec.rb
+- spec/api/uploading_api/upload_params_spec.rb
+- spec/api/uploading_api_spec.rb
 - spec/resources/file_list_spec.rb
 - spec/resources/file_spec.rb
 - spec/resources/group_list_spec.rb
@@ -213,11 +230,9 @@ test_files:
 - spec/rest/auth/simple_spec.rb
 - spec/rest/errors_spec.rb
 - spec/rest/upload_connection_spec.rb
+- spec/shared/resource_list.rb
 - spec/spec_helper.rb
 - spec/uploadcare_spec.rb
-- spec/uploading/uploading_multiple_spec.rb
-- spec/uploading/uploading_spec.rb
 - spec/utils/parser_spec.rb
-- spec/utils/user_agent_spec.rb
 - spec/view.png
 - spec/view2.jpg