logical_model 0.2.21 → 0.2.22

data/VERSION

@@ -1 +1 @@
-0.2.21
+0.2.22

data/lib/logical_model.rb

@@ -18,7 +18,7 @@ require 'safe_log'
 #   api_key_name: api key parameter name. eg: app_key
 #   api_key: api_key. eg: "asd32fa4s4pdf35tr"
 #   log_path: Path to log file. Will be ignored if using Rails.
-#   json_root: TODO doc
+#   json_root: Used to build parameters. Default: class name underscored
 #
 # You may use validations such as validates_presence_of, etc.
 #
@@ -204,7 +204,7 @@ class LogicalModel
   end
 
   def self.log_ok(response)
-    self.logger.info("LogicalModel Log: #{response.code} #{mask_api_key(response.request.url)} in #{response.time}s")
+    self.logger.info("LogicalModel Log: #{response.code} #{mask_api_key(response.effective_url)} in #{response.time}s")
     self.logger.debug("LogicalModel Log RESPONSE: #{response.body}")
   end
 
@@ -218,7 +218,7 @@ class LogicalModel
     rescue => e
       error_message = "error"
     end
-    msg = "LogicalModel Log: #{response.code} #{mask_api_key(response.request.url)} in #{response.time}s FAILED: #{error_message}"
+    msg = "LogicalModel Log: #{response.code} #{mask_api_key(response.effective_url)} in #{response.time}s FAILED: #{error_message}"
     self.logger.warn(msg)
     self.logger.debug("LogicalModel Log RESPONSE: #{response.body}")
   end
@@ -445,9 +445,9 @@ class LogicalModel
     params = self.class.merge_key(params)
 
     response = nil
-    #Timeout::timeout(self.class.timeout/1000) do
-      response = Typhoeus::Request.post( self.class.resource_uri, :params => params, :timeout => self.class.timeout )
-    #end
+    Timeout::timeout(self.class.timeout/1000) do
+      response = Typhoeus::Request.post( self.class.resource_uri, :body => params, :timeout => self.class.timeout )
+    end
     if response.code == 201
       log_ok(response)
       self.id = ActiveSupport::JSON.decode(response.body)["id"]
@@ -484,26 +484,18 @@ class LogicalModel
 
     params = self.class.merge_key(attribute_params)
 
-    e = Typhoeus::Easy.new
-
-    e.url = self.class.resource_uri(_id)
-    e.method = :put
-    e.params = params
-
     response = nil
     Timeout::timeout(self.class.timeout/1000) do
-      # using Typhoeus::Easy avoids PUT hang issue: https://github.com/dbalatero/typhoeus/issues/69
-      e.perform
+      response = Typhoeus::Request.put( self.class.resource_uri(id),
+                                        :params => params,
+                                        :timeout => self.class.timeout )
     end
 
-    if e.response_code == 200
-      self.class.logger.info("LogicalModel Log: #{e.response_code} #{e.url} in #{e.total_time_taken}s")
-      self.class.logger.debug("LogicalModel Log RESPONSE: #{e.response_body}")
+    if response.code == 200
+      log_ok(response)
       return self
     else
-      msg = "LogicalModel Log: #{e.response_code} #{e.url} in #{e.total_time_taken}s FAILED"
-      self.class.logger.warn(msg)
-      self.class.logger.debug("LogicalModel Log RESPONSE: #{e.response_body}")
+      log_failed(response)
       return nil
     end
 

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.2.21"
+  s.version = "0.2.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2012-08-19"
+  s.date = "2012-08-21"
   s.description = "LogicalModel allows to use a resource as a model. It is based on web presentation http://www.slideshare.net/ihower/serviceoriented-design-and-implement-with-rails3"
   s.email = "dwaynemac@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -329,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -777852493
+      hash: 415513441
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: