admitad 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1455e6948bf99bda3d566232ef66e6ca10ed30f45a747125ee16fdb1522d64
-  data.tar.gz: 726e72b61f0299bbf3cbc72257a80af5d95b1a90919ee05152e90c078cd77631
+  metadata.gz: 872b5319b4120dc8c929d09e0f0c769d210d57e27e220585f21f002e61ad985c
+  data.tar.gz: 88c7a246bcbee7e3b686d1868fb810c842b77881b1b870667199bd0d90de96a8
 SHA512:
-  metadata.gz: 67f21bc544480852d36010b0b5995102766de7df13494341711ecb6d29c43e37cd14122389df3c69f88eba4d3141960e5eeaf085878ee50ca2a5c8fc21dc1ba9
-  data.tar.gz: 3ec8ffc57c79139db2c77baf5dd329c2517ac19a68d617c0eddbae9392403c2940247ef53b2259fc10efcf24e46833ae6774a5039f98f2a5d87174cc05a55c5b
+  metadata.gz: f054603cc94547cd6fc0fc1ff3c64a0a385b6d43627da4e849fac682e5b6b8793f4dd49df81fdbc77d0f7ace0de1fbcd6f03afd1dabe511d2a12838a93e4f1f9
+  data.tar.gz: ba324c906d26afebcc2a119b797f62e14c52c87c927ab732b8b0ee9cd5a4759bf9c74acab48437b19227bf303a1af352b9e50e479d60b307cdb6441b322aced7

data/admitad.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'admitad'
   spec.version       = Admitad::VERSION
   spec.authors       = ['alexandr-senyuk']
-  spec.email         = ['alexandr.030197@gmail.com']
+  spec.email         = ['a.senyuk.io@gmail.com']
 
   spec.summary       = 'Simple wrapper for admitad api'
   spec.description   = 'This interface helps you to create applications for Admitad affiliate network.

data/bin/console

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-require 'admitad'
-require 'yaml'
+require_relative './../lib/admitad'
 require 'pry'
+require 'yaml'
 
 secrets = YAML.load_file('secrets.yml')
 

data/bin/setup

@@ -4,5 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/lib/admitad.rb

@@ -1,11 +1,11 @@
 require 'virtus'
-require 'admitad/config'
-require 'admitad/version'
-require 'admitad/constants'
-require 'admitad/models/result'
+require_relative 'admitad/config'
+require_relative 'admitad/version'
+require_relative 'admitad/constants'
+require_relative 'admitad/models/result'
 
 Dir[File.join(__dir__, 'admitad', 'models', '*.rb')].map(&method(:require))
-Dir[File.join(__dir__, 'admitad', '*.rb')].map(&method(:require))
+Dir[File.join(__dir__, 'admitad', '**', '*.rb')].map(&method(:require))
 
 module Admitad
   def configuration

data/lib/admitad/concerns/wrappers/actions.rb

@@ -0,0 +1,19 @@
+module Admitad
+  module Wrappers
+    module Actions
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :action_statistic, to: :instance
+        end
+      end
+
+      def action_statistic(**params)
+        verifying_token do
+          client.statistics_actions(params)
+        end
+      end
+    end
+  end
+end

data/lib/admitad/concerns/wrappers/ad_spaces.rb

@@ -0,0 +1,25 @@
+module Admitad
+  module Wrappers
+    module AdSpaces
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :ad_spaces_where, :find_ad_space_by_id, to: :instance
+        end
+      end
+
+      def ad_spaces_where(**params)
+        verifying_token do
+          client.websites(params)
+        end
+      end
+
+      def find_ad_space_by_id(id, **params)
+        verifying_token do
+          client.websites(params.merge(id: id))
+        end
+      end
+    end
+  end
+end

data/lib/admitad/concerns/wrappers/affiliate_programs.rb

@@ -0,0 +1,44 @@
+module Admitad
+  module Wrappers
+    module AffiliatePrograms
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :affiliate_programs_where, :affiliate_programs_for_ad_space,
+                   :connect_affiliate_program, :disconnect_affiliate_program,
+                   to: :instance
+        end
+      end
+
+      def affiliate_programs_where(**params)
+        verifying_token do
+          client.advcampaigns(params)
+        end
+      end
+
+      def affiliate_programs_for_ad_space(ad_space, **params)
+        id = ad_space.try(:id) || ad_space
+        verifying_token do
+          client.advcampaigns_website(params.merge(w_id: id))
+        end
+      end
+
+      def connect_affiliate_program(ad_space, affiliate_program)
+        w_id = ad_space.try(:id) || ad_space
+        c_id = affiliate_program.try(:id) || affiliate_program
+        verifying_token do
+          client.advcampaigns_attach(w_id: w_id, c_id: c_id)
+        end
+      end
+
+      def disconnect_affiliate_program(ad_space, affiliate_program)
+        w_id = ad_space.try(:id) || ad_space
+        c_id = affiliate_program.try(:id) || affiliate_program
+        verifying_token do
+          client.advcampaigns_detach(w_id: w_id, c_id: c_id)
+        end
+      end
+    end
+  end
+end

data/lib/admitad/concerns/wrappers/categories.rb

@@ -0,0 +1,19 @@
+module Admitad
+  module Wrappers
+    module Categories
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :categories, to: :instance
+        end
+      end
+
+      def categories(**params)
+        verifying_token do
+          client.categories(params)
+        end
+      end
+    end
+  end
+end

data/lib/admitad/concerns/wrappers/coupons.rb

@@ -0,0 +1,45 @@
+module Admitad
+  module Wrappers
+    module Coupons
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :coupon_categories, :coupons, :find_coupon,
+                   :find_coupon_for_website, :coupons_for_website,
+                   to: :instance
+        end
+      end
+
+      def coupons(**params)
+        verifying_token do
+          client.coupons(params)
+        end
+      end
+
+      def find_coupon(id)
+        verifying_token do
+          client.coupons(id: id)
+        end
+      end
+
+      def coupon_categories(**params)
+        verifying_token do
+          client.coupons_categories(params)
+        end
+      end
+
+      def find_coupon_for_website(id, **params)
+        verifying_token do
+          client.coupons_website(params.merge(c_id: id))
+        end
+      end
+
+      def coupons_for_website(**params)
+        verifying_token do
+          client.coupons_website(params)
+        end
+      end
+    end
+  end
+end

data/lib/admitad/concerns/wrappers/currencies.rb

@@ -0,0 +1,25 @@
+module Admitad
+  module Wrappers
+    module Currencies
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :currencies, :currencies_rate, to: :instance
+        end
+      end
+
+      def currencies(**params)
+        verifying_token do
+          client.currencies(params)
+        end
+      end
+
+      def currencies_rate(**params)
+        verifying_token do
+          client.currencies_rate(params)
+        end
+      end
+    end
+  end
+end

data/lib/admitad/concerns/wrappers/deeplinks.rb

@@ -0,0 +1,19 @@
+module Admitad
+  module Wrappers
+    module Deeplinks
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :generate_deeplink, to: :instance
+        end
+      end
+
+      def generate_deeplink(**params)
+        verifying_token do
+          client.deeplink(params)
+        end
+      end
+    end
+  end
+end

data/lib/admitad/concerns/wrappers/regions.rb

@@ -0,0 +1,19 @@
+module Admitad
+  module Wrappers
+    module Regions
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          delegate :regions, to: :instance
+        end
+      end
+
+      def regions(**params)
+        verifying_token do
+          client.websites_regions(params)
+        end
+      end
+    end
+  end
+end

data/lib/admitad/version.rb

@@ -1,3 +1,3 @@
 module Admitad
-  VERSION = '0.0.11'.freeze
+  VERSION = '0.0.12'.freeze
 end

data/lib/admitad/wrapper.rb

@@ -1,130 +1,41 @@
 module Admitad
   class Wrapper
     include Singleton
-    class << self
-      delegate :action_statistic, :generate_deeplink, :regions, :coupon_categories,
-               :categories, :ad_spaces_where, :find_ad_space_by_id, :coupons, :find_coupon,
-               :affiliate_programs_where, :affiliate_programs_for_ad_space,
-               :connect_affiliate_program, :disconnect_affiliate_program, :find_coupon_for_website,
-               :coupons_for_website, :currencies, :currencies_rate,
-               to: :instance
-    end
-
-    def initialize
-      @client = Client.new
-      @token = create_token
-      assign_token
-    end
-
-    def coupons(**params)
-      check_token
-      client.coupons(params)
-    end
-
-    def find_coupon(id)
-      check_token
-      client.coupons(id: id)
-    end
-
-    def coupon_categories(**params)
-      check_token
-      client.coupons_categories(params)
-    end
-
-    def find_coupon_for_website(id, **params)
-      check_token
-      client.coupons_website(params.merge(c_id: id))
-    end
-
-    def coupons_for_website(**params)
-      check_token
-      client.coupons_website(params)
-    end
-
-    def action_statistic(**params)
-      check_token
-      client.statistics_actions(params)
-    end
-
-    def generate_deeplink(**params)
-      check_token
-      client.deeplink(params)
-    end
-
-    def regions(**params)
-      check_token
-      client.websites_regions(params)
-    end
+    include Wrappers::Coupons
+    include Wrappers::Deeplinks
+    include Wrappers::Regions
+    include Wrappers::Actions
+    include Wrappers::Categories
+    include Wrappers::AdSpaces
+    include Wrappers::Currencies
+    include Wrappers::AffiliatePrograms
 
-    def categories(**params)
-      check_token
-      client.categories(params)
-    end
-
-    def currencies(**params)
-      check_token
-      client.currencies(params)
-    end
-
-    def currencies_rate(**params)
-      check_token
-      client.currencies_rate(params)
-    end
-
-    def ad_spaces_where(**params)
-      check_token
-      client.websites(params)
-    end
-
-    def find_ad_space_by_id(id, **params)
-      check_token
-      client.websites(params.merge(id: id))
-    end
-
-    def affiliate_programs_where(**params)
-      check_token
-      client.advcampaigns(params)
-    end
-
-    def affiliate_programs_for_ad_space(ad_space, **params)
-      check_token
-      id = ad_space.try(:id) || ad_space
-      client.advcampaigns_website(params.merge(w_id: id))
-    end
-
-    def connect_affiliate_program(ad_space, affiliate_program)
-      check_token
-      w_id = ad_space.try(:id) || ad_space
-      c_id = affiliate_program.try(:id) || affiliate_program
-      client.advcampaigns_attach(w_id: w_id, c_id: c_id)
-    end
+    private
 
-    def disconnect_affiliate_program(ad_space, affiliate_program)
-      check_token
-      w_id = ad_space.try(:id) || ad_space
-      c_id = affiliate_program.try(:id) || affiliate_program
-      client.advcampaigns_detach(w_id: w_id, c_id: c_id)
+    def initialize
+      create_token
     end
 
-    private
-
-    def check_token
-      return if token&.success? && !token.expired?
+    def verifying_token
+      return token.attributes.stringify_keys if token.error?
+      return yield unless token.expired?
 
-      @token = token.expired? ? refresh_token : create_token
-      assign_token
+      refresh_token
+      verifying_token { yield }
     end
 
-    def assign_token
+    def create_client
       @client = Client.new(token.try(:access_token))
     end
 
     def create_token
-      Token.create(client.token(grant_type: :client_credentials))
+      @token = Token.create(Client.new.token(grant_type: :client_credentials))
+      create_client
     end
 
     def refresh_token
-      Token.create(client.token(grant_type: :refresh_token, refresh_token: token.refresh_token))
+      @token = Token.create(client.token(grant_type: :refresh_token, refresh_token: token.refresh_token))
+      create_client
     end
 
     attr_reader :client, :token

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admitad
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - alexandr-senyuk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ description: |-
                             You can build up applications to analyze your own statistics and accounting records or
                             to put them up for sale in the Admitad App Store.
 email:
-- alexandr.030197@gmail.com
+- a.senyuk.io@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -152,6 +152,14 @@ files:
 - bin/setup
 - lib/admitad.rb
 - lib/admitad/client.rb
+- lib/admitad/concerns/wrappers/actions.rb
+- lib/admitad/concerns/wrappers/ad_spaces.rb
+- lib/admitad/concerns/wrappers/affiliate_programs.rb
+- lib/admitad/concerns/wrappers/categories.rb
+- lib/admitad/concerns/wrappers/coupons.rb
+- lib/admitad/concerns/wrappers/currencies.rb
+- lib/admitad/concerns/wrappers/deeplinks.rb
+- lib/admitad/concerns/wrappers/regions.rb
 - lib/admitad/config.rb
 - lib/admitad/constants.rb
 - lib/admitad/models/actions_response.rb
@@ -187,8 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Simple wrapper for admitad api