my_target_api 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d637416775f256beda271796924a188a577f31
-  data.tar.gz: 0764dacd1b9b341b72730ed142866c7c05b02383
+  metadata.gz: e53adbd2b5a083b0fb9e90646dac235545237336
+  data.tar.gz: 88bfab044cf0b2214ff029443786e7dc4ad82f76
 SHA512:
-  metadata.gz: 89d329c205f1792ce8173ce52af161aee3eaa12b780257ec4cf3714a7f2548ca7ac510477453d2cc6f683ff954480529be9dde9a13a81ab877f58de8c3935f47
-  data.tar.gz: cc342e1016adc4a9760b738081cd6b382238b32744e028db90b15156619b6c8a97cd5a2415e3d79c261698d59d69b56be5c4e786e5ce556a97ee6586b56cc79a
+  metadata.gz: fc6883a6ba4ce7b7dacd71d54b0d74adca74b92db223a88e5d79b6e129e2fb8a0ef81f6a53c64da507660658e62014ba0c4ce603160b269bac82c243de750106
+  data.tar.gz: 7a88cc9582adea5d6f358b166640fc62d2e391eda2b14e39e1ed460406e489c244c5b42ec8310c89cba4c9c50101efda9283c3b5e8d8a068e1f7a377c2cbe338

data/Gemfile

@@ -2,5 +2,5 @@
 
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in mailru_target.gemspec
+# Specify your gem's dependencies in my_target_api.gemspec
 gemspec

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application's Gemfile:
 
 ```
-gem 'my_target_api', '~> 1.0.4'
+gem 'my_target_api', '~> 1.0.5'
 ```
 
 Or install from command line:

data/lib/my_target_api/request.rb

@@ -35,19 +35,27 @@ class MyTargetApi
       process_response(response)
     end
 
+    private
+
+    attr_reader :logger
+
     def body_parameters(params)
       result_params = params.dup
       result_params.delete(:access_token)
 
       if params.values.any? { |param| param.is_a? IO } || params[:grant_type]
-        params.map do |name, value|
-          [name, value.is_a?(Array) || value.is_a?(Hash) ? value.to_json : value]
-        end.to_h
+        individual_body_parameters(params)
       else
         params.to_json
       end
     end
 
+    def individual_body_parameters(params)
+      params.map do |name, value|
+        [name, value.is_a?(Array) || value.is_a?(Hash) ? value.to_json : value]
+      end.to_h
+    end
+
     def header_parameters(params)
       result_params = params.dup
       result_params.delete(:access_token)
@@ -78,10 +86,6 @@ class MyTargetApi
       raise MyTargetApi::ConnectionError, e
     end
 
-    private
-
-    attr_reader :logger
-
     def log_rest_client_exception(exception)
       log_message =
         <<-LOG

data/lib/my_target_api/resource.rb

@@ -10,36 +10,33 @@ class MyTargetApi
     end
 
     def create(params = {})
-      params = prepare_params(params)
-
-      api.post_request("#{path}.json", params)
+      with_prepared_params(params) do |prepared|
+        api.post_request("#{path}.json", prepared)
+      end
     end
 
     def read(params = {})
-      params = prepare_params(params)
-      id = params.delete(:id)
-
-      if id
-        api.get_request("#{path}/#{id}.json", params)
-      else
-        api.get_request("#{path}.json", params)
+      with_prepared_params(params) do |prepared|
+        id = prepared.delete(:id)
+
+        if id
+          api.get_request("#{path}/#{id}.json", prepared)
+        else
+          api.get_request("#{path}.json", prepared)
+        end
       end
     end
 
     def update(params = {})
-      params = prepare_params(params)
-      id = params.delete(:id)
-      raise ArgumentError, ':id is required' unless id
-
-      api.post_request("#{path}/#{id}.json", params)
+      with_id_and_prepared_params(params) do |id, prepared|
+        api.post_request("#{path}/#{id}.json", prepared)
+      end
     end
 
     def delete(params = {})
-      params = prepare_params(params)
-      id = params.delete(:id)
-      raise ArgumentError, ':id is required' unless id
-
-      api.delete_request("#{path}/#{id}.json", params)
+      with_id_and_prepared_params(params) do |id, prepared|
+        api.delete_request("#{path}/#{id}.json", prepared)
+      end
     end
 
     def resource(relative_path)
@@ -50,12 +47,23 @@ class MyTargetApi
 
     attr_reader :api, :path
 
-    def prepare_params(params)
+    def with_prepared_params(params)
       raise ArgumentError, 'Params must be a Hash' unless params.is_a? Hash
 
-      params.map do |param, value|
+      prepared = params.map do |param, value|
         [param.to_sym, value]
       end.to_h
+
+      yield prepared
+    end
+
+    def with_id_and_prepared_params(params)
+      with_prepared_params(params) do |prepared|
+        id = prepared.delete(:id)
+        raise ArgumentError, ':id is required' unless id
+
+        yield id, prepared.dup
+      end
     end
 
   end

data/lib/my_target_api/version.rb

@@ -2,6 +2,6 @@
 
 class MyTargetApi
 
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 
 end

data/my_target_api.gemspec

@@ -7,7 +7,7 @@ require 'my_target_api/version'
 Gem::Specification.new do |spec|
   spec.name          = 'my_target_api'
   spec.version       = MyTargetApi::VERSION
-  spec.authors       = ['Reshetnikov Ivan']
+  spec.authors       = ['OneRetarget.com']
   spec.email         = ['help@oneretarget.com']
   spec.summary       = 'Ruby client for myTarget API'
   spec.description   = <<~DESC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_target_api
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
-- Reshetnikov Ivan
+- OneRetarget.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -149,10 +149,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/my_target_api.rb
 - lib/my_target_api/connection_error.rb
 - lib/my_target_api/request.rb

data/Gemfile.lock

@@ -1,81 +0,0 @@
-PATH
-  remote: .
-  specs:
-    my_target_api (1.0.4)
-      json (~> 2.0, >= 2.0.0)
-      rest-client (~> 2.0, >= 2.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    domain_name (0.5.20170404)
-      unf (>= 0.0.5, < 1.0.0)
-    hashdiff (0.3.7)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    json (2.1.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    netrc (0.11.0)
-    parallel (1.12.1)
-    parser (2.5.0.5)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
-    public_suffix (3.0.2)
-    rainbow (3.0.0)
-    rake (12.3.1)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.54.0)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    safe_yaml (1.0.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.3.0)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  my_target_api!
-  rake (~> 12.3.0, >= 12.3.0)
-  rspec (~> 3.7.0, >= 3.7.0)
-  rubocop (~> 0.54.0)
-  webmock (~> 2.3.2, >= 2.3.2)
-
-BUNDLED WITH
-   1.16.1

data/Rakefile

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'