mailerlite 1.10.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ccc9f1ff0482360a7e4a1036ff3f67d646c3623402a1c05a777e3457a392e2e
-  data.tar.gz: 1c70b2e1e35e22c93d70d6edc623a5975ef735be37b23cfd295450a09f9a97ce
+  metadata.gz: 22139fe497a0ae5c7b362b0ac073b7f438ee2f3f5a6b6066c9f32b7eb3e49fb7
+  data.tar.gz: d69c1973ac5749db3da284f7b0b192498c339e05451f6a180e7107d9f66c5ec8
 SHA512:
-  metadata.gz: 69a04fe0dc9a5487e146102ddc7fe7debe86a1624f8d651856f0f2b33a0b2a8ed0bc9b8dfc3b90bb16c58eb0a7f454bc395ef62ab4387a4b167270e8147b420a
-  data.tar.gz: 04c904fc8dcb9a1cb200c098c0fc2e9cedc7e778fb6430299a1b2a3cfd8465ac8a66628d4f0e53c89ab1f0c0b1ca6171089c41d80e88ab4c68111dc9fb8c1af4
+  metadata.gz: 84263464b713fe7b1c70b3fd6f300feeeddc9329f68e7444e7fed91433d38948763114c1c8e0f17c2a8512586db6a23b062692bf6a1137152e0d878928a94428
+  data.tar.gz: a9f42133f73b09c8256edc5c859fc6d08e5deef03643b2b17b2b7a59c8e342e421908c5fa7e69d5cf33d50f33e8a79eea5ccf850dc611c6c16972065480933f4

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/test.yml

@@ -7,20 +7,18 @@ jobs:
     name: Test
     strategy:
       matrix:
-        ruby: [2.5, 2.6, 2.7]
+        ruby: [2.5, 2.6, 2.7, '3.0', head, truffleruby]
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Ruby ${{ matrix.ruby }}
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true
+
     - name: RSpec
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -32,15 +30,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        ruby-version: '3.0'
+        bundler-cache: true
     - name: RuboCop
       run: |
         bundle exec rubocop

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/ParameterAlignment:
   Enabled: true
@@ -31,7 +32,13 @@ Style/DoubleNegation:
   Exclude:
     - 'lib/mailerlite/utils.rb'
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Metrics/BlockLength:
   Exclude:
     - '*.gemspec'
     - 'spec/**/*_spec.rb'
+
+Lint/MissingSuper:
+  Enabled: false

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Justas Palumickas
+Copyright (c) 2021 Justas Palumickas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -40,6 +40,7 @@ Or create file under `config/initializers/mailerlite.rb`
 ```ruby
 MailerLite.configure do |config|
   config.api_key = 'my-secret-api-key'
+  # config.timeout = 10
 end
 ```
 
@@ -62,9 +63,12 @@ implementations:
 * Ruby 2.5.0
 * Ruby 2.6.0
 * Ruby 2.7.0
+* Ruby 3.0.0
+* Truffleruby
 
-## Copyright
-Copyright (c) 2020 Justas Palumickas. See [LICENSE][github_actions] for details.
+## License
+
+The gem is available as open source under the terms of the [MIT License][license].
 
 [rubygems]: https://rubygems.org/gems/mailerlite
 [codecov]: https://codecov.io/gh/jpalumickas/mailerlite-ruby

data/examples/subscribers.md

@@ -33,7 +33,7 @@ client.create_subscriber(email: 'john@example.com', name: 'John Smith')
 ## Update single subscriber
 
 ```ruby
-client.update_subscriber(subscriber_id options)
+client.update_subscriber(subscriber_id, options)
 ```
 
 or with email

data/lib/mailerlite/client.rb

@@ -26,8 +26,11 @@ module MailerLite
     #
     # @param options [Hash] A customizable set of options.
     # @option options [String] :api_key API Key provider from MailerLite.
+    # @option options [String] :timeout optional open/read timeout Integer in
+    #   seconds
     def initialize(options = {})
       config.api_key = options[:api_key] if options[:api_key]
+      config.timeout = options[:timeout] if options[:timeout]
     end
 
     # @return [Configuration]

data/lib/mailerlite/configuration.rb

@@ -9,7 +9,7 @@ module MailerLite
     # Default User Agent header string.
     USER_AGENT = "MailerLite Ruby v#{MailerLite::VERSION}"
 
-    attr_accessor :api_key
+    attr_accessor :api_key, :timeout
     attr_writer :url, :user_agent
 
     # Takes url provided from configuration or uses default one.

data/lib/mailerlite/connection.rb

@@ -37,30 +37,35 @@ module MailerLite
     private
 
     def request(method, path, query_params = {}, body_params = {})
-      response = connection.send(method) do |request|
-        request.url(path, query_params)
-        request.headers['Content-Type'] = 'application/json'
-
-        if client.config.api_key
-          request.headers['X-MailerLite-ApiKey'] = client.config.api_key
-        end
-
-        request.body = body_params.to_json
+      connection.send(method, path) do |request|
+        request.params = query_params unless query_params.empty?
+        request.body = body_params.to_json unless body_params.empty?
       end
-
-      response
     end
 
     def connection
       conn_opts = {
-        headers: { user_agent: client.config.user_agent },
         url: client.config.url,
-        builder: middleware
+        builder: middleware,
+        headers: headers
       }
+      timeout = client.config.timeout
+      conn_opts[:request] = { timeout: timeout } unless timeout.nil?
 
       Faraday.new(conn_opts)
     end
 
+    def headers
+      headers = {
+        'User-Agent' => client.config.user_agent,
+        'Content-Type' => 'application/json'
+      }
+
+      headers['X-MailerLite-ApiKey'] = client.config.api_key if client.config.api_key
+
+      headers
+    end
+
     def middleware
       @middleware ||= Faraday::RackBuilder.new do |builder|
         builder.request :json

data/lib/mailerlite/middleware/fix_unparsed_json.rb

@@ -4,10 +4,10 @@ module MailerLite
   module Middleware
     # This middleware will convert empty response to {}
     class FixUnparsedJson < Faraday::Response::Middleware
-      private
+      def parse(body)
+        return '{}' if body == ''
 
-      def on_complete(response)
-        response[:body] = {} if response[:body] == ''
+        body
       end
     end
   end

data/lib/mailerlite/middleware/raise_error.rb

@@ -6,8 +6,6 @@ module MailerLite
     # This class raises an exception based HTTP status codes returned
     # by the API.
     class RaiseError < Faraday::Response::Middleware
-      private
-
       def on_complete(response)
         error = MailerLite::Error.from_response(response)
         raise error if error

data/lib/mailerlite/middleware/underscore_keys.rb

@@ -4,12 +4,12 @@ module MailerLite
   module Middleware
     # This class will underscore all response keys from CamelCase.
     class UnderscoreKeys < Faraday::Response::Middleware
-      private
-
       def on_complete(response)
         response[:body] = updated_response(response[:body])
       end
 
+      private
+
       def updated_response(response)
         if response.is_a?(Hash)
           underscore_hash_keys(response)

data/lib/mailerlite/version.rb

@@ -2,5 +2,5 @@
 
 module MailerLite
   # @return [String] Version number.
-  VERSION = '1.10.0'
+  VERSION = '1.13.1'
 end

data/mailerlite.gemspec

@@ -34,13 +34,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday', '~> 1.0', '>= 1.0.1'
   spec.add_dependency 'faraday_middleware', '~> 1.0'
-  spec.add_dependency 'hashie', '>= 3.5.5'
+  spec.add_dependency 'hashie', '~> 4.0'
 
-  spec.add_development_dependency 'codecov', '~> 0.1'
-  spec.add_development_dependency 'pry', '~> 0.13'
+  # spec.add_development_dependency 'codecov', '~> 0.2', '>= 0.2.12'
+  spec.add_development_dependency 'pry', '~> 0.14'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop', '~> 0.82'
-  spec.add_development_dependency 'simplecov', '~> 0.18'
-  spec.add_development_dependency 'webmock', '~> 3.8'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.18'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.add_development_dependency 'webmock', '~> 3.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailerlite
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Justas Palumickas
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -46,46 +46,32 @@ dependencies:
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.5
-- !ruby/object:Gem::Dependency
-  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
+        version: '4.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,56 +92,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.82'
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.82'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.14'
 description: Ruby gem for MailerLite API v2
 email:
 - jpalumickas@gmail.com
@@ -163,6 +149,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".hound.yml"
@@ -213,7 +200,7 @@ metadata:
   changelog_uri: https://github.com/jpalumickas/mailerlite-ruby/releases
   documentation_uri: https://github.com/jpalumickas/mailerlite-ruby/tree/master/examples
   source_code_uri: https://github.com/jpalumickas/mailerlite-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,8 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.24
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for MailerLite API v2
 test_files: []