napa 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921842df68ddfd43053accc0281962d797225ced
-  data.tar.gz: 892d34f1952b7e73dba7dff8f485d2930d6b39ed
+  metadata.gz: 6b908b554665776da48de53dd708fa5aab073f75
+  data.tar.gz: 22d74ccfd70d4864121f527266e7de4b062a7068
 SHA512:
-  metadata.gz: 3b9c94ad04f33374ffc54ec532ef07de33e915f03c5353e50d0ad43e823ff22d0dd731c2b8fd1917faf747945e68a43cc4f73fb6b401b75d37de3ea89bae4c46
-  data.tar.gz: 651d69ad11fa10824d704f0c87b268f9e4a5c997b7408f483e04472f8c54d0a8844d9789d9b6a27317d5a1a191559ae721ae8f1cfcc4e0786024253acbde1c02
+  metadata.gz: 09c3b747af4ec25f35adbc5f65296139d365907901276c0dfcde2f9ebd8f86243ab55edad8ce83849869dde2f20d3487394ea745a222a79340b698ffc6ba4e4c
+  data.tar.gz: 4634f451434e794ad7ec3aa3767272e803348e799de9a8412e7cec54320069074ad95c0b03885022e7d36475491228b79fd8e196491458b66bc31b66aeda9e56

data/lib/napa/generators/migration_generator.rb

@@ -12,7 +12,7 @@ module Napa
       end
 
       def migration_filename
-        "#{version}_#{migration_name}"
+        "#{version}_#{migration_name.underscore}"
       end
 
       def migration

data/lib/napa/generators/templates/migration/%migration_filename%.rb.tt

@@ -1,7 +1,4 @@
 class <%= migration_name.classify %> < ActiveRecord::Migration
   def change
-    # create_table :foo do |t|
-    #   t.string :name, :null => false
-    # end
   end
 end

data/lib/napa/grape_extenders.rb

@@ -9,7 +9,7 @@ module Napa
           rack_response(Napa::JsonError.new(:record_not_found, 'record not found').to_json, 404)
         end
         modified_class.rescue_from ::ActiveRecord::RecordInvalid do |e|
-          rack_response(Napa::JsonError.new(:record_invalid, 'record not found').to_json, 400)
+          rack_response(Napa::JsonError.new(:unprocessable_entity, e.message).to_json, 422)
         end
       end
     end

data/lib/napa/middleware/request_stats.rb

@@ -5,6 +5,15 @@ module Napa
         @app = app
       end
 
+      def normalize_path(path)
+        case 
+          when path == '/'
+            'root'
+          else
+            path.start_with?('/') ? path[1..-1] : path
+        end
+      end
+
       def call(env)
         # Mark the request time
         start = Time.now
@@ -16,12 +25,15 @@ module Napa
         stop = Time.now
 
         # Calculate total response time
-        response_time = stop - start
+        response_time = (stop - start) * 1000
+        
+        request = Rack::Request.new(env)
+        path = normalize_path(request.path_info)
+        stat = "#{Napa::Identity.name}.http.#{request.request_method.downcase}.#{path}".gsub('/', '.')
 
         # Emit stats to StatsD
-        Napa::Stats.emitter.increment('api_requests')
-        Napa::Stats.emitter.timing('api_response_time', response_time)
-
+        Napa::Stats.emitter.increment(stat + '.requests')
+        Napa::Stats.emitter.timing(stat + '.response_time', response_time)
         # Return the results
         [status, headers, body]
       end

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.1.28'
+  VERSION = '0.1.29'
 
   class Version
     class << self

data/spec/middleware/request_stats_spec.rb

@@ -10,18 +10,21 @@ describe Napa::Middleware::RequestStats do
   end
 
   it 'should increment api_requests counter' do
-    Napa::Stats.emitter.should_receive(:increment).with('api_requests')
+    Napa::Stats.emitter.should_receive(:increment).with(Napa::Identity.name + ".http.get." + "test.path.requests")
     app = lambda { |env| [200, { 'Content-Type' => 'application/json' }, Array.new] }
     middleware = Napa::Middleware::RequestStats.new(app)
-    env = Rack::MockRequest.env_for('/test')
+    env = Rack::MockRequest.env_for('/test/path')
     middleware.call(env)
   end
 
   it 'should send the api_response_time' do
-    Napa::Stats.emitter.should_receive(:timing).with('api_response_time', an_instance_of(Float))
+    Napa::Stats.emitter.should_receive(:timing).with(
+                                                     Napa::Identity.name + ".http.get." + "test.path.response_time", 
+                                                     an_instance_of(Float)
+                                                    )
     app = lambda { |env| [200, { 'Content-Type' => 'application/json'}, Array.new] }
     middleware = Napa::Middleware::RequestStats.new(app)
-    env = Rack::MockRequest.env_for('/test')
+    env = Rack::MockRequest.env_for('/test/path')
     middleware.call(env)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: napa
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake