ragoon 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23616cbfc914424fbaae35704b3e75882cbf07c6
-  data.tar.gz: 78a00db94a1831c7b0d74eda848e422b09dcd9cc
+  metadata.gz: 6d599f1d03691cb88ef6728c4cecdbf69d1762ef
+  data.tar.gz: 18f8ce5b9989c066663da7f0079db320510b499a
 SHA512:
-  metadata.gz: 9729d0754e37771f8fc7e9de50d7f7234c3aed0bf567a1c6372a0d921ba4d00045c59b7fdd3312c74f16e805595490808154d8241206863853d83ccbb0431adf
-  data.tar.gz: 208f461513e1024985d2bf0041a96555c7da2eb074c1622ed6e3dad5340981640ca83c74848d5b062a6492895d1460f2cfeafc8a8bf42d7e6dee4fb9e6da6d92
+  metadata.gz: '009eefbef6e6e0175c27233b6ff1fa167806601f7fc1ead1f17cb3556759ddb5fba0977f71ae3eb1ed2a80db810b6e8a16cef3a84395dbefe24292735644a89c'
+  data.tar.gz: d5e4ad9a3f7f5bfd8f9c478f8a40207d4ce8c9bedf49d57dc07634bf11ef74e828d61d47d1bbbbd6da8d7f7d0275aa763f4fc236b1ea4436749f347931a8e978

data/.gitignore

@@ -8,7 +8,6 @@
 /spec/reports/
 /tmp/
 /vendor/bundle/
-/.secret_options
+/.secret_options*
 /build/
 /release/
-

data/lib/ragoon.rb

@@ -4,6 +4,7 @@ require 'time'
 
 require 'ragoon/version'
 require 'ragoon/xml'
+require 'ragoon/error'
 require 'ragoon/client'
 require 'ragoon/services'
 require 'ragoon/services/schedule'
@@ -15,10 +16,11 @@ module Ragoon
 
   def self.default_options
     {
-      endpoint: ENV['GAROON_ENDPOINT'] || secret_options[:garoon_endpoint] || raise_option_error('endpoint'),
-      username: ENV['GAROON_USERNAME'] || secret_options[:garoon_username] || raise_option_error('username'),
-      password: ENV['GAROON_PASSWORD'] || secret_options[:garoon_password] || raise_option_error('password'),
-      version:  ENV['GAROON_VERSION']  || secret_options[:garoon_version]  || 4
+      endpoint: ENV['GAROON_ENDPOINT'] || raise_option_error('endpoint'),
+      username: ENV['GAROON_USERNAME'] || raise_option_error('username'),
+      password: ENV['GAROON_PASSWORD'] || raise_option_error('password'),
+      version:  ENV['GAROON_VERSION']  || 4,
+      retry:    ENV['GAROON_RETRY']    || 10,
     }
   end
 
@@ -30,8 +32,11 @@ module Ragoon
 
   def self.secret_options
     if @@secret_options.empty?
-      raise '`./.secret_options` is required.' unless File.exists?('./.secret_options')
-      @@secret_options = eval(File.read('./.secret_options'))
+      if File.exist?('./.secret_options')
+        @@secret_options = eval(File.read('./.secret_options'))
+      else
+        @@secret_options = default_options
+      end
     end
     @@secret_options
   end

data/lib/ragoon/client.rb

@@ -7,9 +7,20 @@ class Ragoon::Client
   end
 
   def request(action_name, body_node)
-    @action_name = action_name
-    @body_node = body_node
-    @response = RestClient.post(endpoint, Ragoon::XML.render(action_name, body_node, @options))
+    retry_count = @options[:retry].to_i
+
+    retry_count.times do
+      begin
+        request_once(action_name, body_node)
+        return
+      rescue Ragoon::Error => e
+        unless e.message.include?('指定された画面はアクセスできません。')
+          raise e
+        end
+        sleep(0.5)
+      end
+    end
+    raise Ragoon::Error.new("試行回数が#{retry_count}回を超えたので終了しました。")
   end
 
   def result_set
@@ -19,4 +30,22 @@ class Ragoon::Client
   def reset
     @result_set = nil
   end
+
+  private
+
+  def request_once(action_name, body_node)
+    reset
+    @action_name = action_name
+    @body_node = body_node
+    @response = RestClient.post(endpoint, Ragoon::XML.render(action_name, body_node, @options))
+  ensure
+    raise_error unless result_set.xpath('//soap:Fault').empty?
+  end
+
+  def raise_error
+    raise Ragoon::Error.new(
+      result_set.xpath('//soap:Reason').text.strip,
+      result_set.xpath('//soap:Detail/*').map { |c| [c.name, c.text.strip] }.to_h
+    )
+  end
 end

data/lib/ragoon/error.rb

@@ -0,0 +1,24 @@
+class Ragoon::Error < StandardError
+  def initialize(message = nil, details = {})
+    super(message)
+    @details = details
+  end
+
+  attr_reader :details
+
+  def code
+    @details['code']
+  end
+
+  def diagnosis
+    @details['diagnosis']
+  end
+
+  def cause
+    @details['cause']
+  end
+
+  def counter_measure
+    @details['counter_measure']
+  end
+end

data/lib/ragoon/services.rb

@@ -7,7 +7,7 @@ class Ragoon::Services
 
   attr_reader :client, :action_type
 
-  def initialize(options = Ragoon.default_options)
+  def initialize(options = Ragoon.secret_options)
     @options = options
     @action_type = self.class.name.split('::').pop.downcase.to_sym
     @client = Ragoon::Client.new(self.endpoint, options)

data/lib/ragoon/version.rb

@@ -1,3 +1,3 @@
 module Ragoon
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragoon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -112,6 +112,7 @@ files:
 - bin/setup
 - lib/ragoon.rb
 - lib/ragoon/client.rb
+- lib/ragoon/error.rb
 - lib/ragoon/services.rb
 - lib/ragoon/services/notification.rb
 - lib/ragoon/services/schedule.rb
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ragoon is a simple Garoon 3 API client.