napa 0.1.11 → 0.1.12

data/bin/napa

@@ -1,17 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'napa'
+require 'napa/cli'
 
-actions = ['new']
-
-if actions.include?(ARGV[0])
-  if ARGV[0] == 'new'
-    if ARGV[1].nil?
-      STDOUT.write "Missing App Name, Exiting\n"
-    else
-      Napa::Generators::Scaffold.new(ARGV[1], ARGV[2])
-    end
-  end
-else
-  STDOUT.write "Unknown Action, Exiting.\n"
-end
+Napa::CLI.start(ARGV)

data/lib/napa/cli.rb

@@ -0,0 +1,9 @@
+require 'thor'
+require 'napa/generators'
+
+module Napa
+  class CLI < Thor
+    register(Generators::ScaffoldGenerator, 'new', 'new <app_name> [app_path]',
+             'Create a new Napa scaffold')
+  end
+end

data/lib/napa/generators/scaffold_generator.rb

@@ -0,0 +1,23 @@
+require 'thor'
+require 'active_support/core_ext/string'
+
+module Napa
+  module Generators
+    class ScaffoldGenerator < Thor::Group
+      include Thor::Actions
+
+      source_root "#{File.dirname(__FILE__)}/templates/scaffold"
+
+      argument :app_name
+      argument :app_path, optional: true
+
+      def generate
+        say 'Generating scaffold...'
+
+        directory ".", (app_path || app_name)
+
+        say 'Done!', :green
+      end
+    end
+  end
+end

data/lib/{generators/templates/scaffold/.gitignore.tpl → napa/generators/templates/scaffold/.gitignore.tt}

@@ -8,4 +8,4 @@
 log/*
 tmp/*
 coverage
-!.keep
+!.keep

data/lib/{generators/templates/scaffold/app/apis/hello_api.rb → napa/generators/templates/scaffold/app/apis/hello_api.rb.tt}

@@ -1,11 +1,11 @@
-module HelloService
+module <%= app_name.classify %>
   class API < Grape::API
     format :json
 
     resource :hello do
       desc 'Return a Hello World message'
       get do
-        { message: 'Hello Wonderful World!' }
+        { message: 'Hello Wonderful World, from <%= app_name.classify %>!' }
       end
     end
 

data/lib/{generators/templates/scaffold/config.ru → napa/generators/templates/scaffold/config.ru.tt}

@@ -14,5 +14,5 @@ use Napa::Middleware::AppMonitor
 use Napa::Middleware::Authentication
 use ActiveRecord::ConnectionAdapters::ConnectionManagement
 
-run HelloService::API # <-- boot your service here --
+run <%= app_name.classify %>::API # <-- boot your service here --
 

data/lib/napa/generators.rb

@@ -0,0 +1 @@
+require 'napa/generators/scaffold_generator'

data/lib/napa/middleware/request_stats.rb

@@ -0,0 +1,30 @@
+module Napa
+  class Middleware
+    class RequestStats
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        # Mark the request time
+        start = Time.now
+
+        # Process the request
+        status, headers, body = @app.call(env)
+
+        # Mark the response time
+        stop = Time.now
+
+        # Calculate total response time
+        response_time = stop - start
+
+        # Emit stats to StatsD
+        Napa::Stats.emitter.increment('api_requests')
+        Napa::Stats.emitter.timing('api_response_time', response_time)
+
+        # Return the results
+        [status, headers, body]
+      end
+    end
+  end
+end

data/lib/napa/stats.rb

@@ -0,0 +1,23 @@
+require 'statsd'
+module Napa
+  class Stats
+    class << self
+      def emitter=(emitter)
+        @emitter = emitter
+      end
+
+      def emitter
+        unless @emitter
+          # Log an error if StatsD settings are not configured
+          message = 'StatsD host and port not configured in environment variables, using default settings'
+          Napa::Logger.logger.warn message unless ENV['STATSD_HOST'] && ENV['STATSD_PORT']
+
+          # Create a new StatsD emitter with the service name as the namespace
+          # Defaults to localhost port 8125 if env vars are nil
+          @emitter = Statsd.new(ENV['STATSD_HOST'], ENV['STATSD_PORT']).tap { |sd| sd.namespace = Napa::Identity.name }
+        end
+        @emitter
+      end
+    end
+  end
+end

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 
   class Version
     class << self

data/lib/napa.rb

@@ -20,7 +20,6 @@ require 'napa/middleware/authentication'
 require 'napa/activerecord'
 require 'napa/authentication'
 require 'napa/grape_api'
-require 'generators/scaffold'
 
 # load rake tasks if Rake installed
 if defined?(Rake)

data/napa.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'logging'
   gem.add_dependency 'dotenv'
   gem.add_dependency 'octokit', '~> 1.25'
+  gem.add_dependency 'thor'
   gem.add_dependency 'virtus'
   gem.add_dependency 'grape'
   gem.add_dependency 'grape-swagger'
   gem.add_dependency 'unicorn'
+  gem.add_dependency 'statsd-ruby'
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"

data/spec/middleware/request_stats_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'napa/middleware/request_stats'
+
+describe Napa::Middleware::RequestStats do
+  before do
+    # Delete any prevous instantiations of the emitter and set valid statsd env vars
+    Napa::Stats.emitter = nil
+    ENV['STATSD_HOST'] = 'localhost'
+    ENV['STATSD_PORT'] = '8125'
+  end
+
+  it 'should increment api_requests counter' do
+    Napa::Stats.emitter.should_receive(:increment).with('api_requests')
+    app = lambda { |env| [200, { 'Content-Type' => 'application/json' }, Array.new] }
+    middleware = Napa::Middleware::RequestStats.new(app)
+    env = Rack::MockRequest.env_for('/test')
+    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))
+    app = lambda { |env| [200, { 'Content-Type' => 'application/json'}, Array.new] }
+    middleware = Napa::Middleware::RequestStats.new(app)
+    env = Rack::MockRequest.env_for('/test')
+    middleware.call(env)
+  end
+
+end

data/spec/stats_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'napa/stats'
+
+describe Napa::Stats do
+  before do
+    # Delete any prevous instantiations of the emitter
+    Napa::Stats.emitter = nil
+    # Stub out logging since there is no log to output to
+    Napa::Logger.stub_chain(:logger, :warn)
+  end
+
+  it 'should log an error if StatsD env variables are not configured' do
+    ENV['STATSD_HOST'] = nil
+    ENV['STATSD_PORT'] = nil
+    message = 'StatsD host and port not configured in environment variables, using default settings'
+    Napa::Logger.logger.should_receive(:warn).with(message)
+    Napa::Stats.emitter
+  end
+
+  it 'should default statsd to localhost port 8125 if env vars are not specified' do
+    ENV['STATSD_HOST'] = nil
+    ENV['STATSD_PORT'] = nil
+    expect(Napa::Stats.emitter.host).to eq('127.0.0.1')
+    expect(Napa::Stats.emitter.port).to eq(8125)
+  end
+
+  it 'should return a StatsD client object' do
+    expect(Napa::Stats.emitter.class.name).to eq('Statsd')
+  end
+
+  it 'the namespace of the StatsD client object should equal the service name' do
+    ENV['SERVICE_NAME'] = 'my-service'
+    expect(Napa::Stats.emitter.namespace).to eq('my-service')
+  end
+
+  it 'should use env variables to set statsd host and port' do
+    ENV['STATSD_HOST']  = 'localhost'
+    ENV['STATSD_PORT']  = '9000'
+    expect(Napa::Stats.emitter.host).to eq('localhost')
+    expect(Napa::Stats.emitter.port).to eq('9000')
+  end
+end

metadata

@@ -1,60 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: napa
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
+  prerelease: 
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,120 +70,169 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-swagger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: statsd-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple framework for building APIs with Grape
@@ -193,27 +250,29 @@ files:
 - README.md
 - Rakefile
 - bin/napa
-- lib/generators/scaffold.rb
-- lib/generators/templates/scaffold/.env
-- lib/generators/templates/scaffold/.env.test
-- lib/generators/templates/scaffold/.gitignore.tpl
-- lib/generators/templates/scaffold/.rubocop.yml
-- lib/generators/templates/scaffold/Gemfile
-- lib/generators/templates/scaffold/README.md
-- lib/generators/templates/scaffold/Rakefile
-- lib/generators/templates/scaffold/app.rb
-- lib/generators/templates/scaffold/app/apis/hello_api.rb
-- lib/generators/templates/scaffold/config.ru
-- lib/generators/templates/scaffold/config/database.yml
-- lib/generators/templates/scaffold/config/initializers/active_record.rb
-- lib/generators/templates/scaffold/config/middleware/honeybadger.rb
-- lib/generators/templates/scaffold/console
-- lib/generators/templates/scaffold/spec/apis/hello_api_spec.rb
-- lib/generators/templates/scaffold/spec/factories/.gitkeep
-- lib/generators/templates/scaffold/spec/spec_helper.rb
 - lib/napa.rb
 - lib/napa/activerecord.rb
 - lib/napa/authentication.rb
+- lib/napa/cli.rb
+- lib/napa/generators.rb
+- lib/napa/generators/scaffold_generator.rb
+- lib/napa/generators/templates/scaffold/.env
+- lib/napa/generators/templates/scaffold/.env.test
+- lib/napa/generators/templates/scaffold/.gitignore.tt
+- lib/napa/generators/templates/scaffold/.rubocop.yml
+- lib/napa/generators/templates/scaffold/Gemfile
+- lib/napa/generators/templates/scaffold/README.md
+- lib/napa/generators/templates/scaffold/Rakefile
+- lib/napa/generators/templates/scaffold/app.rb
+- lib/napa/generators/templates/scaffold/app/apis/hello_api.rb.tt
+- lib/napa/generators/templates/scaffold/config.ru.tt
+- lib/napa/generators/templates/scaffold/config/database.yml
+- lib/napa/generators/templates/scaffold/config/initializers/active_record.rb
+- lib/napa/generators/templates/scaffold/config/middleware/honeybadger.rb
+- lib/napa/generators/templates/scaffold/console
+- lib/napa/generators/templates/scaffold/spec/apis/hello_api_spec.rb
+- lib/napa/generators/templates/scaffold/spec/factories/.gitkeep
+- lib/napa/generators/templates/scaffold/spec/spec_helper.rb
 - lib/napa/grape_api.rb
 - lib/napa/grape_extensions/error_formatter.rb
 - lib/napa/grape_extensions/error_presenter.rb
@@ -224,6 +283,8 @@ files:
 - lib/napa/middleware/app_monitor.rb
 - lib/napa/middleware/authentication.rb
 - lib/napa/middleware/logger.rb
+- lib/napa/middleware/request_stats.rb
+- lib/napa/stats.rb
 - lib/napa/version.rb
 - lib/tasks/db.rake
 - lib/tasks/deploy.rake
@@ -236,31 +297,34 @@ files:
 - spec/json_error_spec.rb
 - spec/logger/log_transaction_spec.rb
 - spec/middleware/authentication_spec.rb
+- spec/middleware/request_stats_spec.rb
 - spec/spec_helper.rb
+- spec/stats_spec.rb
 - spec/version_spec.rb
 - tasks/version.rake
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple framework for building APIs with Grape
 test_files:
 - spec/authentication_spec.rb
@@ -269,5 +333,8 @@ test_files:
 - spec/json_error_spec.rb
 - spec/logger/log_transaction_spec.rb
 - spec/middleware/authentication_spec.rb
+- spec/middleware/request_stats_spec.rb
 - spec/spec_helper.rb
+- spec/stats_spec.rb
 - spec/version_spec.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: fd6b925472644eaf0393cce14068d151df8ae98c
-  data.tar.gz: 6cd4fa2e481c78ffe9a11bca8784ef67c24b0fe0
-SHA512:
-  metadata.gz: 4f950b660d847ea59bc2313c767ea55b3b49bad90f39839a9219f62ce3a8c66264930d3e8b7e8ce19af6b6c5680f4bbd19e6e038f07a26993fc837f62665e085
-  data.tar.gz: c076d3ca205321e6ba86db23bdf944d873ba069ad3507ce636db6c60e278a536349f648be2783c6fa7a3f92ea476fecb8a1aad6e5f7e0661e63a5ef25430fffc

data/lib/generators/scaffold.rb

@@ -1,68 +0,0 @@
-module Napa
-  module Generators
-    class Scaffold
-      def initialize(app_name, app_path = nil)
-        @app_name = app_name
-        @app_path = app_path.nil? ? app_name : app_path
-        @template_path = File.expand_path(File.join(File.dirname(__FILE__), 'templates/scaffold'))
-        @files = file_list
-
-        create_files!
-
-        STDOUT.write "Generator Finished!\n"
-      end
-
-      def file_list
-        [
-          'app/apis/hello_api.rb',
-          'app/models/.keep',
-          'config/database.yml',
-          'config/initializers/active_record.rb',
-          'config/middleware/honeybadger.rb',
-          'db/migrate/.keep',
-          'lib/tasks/.keep',
-          'log/.keep',
-          'public/.keep',
-          'spec/spec_helper.rb',
-          'spec/apis/hello_api_spec.rb',
-          'tmp/.keep',
-          '.env',
-          '.env.test',
-          '.rubocop.yml',
-          '.gitignore.tpl',
-          'app.rb',
-          'config.ru',
-          'console',
-          'Gemfile',
-          'Rakefile',
-          'README.md'
-        ]
-      end
-
-      def create_files!
-        @files.each do |file|
-          create_file_with_template(file)
-        end
-      end
-
-      def create_file_with_template(file)
-        template_file = [@template_path, file].join('/')
-        new_file      = [@app_name, file.gsub(/.tpl$/, '')].join('/')
-
-        FileUtils.mkdir_p(File.dirname(new_file))
-
-        if File.exists?(template_file)
-          file_content = File.read(template_file)
-
-          # replace template variables
-          file_content.gsub!(/{{app_name}}/, @app_name)
-          File.open(new_file, 'w') { |f| f.write(file_content) }
-        else
-          FileUtils.touch(new_file)
-        end
-
-        STDOUT.write "Creating File: #{new_file}\n"
-      end
-    end
-  end
-end