survey-gizmo-ruby 6.0.3 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df56a925ae1b46ab339112104842f941081b571
-  data.tar.gz: 6492ac9c08f5398fa2722df6898738b5ec480c58
+  metadata.gz: c9212a1b4d700277db950e43704325fe142193b3
+  data.tar.gz: 5fa9f82cd2349c0bd649e56807ee8378687205c3
 SHA512:
-  metadata.gz: ee894f64477a704f7c77139c4732c73a81d0b29ef9cc29e4f42f12034f932726fe9722276e7a2c8565b7eeb48168a99a5881dfa62020e9582074852b7997f005
-  data.tar.gz: e56cceae702194825ed8f608efafad7c17da1266cf3957e9c934d85fe73144e05af5c145d9d1c33d2b7ceb109381ca02116d0c4770f100450b900cf4c6477347
+  metadata.gz: 5731f64d824843664d1dd208fc92bbf1060815d96bf25c545908018b0508167f3f955c3e021f0f6d127c15fd8e5f3321f96643cedd938f4ff25785735172b2b9
+  data.tar.gz: 94874505cc5d2739334cf86bde4805616eb2dd178d865eaf20cba1cf670733f870debee1b38b0ae61225db68f22c5498f677cef48915002b25c70f1b8bb9ce97

data/lib/survey-gizmo-ruby.rb

@@ -11,6 +11,7 @@ require 'digest/md5'
 require 'faraday'
 require 'faraday_middleware'
 require 'logger'
+require 'retriable'
 require 'virtus'
 
 path = File.join(File.expand_path(File.dirname(__FILE__)), 'survey_gizmo')

data/lib/survey_gizmo/connection.rb

@@ -3,7 +3,21 @@ require 'active_support/core_ext/module/delegation'
 module SurveyGizmo
   class Connection
     class << self
-      delegate :put, :get, :delete, :post, to: :connection
+      def get(route)
+        Retriable.retriable(retriable_args) { connection.get(route) }
+      end
+
+      def post(route, params)
+        Retriable.retriable(retriable_args) { connection.post(route, params) }
+      end
+
+      def put(route, params)
+        Retriable.retriable(retriable_args) { connection.put(route, params) }
+      end
+
+      def delete(route)
+        Retriable.retriable(retriable_args) { connection.delete(route) }
+      end
 
       def reset!
         @connection = nil
@@ -12,7 +26,7 @@ module SurveyGizmo
       private
 
       def connection
-        options = {
+        faraday_options = {
           url: SurveyGizmo.configuration.api_url,
           params: {
             api_token: SurveyGizmo.configuration.api_token,
@@ -24,31 +38,29 @@ module SurveyGizmo
           }
         }
 
-        retry_options = {
-          max: SurveyGizmo.configuration.retry_attempts,
+        @connection ||= Faraday.new(faraday_options) do |connection|
+          connection.request :url_encoded
+
+          connection.response :parse_survey_gizmo_data
+          connection.response :json, content_type: /\bjson$/
+          connection.response :logger, SurveyGizmo.configuration.logger, bodies: true if SurveyGizmo.configuration.api_debug
+
+          connection.adapter Faraday.default_adapter
+        end
+      end
+
+      def retriable_args
+        {
           interval: SurveyGizmo.configuration.retry_interval,
-          exceptions: [
+          tries:         SurveyGizmo.configuration.retry_attempts + 1,
+          on: [
             SurveyGizmo::BadResponseError,
             SurveyGizmo::RateLimitExceededError,
             Errno::ETIMEDOUT,
             Net::ReadTimeout,
             Faraday::Error::TimeoutError,
-            'Timeout::Error',
-            'Error::TimeoutError'
           ]
         }
-
-        @connection ||= Faraday.new(options) do |connection|
-          connection.request :retry, retry_options
-          connection.request :url_encoded
-
-          connection.response :parse_survey_gizmo_data
-          connection.response :pester_survey_gizmo
-          connection.response :logger, SurveyGizmo.configuration.logger, bodies: true if SurveyGizmo.configuration.api_debug
-          connection.response :json, content_type: /\bjson$/
-
-          connection.adapter Faraday.default_adapter
-        end
       end
     end
   end

data/lib/survey_gizmo/faraday_middleware/parse_survey_gizmo.rb

@@ -1,14 +1,35 @@
 require 'faraday_middleware/response_middleware'
 
 module SurveyGizmo
+  class RateLimitExceededError < RuntimeError; end
+  class BadResponseError < RuntimeError; end
+
   class ParseSurveyGizmo < FaradayMiddleware::ResponseMiddleware
     Faraday::Response.register_middleware(parse_survey_gizmo_data: self)
 
-    PAGINATION_FIELDS = ['total_count', 'page', 'total_pages', 'results_per_page']
-    TIME_FIELDS = ['datesubmitted', 'created_on', 'modified_on', 'datecreated', 'datemodified']
+    PAGINATION_FIELDS = [
+      'page',
+      'results_per_page',
+      'total_count',
+      'total_pages'
+    ]
+
+    TIME_FIELDS = [
+      'created_on',
+      'datecreated',
+      'datemodified',
+      'datesubmitted',
+      'modified_on'
+    ]
 
-    def parse_response?(env)
-      true
+    def call(environment)
+      @app.call(environment).on_complete do |response|
+        fail RateLimitExceededError if response.status == 429
+        fail BadResponseError, "Bad response code #{response.status} in #{response.inspect}" unless response.status == 200
+        fail BadResponseError, response.body['message'] unless response.body['result_ok'] && response.body['result_ok'].to_s =~ /^true$/i
+
+        process_response(response)
+      end
     end
 
     define_parser do |body|

data/lib/survey_gizmo/version.rb

@@ -1,3 +1,3 @@
 module SurveyGizmo
-  VERSION = '6.0.3'
+  VERSION = '6.1.0'
 end

data/survey-gizmo-ruby.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'awesome_print', '~> 1'
   gem.add_dependency 'faraday', '>= 0.9.1', '~> 0.9'
   gem.add_dependency 'faraday_middleware', '~> 0.9'
+  gem.add_dependency 'retriable', '~> 1.4'
   gem.add_dependency 'i18n'
   gem.add_dependency 'virtus', '>= 1.0.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: survey-gizmo-ruby
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.0
 platform: ruby
 authors:
 - Kabari Hendrick
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -89,6 +89,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +216,6 @@ files:
 - lib/survey_gizmo/configuration.rb
 - lib/survey_gizmo/connection.rb
 - lib/survey_gizmo/faraday_middleware/parse_survey_gizmo.rb
-- lib/survey_gizmo/faraday_middleware/pester_survey_gizmo.rb
 - lib/survey_gizmo/logger.rb
 - lib/survey_gizmo/multilingual_title.rb
 - lib/survey_gizmo/resource.rb

data/lib/survey_gizmo/faraday_middleware/pester_survey_gizmo.rb

@@ -1,16 +0,0 @@
-module SurveyGizmo
-  class RateLimitExceededError < RuntimeError; end
-  class BadResponseError < RuntimeError; end
-
-  class PesterSurveyGizmoMiddleware < Faraday::Middleware
-    Faraday::Response.register_middleware(pester_survey_gizmo: self)
-
-    def call(environment)
-      @app.call(environment).on_complete do |response|
-        fail RateLimitExceededError if response.status == 429
-        fail BadResponseError, "Bad response code #{response.status} in #{response.inspect}" unless response.status == 200
-        fail BadResponseError, response.body['message'] unless response.body['result_ok'] && response.body['result_ok'].to_s =~ /^true$/i
-      end
-    end
-  end
-end