uploadcare-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13befd5dd6e5faed651bdb5735db6273577ce2da
-  data.tar.gz: f93c39068ff590a2b0fcd5bb1388b225c477e00f
+  metadata.gz: 7c1df4ed27dd413da0a8aa2bf116fc41a5f59347
+  data.tar.gz: d947913ea623ceeffc06c583b3406e751f59f7c8
 SHA512:
-  metadata.gz: 4138493da1575faba21ed1136845693c540ef97a04f22bde1f1ea27b2f0cbb02d613cdd207afaa09bec01866984451c14aed15e5b3838b6dcd45a49547102588
-  data.tar.gz: c00dca425022a489b824add52361f82454e79aa8aa51e7afe8e8750ec9ead0145558187b22cb894ddaca46ce93c406a345ab37a9d2c1c9d8fd93babd2c95e7d1
+  metadata.gz: b84d77ef7cf3b2f8aa0463fc824bbb71ed94c78f75817d5756c108d4296df555e58684eaaf202475792e5d953228729a7606f42697e116dceb2fa619b2037fe0
+  data.tar.gz: 85c71b37914fc456cb2e6b9ef0b4f5d691c68ddaa88c44f00edd42504ed9601362bbbce4b4f2ae34a8e9ed1d1115f543e5e3576b750d2bd2c0a2d81cf605b9fa

data/.gitignore

@@ -2,4 +2,5 @@ Gemfile.lock
 .ruby-gemset
 .ruby-version
 
+*.DS_Store
 *.gem

data/lib/uploadcare/resources/file.rb

@@ -92,6 +92,18 @@ module Uploadcare
       alias_method :is_removed?, :is_deleted?
 
 
+      # copy file to target location
+      # note what file copied with operations
+      def copy with_operations=true, target=nil
+        data = Hash.new
+        data[:target] = target if target
+        data[:source] = self.cdn_url_with_operations if with_operations
+        data[:source] = self.cdn_url_without_operations unless with_operations
+
+        @api.post "/files/", data
+      end
+
+
       # Datetime methods
       # practicly try and parse the string to date objects
       ["original", "uploaded", "stored", "removed"].each do |dt|

data/lib/uploadcare/resources/project.rb

@@ -8,14 +8,6 @@ module Uploadcare
         data = @api.get "/project/"
         super data
       end
-
-      # def load data
-      #   if data.respond_to? :each
-      #     data.each do |key, value|
-      #       self.send "#{key}=", value
-      #     end
-      #   end
-      # end
     end
   end
 end

data/lib/uploadcare/rest/middlewares/parse_json_middleware.rb

@@ -7,6 +7,8 @@ module Uploadcare
       class ParseJson < Faraday::Response::Middleware
         WHITESPACE_REGEX = /\A^\s*$\z/
 
+        ERROR_CODES = [400, 401, 403, 404, 406, 408, 422, 429, 500, 502, 503, 504]
+
         def parse(body)
           case body
           when WHITESPACE_REGEX, nil
@@ -17,7 +19,7 @@ module Uploadcare
         end
 
         def on_complete(response)
-          response[:body] = parse(response[:body]) if respond_to?(:parse) && !(response[:status] > 200) #!unparsable_status_codes.include?(response.status)
+          response[:body] = parse(response[:body]) if respond_to?(:parse) && !ERROR_CODES.include?(response[:status])
         end
 
         def unparsable_status_codes

data/lib/uploadcare/version.rb

@@ -1,3 +1,3 @@
 module Uploadcare
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/{file_list_spec.rb → resources/file_list_spec.rb}

@@ -3,9 +3,8 @@ require 'uri'
 require 'socket'
 
 describe Uploadcare::Api::File do
-  before :each do
-    @api = Uploadcare::Api.new(CONFIG)
-    @url = "http://macaw.co/images/macaw-logo.png"
+  before :all do
+    @api = API
     @list = @api.file_list 1
   end
 

data/spec/{file_spec.rb → resources/file_spec.rb}

@@ -4,9 +4,8 @@ require 'socket'
 
 describe Uploadcare::Api::File do
   before :each do
-    @api = Uploadcare::Api.new(CONFIG)
-    @url = "http://macaw.co/images/macaw-logo.png"
-    @file = @api.upload @url
+    @api = API
+    @file = @api.upload IMAGE_URL
   end
 
   it 'file should be an instance of File' do
@@ -102,4 +101,10 @@ describe Uploadcare::Api::File do
     @file.datetime_removed.should == @file.datetime_deleted
   end
 
+
+  it 'should copy itself' do
+    result = @file.copy
+    result.should be_kind_of(Hash)
+    result["type"].should == "file"
+  end
 end

data/spec/{group_list_spec.rb → resources/group_list_spec.rb}

@@ -3,9 +3,8 @@ require 'uri'
 require 'socket'
 
 describe Uploadcare::Api::File do
-  before :each do
-    @api = Uploadcare::Api.new(CONFIG)
-    @url = "http://macaw.co/images/macaw-logo.png"
+  before :all do
+    @api = API
     @list = @api.group_list
   end
 

data/spec/{group_spec.rb → resources/group_spec.rb}

@@ -3,12 +3,9 @@ require 'uri'
 require 'socket'
 
 describe Uploadcare::Api::Group do
-  before :each do
-    @api = Uploadcare::Api.new(CONFIG)
-    @file = File.open(File.join(File.dirname(__FILE__), 'view.png'))
-    @file2 = File.open(File.join(File.dirname(__FILE__), 'view2.jpg'))
-    @files_ary = [@file, @file2]
-    @files = @api.upload @files_ary
+  before :all do
+    @api = API
+    @files = @api.upload FILES_ARY
   end
 
   it "should return group object" do

data/spec/{operations_spec.rb → resources/operations_spec.rb}

@@ -3,10 +3,9 @@ require 'uri'
 require 'socket'
 
 describe Uploadcare::Api::File do
-  before :each do
-    @api = Uploadcare::Api.new(CONFIG)
-    @url = "http://macaw.co/images/macaw-logo.png"
-    @file = @api.upload @url
+  before :all do
+    @api = API
+    @file = @api.upload IMAGE_URL
   end
 
   it "freshly uploaded file should have empty operations list" do

data/spec/{project_spec.rb → resources/project_spec.rb}

@@ -3,8 +3,8 @@ require 'uri'
 require 'socket'
 
 describe Uploadcare::Api::Project do
-  before :each do
-    @api = Uploadcare::Api.new(CONFIG)
+  before :all do
+    @api = API
     @project = @api.project
   end
 

data/spec/spec_helper.rb

@@ -10,6 +10,14 @@ require 'yaml'
 CONFIG = Uploadcare.default_settings
 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)
+IMAGE_URL = "http://macaw.co/images/macaw-logo.png"
+
+FILE1 = File.open(File.join(File.dirname(__FILE__), 'view.png'))
+FILE2 = File.open(File.join(File.dirname(__FILE__), 'view2.jpg'))
+FILES_ARY = [FILE1, FILE2]
+
+
 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]}]

data/spec/{uploading_multiple_spec.rb → uploading/uploading_multiple_spec.rb}

@@ -3,11 +3,9 @@ require 'uri'
 require 'socket'
 
 describe Uploadcare::Api do
-  before :each do
-    @api = Uploadcare::Api.new(CONFIG)
-    @file = File.open(File.join(File.dirname(__FILE__), 'view.png'))
-    @file2 = File.open(File.join(File.dirname(__FILE__), 'view2.jpg'))
-    @files_ary = [@file, @file2]
+  before :all do
+    @api = API
+    @files_ary = FILES_ARY
   end
 
   it "it should upload multiple files" do

data/spec/{uploading_spec.rb → uploading/uploading_spec.rb}

@@ -3,10 +3,10 @@ require 'uri'
 require 'socket'
 
 describe Uploadcare::Api do
-  before :each do
-    @api = Uploadcare::Api.new(CONFIG)
-    @file = File.open(File.join(File.dirname(__FILE__), 'view.png'))
-    @url = "http://macaw.co/images/macaw-logo.png"
+  before :all do
+    @api = API
+    @file = FILE1
+    @url = IMAGE_URL
   end
 
   it 'should upload file or url' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - '@rastyagaev (Vadim Rastyagaev)'
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -132,20 +132,20 @@ files:
 - lib/uploadcare/rest/middlewares/raise_error_middleware.rb
 - lib/uploadcare/utils/parser.rb
 - lib/uploadcare/version.rb
-- spec/file_list_spec.rb
-- spec/file_spec.rb
-- spec/group_list_spec.rb
-- spec/group_spec.rb
-- spec/operations_spec.rb
-- spec/parser_spec.rb
-- spec/project_spec.rb
-- spec/raw_api_spec.rb
+- spec/api/raw_api_spec.rb
+- spec/resources/file_list_spec.rb
+- spec/resources/file_spec.rb
+- spec/resources/group_list_spec.rb
+- spec/resources/group_spec.rb
+- spec/resources/operations_spec.rb
+- spec/resources/project_spec.rb
 - spec/rest/api_connection_spec.rb
 - spec/rest/errors_spec.rb
 - spec/rest/upload_connection_spec.rb
 - spec/spec_helper.rb
-- spec/uploading_multiple_spec.rb
-- spec/uploading_spec.rb
+- spec/uploading/uploading_multiple_spec.rb
+- spec/uploading/uploading_spec.rb
+- spec/utils/parser_spec.rb
 - spec/view.png
 - spec/view2.jpg
 - uploadcare-ruby.gemspec
@@ -176,19 +176,19 @@ signing_key:
 specification_version: 4
 summary: Ruby gem for Uploadcare
 test_files:
-- spec/file_list_spec.rb
-- spec/file_spec.rb
-- spec/group_list_spec.rb
-- spec/group_spec.rb
-- spec/operations_spec.rb
-- spec/parser_spec.rb
-- spec/project_spec.rb
-- spec/raw_api_spec.rb
+- spec/api/raw_api_spec.rb
+- spec/resources/file_list_spec.rb
+- spec/resources/file_spec.rb
+- spec/resources/group_list_spec.rb
+- spec/resources/group_spec.rb
+- spec/resources/operations_spec.rb
+- spec/resources/project_spec.rb
 - spec/rest/api_connection_spec.rb
 - spec/rest/errors_spec.rb
 - spec/rest/upload_connection_spec.rb
 - spec/spec_helper.rb
-- spec/uploading_multiple_spec.rb
-- spec/uploading_spec.rb
+- spec/uploading/uploading_multiple_spec.rb
+- spec/uploading/uploading_spec.rb
+- spec/utils/parser_spec.rb
 - spec/view.png
 - spec/view2.jpg