craftyclicks-ruby 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ec2ce4604a95f60db9d88c5f381f7b623a7be524
-  data.tar.gz: 07b9b461689ab15ebe5938580db6f6af47034d0e
+SHA256:
+  metadata.gz: 10c88caf348be280674690b56b0443619a61828ab3a5f34c3a6367d34a12b54e
+  data.tar.gz: f413e9cb7a0daaf4c9c83a35cba56f087c5f9ff1c2fc45e05fd36415ebc141d2
 SHA512:
-  metadata.gz: 27fe347df999a209a7239364d200096a31ba0883e74593d80fad7d27ed55a0b6b02de899c66df0f6d58370e3818e74b60f463a5ff9e376eb7a6d9e2ba7b0728c
-  data.tar.gz: d79b0779881abd08f7efd69c811a73dace3b9f1e092701d740aa9c02cbcba4101c34f0932b9a4424dfcb4eefd7692cb329c0dcff007207102f63e5f1b3c8e039
+  metadata.gz: e7b1dddc37b1619fbe496a29a3859bcfaecc04e09d84302d2c2bef22c3c50d62270776921c73c76b5a04fd92803916a3d045e8a538a459528ab34509c2a868bb
+  data.tar.gz: 2757ee46101a37008e005f922765d9e0f1df79c92f62284a5dac8062122d5eb9b8607a51b45cbb8e8ea5f0b2f4194b98820cb8f0bfac02cba0d1370e61b21b51

data/.rubocop.yml

@@ -1,164 +1,12 @@
-# Relaxed.Ruby.Style
-## Version 2.0
+inherit_gem:
+  relaxed-rubocop: .rubocop.yml
 
-Style/Alias:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylealias
-
-Style/AsciiComments:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleasciicomments
-
-Style/BeginBlock:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylebeginblock
-
-Style/BlockDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
-
-Style/CommentAnnotation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
-
-Style/Documentation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledocumentation
-
-Style/DotPosition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledotposition
-
-Style/DoubleNegation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
-
-Style/EndBlock:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleendblock
-
-Style/FormatString:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleformatstring
-
-Style/IfUnlessModifier:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
-
-Style/Lambda:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylelambda
-
-Style/ModuleFunction:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylemodulefunction
-
-Style/MultilineBlockChain:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
-
-Style/NegatedIf:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
-
-Style/NegatedWhile:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
-
-Style/ParallelAssignment:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
-
-Style/PerlBackrefs:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleperlbackrefs
-
-Style/Semicolon:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
-
-Style/SignalException:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesignalexception
-
-Style/SingleLineBlockParams:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesinglelineblockparams
-
-Style/SingleLineMethods:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
-
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
-
-Style/SpaceInsideParens:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
-
-Style/SpecialGlobalVars:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
-
-Style/StringLiterals:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylestringliterals
-
-Style/TrailingCommaInArguments:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
-
-Style/TrailingCommaInLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
-
-Style/WhileUntilModifier:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
-
-Style/WordArray:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylewordarray
-
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
-
-Lint/AssignmentInCondition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockNesting:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.4
 
 Metrics/BlockLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/**/*.rb'
+    - '*.gemspec'

data/.travis.yml

@@ -1,10 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - 2.7.0-preview1
 
 cache: bundler
 
@@ -13,7 +13,9 @@ before_script:
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 
-before_install: gem update
+before_install:
+  - gem update --system
+  - gem install bundler
 
 script: bundle exec rspec
 

data/Gemfile

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

data/Rakefile

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

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'crafty_clicks'

data/crafty_clicks.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'crafty_clicks/version'
 
@@ -11,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'A simple wrapper around the CraftClicks API'
   spec.homepage      = 'https://www.github.com/JoeSouthan/craftyclicks-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 2.4'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
@@ -22,15 +24,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'fuubar', '~> 2.2'
   spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'rake', '~> 12'
+  spec.add_development_dependency 'relaxed-rubocop'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rubocop', '~> 0.71'
   spec.add_development_dependency 'simplecov', '~> 0.15'
   spec.add_development_dependency 'vcr', '~> 4'
-  spec.add_development_dependency 'webmock', '~> 3.1'
-  spec.add_dependency 'oj', '~> 3.3'
+  spec.add_development_dependency 'webmock', '~> 3.5'
+  spec.add_dependency 'oj', '~> 3.7'
   spec.add_dependency 'rest-client', '>= 1.8', '< 3.0'
 end

data/lib/crafty_clicks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'crafty_clicks/address_lookup'
 require 'crafty_clicks/api_base'
 require 'crafty_clicks/api_base/exceptions'

data/lib/crafty_clicks/address_lookup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CraftyClicks
   class AddressLookup
     def self.find(query:, country:, id: nil, ip_address: nil, coords: [])

data/lib/crafty_clicks/api_base.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'rest-client'
 require 'oj'
 
 module CraftyClicks
   class ApiBase
     attr_accessor :result
-    ADDRESS_ENDPOINT = 'https://api.craftyclicks.co.uk/address/1.1'.freeze
-    POSTCODE_ENDPOINT = 'http://pcls1.craftyclicks.co.uk/json'.freeze
+    ADDRESS_ENDPOINT = 'https://api.craftyclicks.co.uk/address/1.1'
+    POSTCODE_ENDPOINT = 'http://pcls1.craftyclicks.co.uk/json'
 
     def initialize(product:, service:, params: {}, http_method: :get)
       @product = self.class.const_get("#{product.upcase}_ENDPOINT")
@@ -23,10 +25,10 @@ module CraftyClicks
           headers: { content_type: :json, accept: :json }
         )
       )
-    rescue RestClient::Unauthorized, RestClient::Forbidden, RestClient::ResourceNotFound => ex
-      raise Exceptions::ApiError.new(ex.response), "Unauthorized: #{ex.response}"
-    rescue RestClient::InternalServerError => ex
-      raise Exceptions::ApiError.new(ex.response), "Server error: #{ex.response}"
+    rescue RestClient::Unauthorized, RestClient::Forbidden, RestClient::ResourceNotFound => e
+      raise Exceptions::ApiError.new(e.response), "Unauthorized: #{e.response}"
+    rescue RestClient::InternalServerError => e
+      raise Exceptions::ApiError.new(e.response), "Server error: #{e.response}"
     end
 
     private
@@ -35,6 +37,7 @@ module CraftyClicks
       @result = Oj.safe_load(request)
       @result = @result.is_a?(Array) ? { 'results' => @result } : @result
       raise Exceptions::ApiError.new(result), "API Error: #{result}" if @result.keys.map { |k| k =~ /error/ }.any?
+
       @result
     end
   end

data/lib/crafty_clicks/api_base/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CraftyClicks
   class ApiBase
     class Exceptions

data/lib/crafty_clicks/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CraftyClicks
   class Configuration
     attr_accessor :api_key

data/lib/crafty_clicks/postcode_lookup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CraftyClicks
   class PostcodeLookup
     attr_accessor :postcode, :geocode, :sort, :response_format, :lines

data/lib/crafty_clicks/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CraftyClicks
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: craftyclicks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Joseph Southan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '12'
+- !ruby/object:Gem::Dependency
+  name: relaxed-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.71'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.71'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -208,15 +222,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple wrapper around the CraftClicks API