numerousapp 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bdd91b07bfb89bd80ad1a1ab27e1ca922b50e43
-  data.tar.gz: c94f71b9997951d8ad71f906bd1410905ef90f10
+  metadata.gz: e3a77c2d75609a18065360ad1de49b131a8ce75e
+  data.tar.gz: 476884887a6b37b9cf3c4f9bafc37124e62d996a
 SHA512:
-  metadata.gz: 6eef3a14e6f0342a39062943b155e7bca3222747ad4d9f15049f3194ce0c464379da64c81a87b76cdf9196cf77c1282dc337996fa5495e962223bd705503a310
-  data.tar.gz: 3222957cbdcea1304bad84c199cf2aa3767066eb4b52f048494bc65207018c78f98a9b92a914ba12aa26bdeb352a88c29c8b97dd94e15c1ece41d1b97050df00
+  metadata.gz: 83f23c276bbe85ae08b7f39a0b7654c3f3d27b113297e697fc59b0a060b818f1ba5f21f5bd912073bcd78649499db51124bc5944d177657c84b1072e0f34148c
+  data.tar.gz: c7f931711ca03bbc166010e95073b95984c211f5d5e25a3ea511dab521ed03d3641a8eb92a6f0eed394d6b1d356ec52a6ddc108a247cc514ed385477d9a93fb2

data/lib/numerousapp.rb

@@ -174,7 +174,7 @@ class NumerousClientInternals
 
     protected
 
-    VersionString = '20150123-1.0.0'
+    VersionString = '20150125-1.0.1'
 
     MethMap = {
         GET: Net::HTTP::Get,
@@ -239,6 +239,16 @@ class NumerousClientInternals
     end
     private :makeboundary
 
+    # helper function to extract header field integer or return -1
+    def getElseM1(d, k)
+        if d.key? k
+            return d[k].to_i
+        else
+            return -1
+        end
+    end
+    private :getElseM1
+
 
     # ALL api exchanges with the Numerous server go through here except
     # for getRedirect() which is a special case (hack) for photo URLs 
@@ -334,8 +344,9 @@ class NumerousClientInternals
             end
 
             # invoke the rate-limiting policy
-            rateRemain = resp['x-rate-limit-remaining'].to_i
-            rateReset = resp['x-rate-limit-reset'].to_i
+
+            rateRemain = getElseM1(resp, 'x-rate-limit-remaining')
+            rateReset = getElseM1(resp, 'x-rate-limit-reset')
             @statistics[:rateRemaining] = rateRemain
             @statistics[:rateReset] = rateReset
 
@@ -519,12 +530,12 @@ class NumerousClientInternals
     #
     #     td is the data you supplied as "throttleData" to the Numerous() constructor
     #     up is a tuple useful for calling the original system throttle policy:
-    #          up[0] is the function pointer
+    #          up[0] is the Proc
     #          up[1] is the td for *that* function
     #          up[2] is the "up" for calling *that* function
     #       ... so after you do your own thing if you then want to defer to the
     #           built-in throttle policy you can
-    #                     return send(up[0], nr, tparams, up[1], up[2])
+    #                     up[0].call(nr, tparams, up[1], up[2])
     #
     # It's really (really really) important to understand the return value and
     # the fact that we are invoked AFTER each request:
@@ -548,6 +559,7 @@ class NumerousClientInternals
         rateleft = tparams[:rateRemaining]
         attempt = tparams[:attempt]    # note: is zero on very first try
         stats = tparams[:statistics]
+        stats[:throttleDefaultCalls] += 1
 
         if attempt > 0
             stats[:throttleMultipleAttempts] += 1
@@ -832,6 +844,13 @@ class Numerous  < NumerousClientInternals
             raise ArgumentError
         end
 
+        # if you specified STRING and sent a regexp... or vice versa
+        if matchType == 'STRING' and labelspec.instance_of?(Regexp)
+            labelspec = labelspec.source
+        elsif matchType != 'STRING' and not labelspec.instance_of?(Regexp)
+            labelspec = /#{labelspec}/
+        end
+
         self.metrics do |m|
             if matchType == 'STRING'        # exact full match required
                 if m['label'] == labelspec
@@ -1027,16 +1046,9 @@ class NumerousMetric < NumerousClientInternals
         @nr = nr
     end
     attr_reader :id
+    attr_reader :nr
 
 
-    #
-    # Obtain the {Numerous} server object associated with a metric.
-    # @return [Numerous]
-    #
-    def getServer()
-        return @nr
-    end
-
     APIInfo = {                             
       # read/update/delete a metric
       metric: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numerousapp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Neil Webber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies: []
 description: Classes implementing the NumerousApp REST APIs for metrics. Requires
   Ruby 2.x