cielo24 0.0.16 → 0.0.17

data/lib/cielo24/version.rb

@@ -1,3 +1,3 @@
-module Cielo24
-  VERSION = '0.0.16'
-end
+module Cielo24
+  VERSION = '0.0.17'
+end

data/lib/cielo24/web_utils.rb

@@ -1,75 +1,102 @@
-module Cielo24
-  class WebUtils
-
-    require 'json'
-    require 'httpclient'
-    require 'timeout'
-    require 'logger'
-    require 'tzinfo'
-    include JSON
-
-    BASIC_TIMEOUT = 60           # seconds (1 minute)
-    DOWNLOAD_TIMEOUT = 300       # seconds (5 minutes)
-    UPLOAD_TIMEOUT = 60*60*24*7  # seconds (1 week)
-    SERVER_TZ = 'America/Los_Angeles'
-    LOGGER = Logger.new(STDOUT)
-
-    def self.get_json(uri, method, timeout, query=nil, headers=nil, body=nil)
-      response = http_request(uri, method, timeout, query, headers, body)
-      return JSON.parse(response)
-    end
-
-    def self.http_request(uri, method, timeout, query=nil, headers=nil, body=nil)
-      http_client = HTTPClient.new
-      http_client.cookie_manager = nil
-      http_client.send_timeout = UPLOAD_TIMEOUT
-      LOGGER.info(uri + (query.nil? ? '' : '?' + URI.encode_www_form(query)))
-
-      # Timeout block:
-      begin
-        # Error is raised if the following block fails to execute in 'timeout' sec:
-        Timeout.timeout(timeout) { # nil timeout = infinite
-
-          response = http_client.request(method, uri, query, body, headers, nil)
-          # Handle web errors
-          if response.status_code == 200 or response.status_code == 204
-            return response.body
-          else
-            json = JSON.parse(response.body)
-            raise WebError.new(json['ErrorType'], json['ErrorComment'])
-          end
-
-        }
-      rescue Timeout::Error
-        raise TimeoutError.new('The HTTP session has timed out.')
-      end
-    end
-
-    def self.to_utc(s)
-      return s if s.empty?
-      tz = TZInfo::Timezone.get(SERVER_TZ)
-      local = DateTime.iso8601(s)
-      utc = tz.local_to_utc local
-      format = '%Y-%m-%dT%H:%M:%S.%L%z' # iso8601 with milliseconds
-      utc.strftime(format)
-    end
-  end
-
-  class WebError < StandardError
-    attr_reader :type
-    def initialize(type, comment)
-      super(comment)
-      @type = type
-    end
-
-    def to_s
-      return @type + ' - ' + super.to_s
-    end
-  end
-
-  class TimeoutError < StandardError
-    def initialize(message)
-      super(message)
-    end
-  end
+module Cielo24
+  class WebUtils
+
+    require 'json'
+    require 'httpclient'
+    require 'timeout'
+    require 'logger'
+    require 'tzinfo'
+    include JSON
+    include TZInfo
+
+    BASIC_TIMEOUT = 60           # seconds (1 minute)
+    DOWNLOAD_TIMEOUT = 300       # seconds (5 minutes)
+    UPLOAD_TIMEOUT = 60*60*24*7  # seconds (1 week)
+    SERVER_TZ = 'America/Los_Angeles'
+    LOGGER = Logger.new(STDOUT)
+
+    def self.get_json(uri, method, timeout, query=nil, headers=nil, body=nil)
+      response = http_request(uri, method, timeout, query, headers, body)
+      return json_parse(response)
+    end
+
+    def self.http_request(uri, method, timeout, query=nil, headers=nil, body=nil)
+      http_client = HTTPClient.new
+      http_client.cookie_manager = nil
+      http_client.send_timeout = UPLOAD_TIMEOUT
+      LOGGER.info(uri + (query.nil? ? '' : '?' + URI.encode_www_form(query)))
+
+      # Timeout block:
+      begin
+        # Error is raised if the following block fails to execute in 'timeout' sec:
+        Timeout.timeout(timeout) { # nil timeout = infinite
+
+          response = http_client.request(method, uri, query, body, headers, nil)
+          # Handle web errors
+          if response.status_code == 200 or response.status_code == 204
+            return response.body
+          else
+            json = json_parse(response.body)
+            raise WebError.new(response.status_code, json['ErrorType'], json['ErrorComment'])
+          end
+
+        }
+      rescue Timeout::Error
+        raise TimeoutError.new('The HTTP session has timed out.')
+      end
+    end
+
+    def self.to_utc(s)
+      return s if s.empty?
+      tz = Timezone.get(SERVER_TZ)
+      local = DateTime.iso8601(s)
+      utc = tz.local_to_utc local
+      format = '%Y-%m-%dT%H:%M:%S.%L%z' # iso8601 with milliseconds
+      utc.strftime(format)
+    end
+
+    def self.json_parse(s)
+      begin
+        return JSON.parse(s)
+      rescue JSON::ParserError
+        raise ParsingError.new("Bad JSON String: \"#{s}\"")
+      end
+    end
+  end
+
+  class CieloError < StandardError
+    attr_reader :type
+    def initialize(type, comment)
+      super(comment)
+      @type = type
+    end
+
+    def to_s
+      "#{@type} - #{super.to_s}"
+    end
+  end
+
+  class WebError < CieloError
+    attr_reader :status_code
+    def initialize(status_code, type, comment)
+      super(type, comment)
+      @status_code = status_code
+    end
+
+    def to_s
+      "#{@status_code}:#{super.to_s}"
+    end
+  end
+
+  class TimeoutError < CieloError
+    def initialize(message)
+      super('TIMEOUT_ERROR', message)
+    end
+  end
+
+  class ParsingError < CieloError
+    def initialize(message)
+      super('PARSING_ERROR', message)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cielo24
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - cielo24
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2015.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2015.7
 description: This gem allows you to interact with the cielo24 public REST API.
 email:
 - support@cielo24.com
@@ -98,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Cielo24 API gem.