insales_api 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 775a094a7936896bf5c2016863c25252ee1b4d00
-  data.tar.gz: a1f9c51de691498d2ee419c5656936bcb80813d6
+SHA256:
+  metadata.gz: 62b41ec2560cf18731edf0215696e41b99f3060d2c685d1ab1c66cdff3bb1b1b
+  data.tar.gz: 50cb0265ef23f2087243865e0a99c64560b6ef9bc5af49838e751c2e42bacb1e
 SHA512:
-  metadata.gz: 716796fb7b345110807446c862e623c989197145cab86b0ae70210939b815f76c3e9c06a1bb3d0bcb64c740a12c6da5703ad8f4bfdcaea8733f97178df107568
-  data.tar.gz: a443fc4c21aa6096f30ef7350fa6a2199d387ed99366480f4178d0b2154c8bf2aba950125a51ef0126f35aa65662bb8fd5f0dd50d2d2d441b333f650b6b9f470
+  metadata.gz: 31027f6d9125e5e43309698dd91ccb2938bbf23c9c633bb9976562cf834c789a5f7ed962dbea15a150d157afca7381568614b292c60fbfd10cdd2549aa6fe70b
+  data.tar.gz: d3f508decd731d258cb89adbbac0a0bb09cf6e160e3ef64136542d792e5fe5d142c7d7d2aeeef16950182608bd7be6588fdf95a48245fc8b7bef77f5fcb2fba9

data/CHANGELOG.md

@@ -1,24 +1,46 @@
-## 0.1.0
+
+## 0.2.0
+* Added: support 429 response code
+* Removed unnecessary files from the gem
+* Fix `Order#to_xml` `order_lines_attributes`
+* Fix `updated_since` time format
+* Added `CustomStatus`
+* Added `Marketplace`
+
+## 0.1.3 (August 31, 2016)
+* `WithUpdatedSince` raises `ActiveResource::ResourceNotFound` on 404
+* `Category` and `Collection` now support `WithUpdatedSince`
+* Added `Currency`
+* Added `PriceKind`
+* Added `StockCurrency`
+
+## 0.1.1 (September 30, 2015)
+* `App#auth_token` and`Password.create` support optional user_email/user_name/user_id
+* Added `Characteristic`
+* Added `User`
+* Added `Notification`
+
+## 0.1.0 (May 06, 2015)
 
 * Helpers
-* ProductFieldValue
+* Added `ProductFieldValue`
 * Controller auth mixins
-* Account inherits AR::Singleton (it breaks ::current & #update methods)
-* Added wait_retry method
-* Added Property resource
-* Added ProductField resource
-* Added ClientGroup resource
+* `Account` inherits `AR::Singleton` (this breaks `::current` & `#update` methods)
+* Added `wait_retry` method
+* Added `Property` resource
+* Added `ProductField` resource
+* Added `ClientGroup` resource
 
-## 0.0.14
+## 0.0.14 (not released to rubygems)
 
-* Added Image resource
-* Fixed Variant.group_update
-* Added DiscountCode resource
-* Added Product.count method
-* Added Order.paid? method
-* Added ApplicationCharge resource
+* Added `Image` resource
+* Fixed `Variant.group_update`
+* Added `DiscountCode` resource
+* Added `Product.count` method
+* Added `Order.paid?` method
+* Added `ApplicationCharge` resource
 
-## 0.0.13
+## 0.0.13 (August 23, 2013)
 
-* ActiveResource::Singleton backport.
-* Fix for multiple InsalesApi::Apps child-classes in single app.
+* `ActiveResource::Singleton` backport.
+* Fix for multiple `InsalesApi::App` child-classes in a single app.

data/insales_api.gemspec

@@ -1,4 +1,7 @@
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+# $LOAD_PATH.push File.expand_path('lib', __dir__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'insales_api/version'
 
 Gem::Specification.new do |s|
@@ -7,17 +10,30 @@ Gem::Specification.new do |s|
   s.authors     = 'InSales'
   s.email       = 'dg@insales.ru'
   s.homepage    = 'https://github.com/insales/insales_api'
-  s.summary     = %q{Gem for accessing the InSales REST web services}
-  s.description = %q{Gem for accessing the InSales REST web services}
+  s.summary     = 'Gem for accessing the InSales REST web services'
+  s.description = 'Gem for accessing the InSales REST web services'
 
-  s.rubyforge_project = 'insales_api'
+  if s.respond_to?(:metadata) # old rubygems do not support metadata
+    s.metadata["homepage_uri"] = s.homepage
+    s.metadata["source_code_uri"] = "https://github.com/insales/insales_api"
+    s.metadata["changelog_uri"] = "https://github.com/insales/insales_api/blob/master/CHANGELOG.md"
+  end
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.required_ruby_version = '>= 1.9'
+
+  s.files = `git ls-files`.split("\n").reject do |f|
+    f.match(Regexp.union(
+              %r{^gemfiles/},
+              %r{^spec/},
+              /^\./,
+              /^Appraisals/,
+              /^Gemfile/,
+              /^Rakefile/
+            ))
+  end
 
-  s.add_dependency('activesupport', ['>= 3.0.0'])
   s.add_dependency('activeresource', ['>= 3.0.0'])
-  s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'rake', '~> 10.3'
+  s.add_dependency('activesupport', ['>= 3.0.0'])
+  s.add_development_dependency 'rake', '>= 10.3'
+  s.add_development_dependency 'rspec', '~> 3.12'
 end

data/lib/active_resource/singleton.rb

@@ -60,11 +60,12 @@ module ActiveResource
       #
       #   Inventory.find
       #   # => raises ResourceNotFound
-      def find(options={})
+      def find(options = {})
         find_singleton(options)
       end
 
       private
+
       # Find singleton resource
       def find_singleton(options)
         prefix_options, query_options = split_options(options[:params])
@@ -73,8 +74,8 @@ module ActiveResource
         resp = self.format.decode(self.connection.get(path, self.headers).body)
         instantiate_record(resp, {})
       end
-
     end
+
     # Deletes the resource from the remove service.
     #
     # ==== Examples
@@ -85,7 +86,6 @@ module ActiveResource
       connection.delete(singleton_path, self.class.headers)
     end
 
-
     protected
 
     # Update the resource on the remote service
@@ -108,7 +108,5 @@ module ActiveResource
     def singleton_path(options = nil)
       self.class.singleton_path(options || prefix_options)
     end
-
   end
-
-end
+end

data/lib/insales/controller/autologin.rb

@@ -1,45 +1,49 @@
 module Insales::Controller
   module Autologin
     protected
-      def insales_authenticate!
-        params[:domain] ||= params[:shop]
-        insales_logout if params[:domain].present? && params[:domain] != session[:domain]
-        return if insales_authenticate_from_session
-        store_location
-        account = find_account_by_request
-        return insales_autologin_start(account) if account
-        redirect_to insales_login_path
-      end
 
-      def insales_authenticate_from_session
-        data = session[:insales_session]
-        return unless data && data[:account_id] && data[:insales_id]
-        @account = account_class.where(account_id: data[:account_id]).
-          find_by_insales_id(data[:insales_id])
-      end
+    def insales_authenticate!
+      params[:domain] ||= params[:shop]
+      insales_logout if params[:domain].present? && params[:domain] != session[:domain]
+      return if insales_authenticate_from_session
 
-      def insales_autologin_start(account)
-        app = insales_app_class.new(account.insales_domain, account.insales_password)
-        auth_url = app.authorization_url
-        session[:insales_token] = app.auth_token
-        session[:insales_token_data] = {
-          domain:       account.insales_domain,
-          account_id:   account.id,
-          insales_id:   account.insales_id,
-        }
-        redirect_to auth_url
-      end
+      store_location
+      account = find_account_by_request
+      return insales_autologin_start(account) if account
 
-      def insales_autologin_finish(token = params[:token])
-        if token && session[:insales_token] == token && session[:insales_token_data].is_a?(Hash)
-          session[:insales_session] = session[:insales_token_data]
-        end
-        session[:insales_token] = session[:insales_token_data] = nil
-        session[:account_id].present?
-      end
+      redirect_to insales_login_path
+    end
 
-      def insales_logout
-        session.delete(:insales_session)
+    def insales_authenticate_from_session
+      data = session[:insales_session]
+      return unless data && data[:account_id] && data[:insales_id]
+
+      @account = account_class.where(account_id: data[:account_id])
+                              .find_by_insales_id(data[:insales_id])
+    end
+
+    def insales_autologin_start(account)
+      app = insales_app_class.new(account.insales_domain, account.insales_password)
+      auth_url = app.authorization_url
+      session[:insales_token] = app.auth_token
+      session[:insales_token_data] = {
+        domain: account.insales_domain,
+        account_id: account.id,
+        insales_id: account.insales_id,
+      }
+      redirect_to auth_url
+    end
+
+    def insales_autologin_finish(token = params[:token])
+      if token && session[:insales_token] == token && session[:insales_token_data].is_a?(Hash)
+        session[:insales_session] = session[:insales_token_data]
       end
+      session[:insales_token] = session[:insales_token_data] = nil
+      session[:account_id].present?
+    end
+
+    def insales_logout
+      session.delete(:insales_session)
+    end
   end
 end

data/lib/insales/controller/base_helpers.rb

@@ -5,9 +5,9 @@ module Insales::Controller
     included do
       class_attribute :insales_config
       self.insales_config = {
-        account_class:      '::Account',
-        insales_app_class:  '::InsalesApi::App',
-        login_path:         'login_path',
+        account_class: '::Account',
+        insales_app_class: '::InsalesApi::App',
+        login_path: 'login_path',
         success_login_path: 'account_path',
       }
 
@@ -29,24 +29,25 @@ module Insales::Controller
     end
 
     protected
-      delegate :insales_app_class, :account_class,
-        :insales_login_path, :insales_success_login_path,
-        to: :class
 
-      def store_location(path = request.url)
-        session[:return_to] = path
-      end
+    delegate :insales_app_class, :account_class,
+             :insales_login_path, :insales_success_login_path,
+             to: :class
 
-      def stored_location
-        session.delete(:return_to)
-      end
+    def store_location(path = request.url)
+      session[:return_to] = path
+    end
 
-      def find_account_by_request
-        if params[:insales_id]
-          account_class.find_by_insales_id(params[:insales_id])
-        elsif params[:domain]
-          account_class.find_by_insales_domain(params[:domain])
-        end
+    def stored_location
+      session.delete(:return_to)
+    end
+
+    def find_account_by_request
+      if params[:insales_id]
+        account_class.find_by_insales_id(params[:insales_id])
+      elsif params[:domain]
+        account_class.find_by_insales_domain(params[:domain])
       end
+    end
   end
 end

data/lib/insales/controller/session_actions.rb

@@ -13,6 +13,7 @@ module Insales::Controller
     def create
       account = find_account_by_request
       return render_not_found unless account
+
       store_location(insales_success_login_path)
       insales_autologin_start(account)
     end
@@ -31,9 +32,10 @@ module Insales::Controller
     end
 
     protected
-      def render_not_found
-        flash.now[:error] = t(:'.account_not_found').html_safe
-        render action: :new
-      end
+
+    def render_not_found
+      flash.now[:error] = t(:'.account_not_found').html_safe
+      render action: :new
+    end
   end
 end

data/lib/insales_api/active_resource_proxy.rb

@@ -4,6 +4,7 @@ module InsalesApi
       def need_proxy?(value)
         klass = value.is_a?(Class) ? value : value.class
         return true if klass < Base || klass <= ActiveResource::Collection
+
         false
       end
     end
@@ -22,9 +23,11 @@ module InsalesApi
     end
 
     private
-      def proxy_for(value)
-        return value unless self.class.need_proxy?(value)
-        self.class.new(@configurer, value)
-      end
+
+    def proxy_for(value)
+      return value unless self.class.need_proxy?(value)
+
+      self.class.new(@configurer, value)
+    end
   end
 end

data/lib/insales_api/app.rb

@@ -1,8 +1,9 @@
 module InsalesApi
   class App
     class_attribute :api_key, :api_secret, :api_autologin_url, :api_host, :api_autologin_path,
-      :base_resource_class
+                    :base_resource_class
     attr_reader :authorized, :domain, :password
+
     self.base_resource_class = Base
 
     class << self
@@ -18,15 +19,15 @@ module InsalesApi
 
       alias_method :prepare_shop, :prepare_domain
       deprecate prepare_shop: :prepare_domain,
-        api_host: :api_autologin_url,
-        api_autologin_path: :api_autologin_url,
-        deprecator: Deprecator
+                api_host: :api_autologin_url,
+                api_autologin_path: :api_autologin_url,
+                deprecator: Deprecator
 
-      def install(domain, token, insales_id)
+      def install(domain, token, insales_id) # rubocop:disable Lint/UnusedMethodArgument
         true
       end
 
-      def uninstall(domain, password)
+      def uninstall(domain, password) # rubocop:disable Lint/UnusedMethodArgument
         true
       end
 
@@ -46,13 +47,13 @@ module InsalesApi
       match = /(.+):(\d+)/.match host
       host, port = match[1..2] if match
       URI::Generic.build(
-        scheme:   'http',
-        host:     host,
-        port:     port && port.to_i,
-        path:     "/admin/applications/#{api_key}/login",
-        query:    {
-          token:  salt,
-          login:  api_autologin_url || "http://#{api_host}/#{api_autologin_path}",
+        scheme: 'http',
+        host: host,
+        port: port && port.to_i,
+        path: "/admin/applications/#{api_key}/login",
+        query: {
+          token: salt,
+          login: api_autologin_url || "http://#{api_host}/#{api_autologin_path}",
         }.to_query,
       ).to_s
     end

data/lib/insales_api/application_charge.rb

@@ -1,3 +1,3 @@
 module InsalesApi
   class ApplicationCharge < Base; end
-end
+end

data/lib/insales_api/application_widget.rb

@@ -1,3 +1,3 @@
 module InsalesApi
   class ApplicationWidget < Base; end
-end
+end

data/lib/insales_api/base.rb

@@ -27,8 +27,8 @@ module InsalesApi
 
       def dump_config
         {
-          user:     self.user,
-          site:     self.site,
+          user: self.user,
+          site: self.site,
           password: self.password,
         }
       end

data/lib/insales_api/category.rb

@@ -4,8 +4,8 @@ module InsalesApi
     class << self
       def set_products_category(new_category_id, product_ids)
         data = {
-          id:           new_category_id,
-          product_ids:  Array(product_ids),
+          id: new_category_id,
+          product_ids: Array(product_ids),
         }
         put(:set_products_category, {}, format.encode(data, root: :new_category))
       end

data/lib/insales_api/collect.rb

@@ -4,7 +4,7 @@ module InsalesApi
       def group_create(product_ids, collection_ids)
         data = {
           collection_ids: Array(collection_ids),
-          product_ids:    Array(product_ids),
+          product_ids: Array(product_ids),
         }
         post(:group_create, {}, format.encode(data, root: :group_create))
       end

data/lib/insales_api/currency.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 module InsalesApi
   class Currency < Base
     include ActiveResource::Singleton

data/lib/insales_api/custom_status.rb

@@ -0,0 +1,3 @@
+module InsalesApi
+  class CustomStatus < Base; end
+end

data/lib/insales_api/helpers/init_api.rb

@@ -53,7 +53,7 @@ module InsalesApi::Helpers
         file, line = caller.first.split(':', 2)
         methods.each do |method|
           alias_method_chain method, :init_api do |target, punct|
-            class_eval <<-RUBY, file, line.to_i  - 1
+            class_eval <<-RUBY, file, line.to_i - 1
               def #{target}_with_init_api#{punct}(*args, &block)                # def sell_with_init_api(*args, &block)
                 init_api { #{target}_without_init_api#{punct}(*args, &block) }  #   init_api { sell_without_init_api(*args, &block) }
               end                                                               # end

data/lib/insales_api/js_tag.rb

@@ -1,3 +1,3 @@
 module InsalesApi
   class JsTag < Base; end
-end
+end

data/lib/insales_api/marketplace.rb

@@ -0,0 +1,3 @@
+module InsalesApi
+  class Marketplace < Base; end
+end

data/lib/insales_api/option_name.rb

@@ -1,3 +1,3 @@
-module InsalesApi  
+module InsalesApi
   class OptionName < Base; end
 end

data/lib/insales_api/option_value.rb

@@ -1,3 +1,3 @@
-module InsalesApi  
+module InsalesApi
   class OptionValue < Base; end
 end

data/lib/insales_api/order.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 module InsalesApi
   class Order < Base
     extend Resource::WithUpdatedSince
@@ -13,7 +14,11 @@ module InsalesApi
     end
 
     def to_xml(options = {})
-      super(options.merge(methods: :order_lines_attributes))
+      serialized_options = options.dup
+      if respond_to? :order_lines_attributes
+        serialized_options[:methods] = :order_lines_attributes
+      end
+      super(serialized_options)
     end
 
     def paid?

data/lib/insales_api/pick_up_source.rb

@@ -0,0 +1,3 @@
+module InsalesApi
+  class PickUpSource < Base; end
+end

data/lib/insales_api/price_kind.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 module InsalesApi
   class PriceKind < Base
     def variant_price_method_name

data/lib/insales_api/product_field_value.rb

@@ -5,12 +5,12 @@ module InsalesApi
     class << self
       def find_by_field_id(params)
         field_id = params[:product_field_id]
-        all(params: {product_id: params[:product_id]}).
-          find { |x| x.product_field_id == field_id }
+        all(params: { product_id: params[:product_id] })
+          .find { |x| x.product_field_id == field_id }
       end
 
       def create_or_update(params)
-        if value = find_by_field_id(params)
+        if (value = find_by_field_id(params))
           value.update_attribute(:value, params[:value])
           value
         else

data/lib/insales_api/property.rb

@@ -1,7 +1,7 @@
 module InsalesApi
   class Property < Base
     def characteristics
-      InsalesApi::Characteristic.all(params: { property_id: id } )
+      InsalesApi::Characteristic.all(params: { property_id: id })
     end
   end
 end

data/lib/insales_api/resource/countable.rb

@@ -2,7 +2,7 @@ module InsalesApi
   module Resource
     module Countable
       def count(options = {})
-        get(:count, options).to_i
+        get(:count, options)['count'].to_i
       end
     end
   end

data/lib/insales_api/resource/paginated.rb

@@ -11,13 +11,15 @@ module InsalesApi
 
       def find_in_batches(options = {})
         per_page = options[:per_page] || PER_PAGE_DEFAULT
-        params = {per_page: per_page}.merge(options[:params] || {})
+        params = { per_page: per_page }.merge(options[:params] || {})
         page = 1
         loop do
           items = all(params: params.merge(page: page))
           return unless items.any?
+
           yield items
           return if items.count < per_page
+
           page += 1
         end
       end

data/lib/insales_api/resource/with_updated_since.rb

@@ -2,26 +2,28 @@ module InsalesApi
   module Resource
     module WithUpdatedSince
       def find_in_batches(options = {}, &block)
-        return super unless updated_since = options.delete(:updated_since)
+        return super unless (updated_since = options.delete(:updated_since))
+
         find_updated_since(updated_since, options, &block)
       end
 
       def find_updated_since(updated_since, options = {})
         per_page = options[:per_page] || PER_PAGE_DEFAULT
         params    = { per_page: per_page }.merge(options[:params] || {})
-        last_id   = nil
+        last_id   = options[:last_id] || nil
         loop do
           items = all(params: params.merge(
-            updated_since:  updated_since,
-            from_id:        last_id,
+            updated_since: updated_since,
+            from_id: last_id,
           ))
 
-          raise ActiveResource::ResourceNotFound if items.nil?
+          raise(ActiveResource::ResourceNotFound.new(nil)) if items.nil?
 
           return unless items.any?
 
           yield items
           return if items.count < per_page
+
           last_item     = items.last
           last_id       = last_item.id
           updated_since = last_item.updated_at

data/lib/insales_api/stock_currency.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 module InsalesApi
   class StockCurrency < Base
   end

data/lib/insales_api/theme.rb

@@ -1,9 +1,7 @@
 module InsalesApi
   class Theme < Base
-
     def assets
-      InsalesApi::Asset.all(params: {theme_id: id})
+      InsalesApi::Asset.all(params: { theme_id: id })
     end
-
   end
 end

data/lib/insales_api/version.rb

@@ -1,8 +1,8 @@
 module InsalesApi
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    TINY  = 2
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/insales_api.rb

@@ -26,6 +26,7 @@ module InsalesApi
     autoload :Collect
     autoload :Collection
     autoload :Currency
+    autoload :CustomStatus
     autoload :DeliveryVariant
     autoload :DiscountCode
     autoload :Domain
@@ -33,6 +34,7 @@ module InsalesApi
     autoload :File
     autoload :Image
     autoload :JsTag
+    autoload :Marketplace
     autoload :Notification
     autoload :OptionName
     autoload :OptionValue
@@ -40,6 +42,7 @@ module InsalesApi
     autoload :OrderLine
     autoload :Page
     autoload :PaymentGateway
+    autoload :PickUpSource
     autoload :PriceKind
     autoload :Product
     autoload :ProductField
@@ -55,7 +58,7 @@ module InsalesApi
   end
 
   class << self
-    # Calls the supplied block. If the block raises <tt>ActiveResource::ServerError</tt> with 503
+    # Calls the supplied block. If the block raises <tt>ActiveResource::ServerError</tt> with 429
     # code which means Insales API request limit is reached, it will wait for the amount of seconds
     # specified in 'Retry-After' response header. The called block will receive a parameter with
     # current attempt number.
@@ -78,15 +81,16 @@ module InsalesApi
     #     puts "Attempt ##{x}."
     #     products = InsalesApi::Products.all
     #   end
-    def wait_retry(max_attempts = nil, callback = nil, &block)
+    def wait_retry(max_attempts = nil, callback = nil, &block) # rubocop:disable Lint/UnusedMethodArgument
       attempts = 0
 
       begin
         attempts += 1
         yield attempts
       rescue ActiveResource::ServerError => ex
-        raise ex if '503' != ex.response.code.to_s
+        raise ex unless %w[429 503].include?(ex.response.code.to_s)
         raise ex if max_attempts && attempts >= max_attempts
+
         retry_after = (ex.response['Retry-After'] || 150).to_i
         callback.call(retry_after, attempts, max_attempts, ex) if callback
         sleep(retry_after)
@@ -94,7 +98,6 @@ module InsalesApi
       end
     end
   end
-
 end
 
 require 'insales_api/helpers/init_api'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: insales_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - InSales
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: activeresource
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,45 +39,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '10.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '3.12'
 description: Gem for accessing the InSales REST web services
 email: dg@insales.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - README.md
-- Rakefile
 - insales_api.gemspec
 - lib/active_resource/singleton.rb
 - lib/insales.rb
@@ -101,6 +97,7 @@ files:
 - lib/insales_api/collect.rb
 - lib/insales_api/collection.rb
 - lib/insales_api/currency.rb
+- lib/insales_api/custom_status.rb
 - lib/insales_api/delivery_variant.rb
 - lib/insales_api/discount_code.rb
 - lib/insales_api/domain.rb
@@ -110,6 +107,7 @@ files:
 - lib/insales_api/helpers/init_api.rb
 - lib/insales_api/image.rb
 - lib/insales_api/js_tag.rb
+- lib/insales_api/marketplace.rb
 - lib/insales_api/notification.rb
 - lib/insales_api/option_name.rb
 - lib/insales_api/option_value.rb
@@ -118,6 +116,7 @@ files:
 - lib/insales_api/page.rb
 - lib/insales_api/password.rb
 - lib/insales_api/payment_gateway.rb
+- lib/insales_api/pick_up_source.rb
 - lib/insales_api/price_kind.rb
 - lib/insales_api/product.rb
 - lib/insales_api/product_field.rb
@@ -133,14 +132,13 @@ files:
 - lib/insales_api/variant.rb
 - lib/insales_api/version.rb
 - lib/insales_api/webhook.rb
-- spec/lib/insales_api/active_resource_proxy_spec.rb
-- spec/lib/insales_api/app_spec.rb
-- spec/lib/insales_api_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/insales/insales_api
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/insales/insales_api
+  source_code_uri: https://github.com/insales/insales_api
+  changelog_uri: https://github.com/insales/insales_api/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,16 +146,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: insales_api
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Gem for accessing the InSales REST web services
 test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.1.0
-notifications:
-  email: false
-before_install:
-  - gem update bundler
-  - bundle install

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,8 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-task default: :spec

data/spec/lib/insales_api/active_resource_proxy_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe InsalesApi::ActiveResourceProxy do
-  let(:proxy) { described_class.new(configurer, object) }
-  let(:configurer) { Object.new.tap { |x| x.stub(:init_api).and_yield } }
-
-  describe '#method_missing' do
-    let(:object) { {} }
-    let(:method_name) { :some_method }
-    subject { proxy.send(method_name) }
-
-    it 'should proxy method to object & pass result through #proxy_for' do
-      result1 = {test: :resut1}
-      result2 = {test: :resut2}
-      object.should_receive(method_name).and_return(result1)
-      proxy.should_receive(:proxy_for).with(result1).and_return(result2)
-      subject.should eq(result2)
-    end
-  end
-
-  describe '::need_proxy?' do
-    subject { described_class.need_proxy?(object) }
-
-    context 'for scalar' do
-      let(:object) { true }
-      it { should be false }
-    end
-
-    context 'for InsalesApi::Base class' do
-      let(:object) { InsalesApi::Account }
-      it { should be true }
-    end
-
-    context 'for InsalesApi::Base object' do
-      let(:object) { InsalesApi::Account.new }
-      it { should be true }
-    end
-
-    context 'for ActiveResource::Collection object' do
-      let(:object) { ActiveResource::Collection.new }
-      it { should be true }
-    end
-
-    context 'for ActiveResource::Base object' do
-      let(:object) { ActiveResource::Base.new }
-      it { should be false }
-    end
-  end
-end

data/spec/lib/insales_api/app_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe InsalesApi::App do
-  let(:domain) { 'my.shop.com' }
-  let(:password) { 'password' }
-  let(:app) { InsalesApi::App.new(domain, password) }
-
-  subject { app }
-
-  describe '#initialize' do
-    its(:domain) { should eq(domain) }
-    its(:password) { should eq(password) }
-    its(:authorized?) { should be false }
-  end
-
-  describe '#configure_api' do
-    it 'configures InsalesApi::Base' do
-      InsalesApi::Base.should_receive(:configure).with(described_class.api_key, domain, password)
-      app.configure_api
-    end
-  end
-
-  describe '#salt' do
-    its(:salt) { should be }
-  end
-
-  describe '#auth_token' do
-    its(:auth_token) { should eq(InsalesApi::Password.create(app.password, app.salt)) }
-  end
-
-  describe 'authorization_url' do
-    subject { app.authorization_url }
-    let(:expected) do
-      URI::Generic.build(
-        scheme:   'http',
-        host:     domain,
-        path:     "/admin/applications/#{app.api_key}/login",
-        query:    {
-          token:  app.salt,
-          login:  app.api_autologin_url,
-        }.to_query,
-      ).to_s
-    end
-    it { should eq(expected) }
-  end
-
-  describe '#authorize' do
-    before { app.auth_token }
-    subject { app.authorize(token) }
-
-    context 'when valid token is given' do
-      let(:token) { app.auth_token }
-      it { should be true }
-    end
-
-    context 'when invalid token is given' do
-      let(:token) { 'bad_token' }
-      it { should be false }
-    end
-  end
-
-  describe '::password_by_token' do
-    let(:token) { 'test' }
-    subject { InsalesApi::App.password_by_token(token) }
-    it { should eq(InsalesApi::Password.create(InsalesApi::App.api_secret, token)) }
-  end
-end

data/spec/lib/insales_api_spec.rb

@@ -1,110 +0,0 @@
-require 'spec_helper'
-
-describe InsalesApi do
-
-  describe '.wait_retry' do
-
-    response_stub = Struct.new(:code, :retry_after) do
-      def [](key)
-        {'Retry-After' => retry_after}[key]
-      end
-    end
-
-    it 'should not run without block' do
-      expect do
-        described_class.wait_retry(20, nil)
-      end.to raise_error
-    end
-
-    it 'should handle succesfull request' do
-      counter = 0
-      described_class.wait_retry do
-        counter += 1
-      end
-
-      expect(counter).to eq(1)
-    end
-
-    it 'should make specified amount of attempts' do
-      counter = 0
-      described_class.wait_retry(3) do
-        counter += 1
-
-        if counter < 3
-          raise ActiveResource::ServerError.new(response_stub.new("503", "0"))
-        end
-      end
-
-      expect(counter).to eq(3)
-    end
-
-    it 'should use callback proc' do
-      callback = Proc.new{}
-      counter = 0
-      callback.should_receive(:call).with(0, 1, 3, instance_of(ActiveResource::ServerError))
-      callback.should_receive(:call).with(0, 2, 3, instance_of(ActiveResource::ServerError))
-
-      described_class.wait_retry(3, callback) do
-        counter += 1
-
-        if counter < 3
-          raise ActiveResource::ServerError.new(response_stub.new("503", "0"))
-        end
-      end
-    end
-
-    it 'should pass attempt number to block' do
-      last_attempt_no = 0
-      described_class.wait_retry(3) do |x|
-        last_attempt_no = x
-
-        if last_attempt_no < 3
-          raise ActiveResource::ServerError.new(response_stub.new("503", "0"))
-        end
-      end
-
-      expect(last_attempt_no).to eq(3)
-    end
-
-    it 'should raise if no attempts left' do
-      expect do
-        described_class.wait_retry(3) do |x|
-          raise ActiveResource::ServerError.new(response_stub.new("503", "0"))
-        end
-      end.to raise_error(ActiveResource::ServerError)
-    end
-
-    it 'should raise on user errors' do
-      attempts = 0
-      expect do
-        described_class.wait_retry(3) do |x|
-          attempts = x
-          raise 'Some other error'
-        end
-      end.to raise_error(StandardError)
-      expect(attempts).to eq(1)
-    end
-
-    it 'should raise on other server errors' do
-      attempts = 0
-      expect do
-        described_class.wait_retry(3) do |x|
-          attempts = x
-          raise ActiveResource::ServerError.new(response_stub.new("502", "0"))
-        end
-      end.to raise_error(ActiveResource::ServerError)
-      expect(attempts).to eq(1)
-    end
-
-    it 'should run until success' do |x|
-      success = false
-      described_class.wait_retry do |x|
-        raise ActiveResource::ServerError.new(response_stub.new("503", "0")) if x < 10
-        success = true
-      end
-
-      expect(success).to be_true
-    end
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,18 +0,0 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'insales_api'
-
-InsalesApi::App.api_key           = 'test'
-InsalesApi::App.api_secret        = 'test'
-InsalesApi::App.api_autologin_url = 'https://host.com/session/autologin'
-
-RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
-end