blomming_api 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e68d30d6391b0b83d63f68c253850bfa881211d
-  data.tar.gz: 52e45bf9d99bee1a8511ee83528873fe7f7d1d07
+  metadata.gz: b7e0c7366da5aff6c926bcee806c8594392d9744
+  data.tar.gz: d9057aa9d300dce1dd2c331216fc58c6dffbf718
 SHA512:
-  metadata.gz: 436ddd6e358c4a8bb02668fc0b47f37d786a2d59689c23dd4887413a85869e2195fe6f01c48433f999b467022d02fa4ea9cec82ca53e1021c1292e1e8c10747b
-  data.tar.gz: ee03040cd62ffb1ae80f7320ed4e0031929a3d7a31b442352690f2a07a9d4b53c09121eb4d5e48dac6e1db63545877c0d508c875e752f3d4e5038ced4e697268
+  metadata.gz: 2d3406fb988cc61bc21bcce750bae444842fd72868a53787013537c848fbd6a87fe9db88e28487fc87756807c3d5bd4d7b62e828389ea36c637c33a12be93433
+  data.tar.gz: 68ba5da8c950751188f5bda3d85757234838bf9a1e8c6f21e84ca5acbcb82c987b60d0f05b0ff42f606e00573669392a996973e7da79867691b71fb53d081907

data/lib/blomming_api/buy_endpoints.rb

@@ -19,7 +19,7 @@ module BlommingApi
       #puts req
       #RestClient.log = 'stdout'
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req
       end  
     end
@@ -31,7 +31,7 @@ module BlommingApi
       # with a hash sends parameters as a urlencoded form body
       load = {:skus => skus.join(','), :multipart => true}
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.put url, load, req
       end  
     end
@@ -43,16 +43,16 @@ module BlommingApi
       # with a hash sends parameters as a urlencoded form body
       load = {:skus => skus.join(','), :multipart => true}
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.put url, load, req
       end  
     end
 
     def carts_clear(cart_id, params={})
-      url = api_url '/carts/#{cart_id}/clear'
+      url = api_url "/carts/#{cart_id}/clear"
       req = request_params({currency: @currency, locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         # PUT with a hash sends parameters as a urlencoded form body ?
         RestClient.put url, req
       end  
@@ -63,7 +63,7 @@ module BlommingApi
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       load = MultiJson.dump order
       
-      load_or_retry do
+      feed_or_retry do
         # POST with raw JSON payloads ?
         RestClient.post url, load, req
       end  
@@ -74,7 +74,7 @@ module BlommingApi
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       load = MultiJson.dump paypal_order
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req
       end  
     end
@@ -84,7 +84,7 @@ module BlommingApi
       url = api_url '/carts/shipping_countries'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -93,7 +93,7 @@ module BlommingApi
       url = api_url '/carts/#{cart_id}/show'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -102,7 +102,7 @@ module BlommingApi
       url = api_url '/carts/#{cart_id}/validate'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -115,7 +115,7 @@ module BlommingApi
       url = api_url '/categories'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -124,7 +124,7 @@ module BlommingApi
       url = api_url "/categories/#{category_id}/items" 
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end    
     end
@@ -136,7 +136,7 @@ module BlommingApi
       url = api_url '/collections'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req 
       end  
     end
@@ -145,7 +145,7 @@ module BlommingApi
       url = api_url "/collections/#{collection_id}/items"
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -157,7 +157,7 @@ module BlommingApi
       url = api_url '/countries'
       req = request_params({locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -169,7 +169,7 @@ module BlommingApi
       url = api_url '/currencies'
       req = request_params({locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -181,7 +181,7 @@ module BlommingApi
       url = api_url '/items/discounted'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do 
+      feed_or_retry do 
         RestClient.get url, req
       end  
     end
@@ -190,7 +190,7 @@ module BlommingApi
       url = api_url '/items/featured'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do 
+      feed_or_retry do 
         RestClient.get url, req
       end     
     end
@@ -199,7 +199,7 @@ module BlommingApi
       url = api_url '/items/hand_picked'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end   
     end
@@ -208,7 +208,7 @@ module BlommingApi
       url = api_url '/items/list'
       req = request_params({id: item_id, currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -217,7 +217,7 @@ module BlommingApi
       url = api_url '/items/most_liked'
       req = request_params({currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -226,7 +226,7 @@ module BlommingApi
       url = api_url '/items/search'
       req = request_params({q: keyword, currency: @currency, locale: @locale}.merge(params))
       
-      load_or_retry do 
+      feed_or_retry do 
         RestClient.get url, req
       end  
     end
@@ -238,7 +238,7 @@ module BlommingApi
       url = api_url '/macrocategories'
       req = request_params({locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -247,7 +247,7 @@ module BlommingApi
       url = api_url "/macrocategories​/:macrocategory_id​/categories" 
       req = request_params({locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end    
     end
@@ -256,7 +256,7 @@ module BlommingApi
       url = api_url "/macrocategories​/:macrocategory_id​/items" 
       req = request_params({locale: @locale}.merge(params))
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end    
     end
@@ -268,7 +268,7 @@ module BlommingApi
     def password_resets (email_of_user, params={})
       url = api_url "/password_resets"    
       
-      load_or_retry do
+      feed_or_retry do
         # payload JSON ?
         RestClient.post url, {email_of_user: email_of_user}.merge(params)
       end  
@@ -281,7 +281,7 @@ module BlommingApi
     def provinces (province_country_code, params={})
       url = api_url "/provinces/#{province_country_code}"    
       
-      load_or_retry do 
+      feed_or_retry do 
         RestClient.get url, request_params(params)
       end  
     end
@@ -292,7 +292,7 @@ module BlommingApi
     def shops (params={})
       url = api_url '/shops'
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, request_params(params)
       end  
     end
@@ -300,7 +300,7 @@ module BlommingApi
     def shop_items (shop_id, params={})
       url = api_url "/shops/#{shop_id}/items"
       
-      data = load_or_retry  do
+      data = feed_or_retry  do
         RestClient.get url, request_params(params)
       end
 
@@ -311,7 +311,7 @@ module BlommingApi
     def shop_item (shop_id, item_id, params={})
       url = api_url "/shops/#{shop_id}/items/#{item_id}"
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, request_params(params)
       end  
     end
@@ -319,7 +319,7 @@ module BlommingApi
     def shops_find (shop_id, params={})
       url = api_url "/shops/#{shop_id}"
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, request_params(params)
       end  
     end
@@ -330,7 +330,7 @@ module BlommingApi
     def tags (params={})
       url = api_url "/tags"
       
-      load_or_retry do 
+      feed_or_retry do 
         RestClient.get url, request_params(params)
       end  
     end
@@ -338,7 +338,7 @@ module BlommingApi
     def tags_items (tag_id, params={})
       url = api_url "/tags/#{tag_id}/items"
       
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, request_params(params)
       end  
     end

data/lib/blomming_api/oauth_endpoint.rb

@@ -48,7 +48,7 @@ module BlommingApi
           raise "FATAL: incorrect authentication type (#{type})"    
       end     
 
-      data = load_or_retry do 
+      data = feed_or_retry do 
         RestClient.post url, auth_params
       end  
 

data/lib/blomming_api/private_helpers.rb

@@ -19,10 +19,10 @@ module BlommingApi
     end
 
     #
-    # load_or_retry:
+    # feed_or_retry:
     # 
     # 1. call RestClient verb, 
-    #    passed in a block (load_or_retry is an iterator)
+    #    passed in a block (feed_or_retry is an iterator)
     #
     # 2. without any exception (http errors): 
     #    return data (convert response data from JSON to Ruby Hash)
@@ -35,7 +35,7 @@ module BlommingApi
     #      if @survive_on_fatal_error if false (default) 
     #         process die with exit  
     #      if @survive_on_fatal_error if true (must be specified in config file) 
-    #         load_or_retry return value: nil (no data available!).  
+    #         feed_or_retry return value: nil (no data available!).  
     #
     # === arguments
     #  
@@ -44,9 +44,9 @@ module BlommingApi
     #
     # === examples
     #
-    #  load_or_retry { RestClient.get url, req }
+    #  feed_or_retry { RestClient.get url, req }
     #
-    def load_or_retry (&restclient_call_block)
+    def feed_or_retry (&restclient_call_block)
       begin
         # call RestClient verb
         json_data = restclient_call_block.call 
@@ -57,7 +57,7 @@ module BlommingApi
         retry
 
       # RestClient exceptions, manage HTTP status code
-      rescue => e
+      rescue RestClient::Exception => e
 
         if http_status_code_401? e
           authenticate_refresh e
@@ -70,11 +70,14 @@ module BlommingApi
           server_error! e
           retry
 
-        # any other exception
+        # any other RestClient exception
         else
           return fatal_error! e
         end
 
+      rescue => e
+        return unknown_error! e
+
       else
         # HTTP status 200: return data (hash from JSON)!
         MultiJson.load json_data
@@ -129,7 +132,7 @@ module BlommingApi
 
 
     def fatal_error!(e)
-      STDERR.puts "#{Time.now}: restclient error. http status code: #{e.response.code}: #{e.response.body}. Exit."
+      STDERR.puts "#{Time.now}: restclient error. http status code: #{e.response.code}: #{e.response.body}."
       
       #
       # survive_on_fatal_error initialized in config file  
@@ -143,5 +146,20 @@ module BlommingApi
       end    
     end
 
+
+    def unknown_error!(e)
+      STDERR.puts "#{Time.now}: error: #{e.class}: #{e.message}"
+      
+      #
+      # survive_on_fatal_error initialized in config file  
+      #
+      unless @survive_on_fatal_error
+        # Process die!
+        exit
+      else
+        # no data!
+        return nil
+      end    
+    end
   end
 end

data/lib/blomming_api/sell_endpoints.rb

@@ -12,7 +12,7 @@ module BlommingApi
       url = api_url "/sell/payment_types​/user_list"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -22,7 +22,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req 
       end  
     end
@@ -32,7 +32,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.put url, load, req 
       end  
     end
@@ -41,7 +41,7 @@ module BlommingApi
       url = api_url "/sell/payment_types​/#{id}"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.delete url, req 
       end  
     end
@@ -54,7 +54,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req 
       end  
     end
@@ -66,7 +66,7 @@ module BlommingApi
       url = api_url "/sell/shipping_countries​​/all"
       req = request_params({locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -79,7 +79,7 @@ module BlommingApi
       url = api_url "/sell/shipping_profiles"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end
     end
@@ -89,7 +89,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req 
       end  
     end
@@ -100,7 +100,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.put url, load, req 
       end  
     end
@@ -111,7 +111,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.put url, load, req 
       end  
     end
@@ -120,7 +120,7 @@ module BlommingApi
       url = api_url "/sell/payment_types​/#{id}"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.delete url, req 
       end  
     end
@@ -129,7 +129,7 @@ module BlommingApi
       url = api_url "/sell/payment_types​/#{id}"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req 
       end  
     end
@@ -139,7 +139,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req 
       end  
     end
@@ -152,7 +152,7 @@ module BlommingApi
       url = api_url "/sell/shipping_regions​/all"
       req = request_params({locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -164,7 +164,7 @@ module BlommingApi
       url = api_url "/sell/shop/dashboard"
       req = request_params({locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -176,7 +176,7 @@ module BlommingApi
       url = api_url '/sell/shop/items'
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -186,7 +186,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req 
       end  
     end
@@ -195,7 +195,7 @@ module BlommingApi
       url = api_url "/sell/shop/items/#{item_id}"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -205,7 +205,7 @@ module BlommingApi
       load = MultiJson.dump payload
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.put url, load, req
       end    
     end
@@ -214,7 +214,7 @@ module BlommingApi
       url = api_url "/sell/shop/items/#{item_id}"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.delete url, req
       end  
     end
@@ -226,7 +226,7 @@ module BlommingApi
       # with a hash sends parameters as a urlencoded form body
       load = {:tags => tags.join(','), :multipart => true}
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req
       end  
     end
@@ -238,12 +238,13 @@ module BlommingApi
       # with a hash sends parameters as a urlencoded form body
       load = {:tags => tags.join(','), :multipart => true}
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.post url, load, req
       end  
     end    
 
 
+
     #
     # SHOP_ORDERS
     #
@@ -251,7 +252,7 @@ module BlommingApi
       url = api_url "/sell/shop/orders/states"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -260,37 +261,37 @@ module BlommingApi
       url = api_url "/sell/shop/orders"
       req = request_params({ order_status: order_status, currency: @currency, locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
 
-    def sell_shop_orders_order_number (order_number, params={})
+    def sell_shop_orders_find (order_number, params={})
       url = api_url "/sell/shop/orders/#{order_number}"
       req = request_params(params)
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
 
-    def sell_shop_orders_order_number_change_state (state, params={})
+    def sell_shop_orders_change_state (order_number, state, params={})
       url = api_url "/sell/shop/orders/#{order_number}/change_state"
       req = request_params({state: state}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         # POST with a hash sends parameters as a urlencoded form body
         RestClient.post url, req
       end  
     end
 
 
-    def sell_shop_orders_order_number_request_cancellation (reason_string, params={})
+    def sell_shop_orders_request_cancellation (order_number, reason_string, params={})
       url = api_url "/sell/shop/orders/#{order_number}/request_cancellation"
       req = request_params(params)
       load = MultiJson.dump reason: reason_string
 
-      load_or_retry do
+      feed_or_retry do
         # POST with raw payloads
         RestClient.post url, load, req
       end  
@@ -303,7 +304,7 @@ module BlommingApi
       url = api_url "/sell/shop/shipping_profiles"
       req = request_params({locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end
@@ -315,7 +316,7 @@ module BlommingApi
       url = api_url "/sell/shop/user_details"
       req = request_params({locale: @locale}.merge(params))
 
-      load_or_retry do
+      feed_or_retry do
         RestClient.get url, req
       end  
     end

data/lib/blomming_api/version.rb

@@ -1,3 +1,3 @@
 module BlommingApi
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blomming_api
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Giorgio Robino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source