wcc-data 0.3.2 → 0.4.0.pre.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d7a1ec54bdcac827469f19b3070bd28caa171b
-  data.tar.gz: 87047ce1841ca72d6e3f63010ce906d1c068a268
+  metadata.gz: '0827526634396239dc87b1b525c01bd9b1d6af64'
+  data.tar.gz: a6cabddbb27e0fd43550fdf5c300d216c34ba8e6
 SHA512:
-  metadata.gz: 5dbc59326f6d74240b8f73edbc6119c549460c4350fcb21df324794ee513be5f1ad70ea9a6ef94961bfc982130cb2203d9b11440f401aebd0e589a9fffd7445a
-  data.tar.gz: 182635eddf51ab2b626d926ffb4e4177f8ce47c40f17f19594eae2741841dd9333b97d3bccb58b28371a8e68d5d18928ec583df203194af74cfc6d4860ba777a
+  metadata.gz: 9f6b442582b46ef65f64c08c2621f1b56310610bc074b5ba3ce05301b8ce124fa6017067dc777aa23d91f16faa92fe565e1dc6f57e7e8cc1b16ccde607706542
+  data.tar.gz: 4062f09e04552c5afe9aef4b2dcbcaf89fd29915ec2f751c6bd79a2d471c6941a66ab49ca57a35b92347ffde424edc93a9f98731ab548c5dfe6fff7ac3030d12

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

@@ -27,11 +27,11 @@ module WCC::Data::Nucleus
           code: 'FTW',
           name: 'Fort Worth',
           key: :ft_worth,
-          street: '3345 Winthrop Avenue',
+          street: '8000 Western Hills Blvd',
           city: 'Fort Worth',
           state: 'TX',
-          zip: '76116',
-          geo: [32.7280064, -97.4146727]
+          zip: '76108',
+          geo: [32.739972, -97.455414]
         },
         {
           id: 3,

data/lib/wcc/data/version.rb

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

data/wcc-data.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = Dir['lib/**/*'] + %w[LICENSE.txt README.md wcc-data.gemspec]
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.2'
+  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.2
+  version: 0.4.0.pre.pre.2
 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:
@@ -97,20 +97,12 @@ dependencies:
 description: Watermark's library for interapp communication via APIs
 email:
 - dev@watermark.org
-executables:
-- rspec
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env.example"
-- ".gitignore"
-- ".rspec"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/rspec
-- circle.yml
 - lib/wcc/data.rb
 - lib/wcc/data/config.rb
 - lib/wcc/data/enumerated_type.rb
@@ -136,61 +128,29 @@ files:
 - lib/wcc/data/rest_endpoint.rb
 - lib/wcc/data/service.rb
 - lib/wcc/data/version.rb
-- spec/spec_helper.rb
-- spec/support/inheritable_class_attribute_examples.rb
-- spec/wcc/data/config_spec.rb
-- spec/wcc/data/enumerated_type_spec.rb
-- spec/wcc/data/faraday_client_app_token_auth_spec.rb
-- spec/wcc/data/mapper/attributes_spec.rb
-- spec/wcc/data/mapper/json_response_spec.rb
-- spec/wcc/data/mapper/rest_configuration_spec.rb
-- spec/wcc/data/mapper/rest_query_spec.rb
-- spec/wcc/data/model_spec.rb
-- spec/wcc/data/nucleus/campus_spec.rb
-- spec/wcc/data/rack_client_app_token_auth_spec.rb
-- spec/wcc/data/response_spec.rb
-- spec/wcc/data/rest_endpoint_spec.rb
-- spec/wcc/data/service_spec.rb
-- spec/wcc/data_spec.rb
 - wcc-data.gemspec
 homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       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:
-- spec/spec_helper.rb
-- spec/support/inheritable_class_attribute_examples.rb
-- spec/wcc/data/config_spec.rb
-- spec/wcc/data/enumerated_type_spec.rb
-- spec/wcc/data/faraday_client_app_token_auth_spec.rb
-- spec/wcc/data/mapper/attributes_spec.rb
-- spec/wcc/data/mapper/json_response_spec.rb
-- spec/wcc/data/mapper/rest_configuration_spec.rb
-- spec/wcc/data/mapper/rest_query_spec.rb
-- spec/wcc/data/model_spec.rb
-- spec/wcc/data/nucleus/campus_spec.rb
-- spec/wcc/data/rack_client_app_token_auth_spec.rb
-- spec/wcc/data/response_spec.rb
-- spec/wcc/data/rest_endpoint_spec.rb
-- spec/wcc/data/service_spec.rb
-- spec/wcc/data_spec.rb
+test_files: []

data/.env.example

@@ -1,3 +0,0 @@
-NUCLEUS_CLIENT_ID=client-id-3
-NUCLEUS_CLIENT_SECRET=client-secret-3
-NUCLEUS_URL=http://login.wcc/

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.env*.local
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in wcc-data.gemspec
-gemspec
-
-gem 'rack', '~>1.6.5'

data/Rakefile

@@ -1,36 +0,0 @@
-require 'bundler/gem_tasks'
-require 'dotenv/tasks'
-
-PROJECT_PATH = File.dirname(__FILE__)
-LIB_PATH = File.join(PROJECT_PATH, "lib")
-
-task :default => :test
-
-desc 'run test examples'
-task :test do
-  exec 'rspec .'
-end
-
-task :environment => :dotenv do
-  $LOAD_PATH.unshift(LIB_PATH)
-  require 'wcc/data'
-end
-
-task :development => [:environment] do
-  WCC::Data.setup do |config|
-    conn = config.applications[:nucleus].connection
-    conn.use Faraday::Response::Logger
-    conn.basic_auth(ENV['NUCLEUS_CLIENT_ID'], ENV['NUCLEUS_CLIENT_SECRET'])
-  end
-end
-
-desc 'launch IRB shell with base environment loaded'
-task :irb => :environment do
-  require 'irb'
-  ARGV.clear
-  IRB.start
-end
-
-desc 'launch IRB shell with development environment loaded'
-task :console => [:development, :irb]
-

data/bin/rspec

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/circle.yml

@@ -1,6 +0,0 @@
-machine:
-  ruby:
-    version: 2.2.2
-dependencies:
-  pre:
-    - cp .env.example .env

data/spec/spec_helper.rb

@@ -1,22 +0,0 @@
-SPEC_DIR = File.dirname(__FILE__)
-FIXTURES_DIR = File.join(SPEC_DIR, "fixtures")
-
-$LOAD_PATH.unshift File.join(SPEC_DIR, "..", "lib")
-$LOAD_PATH.unshift SPEC_DIR
-
-require 'dotenv'
-Dotenv.load
-
-require 'wcc/data'
-require 'sidekiq'
-
-Dir[File.join(SPEC_DIR, "support", "*.rb")].each do |support_file|
-  require "support/#{File.basename(support_file, ".rb")}"
-end
-
-RSpec.configure do |config|
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  config.order = 'random'
-end