LVS-JSONService 0.4.8 → 0.4.9

data/LVS-JSONService.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{LVS-JSONService}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["LVS", "andyjeffries"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-12-16}
   s.email = %q{info@lvs.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -50,9 +50,7 @@ Gem::Specification.new do |s|
      "spec/lvs/json_service/request_spec.rb",
      "spec/spec_helper.rb"
   ]
-  s.add_dependency('activesupport', '>= 3.0.1')
-  s.add_dependency('eventmachine', '>= 0.12.10')
-  s.add_dependency('em-http-request', '>= 0.2.6')
+  s.add_dependency('activesupport', '>= 3.0.3')
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "JSONService"
-    gem.summary = %Q{TODO}
+    gem.summary = %Q{This is a JSON Service for interacting with an ABP backend server from LVS}
     gem.email = "info@lvs.co.uk"
     gem.homepage = "http://github.com/lvs/JSONService"
     gem.authors = ["LVS", "andyjeffries"]

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/json_service.rb

@@ -1,6 +1,4 @@
 require 'rubygems'
 require 'active_support'
-require 'eventmachine'
-require 'em-http'
 require 'lvs/json_service/base'
 require 'lvs/json_service/logger'

data/lib/lvs/json_service/base.rb

@@ -21,7 +21,6 @@ module LVS
         @auth_cert          = ""
         @auth_key           = ""
         @auth_key_pass      = ""
-        @eventmachine_async = false
 
         def encrypted=(value)
           @encrypted = value
@@ -56,10 +55,6 @@ module LVS
           @field_prefix = value
         end
         
-        def is_eventmachine_async!
-          @eventmachine_async = true
-        end
-        
         def site=(value)
           # value is containing AGP_LOCATION already sometimes:
           value.gsub!(/^#{AGP_LOCATION}/, '') if defined?(AGP_LOCATION) && value.match(/#{AGP_LOCATION}/)
@@ -98,7 +93,6 @@ module LVS
           end
 
           options[:encrypted]          = @encrypted if @encrypted
-          options[:eventmachine_async] = @eventmachine_async if @eventmachine_async
           options[:auth_cert]          = @auth_cert if @auth_cert
           options[:auth_key]           = @auth_key if @auth_key
           options[:auth_key_pass]      = @auth_key_pass if @auth_key_pass

data/lib/lvs/json_service/request.rb

@@ -79,30 +79,6 @@ module LVS
           yield(response)
         end
 
-        def http_eventmachine_request_with_timeout(service, args, options)
-          http_options = {}
-          http_options[:timeout] = options[:timeout] || 1
-          http_options[:head] = {"X-LVS-Request-ID" => options[:request_id]}
-          http_options[:body] = {"object_request" => args.to_json}
-          
-          http = EventMachine::HttpRequest.new(service).post(http_options)
-          http.callback {
-            response = OpenStruct.new(:request_id => http.response_header["X-LVS-Request-ID"], :body => http.response)
-            yield(response)
-          }
-          http.errback {
-            if (http.response_header.status == 404)
-              yield(LVS::JsonService::NotFoundError.new("404 Found for the service #{service}", 404, service, args))
-            elsif (http.response_header.status == 304)
-              yield(LVS::JsonService::NotModified.new("304 Data hasn't changed", 304, service, args))
-            elsif (http.response_header.status == 0)
-              yield(LVS::JsonService::BackendUnavailableError.new("Backend unavailable (in time)", 500, service, args))
-            else
-              yield(LVS::JsonService::Error.new("Unknown error (#{http.response_header.inspect})", 500, service, args))
-            end
-          }
-        end
-
         def run_remote_request(service, args, options = {})
           LVS::JsonService::Logger.debug "Requesting '#{service}' with #{args.to_json}"
           
@@ -116,44 +92,21 @@ module LVS
           end
           if response.nil?
             start = Time.now
-            if options[:eventmachine_async]
-              http_eventmachine_request_with_timeout(service, args, options) do |response|
-                if response.is_a?(LVS::JsonService::Error)
-                  result = response
-                else
-                  verify_request_id(response.request_id, options[:request_id])
-                  net_timing = ("%.1f" % ((Time.now - start) * 1000)) + "ms"
-                  start = Time.now
-                  result = JSON.parse(response.body)
-                  parse_timing = ("%.1f" % ((Time.now - start) * 1000)) + "ms"
-                  timing = "Net: #{net_timing}, Parse: #{parse_timing}"
-                  if options[:cached_for]
-                    Rails.cache.write([service, args].cache_key, [response, result], :expires_in => options[:cached_for])
-                  end
-                  log_response(timing, response.body, options)
-                  if result.is_a?(Hash) && result.has_key?("PCode")
-                    result = LVS::JsonService::Error.new(result["message"], result["PCode"], service, args, result)
-                  end
-                end
-                yield(result) if block_given?
+            http_standard_request_with_timeout(service, args, options) do |response|
+              verify_request_id(response["X-LVS-Request-ID"], options[:request_id])
+              net_timing = ("%.1f" % ((Time.now - start) * 1000)) + "ms"
+              start = Time.now
+              result = JSON.parse(response.body)
+              parse_timing = ("%.1f" % ((Time.now - start) * 1000)) + "ms"
+              timing = "Net: #{net_timing}, Parse: #{parse_timing}"
+              if options[:cached_for]
+                Rails.cache.write([service, args].cache_key, [response, result], :expires_in => options[:cached_for])
               end
-            else
-              http_standard_request_with_timeout(service, args, options) do |response|
-                verify_request_id(response["X-LVS-Request-ID"], options[:request_id])
-                net_timing = ("%.1f" % ((Time.now - start) * 1000)) + "ms"
-                start = Time.now
-                result = JSON.parse(response.body)
-                parse_timing = ("%.1f" % ((Time.now - start) * 1000)) + "ms"
-                timing = "Net: #{net_timing}, Parse: #{parse_timing}"
-                if options[:cached_for]
-                  Rails.cache.write([service, args].cache_key, [response, result], :expires_in => options[:cached_for])
-                end
-                log_response(timing, response.body, options)
-                if result.is_a?(Hash) && result.has_key?("PCode")
-                  raise LVS::JsonService::Error.new(result["message"], result["PCode"], service, args, result)
-                end
-                yield(result) if block_given?
+              log_response(timing, response.body, options)
+              if result.is_a?(Hash) && result.has_key?("PCode")
+                raise LVS::JsonService::Error.new(result["message"], result["PCode"], service, args, result)
               end
+              yield(result) if block_given?
             end
           else
             log_response(timing, response.body, options)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - LVS
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 +00:00
+date: 2010-12-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,40 +29,10 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 1
-        version: 3.0.1
+        - 3
+        version: 3.0.3
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
-        version: 0.12.10
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 6
-        version: 0.2.6
-  type: :runtime
-  version_requirements: *id003
 description: 
 email: info@lvs.co.uk
 executables: []