sr_fax 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08b8fbb2726537e1c481371db271bd81a630689
-  data.tar.gz: 12939f123b696d6bc753e275cd18cf7821184f78
+  metadata.gz: e48956c74b31f3de3cb0045346c13e853f2ff63b
+  data.tar.gz: 279682183600050e3feac2d51d6ad1edbd5f6904
 SHA512:
-  metadata.gz: b3ba7b257586a528df2983a692ba24fc77cbc115125882fa478c55917ac979674a25c3a220426dceccdabbb638d06f78a9debda3b4fab077d76274f6be5197ec
-  data.tar.gz: 03a576e0bc5b91855ff6737ae4dc1ac547673863d167d79e29f564a2f15639d4c5fc7cddbd17c7f08301cd8e53ae932a0bf0150d6f1be71d5e75e3b80bfb2f2f
+  metadata.gz: e604ffac24efd5b2740e7a0bf18d26abbe208a6cb59fa4f6362bd861fafe1efa3aa4499474a016b8b68e9b6d3cec637e4c1db197d3db22ee034e09fbbbb7230f
+  data.tar.gz: 52e0d48ec3caf51f3a07380684ecd25e7373b8099df7f28325f14d389f8b17fa1c81529a177ac5a2bd240fd2059ccfd7b80e521855f08eec2ae06298637801d5

data/README.md

@@ -29,6 +29,7 @@ require 'srfax'
 SrFax.setup do |config|
   config.defaults[:access_id] = '1234'
   config.defaults[:access_pwd] = 'password'
+  config.connection_defaults[:timeout] = 180
 end
 
 SrFax.view_inbox
@@ -50,12 +51,6 @@ The SrFax module currently supports the following functions
   - View account usage
   - Download faxes from the inbox or outbox
 
-Not yet implemented:
-  - Sending faxes
-  - Delete pending faxes (to be sent)
-  - Stop fax
-  - Multifax status
-
 ## Development
 
 After checking out the repo, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/srfax.rb

@@ -34,6 +34,12 @@ module SrFax
     sResponseFormat: 'JSON' # XML or JSON
   }
 
+  mattr_accessor :connection_defaults
+  # Default values to use with the RestClient connection
+  @@connection_defaults = {
+    timeout: 180
+  }
+
   mattr_accessor :logger
   # Logger object for use in standalone modeo or with Rails
   @@logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
@@ -299,9 +305,37 @@ module SrFax
     # @return [Hash] The hash payload value including a proper status.  Will never return nil.
     def execute(postVariables)
       logger.debug postVariables.merge(defaults)
-      res = RestClient.post BASE_URL, postVariables.merge(defaults).to_json, :content_type => :json, :accept => :json
+      # redirect where necessary
+      res = RestClient::Request.execute(:method => :post, :url => BASE_URL, 
+        :payload => postVariables.merge(defaults).to_json, 
+        :timeout => connection_defaults[:timeout], :open_timeout => connection_defaults[:timeout], 
+        :headers => {:accept => :json}) { |response, request, result, &block|
+          if [301, 302, 307].include? response.code
+            response.follow_redirection(request, result, &block)
+          elsif [200].include? response.code
+            # default behaviour for OK requests
+            response.return!(request, result, &block)
+          else
+            # suppress the throw's by RestClient
+            response = Oj.dump({"Status"=>"Failure", "Result"=>"#{response}"}, mode: :compat)
+          end
+        }
+    
+#      res = RestClient.post(BASE_URL, postVariables.merge(defaults).to_json, 
+#        :content_type => :json, :accept => :json, 
+#        :timeout => connection_defaults[:timeout], :open_timeout => connection_defaults[:timeout] ){ |response, request, result, &block|
+#          if [301, 302, 307].include? response.code
+#            response.follow_redirection(request, result, &block)
+#          elsif [200].include? response.code
+#            # default behaviour
+#            response.return!(request, result, &block)
+#          else
+#            # suppress the throw's by RestClient
+#            response = {"Status"=>"Failure", "Result"=>"#{response}"}.to_json
+#          end
+#        }
       return_data = nil
-      return_data = JSON.parse(res) if res
+      return_data = !res.nil? ? JSON.parse(res) : nil
 
       if return_data.nil? || return_data.fetch("Status", "Failure") != "Success"
         logger.debug "Execution of SR Fax command not successful" 

data/lib/version.rb

@@ -1,4 +1,4 @@
 module SrFax
   # Version # for SrFax
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/srfax.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "~> 0.8"
   spec.add_development_dependency "yard", "~> 0.8"
   spec.add_dependency 'logger', '~> 1'
+  spec.add_dependency 'oj', '~> 2.11'
   spec.add_dependency 'activesupport', '~> 4.2'
   spec.add_dependency 'rest-client', '~> 1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sr_fax
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jeff Klink
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement