mailerlite 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a739963fd127ae8c42af6a2ceacfded67e42eb96
-  data.tar.gz: 21d605553139028079007949fc7515877aa5c218
+  metadata.gz: c12879562f401358996022b1ca5cdebbbadda822
+  data.tar.gz: 871117ea177f7b68c68cdf6bfcca64daacdd3c9d
 SHA512:
-  metadata.gz: e3ee319eda69a4cb89625a105c09baa29a2291efb40ec1c55235c2336c177ece212ad376793722b56490eb3b792f10a596624d7861b8d35ecb28e414f4faa03d
-  data.tar.gz: 2d189d579c72281e66a45065f5b7ed3f785a36b9ab64d397e2dadf08d8b1d2e99c0bee41d4e0f3f2db742b680333524838ac1ec5191c8abeccb480febb75f8e7
+  metadata.gz: a7087390b80ed3f0ca82b0d2e4cd91c0b1fd73974ee548ba03964fbcf56b99edec4ad7e38182c3d49a71e6d5ed6cb23049c6d3baaca0f65c8b9d613ba89dc1ea
+  data.tar.gz: 52ae9d8a5750e887d7ce477380a0e63afbdb58c32a5d73ea4442e4a0bdc0a4244e72096ca7bfd4b7fff552d2cfdb6812a6f0f4a174e99e04c411ed8c391efd86

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.0
   Include:
     - '**/Rakefile'
     - '**/Gemfile'
@@ -29,6 +30,10 @@ Lint/EndAlignment:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/mailerlite/utils.rb'
+
 Metrics/BlockLength:
   ExcludedMethods:
     - 'describe'

data/README.md

@@ -32,6 +32,12 @@ You can find your API key in page: Integrations » Developer API.
 client = MailerLite::Client.new(api_key: 'my-secret-api-key')
 ```
 
+Example:
+
+```ruby
+client.campaigns
+```
+
 Or create file under `config/initializers/mailerlite.rb`
 
 ```ruby
@@ -40,6 +46,15 @@ MailerLite.configure do |config|
 end
 ```
 
+When you configured global settings in file, then you can request methods
+on `MailerLite` class directly.
+
+Example:
+
+```ruby
+MailerLite.campaigns
+```
+
 See more documentation in [examples][examples] directory.
 
 ## Supported Ruby Versions

data/examples/authentication.md

@@ -26,8 +26,8 @@ MailerLite.configure do |config|
 end
 ```
 
-When you configured in file, you can request methods on `MailerLite` class
-directly.
+When you configured global settings in file, then you can request methods
+on `MailerLite` class directly.
 
 Example:
 

data/lib/mailerlite.rb

@@ -1,6 +1,5 @@
-require 'mailerlite/core_ext/string'
-
 require 'mailerlite/version'
+require 'mailerlite/utils'
 require 'mailerlite/error'
 require 'mailerlite/client'
 

data/lib/mailerlite/connection.rb

@@ -66,9 +66,9 @@ module MailerLite
         builder.use FaradayMiddleware::FollowRedirects
         builder.use FaradayMiddleware::Mashify, mash_class: MailerLite::Mash
         builder.use MailerLite::Middleware::UnderscoreKeys
+        builder.use MailerLite::Middleware::RaiseError
         builder.use FaradayMiddleware::ParseJson
         builder.use MailerLite::Middleware::FixUnparsedJson
-        builder.use MailerLite::Middleware::RaiseError
 
         builder.adapter Faraday.default_adapter
       end

data/lib/mailerlite/error.rb

@@ -1,14 +1,19 @@
 module MailerLite
   # Base MailerLite error.
   class Error < StandardError
+    def initialize(msg = nil)
+      @message = msg
+    end
+
     # Returns the appropriate MailerLite::Error sublcass based on status and
     # response message.
     #
-    # @param response [Hash] HTTP response.
+    # @param response [Faraday::Env] HTTP response.
     #
     # @return [MailerLite::Error]
     def self.from_response(response)
-      status = response[:status].to_i
+      status = response.status.to_i
+      message = error_message(response)
 
       klass = case status
       when 400 then MailerLite::BadRequest
@@ -17,7 +22,20 @@ module MailerLite
       when 500 then MailerLite::InternalServerError
       end
 
-      klass.new if klass
+      klass.new(message) if klass
+    end
+
+    # Returns the appropriate MailerLite error message based on response
+    #
+    # @param response [Faraday::Env] HTTP response.
+    #
+    # @return [String] MailerLite error message.
+    def self.error_message(response)
+      return unless response.body.is_a?(Hash)
+      return unless response.body['error']
+
+      message = response.body['error']['message']
+      MailerLite::Utils.presence(message)
     end
   end
 
@@ -25,7 +43,7 @@ module MailerLite
   class BadRequest < Error
     # Default error message.
     def to_s
-      'Missing a required parameter or calling invalid method'
+      @message || 'Missing a required parameter or calling invalid method'
     end
   end
 
@@ -33,7 +51,7 @@ module MailerLite
   class Unauthorized < Error
     # Default error message.
     def to_s
-      'Invalid API key provided'
+      @message || 'Invalid API key provided'
     end
   end
 
@@ -41,7 +59,7 @@ module MailerLite
   class NotFound < Error
     # Default error message.
     def to_s
-      "Can't find requested items"
+      @message || "Can't find requested items"
     end
   end
 
@@ -49,7 +67,7 @@ module MailerLite
   class InternalServerError < Error
     # Default error message.
     def to_s
-      'The server encountered an unexpected condition'
+      @message || 'The server encountered an unexpected condition'
     end
   end
 end

data/lib/mailerlite/middleware/underscore_keys.rb

@@ -18,7 +18,8 @@ module MailerLite
 
       def underscore_hash_keys(hash)
         hash.each_with_object({}) do |(k, v), new_hash|
-          new_hash[k.underscore] = updated_response(v)
+          key = MailerLite::Utils.underscore(k.to_s)
+          new_hash[key] = updated_response(v)
         end
       end
     end

data/lib/mailerlite/utils.rb

@@ -0,0 +1,29 @@
+module MailerLite
+  module Utils
+    BLANK_RE = /\A[[:space:]]*\z/
+
+    class << self
+      def underscore(string)
+        string.gsub(/::/, '/')
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .tr('-', '_')
+          .downcase
+      end
+
+      def blank?(obj)
+        return !!BLANK_RE.match(obj) if obj.is_a?(String)
+
+        obj.respond_to?(:empty?) ? !!obj.empty? : !obj
+      end
+
+      def present?(obj)
+        !blank?(obj)
+      end
+
+      def presence(obj)
+        obj if present?(obj)
+      end
+    end
+  end
+end

data/lib/mailerlite/version.rb

@@ -1,4 +1,4 @@
 module MailerLite
   # @return [String] Version number.
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailerlite
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Justas Palumickas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -114,12 +114,12 @@ files:
 - lib/mailerlite/clients/subscribers.rb
 - lib/mailerlite/configuration.rb
 - lib/mailerlite/connection.rb
-- lib/mailerlite/core_ext/string.rb
 - lib/mailerlite/error.rb
 - lib/mailerlite/mash.rb
 - lib/mailerlite/middleware/fix_unparsed_json.rb
 - lib/mailerlite/middleware/raise_error.rb
 - lib/mailerlite/middleware/underscore_keys.rb
+- lib/mailerlite/utils.rb
 - lib/mailerlite/version.rb
 - mailerlite.gemspec
 homepage: https://github.com/jpalumickas/mailerlite-ruby

data/lib/mailerlite/core_ext/string.rb

@@ -1,10 +0,0 @@
-# Custom String extensions
-class String
-  def underscore
-    gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .tr('-', '_')
-      .downcase
-  end
-end