toolhound-ruby 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d805f7cd2610f4eb8ebfbe333ee7a1c2f1bbb7c
-  data.tar.gz: 41e60e242c01ba995bef8ad7a807fadc33942070
+  metadata.gz: d565b36e473e2a0408b05d69a052857da5e905c0
+  data.tar.gz: 217bd08339369598c7a2a7b654e77fbfedd45630
 SHA512:
-  metadata.gz: 6766bab4a1f3640263fd06224dec835c83cd1bcc4f6921af22d11f35e03548d306087e94031fad46d5f8fcb144cbb68fd8838768e2a19bb502bd2c2505f7847b
-  data.tar.gz: 114688fb921a19ff062e15f4d0a3db0a0f762cd66ada32df401919d3202ec76f4810bf2b5e01f3476f84bf6d023bd1be9e45fa4f9632c33c6ab0ea42def391b7
+  metadata.gz: ce7dbd7737c28fae30bed18cf0f5679fc253f480ab642891fbbcbe37ff63786f3682815b83abb1c8de3ef6a3e67505dded58527c4116746f0901f2e020dc4e98
+  data.tar.gz: 14094a0c2cc9e0fcae54378f1396a9cd8ac912692e542cde56c5c271324cddbf4e673434a5118b41a45fd54601994e8863c76001cc95ca3070984678fd886068

data/lib/toolhound-ruby/authentication.rb

@@ -19,7 +19,8 @@ module Toolhound
           dataserver: @dataserver,
           port:       @port,
           username:   @username,
-          password:   @password
+          password:   @password,
+          timeout:    10
         )
       end
 

data/lib/toolhound-ruby/base.rb

@@ -298,6 +298,8 @@ module Toolhound
         data << transform_attributes(row)
       end
       data
+    ensure
+      finish_statement_handle(results)
     end
 
     def build_and_query(options, query_options = {})
@@ -385,6 +387,13 @@ module Toolhound
 
     end
 
-  end
+  protected
+    def finish_statement_handle(handle)
+      handle.cancel if handle
+
+      handle
+    end
+
+  end # Base
 
 end

data/lib/toolhound-ruby/client.rb

@@ -75,6 +75,7 @@ module Toolhound
 
     def connection
       if @connection && @connection.dead?
+        @connection.cancel
         sign_in
       end
       @connection
@@ -108,7 +109,7 @@ module Toolhound
     def transaction
       @transaction ||= Toolhound::Transaction.new(self)
     end
-    
+
     def inventory
       @inventory ||= Toolhound::Inventory.new(self)
     end

data/lib/toolhound-ruby/transaction.rb

@@ -53,7 +53,14 @@ module Toolhound
     end
 
 
-    def return_periods_for_entity(entity_id)
+    def return_periods(options = {})
+      entity_id     = options.delete :entity_id
+      damaged_only  = options.delete :damaged_only
+
+      wheres = []
+
+      wheres << {'transaction.int_entity_id' => entity_id} if entity_id
+
       selects = {
         transaction: [
           {dte_transaction_date: {as: :min_date, agg: :min} },
@@ -66,9 +73,12 @@ module Toolhound
       	         tblTransactionType.intTransactionTypeID = tblTransactionDetail.intTransactionTypeID
       	        AND tblTransactionType.bolReturn = 'true'
                "
+      if damaged_only
+        joins << "INNER JOIN tblReturnStatus ON tblReturnStatus.intReturnStatusID = tblTransactionDetail.intReturnStatusID"
+        wheres << "(tblReturnStatus.bolCreateWO = 1 OR tblReturnStatus.bolRetire = 1)"
+      end
 
-
-      build_and_query(joins: joins, selects: selects, where: [{'transaction.int_entity_id' => entity_id}], from: 'tblTransactionDetail').first
+      build_and_query(joins: joins, selects: selects, where: wheres, from: 'tblTransactionDetail').first
 
     end
 

data/lib/toolhound-ruby/version.rb

@@ -1,3 +1,3 @@
 module Toolhound
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toolhound-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Markus Klooth