iterable-api 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4fe814e6c211b3dfc26c78f7748a4dfdc51d849
-  data.tar.gz: f91e92f8b9cd6883d8612997691a8c56d0cfee33
+  metadata.gz: 2dc4e2e159bc6acb049c8157419327d85fa993d8
+  data.tar.gz: 1f10e1a2cb609298c14234616cb197b5487807a6
 SHA512:
-  metadata.gz: 133219eaf8ec16f6704a3281df19158475c4113dc2898aa9e2417ce809afcdfbd3fee074b81d072204def6ca4aa0633fab5fc3062ea8421f74212bdfd9560bc5
-  data.tar.gz: d5fc734f1468b1e6485b15af741d4174d1de547b5ed89c0d9d13ffa2cc8837bb9f04ed7e657b184e343ef50ae1abee3d61ada5e2dc53e24ae1179c2b5803ab16
+  metadata.gz: 42db222320f5e74460148ce1fa015f1715399e2e7e4ba36e3a3c0375d1461469641b06975654d3b72d83284e8e571b32ce4c57213e6145621ebd08f5e1c4b766
+  data.tar.gz: 13e1a52ca5f41d1cae7d00e9f3a61b6ec3dead296532c0ec734f89dc74ba9432e15dbb6d7fb9d121e01aea0f594ac93816aee1c32daf55d4d50908551006d4f6

data/lib/iterable/api.rb

@@ -6,12 +6,14 @@
 
 module Iterable
   class Api
+    attr_accessor :api_key
+
     # Class constructor
     # @param [String] api_key - Iterable API Key
     # @return
     def initialize(api_key = nil)
-      Services::BaseService.api_key = api_key || Util::Config.get('auth.api_key')
-      if Services::BaseService.api_key.nil? || Services::BaseService.api_key == ''
+      @api_key = api_key || Util::Config.get('auth.api_key')
+      if @api_key.nil? || @api_key == ''
         raise ArgumentError.new(Util::Config.get('errors.api_key_missing'))
       end
     end
@@ -20,34 +22,34 @@ module Iterable
     # List Services
     #
     def lists
-      Services::ListService.all
+      Services::ListService.new(@api_key).all
     end
 
     def lists_subscribe(list_id, subscribers)
-      Services::ListService.subscribe(list_id, subscribers)
+      Services::ListService.new(@api_key).subscribe(list_id, subscribers)
     end
 
     def list_by_id(list_id)
-      Services::ListService.find_by_id(list_id)
+      Services::ListService.new(@api_key).find_by_id(list_id)
     end
 
     #
     # User Services
     #
     def user_by_email(email)
-      Services::UserService.find_by_email(email)
+      Services::UserService.new(@api_key).find_by_email(email)
     end
 
     def user_by_id(id)
-      Services::UserService.find_by_id(id)
+      Services::UserService.new(@api_key).find_by_id(id)
     end
 
     def user_update(user)
-      Services::UserService.update(user)
+      Services::UserService.new(@api_key).update(user)
     end
 
     def user_fields
-      Services::UserService.fields
+      Services::UserService.new(@api_key).fields
     end
 
     def user_subscriptions_update
@@ -57,14 +59,14 @@ module Iterable
     # Event Services
     #
     def track_event(event)
-      Services::EventService.track(event)
+      Services::EventService.new(@api_key).track(event)
     end
 
     #
     # Commerce Services
     #
     def track_purchase(track_purchase_request)
-      Services::CommerceService.track_purchase(track_purchase_request)
+      Services::CommerceService.new(@api_key).track_purchase(track_purchase_request)
     end
   end
 end

data/lib/iterable/services/base_service.rb

@@ -7,69 +7,70 @@
 module Iterable
   module Services
     class BaseService
-      class << self
-        attr_accessor :api_key
+      attr_accessor :api_key
+      def initialize(api_key = nil)
+        @api_key = api_key
+      end
 
-        protected
+      protected
 
-        def get(path, params = {}, response_type = Iterable::Responses::General)
-          url = URI::join(Util::Config.get('endpoints.base_url'), path).to_s
-          url = build_url(url, params)
-          response = RestClient.get(url, get_headers())
-          begin
-            response_type.new JSON.parse(response.body)
-          rescue
-            Hashie::Mash.new JSON.parse(response.body)
-          end
+      def get(path, params = {}, response_type = Iterable::Responses::General)
+        url = URI::join(Util::Config.get('endpoints.base_url'), path).to_s
+        url = build_url(url, params)
+        response = RestClient.get(url, get_headers())
+        begin
+          response_type.new JSON.parse(response.body)
+        rescue
+          Hashie::Mash.new JSON.parse(response.body)
         end
+      end
 
-        def post(path, body = {}, params = {}, response_type = Iterable::Responses::General)
-          url = URI::join(Util::Config.get('endpoints.base_url'), path).to_s
-          url = build_url(url, params)
-          response = RestClient.post(url, body.to_json, get_headers())
-          begin
-            response_type.new JSON.parse(response.body)
-          rescue
-            Hashie::Mash.new JSON.parse(response.body)
-          end
+      def post(path, body = {}, params = {}, response_type = Iterable::Responses::General)
+        url = URI::join(Util::Config.get('endpoints.base_url'), path).to_s
+        url = build_url(url, params)
+        response = RestClient.post(url, body.to_json, get_headers())
+        begin
+          response_type.new JSON.parse(response.body)
+        rescue
+          Hashie::Mash.new JSON.parse(response.body)
         end
+      end
 
-        # Return required headers for making an http request with Iterable
-        # @param [String] content_type - The MIME type of the body of the request, default is 'application/json'
-        # @return [Hash] - authorization headers
-        def get_headers(content_type = 'application/json')
-          {
-            :content_type           => content_type,
-            :accept                 => 'application/json',
-            :user_agent             => "Iterable Ruby SDK v#{Iterable::VERSION} (#{RUBY_DESCRIPTION})",
-            :x_ctct_request_source  => "sdk.ruby.#{Iterable::VERSION}",
-            'Api-Key'               => BaseService.api_key
-          }
-        end
+      # Return required headers for making an http request with Iterable
+      # @param [String] content_type - The MIME type of the body of the request, default is 'application/json'
+      # @return [Hash] - authorization headers
+      def get_headers(content_type = 'application/json')
+        {
+          :content_type           => content_type,
+          :accept                 => 'application/json',
+          :user_agent             => "Iterable Ruby SDK v#{Iterable::VERSION} (#{RUBY_DESCRIPTION})",
+          :x_ctct_request_source  => "sdk.ruby.#{Iterable::VERSION}",
+          'Api-Key'               => @api_key
+        }
+      end
 
-        # Build a url from the base url and query parameters hash. Query parameters
-        # should not be URL encoded because this method will handle that
-        # @param [String] url - The base url
-        # @param [Hash] params - A hash with query parameters
-        # @return [String] - the url with query parameters hash 
-        def build_url(url, params = nil)
-          if params.respond_to? :each
-            params.each do |key, value|
-              # Convert dates to CC date format
-              if value.respond_to? :iso8601
-                params[key] = value.iso8601
-              end
+      # Build a url from the base url and query parameters hash. Query parameters
+      # should not be URL encoded because this method will handle that
+      # @param [String] url - The base url
+      # @param [Hash] params - A hash with query parameters
+      # @return [String] - the url with query parameters hash
+      def build_url(url, params = nil)
+        if params.respond_to? :each
+          params.each do |key, value|
+            # Convert dates to CC date format
+            if value.respond_to? :iso8601
+              params[key] = value.iso8601
+            end
 
-              if key.to_s == 'next' && value.match(/^.*?next=(.*)$/)
-                params[key] = $1
-              end
+            if key.to_s == 'next' && value.match(/^.*?next=(.*)$/)
+              params[key] = $1
             end
-          else
-            params ||= {}
           end
-          url + '?' + Util::Helpers.http_build_query(params)
+        else
+          params ||= {}
         end
+        url + '?' + Util::Helpers.http_build_query(params)
       end
     end
   end
-end
+end

data/lib/iterable/services/commerce_service.rb

@@ -7,12 +7,10 @@
 module Iterable
   module Services
     class CommerceService < BaseService
-      class << self
-        def track_purchase(request)
-          raise Exceptions::ServiceException, "Must be a Iterable::Requests::TrackPurchase" unless request.is_a?(Iterable::Requests::TrackPurchase)
-          post(Util::Config.get('endpoints.track_purchase'), request)
-        end
+      def track_purchase(request)
+        raise Exceptions::ServiceException, "Must be a Iterable::Requests::TrackPurchase" unless request.is_a?(Iterable::Requests::TrackPurchase)
+        post(Util::Config.get('endpoints.track_purchase'), request)
       end
     end
   end
-end
+end

data/lib/iterable/services/event_service.rb

@@ -7,12 +7,10 @@
 module Iterable
   module Services
     class EventService < BaseService
-      class << self
         def track(event)
           raise Exceptions::ServiceException, "Must be a Iterable::Event" unless event.is_a?(Iterable::Event)
           post(Util::Config.get('endpoints.track_event'), event)
         end
-      end
     end
   end
 end

data/lib/iterable/services/list_service.rb

@@ -7,20 +7,18 @@
 module Iterable
   module Services
     class ListService < BaseService
-      class << self
-        def all
-          get(Util::Config.get('endpoints.lists'), nil, Iterable::Responses::Lists)
-        end
+      def all
+        get(Util::Config.get('endpoints.lists'), nil, Iterable::Responses::Lists)
+      end
 
-        def find_by_id(id)
-          # iterate over all lists to find the id
-          all.lists.select{|x| x.id == id.to_i}.first
-        end
+      def find_by_id(id)
+        # iterate over all lists to find the id
+        all.lists.select{|x| x.id == id.to_i}.first
+      end
 
-        def subscribe(list_id, subscribers)
-          request = Iterable::Requests::Subscribe.new(listId: list_id, subscribers: subscribers)
-          post(Util::Config.get('endpoints.lists_subscribe'), request, nil, Iterable::Responses::Subscribe)
-        end
+      def subscribe(list_id, subscribers)
+        request = Iterable::Requests::Subscribe.new(listId: list_id, subscribers: subscribers)
+        post(Util::Config.get('endpoints.lists_subscribe'), request, nil, Iterable::Responses::Subscribe)
       end
     end
   end

data/lib/iterable/services/user_service.rb

@@ -7,32 +7,30 @@
 module Iterable
   module Services
     class UserService < BaseService
-      class << self
-        def find_by_email(email)
-          raise Exceptions::ServiceException, "Email is required." if email.nil?
-          find_by((Util::Config.get('endpoints.user_by_email') % [email]))
-        end
+      def find_by_email(email)
+        raise Exceptions::ServiceException, "Email is required." if email.nil?
+        find_by((Util::Config.get('endpoints.user_by_email') % [email]))
+      end
 
-        def find_by_id(id)
-          raise Exceptions::ServiceException, "Id is required." if id.nil?
-          find_by((Util::Config.get('endpoints.user_by_id') % [id]))
-        end
+      def find_by_id(id)
+        raise Exceptions::ServiceException, "Id is required." if id.nil?
+        find_by((Util::Config.get('endpoints.user_by_id') % [id]))
+      end
 
-        def update(user)
-          raise Exceptions::ServiceException, "Must be a Iterable::Requests::UserUpdate" unless user.is_a?(Iterable::Requests::UserUpdate)
-          post(Util::Config.get('endpoints.user_update'), user)
-        end
+      def update(user)
+        raise Exceptions::ServiceException, "Must be a Iterable::Requests::UserUpdate" unless user.is_a?(Iterable::Requests::UserUpdate)
+        post(Util::Config.get('endpoints.user_update'), user)
+      end
 
-        def fields
-          get(Util::Config.get('endpoints.user_fields'))
-        end
+      def fields
+        get(Util::Config.get('endpoints.user_fields'))
+      end
 
-        private 
+      private
 
-        def find_by(path)
-          get(path, nil, Iterable::Responses::User)
-        end
+      def find_by(path)
+        get(path, nil, Iterable::Responses::User)
       end
     end
   end
-end
+end

data/lib/iterable/version.rb

@@ -1,3 +1,3 @@
 module Iterable
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iterable-api
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Iterable