napa 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3d14f08974a25ee574b448040d62e949e13c6f9
-  data.tar.gz: 8c33fbaf760e8cd7531d56364214deec18aef603
+  metadata.gz: a86977739a2b0f1f4cf4aaa6e09e4e46cb418bb1
+  data.tar.gz: 17e5f2adcfac479a0dffaa387426cb4bc62f332d
 SHA512:
-  metadata.gz: e799425227024c8a459633c1a1e89720538f7ac729993f21deb360c195ec758d90aeafe4bf1fd4f5a2946e5c744b6e29ce6d28734d5d6f2c20ed6f1949d5c243
-  data.tar.gz: 809afa7e7c68385567b7864af4d92125a864e88c457eb0a6377dff29d3183537496fb0446b709a14f5fd9b224398ad3386e9b55f767edcd28adab2caee241e34
+  metadata.gz: c773958e1082a196633c1b3fcc0e98fd3d71749508067f962e8e5b4a372e8bee079c9a74abe0c136bedeb3ec08137a9990fb1cb6b9c132f9134f800056c04098
+  data.tar.gz: 270d6fae56b4ab43ef83ad14f85775e6e9d489985eb7aa2d20505837fdcd6fa4b8abf9a6fafd6dc6db1b1cbab1393aeb814b5d2761f63d94948d6c6c58d5dcbe

data/lib/napa/active_record_extensions/filter_by_hash.rb

@@ -6,7 +6,7 @@ if defined?(ActiveRecord)
           # pass an empty where clause to force results to be a relation that will be lazy evaluated
           results = where({})
           search_hash.each do |k, v|
-            results = results.where(k => v) if v.present?
+            results = results.where(k => v)
           end
           results
         end

data/lib/napa/generators/templates/api/app/apis/%name_tableize%_api.rb.tt

@@ -1,12 +1,11 @@
 class <%= name.classify.pluralize %>Api < Grape::API
-  represent <%= name.classify %>, with: <%= name.classify %>Entity
   desc 'Get a list of <%= name.underscore.tableize %>', entity: <%= name.classify %>Entity
   params do
     optional :ids, type: String, desc: 'comma separated <%= name.underscore %> ids'
   end
   get do
-    <%= name.underscore.tableize %> = <%= name.classify %>.filter(declared(params))
-    present <%= name.underscore.tableize %>
+    <%= name.underscore.tableize %> = <%= name.classify %>.filter(declared(params, include_missing: false))
+    present <%= name.underscore.tableize %>, with: <%= name.classify %>Entity
   end
 
   desc 'Create an <%= name.underscore %>', entity: <%= name.classify %>Entity
@@ -14,13 +13,9 @@ class <%= name.classify.pluralize %>Api < Grape::API
   end
 
   post do
-    begin
-      <%= name.underscore %> = <%= name.classify %>.create(declared(params))
-    rescue NameError
-      error!(present_error(:kind_not_found))
-    end
+    <%= name.underscore %> = <%= name.classify %>.create(declared(params, include_missing: false))
     error!(present_error(:record_invalid, <%= name.underscore %>.errors.full_messages)) unless <%= name.underscore %>.errors.empty?
-    present <%= name.underscore %>
+    present <%= name.underscore %>, with: <%= name.classify %>Entity
   end
 
   params do
@@ -30,7 +25,7 @@ class <%= name.classify.pluralize %>Api < Grape::API
     desc 'Get an <%= name.underscore %>', entity: <%= name.classify %>Entity
     get do
       <%= name.underscore %> = <%= name.classify %>.find(params[:id])
-      present <%= name.underscore %>
+      present <%= name.underscore %>, with: <%= name.classify %>Entity
     end
 
     desc 'Update an <%= name.underscore %>', entity: <%= name.classify %>Entity
@@ -39,8 +34,8 @@ class <%= name.classify.pluralize %>Api < Grape::API
     put do
       # fetch <%= name.underscore %> record and update attributes.  exceptions caught in app.rb
       <%= name.underscore %> = <%= name.classify %>.find(params[:id])
-      <%= name.underscore %>.update_attributes!(declared(params).select { |param, value| value.present? })
-      present <%= name.underscore %>
+      <%= name.underscore %>.update_attributes!(declared(params, include_missing: false).select { |param, value| value.present? })
+      present <%= name.underscore %>, with: <%= name.classify %>Entity
     end
   end
 end

data/lib/napa/generators/templates/scaffold/{.env.test → .env.test.tt}

@@ -1,7 +1,7 @@
-SERVICE_NAME={{app_name}}
+SERVICE_NAME=<%= app_name %>
 RACK_ENV=test
 
 DATABASE_USER=root
 DATABASE_PASSWORD=''
 DATABASE_HOST=localhost
-DATABASE_NAME={{app_name}}_test
+DATABASE_NAME=<%= app_name.underscore %>_test

data/lib/napa/generators/templates/scaffold/.env.tt

@@ -0,0 +1,6 @@
+SERVICE_NAME=<%= app_name %>
+
+DATABASE_USER=root
+DATABASE_PASSWORD=''
+DATABASE_HOST=localhost
+DATABASE_NAME=<%= app_name.underscore %>_development

data/lib/napa/generators/templates/scaffold/.gitignore.tt

@@ -4,7 +4,8 @@
 .env
 .vagrant
 .rspec
-.env.*
+.env
+!.env.test
 log/*
 tmp/*
 coverage

data/lib/napa/generators/templates/scaffold/Gemfile

@@ -2,13 +2,11 @@ source 'https://rubygems.org'
 
 gem 'rack-cors'
 gem 'mysql2'
-gem 'activerecord', '3.2.13', :require => 'active_record'
+gem 'activerecord', :require => 'active_record'
 gem 'honeybadger'
 gem 'json'
 gem 'shotgun'
 gem 'napa'
-gem 'grape-pagination'
-gem 'will_paginate', '~> 3.0'
 
 group :development,:test do
   gem 'pry'

data/lib/napa/generators/templates/scaffold/app/apis/application_api.rb

@@ -0,0 +1,9 @@
+class ApplicationApi
+  format :json
+  extend Napa::ApiExceptionCatchers
+
+  mount HelloApi => '/'
+
+  add_swagger_documentation
+end
+

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

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

data/lib/napa/generators/templates/scaffold/app.rb

@@ -4,8 +4,6 @@ Bundler.setup(:default)
 require 'napa/setup'
 Bundler.require(:default, Napa.env.to_sym)
 require 'napa'
-require 'will_paginate'
-require 'will_paginate/active_record'
 
 # load environment
 Dotenv.load(Napa.env.test? ? '.env.test' : '.env')
@@ -20,4 +18,5 @@ Dir['./config/initializers/**/*.rb'].map { |file| require file }
 Dir['./config/middleware/**/*.rb'].map { |file| require file }
 
 # autoload app
-Dir['./app/**/**/*.rb'].map { |file| require file }
+relative_load_paths = %w[app/apis app/entities app/models app/workers lib]
+ActiveSupport::Dependencies.autoload_paths += relative_load_paths

data/lib/napa/generators/templates/scaffold/config.ru.tt

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

data/lib/napa/grape_extenders.rb

@@ -0,0 +1,17 @@
+module Napa
+  module GrapeExtenders
+    def self.extended(modified_class)
+      # when extended, set the exceptions to handle
+
+      # if AR is being used, rescue from common AR errors
+      if defined?(::ActiveRecord)
+        modified_class.rescue_from ::ActiveRecord::RecordNotFound do |e|
+          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, 500)
+        end
+      end
+    end
+  end
+end

data/lib/napa/grape_extensions/error_presenter.rb

@@ -7,4 +7,4 @@ module Napa
     # extend all endpoints to include this
     Grape::Endpoint.send :include, self
   end
-end
+end

data/lib/napa/json_error.rb

@@ -6,12 +6,16 @@ module Napa
     end
 
     def to_json(options = {})
+      to_h.to_json(options)
+    end
+
+    def to_h
       {
         error: {
           code: @code,
           message: @message
         }
-      }.to_json
+      }
     end
   end
-end
+end

data/lib/napa/stats_d_timer.rb

@@ -0,0 +1,22 @@
+module Napa
+  module StatsDTimer
+    def report_time(timer_name)
+      start_time = Time.now
+      yield
+      response_time = Time.now - start_time
+      Napa::Stats.emitter.timing(timer_name, response_time)
+    end
+
+    module ClassMethods
+      def report_time(timer_name)
+        new.report_time(timer_name) do
+          yield
+        end
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+  end
+end

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 
   class Version
     class << self

data/lib/napa.rb

@@ -17,13 +17,13 @@ require 'napa/stats'
 require 'napa/active_record_extensions/filter_by_hash'
 require 'napa/grape_extensions/error_formatter'
 require 'napa/grape_extensions/error_presenter'
+require 'napa/grape_extenders'
 require 'napa/middleware/logger'
 require 'napa/middleware/app_monitor'
 require 'napa/middleware/authentication'
 require 'napa/middleware/request_stats'
 require 'napa/activerecord'
 require 'napa/authentication'
-require 'napa/grape_api'
 
 # load rake tasks if Rake installed
 if defined?(Rake)

data/lib/tasks/db.rake

@@ -47,18 +47,14 @@ unless defined?(Rails)
         # Define migrations path (needed later)
         migrations_path = './db/migrate'
 
-        # Find the highest existing migration version or set to 1
-        if (existing_migrations = Dir[File.join(migrations_path, '*.rb')]).length > 0
-          version = File.basename(existing_migrations.sort.reverse.first)[/^(\d+)_/,1].to_i + 1
-        else
-          version = 1
-        end
+        # timestamp the migration
+        version = Time.now.utc.to_s.gsub(':','').gsub('-','').gsub('UTC','').gsub(' ','')
 
         # Use the migration template to fill the body of the migration
         migration_content = Napa::ActiveRecord.migration_template(migration_name.camelize)
 
         # Generate migration filename
-        migration_filename = "#{"%03d" % version}_#{migration_name}.rb"
+        migration_filename = "#{version}_#{migration_name}.rb"
 
         # Write the migration
         File.open(File.join(migrations_path, migration_filename), "w+") do |migration|
@@ -86,4 +82,4 @@ unless defined?(Rails)
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: napa
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -261,14 +261,15 @@ files:
 - lib/napa/generators/templates/api/app/apis/%name_tableize%_api.rb.tt
 - lib/napa/generators/templates/api/app/entities/%name_underscore%_entity.rb.tt
 - lib/napa/generators/templates/api/app/models/%name_underscore%.rb.tt
-- lib/napa/generators/templates/scaffold/.env
-- lib/napa/generators/templates/scaffold/.env.test
+- lib/napa/generators/templates/scaffold/.env.test.tt
+- lib/napa/generators/templates/scaffold/.env.tt
 - 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/application_api.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
@@ -279,7 +280,7 @@ files:
 - 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_extenders.rb
 - lib/napa/grape_extensions/error_formatter.rb
 - lib/napa/grape_extensions/error_presenter.rb
 - lib/napa/identity.rb
@@ -292,6 +293,7 @@ files:
 - lib/napa/middleware/request_stats.rb
 - lib/napa/setup.rb
 - lib/napa/stats.rb
+- lib/napa/stats_d_timer.rb
 - lib/napa/version.rb
 - lib/tasks/db.rake
 - lib/tasks/deploy.rake

data/lib/napa/generators/templates/scaffold/.env

@@ -1,6 +0,0 @@
-SERVICE_NAME={{app_name}}
-
-DATABASE_USER=root
-DATABASE_PASSWORD=''
-DATABASE_HOST=localhost
-DATABASE_NAME={{app_name}}_development

data/lib/napa/grape_api.rb

@@ -1,9 +0,0 @@
-require 'grape'
-class Napa::GrapeAPI < Grape::API
-  def after
-    @app_response[1]['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
-    @app_response[1]['Pragma'] = 'no-cache'
-    @app_response[1]['Expires'] = 'Fri, 01 Jan 1990 00:00:00 GMT'
-    @app_response
-  end
-end