icontact 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3a505fef9d111e1ef537217756169f65c579596
-  data.tar.gz: 06965beb80528dd7cf36f572102d2e10b66552f6
+  metadata.gz: f572c6471d13d68cbe4ba58806245804f45d5a66
+  data.tar.gz: 20e10242041a60effef3af1e78fa74e82d08633a
 SHA512:
-  metadata.gz: be07d42d4083962a9f58e951f22c3c6111113b9c4bdbd865b69c12794a76fc73dd166b8836521fb9ffe9c02f9fb1f9906b1a08ceaceda038e1c0fd4bf18720d8
-  data.tar.gz: 3d7d61dfb0e167e2333157d1c78d6f9c476bfb0c6b84034aef12f42ba1bfda4554d0f7233f8689cb453dd00ceb0ad68577df7ab9fb0619a10739ec49fcde49f3
+  metadata.gz: dcc7988eda595f77b7e559b81f354cffcb1d926c7e8cac578d84c10b398cf89c997b87674b7e13033afbade4b03d9deaff88cfe91aad31f0ebf392b6aeac7baf
+  data.tar.gz: 0624508f859b3a0a1b5556510a47429a0fde3c28cefdc7bc8a8d15a9f81936cb894e8b221338f8217d4b7f4f888ffe5f94459205b5248f15693fdc47085a7de4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    icontact (0.0.3)
+    icontact (0.0.4)
       faraday (~> 0.8)
       oj (~> 2.11)
 

data/icontact.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |gem|
   gem.name          = 'icontact'
-  gem.version       = '0.0.3'
+  gem.version       = '0.0.4'
   gem.authors       = ['Devin Turner']
   gem.email         = ['devin.turner09@gmail.com']
   gem.summary       = 'Ruby wrapper for the iContact API'

data/lib/icontact/api/accounts.rb

@@ -3,7 +3,7 @@ module IContact
     module Accounts
 
       def get_account(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = get(accounts_path + id)
         resource(response, 'account')
       end
@@ -14,7 +14,7 @@ module IContact
       end
 
       def update_account(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = post(accounts_path + id, data)
         resource(response, 'account')
       end

data/lib/icontact/api/client_folders.rb

@@ -3,7 +3,7 @@ module IContact
     module ClientFolders
 
       def get_client_folder(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = get(client_folders_path + id)
         resource(response, 'clientfolder')
       end
@@ -15,7 +15,7 @@ module IContact
 
       def create_client_folder(data)
         response = post(client_folders_path, wrap(data))
-        resource(response, 'clientfolders', 0)
+        resource(response, 'clientfolders', true)
       end
 
       def create_client_folders(data)
@@ -24,13 +24,13 @@ module IContact
       end
 
       def update_client_folder(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = post(client_folders_path + id, data)
         resource(response, 'clientfolder')
       end
 
       def update_client_folder!(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = put(client_folders_path + id, data)
         resource(response, 'clientfolder')
       end

data/lib/icontact/api/contacts.rb

@@ -3,7 +3,7 @@ module IContact
     module Contacts
 
       def get_contact(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = get(contacts_path + id)
         resource(response, 'contact')
       end
@@ -15,7 +15,7 @@ module IContact
 
       def create_contact(data)
         response = post(contacts_path, wrap(data))
-        resource(response, 'contacts', 0)
+        resource(response, 'contacts', true)
       end
 
       def create_contacts(data)
@@ -24,13 +24,13 @@ module IContact
       end
 
       def update_contact(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = post(contacts_path + id, data)
         resource(response, 'contact')
       end
 
       def update_contact!(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = put(contacts_path + id, data)
         resource(response, 'contact')
       end
@@ -41,13 +41,13 @@ module IContact
       end
 
       def delete_contact(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = delete(contacts_path + id)
         resource(response, 'status')
       end
 
       def find_contacts(data)
-        raise ArgumentError, 'Data cannot be empty' if data.nil? || data.empty?
+        ensure_valid_data(data)
         data.merge!(limit: 10000) unless data.has_key?(:limit)
         response = get(contacts_path + query(data))
         resource(response, 'contacts')

data/lib/icontact/api/custom_fields.rb

@@ -3,7 +3,7 @@ module IContact
     module CustomFields
 
       def get_custom_field(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = get(custom_fields_path + id)
         resource(response, 'customfield')
       end
@@ -15,7 +15,7 @@ module IContact
 
       def create_custom_field(data)
         response = post(custom_fields_path, wrap(data))
-        resource(response, 'customfields', 0)
+        resource(response, 'customfields', true)
       end
 
       def create_custom_fields(data)
@@ -24,13 +24,13 @@ module IContact
       end
 
       def update_custom_field(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = post(custom_fields_path + id, data)
         resource(response, 'customfield')
       end
 
       def update_custom_field!(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = put(custom_fields_path + id, data)
         resource(response, 'customfield')
       end
@@ -41,7 +41,7 @@ module IContact
       end
 
       def delete_custom_field(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = delete(custom_fields_path + id)
         resource(response, 'status')
       end

data/lib/icontact/api/lists.rb

@@ -3,7 +3,7 @@ module IContact
     module Lists
 
       def get_list(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = get(lists_path + id)
         resource(response, 'list')
       end
@@ -15,7 +15,7 @@ module IContact
 
       def create_list(data)
         response = post(lists_path, wrap(data))
-        resource(response, 'lists', 0)
+        resource(response, 'lists', true)
       end
 
       def create_lists(data)
@@ -24,13 +24,13 @@ module IContact
       end
 
       def update_list(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = post(lists_path + id, data)
         resource(response, 'list')
       end
 
       def update_list!(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = put(lists_path + id, data)
         resource(response, 'list')
       end
@@ -41,7 +41,7 @@ module IContact
       end
 
       def delete_list(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = delete(lists_path + id)
         resource(response, 'status')
       end

data/lib/icontact/api/subscriptions.rb

@@ -3,7 +3,7 @@ module IContact
     module Subscriptions
 
       def get_subscription(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = get(subscriptions_path + id)
         resource(response, 'subscription')
       end
@@ -15,7 +15,7 @@ module IContact
 
       def create_subscription(data)
         response = post(subscriptions_path, wrap(data))
-        resource(response, 'subscriptions', 0)
+        resource(response, 'subscriptions', true)
       end
 
       def create_subscriptions(data)
@@ -24,13 +24,13 @@ module IContact
       end
 
       def update_subscription(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = post(subscriptions_path + id, data)
         resource(response, 'subscription')
       end
 
       def move_contact(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = put(subscriptions_path + id, data)
         resource(response, 'subscription')
       end

data/lib/icontact/api/users.rb

@@ -3,7 +3,7 @@ module IContact
     module Users
 
       def get_user(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = get(users_path + id)
         resource(response, 'user')
       end
@@ -15,7 +15,7 @@ module IContact
 
       def create_user(data)
         response = post(users_path, wrap(data))
-        resource(response, 'users', 0)
+        resource(response, 'users', true)
       end
 
       def create_users(data)
@@ -24,7 +24,7 @@ module IContact
       end
 
       def update_user(id, data)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = post(users_path + id, data)
         resource(response, 'user')
       end
@@ -35,7 +35,7 @@ module IContact
       end
 
       def delete_user(id)
-        raise ArgumentError, 'ID cannot be nil' if id.nil?
+        ensure_valid_id(id)
         response = delete(users_path + id)
         resource(response, 'status')
       end

data/lib/icontact/api.rb

@@ -53,13 +53,13 @@ module IContact
       data.respond_to?(:to_ary) ? data.to_ary : [data]
     end
 
-    def resource(data, field, position = nil)
-      if data.empty? || data[field].nil?
+    def resource(data, collection, first = false)
+      if data.empty? || data[collection].nil?
         []
-      elsif position.nil?
-        data[field]
+      elsif first
+        data[collection].first
       else
-        data[field][position]
+        data[collection]
       end
     end
 

data/lib/icontact/connection.rb

@@ -13,12 +13,12 @@ module IContact
     end
 
     def post(path, data)
-      raise ArgumentError, 'Data cannot be empty' if data.nil? || data.empty?
+      ensure_valid(data)
       request(:post, path, data)
     end
 
     def put(path, data)
-      raise ArgumentError, 'Data cannot be empty' if data.nil? || data.empty?
+      ensure_valid_data(data)
       request(:put, path, data)
     end
 
@@ -45,7 +45,7 @@ module IContact
     end
 
     def request(method, path, data = {})
-      request  = data.empty? ? '' : Oj.dump(data, mode: :compat)
+      request  = Oj.dump((data || {}), mode: :compat)
       response = connection.run_request(method, BASE_URL + path, request, headers)
       handle_response(response)
     end
@@ -62,12 +62,18 @@ module IContact
     def response_success(response)
       if response.env[:method] == :delete
         { 'status' => true }
-      elsif !response.body.nil? && !response.body.strip.empty?
-        Oj.load(response.body, mode: :compat)
       else
-        []
+        Oj.load((response.body || {}), mode: :compat)
       end
     end
 
+    def ensure_valid_id(id)
+      raise ArgumentError, 'ID cannot be nil' if id.nil?
+    end
+
+    def ensure_valid_data(data)
+      raise ArgumentError, 'Data cannot be empty' if data.nil? || data.empty?
+    end
+
   end
 end

data/lib/icontact/errors.rb

@@ -28,7 +28,7 @@ module IContact
   class IContact::UnsupportedMediaType < IContactError; end
 
   class ErrorHandler
-    ERRORS = {
+    MAPPED_ERRORS = {
       400 => IContact::BadRequest,
       401 => IContact::NotAuthorized,
       402 => IContact::PaymentRequest,
@@ -44,11 +44,12 @@ module IContact
     }
 
     def initialize(response)
-      error_class = ERRORS[response.status.to_i]
-      message = Oj.load(response.body)['errors']
+      klass   = MAPPED_ERRORS[response.status.to_i]
+      parsed  = Oj.load(response.body || '')
+      message = parsed.nil? ? '' : parsed['errors']
 
-      if error_class
-        raise error_class.new(message)
+      if klass
+        raise klass.new(message)
       else
         raise IContactError.new("#{response.status}: #{message}")
       end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: icontact
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Devin Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -118,12 +118,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []