esp-commons 0.5.3 → 0.5.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 97aa86b8429f52ebe262c6327af1aaeb7406c5cf
+  data.tar.gz: 047edc80b83b9067233a2a703bd1090ed14c768a
+SHA512:
+  metadata.gz: c90f207e5c98fd684a16c7548643387f0f14523f9b8c4b4f2517cc5a72d4427610673f0cbf689ba393b33457d9e7b06d35d440bd3fcefc1daaf57b49798011a9
+  data.tar.gz: 53ff0f6147130536e3b1d20361e1ab59040eacd6b7fca663d9c753c91cbe910bdbf8e2f461ca03603287c66133d6fdcb9670788c0f6b7755771b1d4d2dcc493f

data/lib/esp-commons/libraries/requester.rb

@@ -1,9 +1,20 @@
 require 'curb'
 
+class RequesterException < Exception
+end
+
 class Requester
   def initialize(url, headers_accept = nil)
-    @response = Curl::Easy.perform(url) do |curl|
-      curl.headers['Accept'] = headers_accept if headers_accept
+    @response ||= RestClient::Request.execute(
+      :method => :get,
+      :url => url,
+      :timeout => 600,
+      :headers => {
+        :Accept => headers_accept,
+        :timeout => 600
+      }
+    ) do |response, request, result, &block|
+      response
     end
   end
 
@@ -11,19 +22,29 @@ class Requester
     @response
   end
 
+  def stringify_headers(headers)
+    headers.map do |k, v|
+      {
+        k.to_s.split('_').map do |s|
+          s.capitalize.gsub('Etag', 'ETag').gsub('Ua', 'UA')
+        end.join('-') => v
+      }
+    end.reduce Hash.new, :merge
+  end
+
   def response_headers
-    @response_headers ||= Hash[response.header_str.split("\r\n").map { |s| s.split(': ').map(&:strip) }]
+    @response_headers ||= stringify_headers response.headers
   end
 
   def response_status
-    @response_status ||= response.response_code
+    @response_status ||= response.code
   end
 
   def response_body
-    @response_body ||= response.body_str.force_encoding 'UTF-8'
+    @response_body ||= response.body.force_encoding 'UTF-8'
   end
 
   def response_hash
-    @response_hash ||= ActiveSupport::JSON.decode(response_body)
+    @response_hash ||= ActiveSupport::JSON.decode(response_body) rescue {}
   end
 end

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.5.3
-  prerelease: 
+  version: 0.5.5
 platform: ruby
 authors:
 - OpenTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: openteam-commons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: openteam-commons
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Description of EspCommons.
@@ -146,47 +129,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/models/esp_commons/image.rb
 - config/locales/commons.ru.yml
+- lib/esp-commons.rb
 - lib/esp-commons/engine.rb
 - lib/esp-commons/libraries/message_maker.rb
 - lib/esp-commons/libraries/requester.rb
 - lib/esp-commons/libraries/subscriber.rb
 - lib/esp-commons/version.rb
-- lib/esp-commons.rb
 - lib/generators/esp_commons/install/install_generator.rb
 - lib/generators/esp_commons/install/templates/script/subscriber
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 homepage: http://github.com/openteam-esp/esp-commons
 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'
-      segments:
-      - 0
-      hash: 693550452088203428
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 693550452088203428
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Summary of EspCommons.
 test_files: []