wcc-data 0.3.1 → 0.4.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27c7b33dc551ef4cfcf077dd1cd034a03b988000
-  data.tar.gz: 8328780be7f3b99ac8c14a9899e1e16fda22dca0
+  metadata.gz: 82f9b734e798bdb01d28323037ba25ea1a87a831
+  data.tar.gz: 46b3020ff169cdfa6e687c9933b765a5f7ed26a6
 SHA512:
-  metadata.gz: 7ec04ded3ce055bf9bc34dbc9cce85bb90bac2b6752a447b6f14ba2d7b383a4f837fa953e1da83c759a27038b5486d67b1e033b0ba25ee5f2a065668482b21ab
-  data.tar.gz: 7357cb8d975af17773b9c39986dc5590e950b9e5506b25afd89487221895815b7c8bacb03af2f614052ee0b44dfb51f0317e144b8134425ce1d4012493ccbd07
+  metadata.gz: b527b25651b9e1e0930ba6c0f4c4b816e929b9efc664910d1b5dd7ce42936840f2b1ab46e1489654c05490a145426bf3121fb9efd236e4cf03d4d596f8f582d5
+  data.tar.gz: 4cf4c852f51a72b46ff553539a72903ef218e314eaafe70651b6945c587efececd064e0f222f2508ba75e6825884954eec81fbf5fc1b64f733ec3e82be292483

data/lib/wcc/data/config.rb

@@ -15,6 +15,7 @@ module WCC::Data
     private
 
     def set_default_applications
+      raise ArgumentError, "Missing NUCLEUS_URL environment variable" unless ENV['NUCLEUS_URL']
       applications[:nucleus].uri = ENV['NUCLEUS_URL']
       if ENV['APP_CLIENT_ID'] && ENV['APP_CLIENT_SECRET']
         applications[:nucleus].connection

data/lib/wcc/data/faraday_client_app_token_auth.rb

@@ -1,64 +1,83 @@
+
+begin
+  gem 'faraday'
+  require 'faraday'
+rescue Gem::LoadError
+  # suppress
+end
+
+
 module WCC::Data
-  class FaradayClientAppTokenAuth < Faraday::Middleware
-    class RedisCache
-      DEFAULT_CACHE_KEY = "org.watermark.data.client-app-token-cache-store"
-      attr_reader :connection, :cache_key
+  if defined?(Faraday)
+    class FaradayClientAppTokenAuth < Faraday::Middleware
+      class RedisCache
+        DEFAULT_CACHE_KEY = "org.watermark.data.client-app-token-cache-store"
+        attr_reader :connection, :cache_key
 
-      def initialize(connection, cache_key: DEFAULT_CACHE_KEY)
-        @connection = connection
-        @cache_key = cache_key
-      end
+        def initialize(connection, cache_key: DEFAULT_CACHE_KEY)
+          @connection = connection
+          @cache_key = cache_key
+        end
 
-      def [](hostname)
-        connection.call { |r| r.hget cache_key, hostname }
-      end
+        def [](hostname)
+          connection.call { |r| r.hget cache_key, hostname }
+        end
 
-      def []=(hostname, token)
-        if token
-          connection.call { |r| r.hset cache_key, hostname, token }
-        else
-          connection.call { |r| r.hdel cache_key, hostname }
+        def []=(hostname, token)
+          if token
+            connection.call { |r| r.hset cache_key, hostname, token }
+          else
+            connection.call { |r| r.hdel cache_key, hostname }
+          end
         end
       end
-    end
 
-    attr_reader :cache, :token_factory
+      attr_reader :cache, :token_factory
 
-    def initialize(app, cache: default_cache, token_factory: method(:default_token_factory))
-      super(app)
-      @cache = cache
-      @token_factory = token_factory
-    end
+      def initialize(app, cache: default_cache, token_factory: method(:default_token_factory))
+        super(app)
+        @cache = cache
+        @token_factory = token_factory
+      end
 
-    def token_for(host)
-      @cache[host] ||= token_factory.(host)
-    end
+      def token_for(host)
+        @cache[host] ||= token_factory.(host)
+      end
 
-    def call(env, retry_on_forbidden: true)
-      request_body = env[:body]
-      host = env[:url].host
-      env[:request_headers]["Authorization"] = "Bearer #{token_for(host)}"
-      @app.call(env).on_complete do |response_env|
-        response = Faraday::Response.new(response_env)
-        cache[host] = nil unless response.success?
-        if response.status == 403 && retry_on_forbidden
-          env[:body] = request_body
-          call(env, retry_on_forbidden: false)
+      def call(env, retry_on_forbidden: true)
+        request_body = env[:body]
+        host = env[:url].host
+        env[:request_headers]["Authorization"] = "Bearer #{token_for(host)}"
+        @app.call(env).on_complete do |response_env|
+          response = Faraday::Response.new(response_env)
+          cache[host] = nil unless response.success?
+          if response.status == 403 && retry_on_forbidden
+            env[:body] = request_body
+            call(env, retry_on_forbidden: false)
+          end
         end
       end
-    end
 
-    private
+      private
 
-    def default_token_factory(host)
-      WCC::Data::Nucleus::ClientAppToken.create(hostname: host).token
-    end
+      def default_token_factory(host)
+        WCC::Data::Nucleus::ClientAppToken.create(hostname: host).token
+      end
 
-    def default_cache
-      RedisCache.new(Sidekiq.method(:redis))
+      def default_cache
+        RedisCache.new(Sidekiq.method(:redis))
+      end
+    end
+  else
+    class FaradayClientAppTokenAuth
+      def initialize(app, cache: default_cache, token_factory: method(:default_token_factory))
+        raise NotSupportedError, 'Please include the "faraday" gem to use this authentication method'
+      end
     end
   end
 end
 
-Faraday::Middleware.register_middleware :client_app_token => lambda { WCC::Data::FaradayClientAppTokenAuth }
+if defined?(Faraday)
+  Faraday::Middleware.register_middleware :client_app_token => lambda { WCC::Data::FaradayClientAppTokenAuth }
+end
 

data/lib/wcc/data/mapper.rb

@@ -5,6 +5,7 @@ module WCC::Data
     class EndpointUndefined < MapperError; end
     class InvalidResponse < MapperError; end
     class RecordNotFound < MapperError; end
+    class ServiceUnavailable < MapperError; end
   end
 
 end

data/lib/wcc/data/mapper/json_response.rb

@@ -4,6 +4,7 @@ module WCC::Data::Mapper
 
     def new_from_response(response)
       raise RecordNotFound if response.status == 404
+      raise ServiceUnavailable if response.status == 503
       case response.json
       when Array
         response.json.collect { |obj| new(obj) }

data/lib/wcc/data/nucleus/campus.rb

@@ -6,7 +6,7 @@ module WCC::Data::Nucleus
     attributes :street, :city, :state, :zip, :geo
 
     def matches?(value)
-      [id, key].include?(value)
+      [id, key, code].include?(value)
     end
 
     def self.db

data/lib/wcc/data/version.rb

@@ -1,5 +1,5 @@
 module WCC
   module Data
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.4.0.pre'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -19,4 +19,6 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.order = 'random'
+
+  ENV['NUCLEUS_URL'] ||= 'http://login.wcc'
 end

data/spec/wcc/data/faraday_client_app_token_auth_spec.rb

@@ -219,6 +219,19 @@ RSpec.describe WCC::Data::FaradayClientAppTokenAuth do
         expect(cache).to receive(:[]=).with("example.com", "abc123")
         auth.token_for("example.com")
       end
+
+      it "passes error up the chain when service unavailable" do
+        allow(auth.token_factory)
+          .to receive(:call)
+          .and_raise(WCC::Data::Mapper::ServiceUnavailable)
+  
+        expect {
+          auth.call({
+            url: URI("http://example.com"),
+            request_headers: {},
+          })
+        }.to raise_error(WCC::Data::Mapper::ServiceUnavailable)
+      end
     end
   end
 end

data/spec/wcc/data/mapper/json_response_spec.rb

@@ -41,6 +41,13 @@ describe WCC::Data::Mapper::JSONResponse do
 
     end
 
+    it "raises ServiceUnavailable when response status is 503" do
+      allow(singular_response).to receive(:status).and_return(503)
+      expect { klass.new_from_response(singular_response) }
+        .to raise_error(WCC::Data::Mapper::ServiceUnavailable)
+
+    end
+
     it "raises InvalidResponse error for non-json objects" do
       expect { klass.new_from_response(double(json: 1, status: 200)) }
         .to raise_error(WCC::Data::Mapper::InvalidResponse)

data/wcc-data.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.2'
 
-  spec.add_dependency "faraday", "~> 0.8"
+  # Required if you use faraday_client_app_token_auth but must be included separately
+  spec.add_development_dependency "faraday", "~> 0.8"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "dotenv", "~> 0.10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-data
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Watermark Dev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -157,7 +157,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,13 +168,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.2.3
+signing_key:
 specification_version: 4
 summary: Watermark's library for interapp communication via APIs
 test_files: