LVS-JSONService 0.5.3 → 0.5.4

data/LVS-JSONService.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{LVS-JSONService}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["LVS", "andyjeffries", "mooktakim"]

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/lvs/json_service/base.rb

@@ -114,17 +114,23 @@ module LVS
             options[:required].each do |key|
               raise LVS::JsonService::Error.new("Required field #{key} wasn't supplied", internal_service, '0', method_params) if method_params[key].blank?
             end
+            url = @site + prefix + internal_service
+            if options[:interpolate_url]
+              method_params.each do |key, value|
+                url.gsub!(":#{key.to_s}", value.to_s)
+              end
+            end
             if block
-              self.run_remote_request(@site + prefix + internal_service, method_params, options) do |result|
-                if flags && flags[:raw]
+              self.run_remote_request(url, method_params, options) do |result|
+                if (flags && flags[:raw]) || options[:raw]
                   yield(result)
                 else
                   block.call(self.parse_result(result))
                 end
               end
             else
-              result = self.run_remote_request(@site + prefix + internal_service, method_params, options)
-              if flags && flags[:raw]
+              result = self.run_remote_request(url, method_params, options)
+              if (flags && flags[:raw]) || options[:raw]
                 result
               else
                 self.parse_result(result)

data/lib/lvs/json_service/request.rb

@@ -19,12 +19,20 @@ module LVS
         def http_standard_request_with_timeout(service, args, options)
           uri = URI.parse(service)
 
-          req = Net::HTTP::Post.new(uri.path)
+          Rails.logger.debug("Options are #{options.inspect}")
+          if options[:http_method] == :get
+            path = uri.path
+            path += "?#{uri.query}" unless uri.query.blank?
+            req = Net::HTTP::Get.new(path)
+            Rails.logger.debug("Getting '#{path}'")
+          else
+            req = Net::HTTP::Post.new(uri.path)
+            req.form_data = { "object_request" => args.to_json }
+            Rails.logger.debug("Posting to #{uri.path}")
+          end
           req.basic_auth(uri.user, uri.password) unless uri.user.to_s == ""
           req.add_field("X-LVS-Request-ID", options[:request_id])
           
-          req.form_data = { "object_request" => args.to_json }
-
           options[:encrypted] ||= require_ssl?
           retries = options[:retries] || 0
           hard_retries = 1 # For persistent connection failures
@@ -36,6 +44,8 @@ module LVS
             http.open_timeout = options[:timeout] || 1
             http.read_timeout = options[:timeout] || 1
             response = http.request(req)
+            Rails.logger.debug("Request is #{req.inspect}")
+            Rails.logger.debug("Response is #{response.body.inspect}")
           
           rescue Errno::EPIPE, EOFError, Errno::ECONNRESET, Errno::ECONNABORTED
             hard_retries -= 1
@@ -97,7 +107,11 @@ module LVS
               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)
+              if options[:raw]
+                result = response.body.force_encoding("UTF-8")
+              else
+                result = JSON.parse(response.body.force_encoding("UTF-8"))
+              end
               parse_timing = ("%.1f" % ((Time.now - start) * 1000)) + "ms"
               timing = "Net: #{net_timing}, Parse: #{parse_timing}"
               if options[:cached_for]

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: LVS-JSONService
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
+  prerelease: 
+  version: 0.5.4
 platform: ruby
 authors: 
 - LVS
@@ -27,10 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
   type: :runtime
   version_requirements: *id001
@@ -82,21 +74,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A Ruby library for interacting with external JSON services