cielo24 0.0.13 → 0.0.15

data/lib/cielo24/version.rb

@@ -1,3 +1,3 @@
-module Cielo24
-  VERSION = "0.0.13"
+module Cielo24
+  VERSION = '0.0.15'
 end

data/lib/cielo24/web_utils.rb

@@ -1,66 +1,64 @@
-module Cielo24
-  class WebUtils
-
-    require 'json'
-    require 'httpclient'
-    require 'timeout'
-    include JSON
-
-    BASIC_TIMEOUT = 60     # seconds
-    DOWNLOAD_TIMEOUT = 300 # seconds
-    @@LAST_URL = "none" # For logging purposes
-
-    def self.LAST_URL
-      return @@LAST_URL
-    end
-
-    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 = 60*60*24*7 # HTTPClient default timeout set to 7 days, our own timeout handler is down below
-      @@LAST_URL = 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
-  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'
+    include JSON
+
+    BASIC_TIMEOUT = 60           # seconds (1 minute)
+    DOWNLOAD_TIMEOUT = 300       # seconds (5 minutes)
+    UPLOAD_TIMEOUT = 60*60*24*7  # seconds (1 week)
+    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
+  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
 end

metadata

@@ -1,71 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: cielo24
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
+  prerelease: 
 platform: ruby
 authors:
 - cielo24
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
 description: This gem allows you to interact with the cielo24 public REST API.
 email:
 - support@cielo24.com
@@ -73,33 +82,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cielo24/actions.rb
-- lib/cielo24/enums.rb
 - lib/cielo24/options.rb
-- lib/cielo24/version.rb
 - lib/cielo24/web_utils.rb
+- lib/cielo24/version.rb
+- lib/cielo24/enums.rb
+- lib/cielo24/actions.rb
 - lib/cielo24.rb
 homepage: http://cielo24.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Cielo24 API gem.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: f88e51bd3f448a402c5f811d76dbf0f5870074a0
-  data.tar.gz: 9b826d4adc30c34d66b497e0b8cec264c82461f3
-SHA512:
-  metadata.gz: e0113e5e3ef2e0083f4732b3334ef1985e16c6418d3beac389f9eab7b4115b99006ab55bc452d37a3e0298da6ddd736e4501fe764a77720f0b08a9e0a054a0b8
-  data.tar.gz: fab07a40a2ab041b348d4d56dd5607f076e3313789f45e786ebb6cec5751fee714ce942d373f33eccc590912e3b50975084dca27d4b52a3d3822f91cbe2f4a4f