saddle 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDE2NjI0YTFjNzExNzNhNTVjZGIxNDc0MjBmNjQ4ZWUzNzA1ODFkMA==
+    M2YwNjAwMDc5ODM3M2JlMDE0NGU5ZWRiYTlhN2FhZmNkYTNjNWE2Nw==
   data.tar.gz: !binary |-
-    ZDkyZTUxZjgwNjMyNmFjYmEwMDc5ZWNkOTZiYTU3ZjZlYzI2NzVkZA==
+    MDIzODc3NjJmYmFhNTlmYmM3MTE4MjZjYzEzYTgxNmViZmNlNjQ4NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2Y2ZDFiMmNhZjNmNmM5NzYxNzIzZWQ1YThmMGUzMTdkNTM3ZDM5YzJkNWJm
-    Y2Q5MGFkYzM0MGQ1NzdlNGY1ZmExMjFhN2JiZGNlZjRkMTIxZjQ0ZTUxMzNk
-    YWIxNWMxNTQ1YWQ4NjdkM2EzNDVjNTFkYjk3NjRiMmMxYmU5NWU=
+    ZjIyN2IyMzJkZjg0NDcyNTY4YTM0NmRjYWVjNzM5MDc5YTRjNGJhZDM1NzAz
+    ZGM2NmY4NzRlNzZlOWMyODE3YWNjNjVkNTEzNGYwNzVjOGQ2MTcwNGM3ODMy
+    OTNiZTc1N2Q1ZThjZDE3NjYyNTM4NGZkOGJhZGQwNDM2YTcyYjI=
   data.tar.gz: !binary |-
-    Yzc0MzU4M2E5ZmQzYTQ5NTNlNjFlYzdjODJiYzgwZWNkOGRmZjg0OTYzMTU3
-    ZWZkZmUwZjMyMTBhZmI3OWY1YzdiNWQyYWY4NzkwNjk5Nzc3MzQ1ZDI2MTNm
-    NDdhYmRmZWI1YWQ0OTE3OWY5NTk1Yzg5NjRkYWQ2ZGE0MmE2YjU=
+    M2MwYzg4NTBlODA5YjkwMTVjYjI4MmRiOTdhMDM2ZmI0NDJjNjgzZjA1ZmUw
+    YThmMThmOGRmNGUyMTVkNDZkMmU1ODYxYTAyZmE1NzExMzBkYWM0OTkxNjMy
+    N2Y1MzUyZmRjNDY0ZDFhMjczNjhhNWFkNTc0MzczNDliYjYwOGM=

data/lib/saddle/endpoint.rb

@@ -13,7 +13,7 @@ module Saddle
     def initialize(requester, relative_path=nil, parent=nil)
       @requester = requester
       @relative_path = relative_path
-      @parent = parent.is_a?(BaseEndpoint) ? parent : nil
+      @parent = parent
     end
 
 
@@ -40,6 +40,7 @@ module Saddle
     def request(method, action, params={}, options={})
       # Augment in interesting options
       options[:saddle] = {
+        :client_name => self.client_name,
         :call_chain => path_array,
         :action => action,
       }
@@ -62,13 +63,27 @@ module Saddle
     def endpoint_chain
       chain = []
       node = self
-      until node.nil?
+      while node.is_a?(BaseEndpoint)
         chain << node
         node = node.parent
       end
       chain.reverse
     end
 
+    # Traverse back until we find the original client
+    def client
+      node = self
+      while node.is_a?(BaseEndpoint)
+        node = node.parent
+      end
+      node
+    end
+
+    # Underscore name of the client
+    def client_name
+      ActiveSupport::Inflector.underscore(self.client.name.split('::')[-2])
+    end
+
 
     # Create an endpoint instance and foist it upon this node
     def build_and_attach_node(endpoint_class, method_name)
@@ -81,11 +96,7 @@ module Saddle
     # This will create a resource endpoint, based upon the parameters
     # of this current node endpoint
     def create_resource_endpoint(endpoint_class, resource_id)
-      endpoint_class.new(
-        @requester,
-        (path_array + [resource_id]).join('/')
-        # no parent so that it can free up memory
-      )
+      endpoint_class.new(@requester, resource_id, self)
     end
   end
 

data/lib/saddle/method_tree_builder.rb

@@ -36,15 +36,16 @@ module Saddle
         if File.file?(root_endpoint_file)
           # Load it and create our base endpoint
           load(root_endpoint_file)
-          self.implementation_module::RootEndpoint.new(requester)
+          root_node_class = self.implementation_module::RootEndpoint
         else
           # 'root_endpoint.rb' doesn't exist, so create a dummy endpoint
-          Saddle::BaseEndpoint.new(requester)
+          root_node_class = Saddle::BaseEndpoint
         end
       else
         # we don't even have an implementation root, so create a dummy endpoint
-        Saddle::BaseEndpoint.new(requester)
+        root_node_class = Saddle::BaseEndpoint
       end
+      root_node_class.new(requester, nil, self)
     end
 
 

data/lib/saddle/middleware/logging/statsd.rb

@@ -33,8 +33,13 @@ module Saddle
           statsd_path = nil
           if env[:request][:statsd_path]
             statsd_path = env[:request][:statsd_path]
-          elsif env[:request][:saddle] && env[:request][:saddle][:call_chain] && env[:request][:saddle][:action]
-            statsd_path = (['saddle'] + env[:request][:saddle][:call_chain] + [env[:request][:saddle][:action]]).join('.')
+          elsif env[:request][:saddle]
+            statsd_path = (
+              ['saddle'] +
+              env[:request][:saddle][:client_name] +
+              env[:request][:saddle][:call_chain] +
+              [env[:request][:saddle][:action]]
+            ).join('.')
           end
 
           # If we have a path, wrap the ensuing app call in STATSD timing

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Mike Lewis