mergent 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa436289497477ab6333360f5d93cf451a31a30de5f935b0837bcf2766028af
-  data.tar.gz: 2e9563a47585a5c1b950c8430fe16835418087cca8959d624f4065c482194c47
+  metadata.gz: '091560d589e98d720d345df17008294a74ae798e2bca2a39f0a7025dfcf6dded'
+  data.tar.gz: 6246ac0ffe441726ae3bde5923740528b79cc6069a1a2239db814bbc8f3c30d7
 SHA512:
-  metadata.gz: 7485effdaa452ede27002ee7cab32e4962e826b6cadf17781dfed2ae60e09c34cfad6bc5782db829f5c934297096f2f1cc54e2b10419d9e23bc94bddc1205bd7
-  data.tar.gz: 4ad86522e95f4dfbb934a5e66b80842042df15943371db92a6ff3ff8fc01361e64b25e7c677c28ef61f01102095e8716b4b17f95bda6d3b196697fe317e3d7b2
+  metadata.gz: d110627a45389094c7040a1025b22a287af95d9f0976b194607d447ea908a553b5b05937882348fee80ff6d44c0a83ba7d8cce9fac473889b21249b0d3fd6dc1
+  data.tar.gz: cac95a4b57248d1924ccec745872cb68f677890bc304661bd893ddd1085d8998f31e40073fe89fbcb22fc057468f7c4dc9f12042ea0914a62188d106d74580d5

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.2.2] - 2022-01-20
+
+- Add `Mergent::RequestValidator` to validate that webhooks came from Mergent's API
+
+## [0.2.1] - 2022-01-20
+
+- Add `Mergent::RequestValidator` to validate that webhooks came from Mergent's API
+
+## [0.2.0] - 2022-01-20
+
+- Add `Mergent::RequestValidator` to validate that webhooks came from Mergent's API
+
+## [0.1.2] - 2022-1-13
+
+- Define explicit methods in `Mergent::Task`, to allow for use of verifying doubles when testing against them.
+- Remove deprecated `cron` method definition
+
 ## [0.1.1] - 2021-12-21
 
 - Define explicit methods in `Mergent::Task`, to allow for use of verifying doubles when testing against them.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mergent (0.1.1)
+    mergent (0.2.2)
 
 GEM
   remote: https://rubygems.org/
@@ -11,15 +11,15 @@ GEM
     ast (2.4.2)
     crack (0.4.5)
       rexml
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     hashdiff (1.0.1)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -27,30 +27,30 @@ GEM
       rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.23.0)
+    rspec-support (3.10.3)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.12.0)
+    rubocop-performance (1.13.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.6.0)
+    rubocop-rspec (2.7.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.1.0)
@@ -73,4 +73,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.33
+   2.3.4

data/README.md

@@ -1,4 +1,4 @@
-# Mergent
+# Mergent Ruby Library
 
 [![Gem Version](https://badge.fury.io/rb/mergent.svg)](https://badge.fury.io/rb/mergent)
 [![CI](https://github.com/mergentlabs/mergent-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/mergentlabs/mergent-ruby/actions/workflows/ci.yml)
@@ -47,10 +47,11 @@ After checking out the repo, run `bundle` to install dependencies. Then, run
 `rake spec` to run the tests.
 
 To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`, and then
-run `bundle exec rake release`, which will create a git tag for the version,
-push git commits and the created tag, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
+
+To release a new version, update the changelog, bump the version number in
+`version.rb`, commit that change, and then run `bundle exec rake release`, which
+will create a git tag for the version, push git commits and the created tag, and
+push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/mergent/client.rb

@@ -6,7 +6,7 @@ require "json"
 module Mergent
   class Client
     def self.post(resource, params) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      uri = URI("https://api.mergent.co/v1/#{resource}")
+      uri = URI("#{Mergent.endpoint}/#{resource}")
       headers = {
         Authorization: "Bearer #{Mergent.api_key}",
         "Content-Type": "application/json"
@@ -15,22 +15,32 @@ module Mergent
       request.body = params.to_json
 
       https = Net::HTTP.new(uri.host, uri.port)
-      https.use_ssl = true
+      https.use_ssl = Mergent.endpoint.start_with?("https")
       response = https.request(request)
 
       case response
       when Net::HTTPSuccess
-        JSON.parse(response.read_body, object_class: Mergent::Object)
+        JSON.parse(response.read_body)
       else
         begin
           body = JSON.parse(response.read_body)
         rescue JSON::ParserError
           body = {}
         end
-        raise Mergent::Error, body["message"]
+        raise Mergent::Error, error_message(body)
       end
     rescue EOFError, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, SocketError
       raise Mergent::ConnectionError
     end
+
+    private
+
+    def self.error_message(body)
+      breakdown = body.fetch("errors", []).map { |error| error.fetch("message", nil) }.compact.join(", ")
+      msg = body["message"]
+      msg << " - #{breakdown}" unless breakdown.empty?
+      msg
+    end
+    private_class_method :error_message
   end
 end

data/lib/mergent/object.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
 module Mergent
-  class Object < OpenStruct; end # rubocop:disable Style/OpenStructUse
+  class Object
+    attr_reader :_data
+
+    def initialize(data = {})
+      @_data = data.transform_keys(&:to_sym)
+    end
+  end
 end

data/lib/mergent/request_validator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Mergent
+  class RequestValidator
+    def initialize(api_key)
+      @api_key = api_key || Mergent.api_key
+    end
+
+    def build_signature(body)
+      digest = OpenSSL::Digest.new("sha1")
+      Base64.strict_encode64(OpenSSL::HMAC.digest(digest, @api_key, body || ""))
+    end
+
+    def valid_signature?(body, signature)
+      build_signature(body) == signature
+    end
+  end
+end

data/lib/mergent/task.rb

@@ -5,15 +5,17 @@ require_relative "object"
 
 module Mergent
   class Task < Mergent::Object
-    def self.create(params = {})
-      object = Client.post("tasks", params)
-      new(object)
-    end
+    ATTRS = %i[name description status request scheduled_for created_at].freeze
 
-    %i[name description status request scheduled_for delay cron].each do |name|
+    ATTRS.each do |name|
       define_method(name) do
-        self[name]
+        @_data[name]
       end
     end
+
+    def self.create(params = {})
+      data = Client.post("tasks", params)
+      new(data)
+    end
   end
 end

data/lib/mergent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mergent
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

data/lib/mergent.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "mergent/errors"
+require_relative "mergent/request_validator"
 require_relative "mergent/task"
 require_relative "mergent/version"
 
 module Mergent
+  ENDPOINT = "https://api.mergent.co/v1"
+
   class << self
-    attr_accessor :api_key
+    attr_accessor :api_key, :endpoint
   end
 end
+
+Mergent.endpoint = Mergent::ENDPOINT

data/mergent.gemspec

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative "lib/mergent/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "mergent"
+  spec.version = Mergent::VERSION
+  spec.author = "Mergent"
+  spec.email = "support@mergent.co"
+
+  spec.summary = "Ruby library for the Mergent API."
+  spec.description = "Ruby library for the Mergent API. See https://mergent.co for details."
+  spec.homepage = "https://mergent.co"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/mergentlabs/mergent-ruby"
+  spec.metadata["changelog_uri"] = "https://github.com/mergentlabs/mergent-ruby/blob/main/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mergent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mergent
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies: []
 description: Ruby library for the Mergent API. See https://mergent.co for details.
 email: support@mergent.co
@@ -29,8 +29,10 @@ files:
 - lib/mergent/client.rb
 - lib/mergent/errors.rb
 - lib/mergent/object.rb
+- lib/mergent/request_validator.rb
 - lib/mergent/task.rb
 - lib/mergent/version.rb
+- mergent.gemspec
 homepage: https://mergent.co
 licenses:
 - MIT
@@ -54,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Ruby library for the Mergent API.