crystal_sdk 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac7754e0ca7737a3f792fbf72b1a38fc333db61
-  data.tar.gz: 36981f0bda19928584e1c408afdd0e52faf329ae
+  metadata.gz: 1dea48c45c081f3af807b9d3d23f1c67cbc6419b
+  data.tar.gz: 4b7c406415da2322c4c11200f2e4fb68389e2754
 SHA512:
-  metadata.gz: c4bffe97b1b4cc64e5f76b5e25e15032b58636b96bbb44d102e960dd349c8d351580d4a6485530b0a2fb13875ad1e901a188a2f876c1ca123fdbf78aaeb0104a
-  data.tar.gz: 6c6579a048f4c7ba398514e52507eaa98a71ff9137e5a3608255df83f5ddd3e36c1b6dc1ca6d01516a3684eaab31b6d794c78b521d6801ec3ab1e0b2d84195d3
+  metadata.gz: 9ec2f1e41105835b55dd790e543bb9ba5066f4c57a1faf0817bd578e55884041fc09a51892c61d48b64d0721c10497e56648600a1546a8616171572bc5d0c4c0
+  data.tar.gz: 99acff4789f52394971b2e0e9a585c76755fa6de6fae8991611a7431ecfa5e9e5ef174ba03d4a1c6099cab9cfa37bc8578cc6b47a7008067e5b8f420594ff4d0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    crystal_sdk (1.0.0)
+    crystal_sdk (1.0.1)
       nestful (~> 1.1)
       recursive-open-struct (~> 1.0)
 

data/lib/crystal_sdk/profile.rb

@@ -1,30 +1,9 @@
 require 'timeout'
+require_relative 'profile/errors'
 require_relative 'profile/request'
 
 module CrystalSDK
   class Profile
-    class NotFoundError < StandardError; end
-    class RateLimitHitError < StandardError; end
-    class UnexpectedError < StandardError; end
-
-    class NotAuthedError < StandardError
-      attr_reader :token
-
-      def initialize(token, msg = 'Organization Token was invalid')
-        @token = token
-        super(msg)
-      end
-    end
-
-    class NotFoundYetError < StandardError
-      attr_reader :request
-
-      def initialize(request, msg = 'Profile not found in time')
-        @request = request
-        super(msg)
-      end
-    end
-
     attr_reader :info, :recommendations
 
     def initialize(info, recommendations)
@@ -56,18 +35,8 @@ module CrystalSDK
           end
         rescue Timeout::Error
           raise NotFoundYetError.new(request)
-
-        rescue Nestful::ResponseError => e
-          check_for_error(e.response)
-          raise e
         end
       end
-
-      def check_for_error(resp)
-        raise RateLimitHitError if resp.code == '429'
-        raise NotAuthedError.new(Base.key) if resp.code == '401'
-        raise NotFoundError if resp.code == '404'
-      end
     end
   end
 end

data/lib/crystal_sdk/profile/errors.rb

@@ -0,0 +1,25 @@
+module CrystalSDK
+  class Profile
+    class NotFoundError < StandardError; end
+    class RateLimitHitError < StandardError; end
+    class UnexpectedError < StandardError; end
+
+    class NotAuthedError < StandardError
+      attr_reader :token
+
+      def initialize(token, msg = 'Organization Token was invalid')
+        @token = token
+        super(msg)
+      end
+    end
+
+    class NotFoundYetError < StandardError
+      attr_reader :request
+
+      def initialize(request, msg = 'Profile not found in time')
+        @request = request
+        super(msg)
+      end
+    end
+  end
+end

data/lib/crystal_sdk/profile/request.rb

@@ -10,17 +10,36 @@ module CrystalSDK
         @id = id
       end
 
-      def self.from_search(query)
-        resp = Api.make_request(:post, 'profile_search/async', params: query)
-        body = JSON.parse(resp.body || '{}', symbolize_names: true)
+      class << self
+        def from_search(query)
+          begin
+            resp = Api.make_request(:post, 'profile_search/async', params: query)
+          rescue Nestful::ResponseError => e
+            check_for_error(e.response)
+            raise e
+          end
 
-        Profile::Request.new(body[:request_id])
+          body = JSON.parse(resp.body || '{}', symbolize_names: true)
+          Profile::Request.new(body[:request_id])
+        end
+
+        def check_for_error(resp)
+          raise Profile::RateLimitHitError if resp.code == '429'
+          raise Profile::NotAuthedError.new(Base.key) if resp.code == '401'
+          raise Profile::NotFoundError if resp.code == '404'
+        end
       end
 
       def fetch_request_info
         return @cached_data if @cached_data
 
-        resp = Api.make_request(:get, "results/#{@id}")
+        begin
+          resp = Api.make_request(:get, "results/#{@id}")
+        rescue Nestful::ResponseError => e
+          Request.check_for_error(e.response)
+          raise e
+        end
+
         body = resp.body ? JSON.parse(resp.body, symbolize_names: true) : nil
 
         if body[:status] == 'complete' || body[:status] == 'error'

data/lib/crystal_sdk/version.rb

@@ -1,3 +1,3 @@
 module CrystalSDK
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/spec/crystal_sdk/profile/request_spec.rb

@@ -22,6 +22,17 @@ describe CrystalSDK::Profile::Request do
 
         expect { subject }.to raise_error('SomeRandomError')
       end
+
+      it 'should pass Nestful exceptions to check_for_error' do
+        allow(CrystalSDK::Api).to receive(:make_request)
+          .with(request_type, endpoint, params: query)
+          .and_raise(Nestful::ResponseError.new(nil, nil))
+
+        expect(CrystalSDK::Profile::Request).to receive(:check_for_error)
+          .and_raise('CheckForErrorCalled')
+
+        expect { subject }.to raise_error('CheckForErrorCalled')
+      end
     end
 
     context 'CrystalSDK::Api returns invalid json body' do
@@ -249,4 +260,65 @@ describe CrystalSDK::Profile::Request do
       end
     end
   end
+
+  describe '.check_for_error' do
+    subject { CrystalSDK::Profile::Request.check_for_error(resp) }
+
+    context '200' do
+      let(:resp) do
+        double(code: '200')
+      end
+
+      it 'should raise no error' do
+        expect { subject }.to_not raise_error
+      end
+    end
+
+    context '202' do
+      let(:resp) { double(code: '202') }
+
+      it 'should raise no error' do
+        expect { subject }.to_not raise_error
+      end
+    end
+
+    context '401' do
+      let(:resp) { double(code: '401') }
+
+      before(:each) do
+        @orig_key = CrystalSDK.key
+        CrystalSDK.key = 'SomeKey'
+      end
+
+      after(:each) do
+        CrystalSDK.key = @orig_key
+      end
+
+      it 'should raise NotAuthedError' do
+        expect { subject }.to raise_error(CrystalSDK::Profile::NotAuthedError)
+
+        begin
+          subject
+        rescue CrystalSDK::Profile::NotAuthedError => e
+          expect(e.token).to eql('SomeKey')
+        end
+      end
+    end
+
+    context '404' do
+      let(:resp) { double(code: '404') }
+
+      it 'should raise NotFoundError' do
+        expect { subject }.to raise_error(CrystalSDK::Profile::NotFoundError)
+      end
+    end
+
+    context '429' do
+      let(:resp) { double(code: '429') }
+
+      it 'should raise RateLimitHitError' do
+        expect { subject }.to raise_error(CrystalSDK::Profile::RateLimitHitError)
+      end
+    end
+  end
 end

data/spec/crystal_sdk/profile_spec.rb

@@ -43,20 +43,10 @@ describe CrystalSDK::Profile do
           .and_return(req)
 
         allow(req).to receive(:did_finish?)
-          .and_raise(Nestful::ResponseError.new(nil, double()))
+          .and_raise(StandardError.new)
       end
 
-      it 'should pass it off to check_for_error' do
-        expect(CrystalSDK::Profile).to receive(:check_for_error)
-          .and_raise('CheckForErrorCalled')
-
-        expect { subject }.to raise_error('CheckForErrorCalled')
-      end
-
-      it 'should still raise exception if passed check_for_error' do
-        expect(CrystalSDK::Profile).to receive(:check_for_error)
-          .and_return(nil)
-
+      it 'should raise exception' do
         expect { subject }.to raise_error
       end
     end
@@ -78,7 +68,7 @@ describe CrystalSDK::Profile do
     end
 
     context 'request did not finish before timeout expired' do
-      subject { CrystalSDK::Profile.search(query, timeout: 1) }
+      subject { CrystalSDK::Profile.search(query, timeout: 0.01) }
 
       before(:each) do
         allow(CrystalSDK::Profile::Request).to receive(:from_search)
@@ -100,66 +90,85 @@ describe CrystalSDK::Profile do
         end
       end
     end
-  end
 
-  describe '.check_for_error' do
-    subject { CrystalSDK::Profile.check_for_error(resp) }
+    context 'ApiSDK threw errors during initial request creation' do
+      context '401 error' do
+        before(:each) do
+          allow(CrystalSDK::Api).to receive(:make_request)
+            .and_raise(Nestful::ResponseError.new(nil, resp))
+        end
+        let(:resp) { OpenStruct.new(code: '401') }
 
-    context '200' do
-      let(:resp) do
-        double(code: '200')
+        it 'should raise NotAuthedError' do
+          expect { subject }.to raise_error(CrystalSDK::Profile::NotAuthedError)
+        end
       end
 
-      it 'should raise no error' do
-        expect { subject }.to_not raise_error
+      context '404 error' do
+        before(:each) do
+          allow(CrystalSDK::Api).to receive(:make_request)
+            .and_raise(Nestful::ResponseError.new(nil, resp))
+        end
+        let(:resp) { OpenStruct.new(code: '404') }
+
+        it 'should raise NotFoundError' do
+          expect { subject }.to raise_error(CrystalSDK::Profile::NotFoundError)
+        end
       end
-    end
 
-    context '202' do
-      let(:resp) { double(code: '202') }
+      context '429 error' do
+        before(:each) do
+          allow(CrystalSDK::Api).to receive(:make_request)
+            .and_raise(Nestful::ResponseError.new(nil, resp))
+        end
+        let(:resp) { OpenStruct.new(code: '429') }
 
-      it 'should raise no error' do
-        expect { subject }.to_not raise_error
+        it 'should raise RateLimitHitError' do
+          expect { subject }.to raise_error(CrystalSDK::Profile::RateLimitHitError)
+        end
       end
     end
 
-    context '401' do
-      let(:resp) { double(code: '401') }
+    context 'ApiSDK threw errors during polling' do
+      context '401 error' do
+        before(:each) do
+          allow(CrystalSDK::Profile::Request).to receive(:from_search)
+            .and_return(CrystalSDK::Profile::Request.new('some_id'))
 
-      before(:each) do
-        @orig_key = CrystalSDK.key
-        CrystalSDK.key = 'SomeKey'
-      end
+          allow(CrystalSDK::Api).to receive(:make_request)
+            .and_raise(Nestful::ResponseError.new(nil, resp))
+        end
+        let(:resp) { OpenStruct.new(code: '401') }
 
-      after(:each) do
-        CrystalSDK.key = @orig_key
+        it 'should raise NotAuthedError' do
+          expect { subject }.to raise_error(CrystalSDK::Profile::NotAuthedError)
+        end
       end
 
-      it 'should raise NotAuthedError' do
-        expect { subject }.to raise_error(CrystalSDK::Profile::NotAuthedError)
+      context '404 error' do
+        before(:each) do
+          allow(CrystalSDK::Api).to receive(:make_request)
+            .and_raise(Nestful::ResponseError.new(nil, resp))
+        end
+        let(:resp) { OpenStruct.new(code: '404') }
 
-        begin
-          subject
-        rescue CrystalSDK::Profile::NotAuthedError => e
-          expect(e.token).to eql('SomeKey')
+        it 'should raise NotFoundError' do
+          expect { subject }.to raise_error(CrystalSDK::Profile::NotFoundError)
         end
       end
-    end
 
-    context '404' do
-      let(:resp) { double(code: '404') }
+      context '429 error' do
+        before(:each) do
+          allow(CrystalSDK::Api).to receive(:make_request)
+            .and_raise(Nestful::ResponseError.new(nil, resp))
+        end
+        let(:resp) { OpenStruct.new(code: '429') }
 
-      it 'should raise NotFoundError' do
-        expect { subject }.to raise_error(CrystalSDK::Profile::NotFoundError)
+        it 'should raise RateLimitHitError' do
+          expect { subject }.to raise_error(CrystalSDK::Profile::RateLimitHitError)
+        end
       end
     end
 
-    context '429' do
-      let(:resp) { double(code: '429') }
-
-      it 'should raise RateLimitHitError' do
-        expect { subject }.to raise_error(CrystalSDK::Profile::RateLimitHitError)
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crystal_sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cory Finger
@@ -86,6 +86,7 @@ files:
 - lib/crystal_sdk/api.rb
 - lib/crystal_sdk/base.rb
 - lib/crystal_sdk/profile.rb
+- lib/crystal_sdk/profile/errors.rb
 - lib/crystal_sdk/profile/request.rb
 - lib/crystal_sdk/version.rb
 - spec/crystal_sdk/api_spec.rb