ozon_api 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cc0bbb7b66282d595c194d1b9c54f4dc69c3e8e
-  data.tar.gz: faa8202488649df9015ce7e17b96c9f2d8b7e88f
+  metadata.gz: 29b82b33e617de476fe7ffc47ac4a73ced8c4e33
+  data.tar.gz: 6b2c1d8d172f7b8a83cc81f1f88c5354e0c42617
 SHA512:
-  metadata.gz: 75d72afcbe16f8e59b57117d40573f110cff22585450156527da75c6234079d565eb809309ce228f40b2c2b5247a8977f0ec7a0b96a4bb4a16d622b8780ad66d
-  data.tar.gz: abbc421a602352598072e7a957af64d1b2521b274b5a036776d1cf42f42ccd9fd2786e9e8473894d200028aaca11a3ab5aaafdd89d1d7c61c97b74f4f81915ed
+  metadata.gz: de3bfa78a25a5151f4ef1a3b2d2ce22a21c1fd6ad21222742f225c5d6b37db266676cea034df12ccd497398a61ccc976b158896ad4d06ea99c89e54ffeebded9
+  data.tar.gz: c754f6c6e32ad284f582200fc470f50c862016ae49c9db3aa98c0ec65f50e144d3d9c9f6e11b6586d17a3a8d5ffaca1bcc84bac8e251c3b8c455415cc5b824c7

data/lib/ozon_api/address_service.rb

@@ -27,7 +27,7 @@ module OzonApi
           search_text:,
           search_text_match_preferred:,
           limit: 20
-        )
+    )
       @client.get(
         [BASE_PATH, 'SearchStreets'].join('/'),
         'cityId': city_id,
@@ -36,6 +36,5 @@ module OzonApi
         'limit': limit
       )
     end
-
   end
 end

data/lib/ozon_api/client.rb

@@ -5,16 +5,12 @@ require 'json'
 
 module OzonApi
   class Client
-    InvalidConfigurationError = Class.new(StandardError)
     ApiError = Class.new(StandardError)
 
-    CONFIGURATION_KEYS = [:scheme, :host, :base_path, :login, :password, :out].freeze
     SUCCESS_STATUS = 2
 
-    def initialize(hsh = {})
-      @config = hsh.select do |key, _|
-        CONFIGURATION_KEYS.include? key.to_sym
-      end
+    def initialize(configuration)
+      @config = configuration
     end
 
     def get(path, params = {})
@@ -67,33 +63,27 @@ module OzonApi
     end
 
     def base_path
-      @base_path ||= @config[:base_path] || 'PartnerService'
+      @config.base_path
     end
 
     def scheme
-      @scheme ||= @config[:scheme] || 'https'
+      @config.scheme
     end
 
     def host
-      @host ||= @config[:host] || 'ows.ozon.ru'
+      @config.host
     end
 
     def login
-      return @login if @login
-      @login = @config[:login] || ENV['OZON_LOGIN']
-      raise InvalidConfigurationError, 'Missing OZON_LOGIN' if @login.nil?
-      @login
+      @config.login
     end
 
     def password
-      return @password if @password
-      @password = @config[:password] || ENV['OZON_PASSWORD']
-      raise InvalidConfigurationError, 'Missing OZON_PASSWORD' if @password.nil?
-      @password
+      @config.password
     end
 
     def out
-      @config[:out]
+      @config.out
     end
 
     def parse_response(data)

data/lib/ozon_api/configuration.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+require 'active_model'
+
+module OzonApi
+  class Configuration
+    include ActiveModel::Validations
+
+    def self.attribute_names
+      [:scheme, :host, :base_path, :login, :password, :out]
+    end
+
+    def attribute_names
+      self.class.attribute_names
+    end
+
+    attr_accessor *attribute_names
+
+    validates :scheme, :host, :base_path, :login, :password, presence: true
+
+    def initialize
+      @base_path = 'PartnerService'
+      @scheme = 'https'
+      @host = 'ows.ozon.ru'
+      @login = ENV['OZON_LOGIN']
+      @password = ENV['OZON_PASSWORD']
+      @out = STDOUT
+
+      yield(self) if block_given?
+
+      [
+        @base_path,
+        @scheme,
+        @host,
+        @login,
+        @password
+      ].each(&:freeze)
+    end
+  end
+end

data/lib/ozon_api/order_service.rb

@@ -50,6 +50,5 @@ module OzonApi
         'reasonId': reason_id
       )
     end
-
   end
 end

data/lib/ozon_api/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module OzonApi
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/ozon_api.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-
 module OzonApi
+  require 'ozon_api/configuration'
   require 'ozon_api/client'
   require 'ozon_api/item_service'
   require 'ozon_api/detail_service'
@@ -9,4 +9,53 @@ module OzonApi
   require 'ozon_api/checkout_service'
   require 'ozon_api/order_service'
   require 'ozon_api/address_service'
+
+  InvalidConfigurationError = Class.new(StandardError)
+
+  def self.setup(&blk)
+    @config ||= OzonApi::Configuration.new(&blk)
+
+    if @config.invalid?
+      msg = "OzonApi configuration ERROR:\n"
+      raise InvalidConfigurationError, msg + @config.errors.full_messages.join("\n")
+    end
+
+    @config
+  end
+
+  def self.reset
+    @config = nil
+  end
+
+  def self.client
+    @client ||= OzonApi::Client.new(@config)
+  end
+
+  def self.item_service
+    @item_service ||= OzonApi::ItemService.new(client)
+  end
+
+  def self.detail_service
+    @detail_service ||= OzonApi::DetailService.new(client)
+  end
+
+  def self.client_service
+    @client_service ||= OzonApi::ClientService.new(client)
+  end
+
+  def self.cart_service
+    @cart_service ||= OzonApi::CartService.new(client)
+  end
+
+  def self.checkout_service
+    @checkout_service ||= OzonApi::CheckoutService.new(client)
+  end
+
+  def self.order_service
+    @order_service ||= OzonApi::OrderService.new(client)
+  end
+
+  def self.address_service
+    @address_service ||= OzonApi::AddressService.new(client)
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ozon_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Yury Kotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
-dependencies: []
+date: 2016-10-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Ozon API wrapper.
 email:
 - non.gi.suong@ya.ru
@@ -24,6 +38,7 @@ files:
 - lib/ozon_api/checkout_service.rb
 - lib/ozon_api/client.rb
 - lib/ozon_api/client_service.rb
+- lib/ozon_api/configuration.rb
 - lib/ozon_api/detail_service.rb
 - lib/ozon_api/item_service.rb
 - lib/ozon_api/order_service.rb