beslist 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b3e9696e5dea81a2aa83d2fdafb07149609182
-  data.tar.gz: 0f64c757393476baee15b1437392786502b0d35c
+  metadata.gz: 8c3b4ae204e35ca4560a13eb9fb5bded06424fcc
+  data.tar.gz: 41b71908b26dfef036fc9676485e3e05ec9f542f
 SHA512:
-  metadata.gz: 3d7d29d727095123187a43e7a68ca4450f884e0cb8f0a8dd560a6ed7fab2110b2901999d25157e9a41dcb5059c98450b994673e6f5f729ce1c1dc63a401be128
-  data.tar.gz: eac60f8f38c8581dc71d96c423e1842e85712be2c20e93f00daa82422875a7a21a77a712f28039d9eeae26240e569acee29c5378d1b63faad2d5c51c32979e5c
+  metadata.gz: d18ab44864c1c7e8eb84fe4df2f7bbff4c24b098b50c38d9e3f46cbd9998ccfe9a9615526edce54550acd5d073c3c68d239f27f8c7c16c7a16542431e30050f3
+  data.tar.gz: 969e9fbaf522e0a4cef73b33a7d5af309f0ed24649f61674e32ada855110bd577f18a38f5a183885717a86ccd23bbfef5027fffd293d5c8a65ceb0939dde1977

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/beslist.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: beslist 0.1.1 ruby lib
+# stub: beslist 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "beslist"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tsyren Ochirov"]
-  s.date = "2015-12-21"
+  s.date = "2015-12-22"
   s.description = "A Ruby client for the Beslist API."
   s.email = "nsu1team@gmail.com"
   s.extra_rdoc_files = [

data/lib/beslist/client.rb

@@ -10,15 +10,18 @@ module Beslist
                                                     :shop_id   => options[:shop_id])
       end
 
-      def shoppingcart_shop_orders(date_from, date_to)
+      def orders(date_from, date_to)
         response = @connection.request do
           @connection.interface.get do |req|
             req.url Beslist::API::Config.prefix + '/shoppingcart/shop_orders/'
             req.params = {
               checksum: @connection.checksum(date_from, date_to),
+              client_id: @connection.options[:client_id],
+              shop_id: @connection.options[:shop_id],
               date_from: date_from,
               date_to: date_to
             }
+            req.params.merge!(output_type: 'test', test_orders: '1') if Beslist::API::Config.mode == 'sandbox'
           end
         end
 

data/lib/beslist/connection.rb

@@ -16,18 +16,10 @@ module Beslist
       end
 
       def interface
-        @interface ||= begin
-          params = {
-            client_id: @connection.options[:client_id],
-            shop_id: @connection.options[:shop_id]
-          }
-          params.merge!(output_type: 'test', test_orders: '1') if Beslist::API::Config.mode == 'sandbox'
-
-          Faraday.new(url: Beslist::API::Config.endpoint, headers: {'Content-Type' => 'application/xml'}, params: params) do |faraday|
-            faraday.request  :url_encoded             # form-encode POST params
-            faraday.response :logger                  # log requests to STDOUT
-            faraday.adapter  :httpclient              # make requests with HttpClient
-          end
+        @interface ||= Faraday.new(url: Beslist::API::Config.endpoint, headers: {'Content-Type' => 'application/xml'}) do |faraday|
+          faraday.request  :url_encoded             # form-encode POST params
+          faraday.response :logger                  # log requests to STDOUT
+          faraday.adapter  :httpclient              # make requests with HttpClient
         end
       end
 

data/spec/lib/beslist/client_spec.rb

@@ -3,9 +3,9 @@ require "spec_helper"
 describe Beslist::API::Client do
   let(:client){ Beslist::Spec.instance }
 
-   describe "#shoppingcart_shop_orders" do
+   describe "#orders" do
      context 'when the checksum is valid' do
-       subject(:orders){ client.shoppingcart_shop_orders(Beslist::Spec.date_from, Beslist::Spec.date_to) }
+       subject(:orders){ client.orders(Beslist::Spec.date_from, Beslist::Spec.date_to) }
        before do
          stubs = Faraday::Adapter::Test::Stubs.new do |stub|
            stub.get("/xml/shoppingcart/shop_orders/?checksum=5439de2fa578c75d1d9ba4195efc663c&client_id=99999&date_from=2015-09-01&date_to=2015-09-03&shop_id=88888") { |env| [200, {}, Beslist::Spec.shop_orders] }
@@ -33,7 +33,7 @@ describe Beslist::API::Client do
 
       it "raises a Beslist::API::Error" do
          expect do
-          client.shoppingcart_shop_orders(Beslist::Spec.date_from, Beslist::Spec.date_to)
+          client.orders(Beslist::Spec.date_from, Beslist::Spec.date_to)
         end.to raise_error(Beslist::API::Error, 'checksum is invalid')
        end
      end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beslist
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tsyren Ochirov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml