retailcrm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 628547b65ef69174b1078a72f18fa478ec180215
-  data.tar.gz: eed44d3358dd746f9e865f42e8d7d7948efb0739
+  metadata.gz: 5892ff6239b7f32f4734350c0594c3aca0d2b542
+  data.tar.gz: e51a74e3dca2008a92a786850608ab13f7973d76
 SHA512:
-  metadata.gz: 34f3a694de6fd01e78196ddaae581bcb892d154ea79ceceb28b21478865f1519edb243f2ad70c044f63448b97ae8f16b7e2dcac2ae44e80891bbf67375215e5b
-  data.tar.gz: cae642d7b1444ca4405eaef03673c66cfd42104d44bc8123ac285bf6be4be8ca74f69cde249b120894f262901bd85a4d7485af493f80f9d576463f75a3ba0f9e
+  metadata.gz: 1138c399ba37c527d18b7f8be73b507ac171c5cd15cb43962c0a387f98f190fa0634965de25d13caae0836a924d06c7a12acd5e98f4009fe7f129da886a05df0
+  data.tar.gz: f9e3ad55a0c60f4fe1ef8f3f6c98e5594f98a5c23f709305c52539623e2efd1b034b7007b5db671ccaca6d8f4855e04fdd0850840fc09cb4a80a183d1e75c69f

data/lib/retailcrm.rb

@@ -13,6 +13,8 @@ class Retailcrm
     @rr_url = "#{url}/api/v#{@rr_version}/"
     @rr_key = key
     @rr_params = { :apiKey => @rr_key }
+    @filter = nil
+    @ids = nil
   end
 
   ##
@@ -20,19 +22,35 @@ class Retailcrm
   # http://www.retailcrm.ru/docs/Разработчики/СправочникМетодовAPIV3
   #
   # Example:
-  #  >> Retailcrm.orders(50, 2, {:email => 'test@example.com', :status => 'new'})
+  #  >> Retailcrm.orders({:email => 'test@example.com', :status => 'new'}, 50, 2)
   #  => {...}
   #
   # Arguments:
+  #   filter (Hash)
   #   limit (Integer) (20|50|100)
   #   page (Integer)
-  #   filter (Array)
-  def orders(filter = {}, limit = 20, page = 1)
+  def orders(filter = nil, limit = 20, page = 1)
     url = "#{@rr_url}orders"
     @rr_params[:limit] = limit
     @rr_params[:page] = page
-    @rr_params[:filter] = filter.to_json
-    return make_request(url)
+    @filter = filter.to_a.map { |x| "filter[#{x[0]}]=#{x[1]}" }.join("&")
+    make_request(url)
+  end
+
+  ##
+  # === Get orders statuses
+  # http://www.retailcrm.ru/docs/Разработчики/СправочникМетодовAPIV3
+  #
+  # Example:
+  #  >> Retailcrm.orders_statuses([26120, 19282])
+  #  => {...}
+  #
+  # Arguments:
+  #   ids (Array)
+  def orders_statuses(ids = [])
+    @ids = ids.map { |x| "ids[]=#{x}" }.join("&")
+    url = "#{@rr_url}orders/statuses"
+    make_request(url)
   end
 
   ##
@@ -48,10 +66,10 @@ class Retailcrm
   #   by (String)
   def orders_get(id, by = 'externalId')
     url = "#{@rr_url}orders/#{id}"
-    if (by != 'externalId')
+    if by != 'externalId'
       @rr_params[:by] = by
     end
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -67,7 +85,7 @@ class Retailcrm
   def orders_create(order)
     url = "#{@rr_url}orders/create"
     @rr_params[:order] = order.to_json
-    return make_request(url, 'post')
+    make_request(url, 'post')
   end
 
   ##
@@ -84,7 +102,7 @@ class Retailcrm
     id = order[:externalId]
     url = "#{@rr_url}orders/#{id}/edit"
     @rr_params[:order] = order.to_json
-    return make_request(url, 'post')
+    make_request(url, 'post')
   end
 
   ##
@@ -100,8 +118,7 @@ class Retailcrm
   def orders_upload(orders)
     url = "#{@rr_url}orders/upload"
     @rr_params[:orders] = orders.to_json
-    result = JSON.parse(make_request(url, 'post'))
-    return result[:uploadedOrders] || result
+    make_request(url, 'post')
   end
 
   ##
@@ -117,7 +134,7 @@ class Retailcrm
   def orders_fix_external_ids(orders)
     url = "#{@rr_url}orders/fix-external-ids"
     @rr_params[:orders] = orders.to_json
-    return make_request(url, 'post')
+    make_request(url, 'post')
   end
 
   ##
@@ -129,32 +146,39 @@ class Retailcrm
   #  => {...}
   #
   # Arguments:
-  #   startDate (Time) (Time.strftime('%Y-%m-%d %H:%M:%S'))
-  #   endDate (Time) (Time.strftime('%Y-%m-%d %H:%M:%S'))
+  #   start_date (Time) (Time.strftime('%Y-%m-%d %H:%M:%S'))
+  #   end_date (Time) (Time.strftime('%Y-%m-%d %H:%M:%S'))
   #   limit (Integer) (20|50|100)
   #   offset (Integer)
-  def orders_history(startDate = nil, endDate = nil, limit = 20, offset = 0)
+  #   skip_my_changes (Boolean)
+  def orders_history(start_date = nil, end_date = nil, limit = 100, offset = 0, skip_my_changes = true)
     url = "#{@rr_url}orders/history"
-    @rr_params[:startDate] = startDate
-    @rr_params[:endDate] = endDate
+    @rr_params[:startDate] = start_date
+    @rr_params[:endDate] = end_date
     @rr_params[:limit] = limit
     @rr_params[:offset] = offset
-    return make_request(url)
+    @rr_params[:skipMyChanges] = skip_my_changes
+    make_request(url)
   end
 
   ##
-  # ===  Get orders statuses
+  # === Get customers by filter
   # http://www.retailcrm.ru/docs/Разработчики/СправочникМетодовAPIV3
   #
   # Example:
-  #  >> Retailcrm.orders_statuses([231,244,356,564])
+  #  >> Retailcrm.customers({:email => 'test@example.com'}, 50, 2)
   #  => {...}
   #
   # Arguments:
-  #   ids (Array)
-  def orders_statuses(ids)
-    url = "#{@rr_url}orders/statuses/#{ids}"
-    return make_request(url)
+  #   filter (Hash)
+  #   limit (Integer) (20|50|100)
+  #   page (Integer)
+  def customers(filter = nil, limit = 20, page = 1)
+    url = "#{@rr_url}customers"
+    @rr_params[:limit] = limit
+    @rr_params[:page] = page
+    @filter = filter.to_a.map { |x| "filter[#{x[0]}]=#{x[1]}" }.join("&")
+    make_request(url)
   end
 
   ##
@@ -170,10 +194,10 @@ class Retailcrm
   #   by (String)
   def customers_get(id, by = 'externalId')
     url = "#{@rr_url}customers/#{id}"
-    if (by != 'externalId')
+    if by != 'externalId'
       @rr_params[:by] = by
     end
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -189,7 +213,7 @@ class Retailcrm
   def customers_create(customer)
     url = "#{@rr_url}customers/create"
     @rr_params[:customer] = customer.to_json
-    return make_request(url, 'post')
+    make_request(url, 'post')
   end
 
   ##
@@ -202,10 +226,11 @@ class Retailcrm
   #
   # Arguments:
   #   customer (Array)
-  def customers_edit(customer, id)
+  def customers_edit(customer)
+    id = customer[:externalId]
     url = "#{@rr_url}customers/#{id}/edit"
     @rr_params[:customer] = customer.to_json
-    return make_request(url, 'post')
+    make_request(url, 'post')
   end
 
   ##
@@ -221,8 +246,7 @@ class Retailcrm
   def customers_upload(customers)
     url = "#{@rr_url}customers/upload"
     @rr_params[:customers] = customers.to_json
-    result = JSON.parse(make_request(url, 'post'))
-    return result[:uploaded] || result
+    make_request(url, 'post')
   end
 
   ##
@@ -238,7 +262,7 @@ class Retailcrm
   def customers_fix_external_ids(customers)
     url = "#{@rr_url}customers/fix-external-ids"
     @rr_params[:customers] = customers.to_json
-    return make_request(url, 'post')
+    make_request(url, 'post')
   end
 
   ##
@@ -247,7 +271,7 @@ class Retailcrm
   #
   def delivery_services
     url = "#{@rr_url}reference/delivery-services"
-    return make_request(url)
+    make_request(url)
   end
 
   # Get delivery types
@@ -255,7 +279,7 @@ class Retailcrm
   #
   def delivery_types
     url = "#{@rr_url}reference/delivery-types"
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -264,7 +288,7 @@ class Retailcrm
   #
   def order_methods
     url = "#{@rr_url}reference/order-methods"
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -273,7 +297,7 @@ class Retailcrm
   #
   def order_types
     url = "#{@rr_url}reference/order-types"
-    return make_request(url)
+    make_request(url)
   end
 
   # Get payment statuses
@@ -281,7 +305,7 @@ class Retailcrm
   #
   def payment_statuses
     url = "#{@rr_url}reference/payment-statuses"
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -290,7 +314,7 @@ class Retailcrm
   #
   def payment_types
     url = "#{@rr_url}reference/payment-types"
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -299,7 +323,7 @@ class Retailcrm
   #
   def product_statuses
     url = "#{@rr_url}reference/product-statuses"
-    return make_request(url)
+    make_request(url)
   end
 
   # Get sites list
@@ -307,7 +331,7 @@ class Retailcrm
   #
   def sites
     url = "#{@rr_url}reference/sites"
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -316,7 +340,7 @@ class Retailcrm
   #
   def status_groups
     url = "#{@rr_url}reference/status-groups"
-    return make_request(url)
+    make_request(url)
   end
 
   # Get statuses
@@ -324,7 +348,7 @@ class Retailcrm
   #
   def statuses
     url = "#{@rr_url}reference/statuses"
-    return make_request(url)
+    make_request(url)
   end
 
   ##
@@ -333,7 +357,7 @@ class Retailcrm
   #
   def stores
     url = "#{@rr_url}reference/stores"
-    return make_request(url)
+    make_request(url)
   end
 
 
@@ -343,7 +367,7 @@ class Retailcrm
   #
   def statistic_update
     url = "#{@rr_url}statistic/update"
-    return make_request(url)
+    make_request(url)
   end
 
   protected
@@ -353,34 +377,42 @@ class Retailcrm
     uri = URI.parse(url)
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
+
     if method == 'post'
       request = Net::HTTP::Post.new(uri)
       request.set_form_data(@rr_params)
     elsif method == 'get'
       request = Net::HTTP::Get.new(uri.path)
       request.set_form_data(@rr_params)
-      request = Net::HTTP::Get.new("#{uri.path}?#{request.body}")
+
+      if @filter.nil?
+        data = "#{request.body}"
+      else
+        data = "#{request.body}&#{@filter}"
+      end
+
+      if @ids.nil?
+        data = "#{request.body}"
+      else
+        data = "#{request.body}&#{@ids}"
+      end
+
+      request = Net::HTTP::Get.new("#{uri.path}?#{data}")
     end
     response = https.request(request)
-    return Retailcrm::Response.new(response.code, response.body)
+    Retailcrm::Response.new(response.code, response.body)
   end
 end
 
 class Retailcrm::Response
+    attr_reader :status, :response
+
     def initialize(status, body)
         @status = status
-        @response = body.empty? ? [] : JSON.parse(body);
-    end
-    
-    def get_status
-        return @status
+        @response = body.empty? ? [] : JSON.parse(body)
     end
-    
-    def get_response
-        return @response
-    end
-    
+
     def is_successfull?
-        return @status.to_i < 400
+        @status.to_i < 400
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retailcrm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alex Lushpai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies: []
 description: Library for interact with RetailCRM API
 email: lushpai@gmail.com