esp_sdk 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52d23d423160230bb03f5d2b126c428f5d8b100
-  data.tar.gz: acebf34428219913ae23155ba4f273307c3c66d9
+  metadata.gz: 5aa714df3a847288324a32ae65bba48ed237af47
+  data.tar.gz: 8e197b5f6243a21242ef6c2031a880e0443fe3d9
 SHA512:
-  metadata.gz: 8c61bdcd07beca80268a66b01c12d7be7ab1aec31a7d3522f3e425804a6096936683e358930f4304dde5b68b95597ec16f608c527719a1b13fb5ac2b164e1682
-  data.tar.gz: 641b7be183bae8eec78d9bf70c314563b213793d651f78ad7934e7aa5f41474d05c105fad4ecc8f68e4a667c37b16511d732d27b8e86bf6ff0fc792888365233
+  metadata.gz: c968f9a4ed69d7a4d66a50b9b22bf72925dac0140818f6b93a0f05168a509223e466057d3881f0fd7de1bd572c8743835a9fcd93d75aa9330a246af5d2e14aaf
+  data.tar.gz: db6a83e184df987dba7eef7938a55b2c6065b822e6bec79228b1979c8a6367e58e49e7f793c98087cd5149f67453a694d7f4de4d5483750e272f051b5141dadd

data/lib/esp_sdk/configure.rb

@@ -16,7 +16,7 @@ module EspSdk
       elsif EspSdk.release?
         @uri = 'https://api-rel.evident.io/api'
       else
-        @uri = 'http://0.0.0.0:3001/api'
+        @uri = 'http://0.0.0.0:3000/api'
       end
     end
 

data/lib/esp_sdk/end_points/base.rb

@@ -78,12 +78,24 @@ module EspSdk
         @current_record  = ActiveSupport::HashWithIndifferentAccess.new(JSON.load(response.body))
       end
 
+      # Converts the link header into a hash of links
+      #
+      # "<http://test.host/api/v1/custom_signatures?page=2>; rel=\"last\", <http://test.host/api/v1/custom_signatures?page=2>; rel=\"next\""
+      # => { "last" => "http://test.host/api/v1/custom_signatures?page=2",
+      #      "next" => "http://test.host/api/v1/custom_signatures?page=2" }
       def pagination_links(response)
         @page_links = ActiveSupport::HashWithIndifferentAccess.new(JSON.load(response.headers[:link]))
+      rescue JSON::ParserError
+        @page_links = ActiveSupport::HashWithIndifferentAccess.new.tap do |page_links|
+          response.headers[:link].to_s.split(',').each  do |link|
+            /<(?<link>.*)>; rel="(?<key>\w*)"/ =~ link
+            page_links[key] = link
+          end
+        end
       end
 
-      def current_page=(value)
-        @current_page = ActiveSupport::HashWithIndifferentAccess.new(value)
+      def current_page=(values)
+        @current_page = values.map(&:with_indifferent_access)
       end
     end
   end

data/lib/esp_sdk/version.rb

@@ -1,3 +1,3 @@
 module EspSdk
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/test/esp_sdk/configure_test.rb

@@ -29,7 +29,7 @@ class ConfigureTest < ActiveSupport::TestCase
       should 'return the development URI when the environment is not release or production' do
         EspSdk.expects(:production?).returns(false)
         EspSdk.expects(:release?).returns(false)
-        assert_equal 'http://0.0.0.0:3001/api', @config.uri
+        assert_equal 'http://0.0.0.0:3000/api', @config.uri
       end
     end
 
@@ -46,4 +46,4 @@ class ConfigureTest < ActiveSupport::TestCase
       end
     end
   end
-end
+end

data/test/esp_sdk/end_points/base_test.rb

@@ -10,28 +10,39 @@ class BaseTest < ActiveSupport::TestCase
     end
 
     context '#next_page' do
-      setup do
-        # Setup fakeweb
-        FakeWeb.register_uri(:get, /api\/v1\/base/,
-                             :body => { stub: 'Stub' }.to_json)
-      end
-
       should 'call list if @current_page is blank' do
+        FakeWeb.register_uri(:get, %r{api/v1/base}, body: [{ stub: 'Stub' }].to_json)
         @base.expects(:list)
+
         @base.next_page
       end
 
       should "return the current page if @page_links['links']' are blank" do
+        FakeWeb.register_uri(:get, %r{api/v1/base}, body: [{ stub: 'Stub' }].to_json)
         @base.expects(:current_page)
+
         @base.next_page
       end
+
+      should 'request next page and set current_page' do
+        FakeWeb.register_uri(:get, 'http://0.0.0.0:3000/api/v1/base',
+                             :body => [{ stub: 'page1' }].to_json,
+                             :link => %(<http://0.0.0.0:3000/api/v1/base?page=5>; rel="last", <http://0.0.0.0:3000/api/v1/base?page=2>; rel="next"))
+        FakeWeb.register_uri(:get, 'http://0.0.0.0:3000/api/v1/base?page=2',
+                             :body => [{ stub: 'page2' }].to_json)
+
+        @base   = EspSdk::EndPoints::Base.new(@config)
+        @base.list
+        @base.next_page
+
+        assert_equal 'page2', @base.current_page.first[:stub]
+      end
     end
 
     context '#prev_page' do
       setup do
-        # Setup fakeweb
-        FakeWeb.register_uri(:get, /api\/v1\/base/,
-                             :body => { stub: 'Stub' }.to_json)
+        FakeWeb.register_uri(:get, %r{api/v1/base},
+                             :body => [{ stub: 'Stub' }].to_json)
       end
 
       should 'call list if @current_page is blank' do
@@ -46,30 +57,26 @@ class BaseTest < ActiveSupport::TestCase
     end
 
     context '#list' do
-      setup do
-        # Setup fakeweb
-         FakeWeb.register_uri(:get, /api\/v1\/base/,
-                             :body => { stub: 'Stub' }.to_json)
-      end
-
       should 'set the current page and setup link pagination' do
+        FakeWeb.register_uri(:get, %r{api/v1/base},
+                             :body => [{ stub: 'Stub' }].to_json)
         @base.expects(:pagination_links)
+
         response = @base.list
-        assert response.key?('stub')
+
+        assert response.first.key?('stub')
         assert_equal response, @base.current_page
       end
     end
 
     context '#show' do
-      setup do
-        # Setup fakeweb
-        FakeWeb.register_uri(:get, /api\/v1\/base\/1/,
-                             :body => { stub: 'Stub' }.to_json)
-      end
-
       should 'call validate id and return the stub response, and set the current_record' do
+        FakeWeb.register_uri(:get, %r{api/v1/base/1},
+                             :body => { stub: 'Stub' }.to_json)
         payload = { id: 1 }
+
         @base.expects(:validate_id).with(payload)
+
         response = @base.show(payload)
         assert response.key?('stub')
         assert_equal response, @base.current_record
@@ -77,15 +84,13 @@ class BaseTest < ActiveSupport::TestCase
     end
 
     context '#update' do
-      setup do
-        # Setup fakeweb
-        FakeWeb.register_uri(:get, /api\/v1\/base\/1/,
-                             :body => { stub: 'Stub' }.to_json)
-      end
-
       should 'call validate id and return the stub response, and set the current_record' do
+        FakeWeb.register_uri(:get, %r{api/v1/base/1},
+                             :body => { stub: 'Stub' }.to_json)
         payload = { id: 1, name: 'Test' }
+
         @base.expects(:validate_id).with(payload)
+
         response = @base.show(payload)
         assert response.key?('stub')
         assert_equal response, @base.current_record
@@ -93,15 +98,13 @@ class BaseTest < ActiveSupport::TestCase
     end
 
     context '#destroy' do
-      setup do
-        # Setup fakeweb
+      should 'call validate id and return the stub response, and set the current_record' do
         FakeWeb.register_uri(:get, /api\/v1\/base\/1/,
                              :body => { success: 'Stub has been destroyed' }.to_json)
-      end
-
-      should 'call validate id and return the stub response, and set the current_record' do
         payload = { id: 1 }
+
         @base.expects(:validate_id).with(payload)
+
         response = @base.show(payload)
         assert response.key?('success')
         assert_equal response, @base.current_record
@@ -127,7 +130,7 @@ class BaseTest < ActiveSupport::TestCase
         # Test through a different endpoint to get a valid URL
         EspSdk.instance_variable_set(:@env, :development)
         external_account = EspSdk::EndPoints::ExternalAccounts.new(@config)
-        assert_equal 'http://0.0.0.0:3001/api/v1/external_accounts/1', external_account.send(:id_url, 1)
+        assert_equal 'http://0.0.0.0:3000/api/v1/external_accounts/1', external_account.send(:id_url, 1)
       end
 
       should 'return a valid id url for the release environment' do
@@ -152,7 +155,7 @@ class BaseTest < ActiveSupport::TestCase
         # Test through a different endpoint to get a valid URL
         EspSdk.instance_variable_set(:@env, :development)
         external_account = EspSdk::EndPoints::ExternalAccounts.new(@config)
-        assert_equal 'http://0.0.0.0:3001/api/v1/external_accounts', external_account.send(:base_url)
+        assert_equal 'http://0.0.0.0:3000/api/v1/external_accounts', external_account.send(:base_url)
       end
 
       should 'return a valid base url for the release environment' do
@@ -173,39 +176,55 @@ class BaseTest < ActiveSupport::TestCase
     end
 
     context 'current_page' do
-      setup do
-        # Setup fakeweb
-        FakeWeb.register_uri(:get, /api\/v1\/base/, body: { stub: 'Stub' }.to_json)
+      should 'convert hashes to ActiveSupport::HashWithIndifferentAccess' do
+        FakeWeb.register_uri(:get, %r{api/v1/base}, body: [{stub: 'Stub'}, {}].to_json)
+
         @base.list
-      end
 
-      should 'be ActiveSupport::HashWithIndifferentAccess' do
-        assert @base.current_page.is_a?(ActiveSupport::HashWithIndifferentAccess)
+        assert @base.current_page.first.is_a?(ActiveSupport::HashWithIndifferentAccess)
+        assert @base.current_page.last.is_a?(ActiveSupport::HashWithIndifferentAccess)
       end
     end
 
     context 'current_record' do
-      setup do
-        # Setup fakeweb
-        FakeWeb.register_uri(:get, /api\/v1\/base\/1/, body: { stub: 'Stub' }.to_json)
+      should 'be ActiveSupport::HashWithIndifferentAccess' do
+        FakeWeb.register_uri(:get, %r{api/v1/base/1}, body: [{ stub: 'Stub' }].to_json)
+
         @base.show(id: 1)
-      end
 
-      should 'be ActiveSupport::HashWithIndifferentAccess' do
         assert @base.current_record.is_a?(ActiveSupport::HashWithIndifferentAccess)
       end
     end
 
     context 'page_links' do
-      setup do
-        # Setup fakeweb
-        FakeWeb.register_uri(:get, /api\/v1\/base/, body: { stub: 'Stub' }.to_json)
+      should 'be ActiveSupport::HashWithIndifferentAccess' do
+        FakeWeb.register_uri(:get, %r{api/v1/base}, body: [{ stub: 'Stub' }].to_json)
+
         @base.list
-      end
 
-      should 'be ActiveSupport::HashWithIndifferentAccess' do
         assert @base.instance_variable_get(:@page_links).is_a?(ActiveSupport::HashWithIndifferentAccess)
       end
+
+      should 'set @page_links to hash with URLs if in JSON format' do
+        FakeWeb.register_uri(:get, %r{api/v1/base}, body: [{ stub: 'Stub' }].to_json,
+                                                    link: %({"next": "http://test.host/api/v1/custom_signatures?page=2", "last": "http://test.host/api/v1/custom_signatures?page=5"}))
+
+        @base.list
+
+        links = @base.instance_variable_get(:@page_links)
+        assert_equal 'http://test.host/api/v1/custom_signatures?page=5', links[:last]
+        assert_equal 'http://test.host/api/v1/custom_signatures?page=2', links[:next]
+      end
+
+      should 'set @page_links to hash with URLs if in HTTP format' do
+        FakeWeb.register_uri(:get, %r{api/v1/base}, body: [{ stub: 'Stub' }].to_json,
+                                                    link: %(<http://test.host/api/v1/custom_signatures?page=5>; rel="last", <http://test.host/api/v1/custom_signatures?page=2>; rel="next"))
+        @base.list
+
+        links = @base.instance_variable_get(:@page_links)
+        assert_equal 'http://test.host/api/v1/custom_signatures?page=5', links[:last]
+        assert_equal 'http://test.host/api/v1/custom_signatures?page=2', links[:next]
+      end
     end
   end
 end

data/test/esp_sdk/end_points/custom_signatures_test.rb

@@ -34,7 +34,7 @@ class CustomSignaturesTest < ActiveSupport::TestCase
     context '#run_url' do
       should 'have the correct run_url for development environment' do
         EspSdk.instance_variable_set(:@env, :development)
-        assert_equal 'http://0.0.0.0:3001/api/v1/custom_signatures/run', @custom_signatures.send(:run_url)
+        assert_equal 'http://0.0.0.0:3000/api/v1/custom_signatures/run', @custom_signatures.send(:run_url)
       end
 
       should 'have the correct run_url for the release environment' do

data/test/esp_sdk/end_points/dashboard_test.rb

@@ -22,7 +22,7 @@ class DashboardTest < ActiveSupport::TestCase
     context '#timewarp_url' do
       should 'have the correct run_url for development environment' do
         EspSdk.instance_variable_set(:@env, :development)
-        assert_equal 'http://0.0.0.0:3001/api/v1/dashboard/timewarp', @dashboard.send(:timewarp_url)
+        assert_equal 'http://0.0.0.0:3000/api/v1/dashboard/timewarp', @dashboard.send(:timewarp_url)
       end
 
       should 'have the correct run_url for the release environment' do

data/test/esp_sdk/end_points/signatures_test.rb

@@ -30,7 +30,7 @@ class SignaturesTest < ActiveSupport::TestCase
     context '#run_url' do
       should 'have the correct run_url for development environment' do
         EspSdk.instance_variable_set(:@env, :development)
-        assert_equal 'http://0.0.0.0:3001/api/v1/signatures/run', @signatures.send(:run_url)
+        assert_equal 'http://0.0.0.0:3000/api/v1/signatures/run', @signatures.send(:run_url)
       end
 
       should 'have the correct run_url for the release environment' do
@@ -47,7 +47,7 @@ class SignaturesTest < ActiveSupport::TestCase
     context '#name_url' do
       should 'have the correct run_url for development environment' do
         EspSdk.instance_variable_set(:@env, :development)
-        assert_equal 'http://0.0.0.0:3001/api/v1/signatures/signature_names', @signatures.send(:name_url)
+        assert_equal 'http://0.0.0.0:3000/api/v1/signatures/signature_names', @signatures.send(:name_url)
       end
 
       should 'have the correct run_url for the release environment' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esp_sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Evident.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: SDK for interacting with the ESP API.