napa 0.1.26 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad5d6d9cbf7390f1b3d421b3fd4d58e121d97af
-  data.tar.gz: a0dc5a4d8ecc8e1664395cebbeb6d64626bc81e5
+  metadata.gz: 921842df68ddfd43053accc0281962d797225ced
+  data.tar.gz: 892d34f1952b7e73dba7dff8f485d2930d6b39ed
 SHA512:
-  metadata.gz: 879a62d886ee27f396f994504d1f421d1f7a6b9f2aadc7b5b7ddf74e2a3e57c9ba8e40caf17954ce67f6deb44abbdbd9848eaf06d3c8002a0705d5571003cd4a
-  data.tar.gz: 5de5e10a32e948e07d238cd687846a2cfe4383630da6b522f80435ab9b7ab5d9d56bce8c439398df678eaffb4fc0eaf7fde859001a9a41884d46a0cb874462c9
+  metadata.gz: 3b9c94ad04f33374ffc54ec532ef07de33e915f03c5353e50d0ad43e823ff22d0dd731c2b8fd1917faf747945e68a43cc4f73fb6b401b75d37de3ea89bae4c46
+  data.tar.gz: 651d69ad11fa10824d704f0c87b268f9e4a5c997b7408f483e04472f8c54d0a8844d9789d9b6a27317d5a1a191559ae721ae8f1cfcc4e0786024253acbde1c02

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/bellycard/napa.png?branch=master)](https://travis-ci.org/bellycard/napa)
+[![Dependency Status](https://gemnasium.com/bellycard/napa.png)](https://gemnasium.com/bellycard/napa)
 
 # Napa
 
@@ -195,4 +196,4 @@ The Health Check middleware will add an endpoint at `/health` that will return s
 
 ## Todo/Feature Requests
 
-* Add specs for logger and logging middleware
+* Add specs for logger and logging middleware

data/bin/napa

@@ -2,4 +2,4 @@
 
 require 'napa/cli'
 
-Napa::CLI.start(ARGV)
+Napa::CLI::Base.start(ARGV)

data/lib/napa.rb

@@ -4,6 +4,7 @@ require 'dotenv'
 require 'logging'
 require 'octokit'
 require 'grape'
+require 'grape-entity'
 require 'json'
 
 # require internal files
@@ -17,12 +18,12 @@ 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_extensions/entity'
 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'
 
 # load rake tasks if Rake installed

data/lib/napa/cli.rb

@@ -1,16 +1,45 @@
 require 'thor'
 require 'napa/generators'
+require 'napa/version'
 
 module Napa
-  class CLI < Thor
-    desc "version", "Shows the Napa version number"
-    def version
-      say Napa::VERSION
+  class CLI
+    class Generate < Thor
+      register(
+        Generators::ApiGenerator,
+        'api',
+        'api <api_name>',
+        'Create a Grape API, Model and Entity'
+      )
+
+      register(
+        Generators::MigrationGenerator,
+        'migration',
+        'migration <migration_name>',
+        'Create a Database Migration'
+      )
     end
+  end
+
+  class CLI
+    class Base < Thor
+      desc "version", "Shows the Napa version number"
+      def version
+        say Napa::VERSION
+      end
 
-    register(Generators::ScaffoldGenerator, 'new', 'new <app_name> [app_path]',
-             'Create a scaffold for a new Napa service')
-    register(Generators::ApiGenerator, 'generate:api', 'generate:api <api_name>',
-             'Create a Grape API, Model and Entity')
+      register(
+        Generators::ScaffoldGenerator,
+        'new',
+        'new <app_name> [app_path]',
+        'Create a scaffold for a new Napa service'
+      )
+
+      desc "generate api <api_name>", "Create a Grape API, Model and Entity"
+      subcommand "generate api", Napa::CLI::Generate
+
+      desc "generate migration <migration_name>", "Create a Database Migration"
+      subcommand "generate", Napa::CLI::Generate
+    end
   end
 end

data/lib/napa/generators.rb

@@ -1,2 +1,3 @@
 require 'napa/generators/scaffold_generator'
 require 'napa/generators/api_generator'
+require 'napa/generators/migration_generator'

data/lib/napa/generators/api_generator.rb

@@ -5,7 +5,6 @@ module Napa
   module Generators
     class ApiGenerator < Thor::Group
       include Thor::Actions
-      namespace :generate
       argument :name
 
       def name_underscore

data/lib/napa/generators/migration_generator.rb

@@ -0,0 +1,26 @@
+require 'thor'
+require 'active_support/all'
+
+module Napa
+  module Generators
+    class MigrationGenerator < Thor::Group
+      include Thor::Actions
+      argument :migration_name
+
+      def version
+        Time.now.utc.to_s.gsub(':','').gsub('-','').gsub('UTC','').gsub(' ','')
+      end
+
+      def migration_filename
+        "#{version}_#{migration_name}"
+      end
+
+      def migration
+        self.class.source_root "#{File.dirname(__FILE__)}/templates/migration"
+        say 'Generating migration...'
+        directory '.', './db/migrate'
+        say 'Done!', :green
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ 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, include_missing: false).select { |param, value| value.present? })
+      <%= name.underscore %>.update_attributes!(declared(params, include_missing: false)
       present <%= name.underscore %>, with: <%= name.classify %>Entity
     end
   end

data/lib/napa/generators/templates/api/app/entities/%name_underscore%_entity.rb.tt

@@ -1,4 +1,4 @@
-class <%= name.classify %>Entity < Grape::Entity
+class <%= name.classify %>Entity < Napa::Entity
   root :data, :data
   expose :id, proc: lambda { |o, opts| o.id.to_s }, documentation:
     { type: 'String', description: 'ID' }

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

@@ -0,0 +1,7 @@
+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, 500)
+          rack_response(Napa::JsonError.new(:record_invalid, 'record not found').to_json, 400)
         end
       end
     end

data/lib/napa/grape_extensions/entity.rb

@@ -0,0 +1,11 @@
+module Napa
+  class Entity < Grape::Entity
+    format_with :to_s do |val|
+      val.to_s
+    end
+
+    def object_type
+      object.class.name.underscore
+    end
+  end
+end

data/lib/napa/identity.rb

@@ -7,7 +7,7 @@ module Napa
         revision: revision,
         pid: pid,
         parent_pid: parent_pid,
-        napa_revision: napa_revision
+        platform: platform
       }
     end
 
@@ -31,7 +31,14 @@ module Napa
       @ppid ||= Process.ppid
     end
 
-    def self.napa_revision
+    def self.platform
+      {
+        version: platform_revision,
+        name: "Napa"
+      }
+    end
+
+    def self.platform_revision
       Napa::VERSION
     end
   end

data/lib/napa/middleware/app_monitor.rb

@@ -6,7 +6,7 @@ module Napa
       end
 
       def call(env)
-        if env['REQUEST_PATH'] == '/health'
+        if ["/health", "/health.json"].include? env['REQUEST_PATH']
           [200, { 'Content-type' => 'application/json' }, [Napa::Identity.health.to_json]]
         else
           @app.call(env)

data/lib/napa/version.rb

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

data/lib/tasks/db.rake

@@ -36,36 +36,6 @@ unless defined?(Rails)
       Rake::Task["db:schema:load"].invoke
     end
 
-    namespace :generate do
-      desc "Generate a migration with given name. Specify migration name with NAME=my_migration_name"
-      task :migration => :environment do
-        raise "Please specify desired migration name with NAME=my_migration_name" unless ENV['NAME']
-
-        # Find migration name from env
-        migration_name = ENV['NAME'].strip.chomp
-
-        # Define migrations path (needed later)
-        migrations_path = './db/migrate'
-
-        # 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 = "#{version}_#{migration_name}.rb"
-
-        # Write the migration
-        File.open(File.join(migrations_path, migration_filename), "w+") do |migration|
-          migration.puts migration_content
-        end
-
-        # Done!
-        puts "Successfully created migration #{migration_filename}"
-      end
-    end
-
     namespace :schema do
       desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
       task :dump => :environment do

data/spec/identity_spec.rb

@@ -42,9 +42,9 @@ describe Napa::Identity do
     end
   end
 
-  context '#napa_revision' do
+  context '#platform_revision' do
     it 'returns the current version of the platform gem' do
-      Napa::Identity.napa_revision.should == Napa::VERSION
+      Napa::Identity.platform_revision.should == Napa::VERSION
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: napa
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.28
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -252,15 +252,16 @@ files:
 - bin/napa
 - lib/napa.rb
 - lib/napa/active_record_extensions/filter_by_hash.rb
-- lib/napa/activerecord.rb
 - lib/napa/authentication.rb
 - lib/napa/cli.rb
 - lib/napa/generators.rb
 - lib/napa/generators/api_generator.rb
+- lib/napa/generators/migration_generator.rb
 - lib/napa/generators/scaffold_generator.rb
 - 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/migration/%migration_filename%.rb.tt
 - lib/napa/generators/templates/scaffold/.env.test.tt
 - lib/napa/generators/templates/scaffold/.env.tt
 - lib/napa/generators/templates/scaffold/.gitignore.tt
@@ -281,6 +282,7 @@ files:
 - lib/napa/generators/templates/scaffold/spec/factories/.gitkeep
 - lib/napa/generators/templates/scaffold/spec/spec_helper.rb
 - lib/napa/grape_extenders.rb
+- lib/napa/grape_extensions/entity.rb
 - lib/napa/grape_extensions/error_formatter.rb
 - lib/napa/grape_extensions/error_presenter.rb
 - lib/napa/identity.rb

data/lib/napa/activerecord.rb

@@ -1,21 +0,0 @@
-module Napa
-  class ActiveRecord
-    class << self
-      def migration_template(migration_class)
-        <<-MIGRATION
-          class #{migration_class} < ActiveRecord::Migration
-            def up
-              # create_table :foo do |t|
-              #   t.string :name, :null => false
-              # end
-            end
-
-            def down
-              # drop_table :foo
-            end
-          end
-        MIGRATION
-      end
-    end
-  end
-end