tops_connect 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e693e4f20693b51e9ef1729c307abae6e8e49cd0d92a04fa8f79a9c83ab43c60
-  data.tar.gz: cc1f4bcc3c10588236114facebba06c693eafa5a20f930a109510ce6c2fd2828
+  metadata.gz: f9e0900387c5f85dd15922e37502820ad5ee15042312e15b3eb855079e662b06
+  data.tar.gz: 4bfa6fd9cf330257df1dbb962dc56d76bfe2de776506a6681cec6bb84e384389
 SHA512:
-  metadata.gz: 8d27cd2cfbfc12ca9e3199fb2893ce1540e5f0c6de448306d346b93a053879e8b7621811fadf0de1ba6541f8d2c80cc507e9a642857251d66c099ef16476b1ea
-  data.tar.gz: 90b74c5944b310533fc7b521340712c550c3369c74f42fd3dc6afe6e181d6bae41df4288ee7f192165126c0adf32eb93035eb554bd1b2fb5f1bbb4db9513d726
+  metadata.gz: ba3de1e94b3ea6dec558f0f8a36dee04f891d4915db9a03ec30e61585fb44509d8dfb4bc1c8ea1ce108662e9c00c4d94a41fe0994cb9b1b7f4af053de7bc6b80
+  data.tar.gz: 2a405e7ea5799f377a236723643ed0b5935c245ad71687743437bbb76809395c7bdcca108dcd365f4635fbb9fa450628294aa87b051a64c20d49b3269e2e9386

data/.rubocop.yml

@@ -1,23 +1,12 @@
 AllCops:
-  Include:
-    - Gemfile
-    - Rakefile
   TargetRubyVersion: 2.5
 
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/MethodLength:
-  Max: 32
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
 Style/Documentation:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
-  Enabled: false
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tops_connect.gemspec

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rspec/core/rake_task'
 require 'bundler/gem_tasks'
 

data/lib/tops_connect/client.rb

@@ -11,6 +11,7 @@ module TopsConnect
 
     headers 'Content-Type' => 'application/json'
 
+    # TODO: Sandbox uses /sandbox/api/v2, Broad uses /v2/broad/api
     base_uri 'https://topsconnectapi.azure-api.net/v2'
 
     def initialize(community_id, community_api_key)
@@ -73,12 +74,10 @@ module TopsConnect
 
     def raise_exception(response)
       case response.code
-      when 404
-        raise TopsConnect::NotFoundError, response
-      when 400..499
-        raise TopsConnect::ClientError, response
+      when 404 then raise TopsConnect::NotFoundError, response
+      when 400..499 then raise TopsConnect::ClientError, response
       when 500..599
-        message = response.parsed_response&.dig('Message') || ''
+        message = TopsConnect::ApiError.error_message(response.parsed_response)
 
         # These errors can largely be ignored - it's not our fault
         raise TopsConnect::TimeoutError, response if message['Timeout expired']

data/lib/tops_connect/communities.rb

@@ -24,9 +24,9 @@ module TopsConnect
     def charge_codes
       get('/chargecode').map do |charge_code|
         {
-          key: charge_code['ChargeCodeKey'],
-          code: charge_code['Code'],
-          description: charge_code['Description']
+          key: charge_code['key'],
+          code: charge_code['code'],
+          description: charge_code['description']
         }
       end
     end

data/lib/tops_connect/configuration.rb

@@ -5,7 +5,7 @@ module TopsConnect
     attr_reader :subscription_key, :client_id, :software_key, :zone
 
     def subscription_key=(key)
-      unless key.match?(/\A\h{32}\z/i)
+      unless key&.match?(/\A\h{32}\z/i)
         raise 'Invalid TOPS Subscription Key. Expected 32 hex characters.'
       end
 
@@ -13,7 +13,7 @@ module TopsConnect
     end
 
     def client_id=(key)
-      unless key.match?(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/)
+      unless key&.match?(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/)
         raise 'Invalid TOPS Client ID. Expected a GUID.'
       end
 
@@ -21,7 +21,7 @@ module TopsConnect
     end
 
     def software_key=(key)
-      unless key.match?(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/)
+      unless key&.match?(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/)
         raise 'Invalid TOPS Software Key. Expected a GUID.'
       end
 

data/lib/tops_connect/errors.rb

@@ -10,10 +10,21 @@ module TopsConnect
       format(
         '%<code>s: %<message>s (%<uri>s)',
         code: @response.code,
-        message: @response.parsed_response&.dig('Message'),
+        message: self.class.error_message(@response.parsed_response),
         uri: @response.request.last_uri.to_s
       )
     end
+
+    def self.error_message(parsed_response)
+      case parsed_response
+      when String
+        parsed_response
+      when Hash
+        parsed_response.dig('Message')
+      else
+        ''
+      end
+    end
   end
 
   # The client submitted invalid information.

data/lib/tops_connect/owner.rb

@@ -8,25 +8,10 @@ module TopsConnect
     alias id owner_key
 
     def alternate_mailing_addresses
-      data['Addresses'].map do |row|
-        next unless row['Type']['Name'] == 'Alternate'
-
-        lines = []
-
-        if row['AddressLine1'].match?(/[[:graph:]]/)
-          lines << row['AddressLine1']
-        end
-
-        if row['AddressLine2'].match?(/[[:graph:]]/)
-          lines << row['AddressLine2']
-        end
-
-        next if lines.empty?
-
-        lines << "#{row['City']}, #{row['State']} #{row['Zip']}"
-
-        lines.map(&:strip).join("\n")
-      end.compact
+      data['Addresses']
+        .select { |row| row['Type']['Name'] == 'Alternate' }
+        .map { |row| offsite_address(row) }
+        .compact
     end
 
     def property_key
@@ -108,5 +93,31 @@ module TopsConnect
     def tops_id
       data['Metadata']['TopsId']
     end
+
+    protected
+
+    def offsite_address(address)
+      lines = address_lines(address)
+
+      return if lines.empty?
+
+      lines << "#{address['City']}, #{address['State']} #{address['Zip']}"
+
+      lines.map(&:strip).join("\n")
+    end
+
+    def address_lines(address)
+      lines = []
+
+      if address['AddressLine1'].match?(/[[:graph:]]/)
+        lines << address['AddressLine1']
+      end
+
+      if address['AddressLine2'].match?(/[[:graph:]]/)
+        lines << address['AddressLine2']
+      end
+
+      lines
+    end
   end
 end

data/lib/tops_connect/property.rb

@@ -13,18 +13,15 @@ module TopsConnect
 
     def address
       property = data['Addresses']
-        .find { |row| row['Type']['Name'] == 'Property' }
+        .find { |row| row.dig('Type', 'Name') == 'Property' }
 
       lines = [
         property['AddressLine1'],
         property['AddressLine2'],
-        "#{property['City']}, #{property['State']} #{property['Zip']}"
+        city_state_zip
       ]
 
-      lines
-        .map(&:strip)
-        .select { |line| line.match?(/[[:graph:]]/) }
-        .join("\n")
+      lines.map(&:strip).select { |line| line.match?(/[[:graph:]]/) }.join("\n")
     end
 
     def community_key
@@ -37,5 +34,9 @@ module TopsConnect
       Time.parse data['Metadata']['ModifiedDate']
     end
     alias updated_at modified_date
+
+    def city_state_zip
+      "#{property['City']}, #{property['State']} #{property['Zip']}"
+    end
   end
 end

data/lib/tops_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TopsConnect
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/tops_connect.gemspec

@@ -1,29 +1,28 @@
 # frozen_string_literal: true
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tops_connect/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'tops_connect'
-  spec.version       = TopsConnect::VERSION
-  spec.authors       = ['Steven Hoffman']
-  spec.email         = ['shoffman@valenciamgmt.com']
+  spec.name = 'tops_connect'
+  spec.version = TopsConnect::VERSION
+  spec.authors = ['Steven Hoffman']
+  spec.email = ['shoffman@valenciamgmt.com']
 
-  spec.summary       = 'Make use of the Tops Connect API'
-  spec.homepage      = 'https://github.com/ValenciaMgmt/tops_connect'
-  spec.license       = 'MIT'
+  spec.summary = 'Make use of the Tops Connect API'
+  spec.homepage = 'https://github.com/ValenciaMgmt/tops_connect'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-                       .reject { |f| f.match(%r{^spec/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10'
-  spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'webmock', '~> 2.3'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 12'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'webmock', '~> 3.4'
 
-  spec.add_dependency 'httparty', '~> 0.13'
+  spec.add_dependency 'httparty', '~> 0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tops_connect
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Steven Hoffman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
 description: 
 email:
 - shoffman@valenciamgmt.com
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Make use of the Tops Connect API