mailjet 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0caf5b8f84f19dcfddd140a77d3912e0e6ee1672
-  data.tar.gz: a5cd66471eb7a399882b33ac4fd347c2f16698a6
+  metadata.gz: 2e5aca2e6992e3629225e95b54f92c345b9a425a
+  data.tar.gz: eb1f16741cb17b0a1db5303e29fd57fc853c44ae
 SHA512:
-  metadata.gz: 38c9e20e47f52baf3746f61e898c579692801d05a13c1dc69c8991bae21573c6f2a4c07da87eb580bec8beab52eb044cda671e108b605fcbc7aae130f4215309
-  data.tar.gz: 2d96779dee5a705fd311fa3a9502f9fa1c502b67348d0fd85c45211c45553d9cb81a04d30ab8f297248cdff78a74f64ab6cf135f7d85ab119fa1ebb6f7269dde
+  metadata.gz: 48c6bd96487aa123c5a201157e4d1d199325ebe582c54423bad89b0ad58c5c9d1f3f5d692ff94257ecd6745625ab1939dfb908cf81f55258a6081125a9d0747b
+  data.tar.gz: 54836996f885ea2286b23ff127d09913722fac7819764436e9f757cbd93bd8d4f0374fd207615438ef417acc1199d575896c8b91688198057abad0c81d43bf30

data/lib/mailjet/connection.rb

@@ -6,7 +6,7 @@ require 'json'
 module Mailjet
   class Connection
 
-    attr_accessor :adapter, :public_operations, :read_only
+    attr_accessor :adapter, :public_operations, :read_only, :perform_api_call
     alias :read_only? :read_only
 
     delegate :options, :concat_urls, :url, to: :adapter
@@ -37,36 +37,39 @@ module Mailjet
       self.read_only = options[:read_only]
       # self.adapter = adapter_class.new(end_point, options.merge(user: api_key, password: secret_key, :verify_ssl => false, content_type: 'application/json'))
       self.adapter = adapter_class.new(end_point, options.merge(user: api_key, password: secret_key, content_type: 'application/json'))
+      self.perform_api_call = options.key?(:perform_api_call) ? options[:perform_api_call] : true
     end
 
-    def get(additional_headers = {}, perform_api_call, &block)
-      handle_api_call(:get, additional_headers, perform_api_call, &block)
+    def get(additional_headers = {}, &block)
+      handle_api_call(:get, additional_headers, &block)
     end
 
-    def post(payload, additional_headers = {}, perform_api_call, &block)
-      handle_api_call(:post, additional_headers, payload, perform_api_call, &block)
+    def post(payload, additional_headers = {}, &block)
+      handle_api_call(:post, additional_headers, payload, &block)
     end
 
-    def put(payload, additional_headers = {}, perform_api_call, &block)
-      handle_api_call(:put, additional_headers, payload, perform_api_call, &block)
+    def put(payload, additional_headers = {}, &block)
+      handle_api_call(:put, additional_headers, payload, &block)
     end
 
-    def delete(additional_headers = {}, perform_api_call, &block)
-      handle_api_call(:delete, additional_headers, perform_api_call, &block)
+    def delete(additional_headers = {}, &block)
+      handle_api_call(:delete, additional_headers, &block)
     end
 
     private
 
-    def handle_api_call(method, additional_headers = {}, payload = {}, perform_api_call, &block)
+    def handle_api_call(method, additional_headers = {}, payload = {}, &block)
       formatted_payload = (additional_headers[:content_type] == :json) ? payload.to_json : payload
       raise Mailjet::MethodNotAllowed unless method_allowed(method)
 
-      if perform_api_call
+      if self.perform_api_call
         if [:get, :delete].include?(method)
           @adapter.send(method, additional_headers, &block)
         else
           @adapter.send(method, formatted_payload, additional_headers, &block)
         end
+      else
+        return {'Count': 0, 'Data': [mock_api_call: true], 'Total': 0}.to_json
       end
     rescue RestClient::Exception => e
       handle_exception(e, additional_headers, formatted_payload)

data/lib/mailjet/resource.rb

@@ -36,7 +36,8 @@ module Mailjet
           options[:api_key] || Mailjet.config.api_key,
           options[:secret_key] || Mailjet.config.secret_key,
           public_operations: public_operations,
-          read_only: read_only)
+          read_only: read_only,
+          perform_api_call: options[:perform_api_call])
       end
 
       def self.default_headers
@@ -57,14 +58,14 @@ module Mailjet
       def all(params = {}, options = {})
         opts = change_resource_path(options)
         params = format_params(params)
-        response = connection(opts).get(default_headers.merge(params: params), opts[:perform_api_call])
+        response = connection(opts).get(default_headers.merge(params: params))
         attribute_array = parse_api_json(response)
         attribute_array.map{ |attributes| instanciate_from_api(attributes) }
       end
 
       def count(options = {})
         opts = change_resource_path(options)
-        response_json = connection(opts).get(default_headers.merge(params: {limit: 1, countrecords: 1}), opts[:perform_api_call])
+        response_json = connection(opts).get(default_headers.merge(params: {limit: 1, countrecords: 1}))
         response_hash = ActiveSupport::JSON.decode(response_json)
         response_hash['Total']
       end
@@ -74,7 +75,7 @@ module Mailjet
         opts = change_resource_path(options)
         self.resource_path = create_action_resource_path(id, job_id) if self.action
         #
-        attributes = parse_api_json(connection(opts)[id].get(default_headers, opts[:perform_api_call])).first
+        attributes = parse_api_json(connection(opts)[id].get(default_headers)).first
         instanciate_from_api(attributes)
 
       rescue Mailjet::ApiError => e
@@ -111,7 +112,7 @@ module Mailjet
          # if action method, ammend url to appropriate id
          opts = change_resource_path(options)
          self.resource_path = create_action_resource_path(id) if self.action
-         connection(options)[id].delete(default_headers)
+         connection(opts)[id].delete(default_headers)
       end
 
       def instanciate_from_api(attributes = {})
@@ -120,6 +121,7 @@ module Mailjet
 
       def parse_api_json(response_json)
         response_hash = ActiveSupport::JSON.decode(response_json)
+
         #Take the response from the API and put it through a method -- taken from the ActiveSupport library -- which converts
         #the date-time from "2014-05-19T15:31:09Z" to "Mon, 19 May 2014 15:31:09 +0000" format.
         response_hash = convert_dates_from(response_hash)
@@ -218,7 +220,7 @@ module Mailjet
             perform_api_call = options[:perform_api_call]
           end
           if options.key?(:url)
-            url = options['url']
+            url = options[:url]
           end
         end
         ret = {version: ver, url: url, perform_api_call: perform_api_call}
@@ -243,16 +245,18 @@ module Mailjet
       attributes[:persisted]
     end
 
-    def save(options)
+    def save(options = {})
+      opts = self.class.change_resource_path(options)
+
       if persisted?
         # case where the entity is updated
-        response = connection(options)[attributes[:id]].put(formatted_payload, default_headers, options[:perform_api_call])
+        response = connection(opts)[attributes[:id]].put(formatted_payload, default_headers)
       else
         # case where the entity is created
-        response = connection(options).post(formatted_payload, default_headers, options[:perform_api_call])
+        response = connection(opts).post(formatted_payload, default_headers)
       end
 
-      if options[:perform_api_call] && !persisted?
+      if opts[:perform_api_call] && !persisted?
         # get attributes only for entity creation
         self.attributes = if self.resource_path == 'send'
           ActiveSupport::JSON.decode(response)
@@ -271,7 +275,7 @@ module Mailjet
       end
     end
 
-    def save!(options)
+    def save!(options = {})
       save(options) || raise(StandardError.new("Resource not persisted"))
     end
 

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Tyler Nappy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport