platformcraft-filespot 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce9b8ca97b45d1bd725051781cab4895a77cbf9f
-  data.tar.gz: 0bf5eebbdf1402e9668e90f92446c0186e508de4
+  metadata.gz: dcf14ef4db847c5acce86205463816c92e5253d7
+  data.tar.gz: 0dcf09bdcf0ec78c02f21f47b98655edf4297c64
 SHA512:
-  metadata.gz: de9d88d716c115541d00fe96671c0b689556408c6c24a7fbbf3a43aa531de6d40a834e323b5c5e169d9858f477259b484e34d9991bfa0487b38f56fd4dc6d31a
-  data.tar.gz: ab831422fcbeeeb6ec0baea3e0d391e792de277943e39dd23fa323b2aad7761317c42190e46c984cabd93aa87a8d137f2b4e8de6941de45d933ace4d3707ed2f
+  metadata.gz: 09b095787de758de0b9d3ff6bba0f84c3168f9ae28b249f102a17f6d563967aff25f4e2a048767a8be3c55dcf714bd955f65588e43fdcbeb2877521c2925f676
+  data.tar.gz: 38123ce0ad062ee4b7bd1c4ac6fed4bb54a4ca12adcc60f5ee6393462f2128a6210a4c9e091da6f9bb73f4c583e4c2b51cb56f4af05afe223ead91002d5a8142

data/lib/filespot/response.rb

@@ -5,10 +5,22 @@ module Filespot
     attr_reader :code, :status, :data
 
     def initialize(response)
-      json_data = JSON.parse(response.body)
-      @code = json_data.delete('code').to_i
-      @status = json_data.delete('status')
-      @data = json_data
+      if response.status == 200
+        json_data = JSON.parse(response.body)
+        @code = json_data.delete('code').to_i
+        @status = json_data.delete('status')
+        @data = json_data
+      else
+        return_error
+      end
+    end
+
+    private
+
+    def return_error
+      @code = 500
+      @status = 'error'
+      @data = nil
     end
   end
 end

data/lib/filespot/version.rb

@@ -1,3 +1,3 @@
 module Filespot
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/spec/fixtures/download_tasks_id.json

@@ -0,0 +1,15 @@
+{
+    "code": 200,
+    "files":["56ea7c4e534b44353536586c"],
+    "status": "success",
+    "task": {
+        "id": "57011e2a534b44741fc67880",
+        "category": "download",
+        "title": "Download abc.mp4",
+        "body": "Download success.",
+        "status": "Completed",
+        "time_start": "03.04.2016T16:44:10",
+        "time_finish": "03.04.2016T16:44:11",
+        "lock": false
+    }
+}

data/spec/lib/client/download_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Filespot::Download do
+  describe 'Download' do
+    context 'get_download_task' do
+      it 'success' do
+        stub_get('/download_tasks/57011e2a534b44741fc67880', 'download_tasks_id.json')
+        task = Filespot::Client.get_download_task('57011e2a534b44741fc67880')
+        expect(task.id).to eq '57011e2a534b44741fc67880'
+      end
+
+      it 'task_id not found' do
+        stub_request(:get, /api/).to_return(status: 500, body: nil)
+        task = Filespot::Client.get_download_task('nil')
+        expect(task).to eq nil
+      end
+    end
+  end
+end

data/spec/lib/client/objects_spec.rb

@@ -2,20 +2,8 @@ require 'spec_helper'
 
 describe Filespot::Client do
   describe 'Objects' do
-    before do
-      allow(Time).to receive(:now).and_return(1450342665)
-
-      Filespot.configure do |config|
-        config.url = 'api.platformcraft.ru'
-        config.version = '1'
-        config.apiuserid = 'test'
-        config.apikey = 'APIUserKey'
-      end
-    end
-
     it '.get_objects' do
-      uri = 'http://api.platformcraft.ru/1/objects?apiuserid=test&hash=46c5500379d2c09c6f8972c7fd79c27fd7ebf0dd0ab47833a034fd613a4f4d93&timestamp=1450342665'
-      stub_get(uri, 'objects.json')
+      stub_get('/objects', 'objects.json')
       objects = Filespot::Client.get_objects
       expect(objects.count).to eq 2
     end

data/spec/lib/response_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Filespot::Response do
+  context 'errors' do
+    let(:response) { double('response') }
+
+    it 'nil if server error' do
+      allow(response).to receive(:status).and_return(500)
+      expect(Filespot::Response.new(response).data).to be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -9,11 +9,23 @@ RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end
+
+  config.before(:each) do
+    allow(Time).to receive(:now).and_return(1450342665)
+
+    Filespot.configure do |config|
+      config.url = 'api.platformcraft.ru'
+      config.version = '1'
+      config.apiuserid = 'test'
+      config.apikey = 'APIUserKey'
+    end
+  end
 end
 
-def stub_get(uri, fixture_name)
+def stub_get(api_method, fixture_name)
   encoding = 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
   agent = 'Faraday v0.9.2'
+  uri = /api.platformcraft.ru\/1/
   stub_request(:get, uri).with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=> encoding, 'User-Agent'=> agent}).to_return(status: 200, body: fixture(fixture_name), headers: {})
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: platformcraft-filespot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - droff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -85,10 +85,13 @@ files:
 - lib/filespot/response.rb
 - lib/filespot/version.rb
 - platformcraft-filespot.gemspec
+- spec/fixtures/download_tasks_id.json
 - spec/fixtures/objects.json
+- spec/lib/client/download_spec.rb
 - spec/lib/client/objects_spec.rb
 - spec/lib/client_spec.rb
 - spec/lib/digest_spec.rb
+- spec/lib/response_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -109,8 +112,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: http://doc.platformcraft.ru/filespot/api/
-test_files: []
+test_files:
+- spec/fixtures/download_tasks_id.json
+- spec/fixtures/objects.json
+- spec/lib/client/download_spec.rb
+- spec/lib/client/objects_spec.rb
+- spec/lib/client_spec.rb
+- spec/lib/digest_spec.rb
+- spec/lib/response_spec.rb
+- spec/spec_helper.rb