ne_api 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2204c0aacf3b3bd35f35c6a866b2c0c7c0c87497
-  data.tar.gz: 2a4b2fef8aed5bf904b9edf65cf7fbd29df5dc6f
+  metadata.gz: a8dcef30d03fc879c00be28c9c2a71aac391d29e
+  data.tar.gz: c3f5334d74ea331433db86cedccce79487babe34
 SHA512:
-  metadata.gz: 08dcade149311b1d6a72edea331b6f4f7d7094b68dbb396bcb557429beda7e174fa514e175253f2b7d68307fe4b3584bbce722878621125e95fa3788c869340a
-  data.tar.gz: 1186d6b9467a0c8a483fb01c1ebd6db187173fd11da09a67334262b747c204587b528b14e3a02d288bbd4c8c9d7309d1740333d33b326b456506caa2ad9aa4a1
+  metadata.gz: bac66101233c942a9f3da9984f7cde6e813167ec1b09453217c3555c1d5d4e76a05bb27966dede5964afc2619b2319a9072ebea8cbc5e571ec289e86a529f20d
+  data.tar.gz: ef10be79aec7f7d48b76fc7774f378baea745e5307d520a5a044b1729f9932bff120dfe04de772c0894caa612ceb1e364f11588977ecf19e7eb7c8f1ae3ff2fe

data/lib/ne_api/version.rb

@@ -1,3 +1,3 @@
 module NeApi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/ne_api.rb

@@ -22,7 +22,11 @@ module NeAPI
   def response response
     body = JSON.parse response.body
     if body["result"] != "success"
-      raise NeAPIException,  body["message"]
+      if (body["code"] == "003001" || body["code"] == "003002")
+        return false
+      else
+        raise NeAPIException,  sprintf("%s:%s", body["code"], body["message"])
+      end
       return false
     end
     body
@@ -30,7 +34,7 @@ module NeAPI
 
   class Master
     include NeAPI
-    attr_accessor :access_token, :refresh_token, :wait_flag
+    attr_accessor :access_token, :refresh_token, :wait_flag, :retry_num, :wait_interval
     PATH_PREFIX="/api_v1_"
 
     def initialize access_token: access_token, refresh_token: refresh_token
@@ -38,6 +42,8 @@ module NeAPI
       @access_token = access_token
       @refresh_token = refresh_token
       @wait_flag = false
+      @retry_num = 1
+      @wait_interval = 30
     end
 
     def force_import
@@ -54,14 +60,27 @@ module NeAPI
       params = params.merge({wait_flag: 1}) if @wait_flag
       
       if fields.present? && query.present?
-        res =response(conn.post PATH_PREFIX+model.to_s+ "/" + method, {access_token: @access_token, refresh_token: @refresh_token, fields: fields}.merge(query).merge(params))
+        post_args = {access_token: @access_token, refresh_token: @refresh_token, fields: fields}.merge(query).merge(params)
+
       elsif fields.present?
-        res =response(conn.post PATH_PREFIX+model.to_s+ "/" + method, {access_token: @access_token, refresh_token: @refresh_token, fields: fields}.merge(params))
+        post_args =  {access_token: @access_token, refresh_token: @refresh_token, fields: fields}.merge(params)
       elsif query.present?
-        res =response(conn.post PATH_PREFIX+model.to_s+ "/" + method, {access_token: @access_token, refresh_token: @refresh_token}.merge(query).merge(params))
+        post_args = {access_token: @access_token, refresh_token: @refresh_token}.merge(query).merge(params)
       else
-        res =response(conn.post PATH_PREFIX+model.to_s+ "/" + method, {access_token: @access_token, refresh_token: @refresh_token}.merge(params))
+        post_args = {access_token: @access_token, refresh_token: @refresh_token}.merge(params)
+      end
+      res = false
+      
+      self.retry_num.times do
+        res =response(conn.post PATH_PREFIX+model.to_s+ "/" + method, post_args)
+        break if res != false
+        sleep(self.wait_interval)
+      end
+      if res == false
+        raise NeAPIException,  "003001:Next Engineが大変混み合っています。APIの接続を#{self.retry_num}回、#{self.wait_interval}秒間隔でアクセスを試みましたが、失敗をしました"
+        return false
       end
+      
       @access_token = res["access_token"] if res["access_token"].present?
       @refresh_token = res["refresh_token"] if res["refresh_token"].present?
 
@@ -112,10 +131,11 @@ module NeAPI
     include NeAPI
     SIGN_IN_PATH = "/users/sign_in/"
     NEAUTH_PATH = "/api_neauth/"
-    attr_accessor :redirect_url, :ne_user
+    attr_accessor :redirect_url, :ne_user, :wait_flag
     
     def initialize redirect_url: nil
       raise NeAPIException, "no redirect_url" if redirect_url.nil?
+      @wait_flag = false
       @redirect_url = redirect_url
     end
 
@@ -127,6 +147,7 @@ module NeAPI
     #access_token/企業情報取得
     def ne_auth uid, state
       @ne_user = response ( conn.post NEAUTH_PATH, {uid: uid, state: state})
+      raise NeAPIException, "003001:Next Engineが大変混み合っているようです" if @ne_user == false
       @ne_user
     end
     def tokens

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ne_api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yuuna Kurita
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler