logical_model 0.6.2 → 0.6.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjA1ZjcxZGY0MmRhYzYyOTMyOTFjMzk3MzkwNjA0YzUyZDAzMjIzYg==
-  data.tar.gz: !binary |-
-    ZmYwMTE4NWE0ODA1MGEyZGY0NWIyZjY1NjQ4OTQ2MTNhNWFmNGVhMw==
+SHA1:
+  metadata.gz: 1a55e6cf668634d84d93d2a35ca533cafcff6928
+  data.tar.gz: 5fe412688d5d6e8b975ed5fcc550fea858bdbcb4
 SHA512:
-  metadata.gz: !binary |-
-    ZTI3MWU0YTc0M2FjYWM1ZTk5ZWVmN2U3YmRkNTM3N2NhM2JlYTExOTBmYTE5
-    ZTkzM2E4MThhOWVhNDJkZjU2MTA4MzIwNDgyYmMzODhlZjQwOGYzNDJiOWFh
-    ZDk3NWY2YjY5ZjU1ZmE4MzI5NzkxNTc5YmYzYzE4ZWU2MDJhYzQ=
-  data.tar.gz: !binary |-
-    ZTI4NDZhODVlNDIyMTdmMGQ0ODIwOTEwMmM3YjY0MTcwNTczNDQxZTZmM2Rj
-    N2I4Zjk2NTJlOGFlZGM3YmJkODk3MmRkZTc1MzNmNWEyN2M5MWE4MzU2NDcw
-    ZGYzYjZjNzM1M2VkOTRiMWVmZTI5Y2MwNWI4YjU1ZDEzNTE1YjQ=
+  metadata.gz: d33cfee597475576d902975556036c759ee06fa7134353c48094e4e0944c19282cbfc70dd580699a099958041272625b8c740449a4e169aff076b44ac8ab4fbd
+  data.tar.gz: 6ebe4b1da56e042db51c2347845af92da15bb459dc97aab8725942d2f612d209765e61ffb0de39c5d58b6b297fb9ea9a53ac84ea40cc443094596360e73c86d1

data/lib/logical_model.rb

@@ -1,4 +1,3 @@
-require 'timeout'
 require 'active_model'
 require 'typhoeus'
 require 'active_support/all' # todo migrate to yajl

data/lib/logical_model/rest_actions.rb

@@ -57,10 +57,7 @@ class LogicalModel
         params = { self.json_root => self.attributes }.merge(params)
         params = self.class.merge_key(params)
 
-        response = nil
-        Timeout::timeout(self.class.timeout/1000) do
-          response = Typhoeus::Request.post( self.class.resource_uri, :body => params, :timeout => self.class.timeout )
-        end
+        response = Typhoeus::Request.post( self.class.resource_uri, body: params, timeout: self.class.timeout )
         self.last_response_code = response.code
         if response.code == 201 || response.code == 202
           log_ok(response)
@@ -80,9 +77,6 @@ class LogicalModel
           log_failed(response)
           return nil
         end
-      rescue Timeout::Error
-        self.class.logger.warn "timeout"
-        return nil
       end
 
       # Updates Objects attributes, this will only send attributes passed as arguments
@@ -102,12 +96,9 @@ class LogicalModel
 
         params = self.class.merge_key(params)
 
-        response = nil
-        Timeout::timeout(self.class.timeout/1000) do
-          response = Typhoeus::Request.put( self.class.resource_uri(id),
-                                            :params => params,
-                                            :timeout => self.class.timeout )
-        end
+        response = Typhoeus::Request.put( self.class.resource_uri(id),
+                                          params: params,
+                                          timeout: self.class.timeout )
 
         if response.code == 200
           log_ok(response)
@@ -116,10 +107,6 @@ class LogicalModel
           log_failed(response)
           return nil
         end
-
-      rescue Timeout::Error
-        self.class.logger.warn("request timed out")
-        return nil
       end
 
       # Saves Objects attributes
@@ -141,10 +128,7 @@ class LogicalModel
 
         params = { self.json_root => sending_params }
         params = self.class.merge_key(params)
-        response = nil
-        Timeout::timeout(self.class.timeout/1000) do
-          response = Typhoeus::Request.put( self.class.resource_uri(id), :params => params, :timeout => self.class.timeout )
-        end
+        response = Typhoeus::Request.put( self.class.resource_uri(id), params: params, timeout: self.class.timeout )
         if response.code == 200
           log_ok(response)
           return self
@@ -152,9 +136,6 @@ class LogicalModel
           log_failed(response)
           return nil
         end
-      rescue Timeout::Error
-        self.class.logger.warn "timeout"
-        return nil
       end
 
       # Destroy object
@@ -216,13 +197,8 @@ class LogicalModel
         self.retries.times do
           begin
             async_all(options){|i| result = i}
-            Timeout::timeout(self.timeout/1000) do
-              self.hydra.run
-            end
+            self.hydra.run
             break unless result.nil?
-          rescue Timeout::Error
-            self.logger.warn("timeout")
-            result = nil
           end
         end
         result
@@ -277,13 +253,8 @@ class LogicalModel
         self.retries.times do
           begin
             async_paginate(options){|i| result = i}
-            Timeout::timeout(self.timeout/1000) do
-              self.hydra.run
-            end
+            self.hydra.run
             break unless result.nil?
-          rescue Timeout::Error
-            self.logger.warn("timeout")
-            result = nil
           end
         end
         result
@@ -326,13 +297,8 @@ class LogicalModel
       def count(options={})
         result = nil
         async_count(options){|i| result = i}
-        Timeout::timeout(self.timeout/1000) do
-          self.hydra.run
-        end
+        self.hydra.run
         result
-      rescue Timeout::Error
-        self.logger.warn("timeout")
-        return nil
       end
 
       # Asynchronic Find
@@ -352,9 +318,10 @@ class LogicalModel
         request.on_complete do |response|
           if response.code >= 200 && response.code < 400
             log_ok(response)
-            yield async_find_response(id, params, response.body)
+            yield async_find_response(id, params, response.body), response.code
           else
             log_failed(response)
+            yield nil, response.code
           end
         end
 
@@ -362,20 +329,30 @@ class LogicalModel
       end
 
       def async_find_response(id, params, body)
-        self.new.from_json(body) # this from_json is defined in ActiveModel::Serializers::JSON
+        if body.blank?
+          # if request failed failed unexpectedly we may get code 200 but empty body
+          self.logger.warn("got response code 200 but empty body")
+          return nil
+        end
+
+        self.new.from_json(body)
       end
 
       # synchronic find
       def find(id, params = {})
         result = nil
-        async_find(id, params){|i| result = i}
-        Timeout::timeout(self.timeout/1000) do
-          self.hydra.run
+        self.retries.times do
+          begin
+            response_code = nil
+            async_find(id, params) do |res,code|
+              result = res
+              response_code = code
+            end
+            self.hydra.run
+            break unless result.nil? && (response_code != 404) # don't retry if response was 404
+          end
         end
         result
-      rescue Timeout::Error
-        self.logger.warn("timeout")
-        return nil
       end
 
       # Deletes Object#id
@@ -391,13 +368,10 @@ class LogicalModel
 
         params = self.merge_key(params)
 
-        response = nil
-        Timeout::timeout(self.timeout/1000) do
-          response = Typhoeus::Request.delete( self.resource_uri(id),
-                                               :params => params,
-                                               :timeout => self.timeout
-          )
-        end
+        response = Typhoeus::Request.delete( self.resource_uri(id),
+                                             params: params,
+                                             timeout: self.timeout
+        )
         if response.code == 200
           log_ok(response)
           return self
@@ -405,9 +379,6 @@ class LogicalModel
           log_failed(response)
           return nil
         end
-      rescue Timeout::Error
-        self.logger.warn "timeout"
-        return nil
       end
 
       # Deletes all Objects matching given ids
@@ -427,13 +398,10 @@ class LogicalModel
         params = self.merge_key(params)
         params = params.merge({:ids => ids})
 
-        response = nil
-        Timeout::timeout(self.timeout/1000) do
-          response = Typhoeus::Request.delete( self.resource_uri+"/destroy_multiple",
-                                               :params => params,
-                                               :timeout => self.timeout
-          )
-        end
+        response = Typhoeus::Request.delete( self.resource_uri+"/destroy_multiple",
+                                             params: params,
+                                             timeout: self.timeout
+        )
         if response.code == 200
           log_ok(response)
           return self
@@ -441,9 +409,6 @@ class LogicalModel
           log_failed(response)
           return nil
         end
-      rescue Timeout::Error
-        self.logger.warn "timeout"
-        return nil
       end
     end
   end
@@ -465,4 +430,4 @@ class LogicalModel
     end
   end
 
-end
+end

data/logical_model.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Dwayne Macgowan
@@ -14,28 +14,28 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,224 +70,224 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: libnotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: LogicalModel allows to use a resource as a model. It is based on web
@@ -299,8 +299,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .travis.yml
+- ".document"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -347,12 +347,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -362,4 +362,3 @@ signing_key:
 specification_version: 3
 summary: LogicalModel allows to use a resource as a model.
 test_files: []
-has_rdoc: