grape-generator 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e806516ef6ba2e1a8307e8391cb8e173c5af4dae
-  data.tar.gz: 3230a8143fb38e29567429cf7b6800f314130e61
+  metadata.gz: ea89c4515b12c647838b5228bebf19eefa3c76cb
+  data.tar.gz: 2705c1baab280db0a496078146328a18b04766f1
 SHA512:
-  metadata.gz: 697535646e692b9894da4328cf54e3cb601e40603e5f02343c470647489f450995a2ff9bd81aff40693e43c1bcaaba2942cd29f870223cc5c635b9919b486953
-  data.tar.gz: 21c2081106d3609a961e4ba69288c8c5a35775d0c151883252502c84340a947ca126567b1f6055ba6a184bea7c354fb87013e9512fb5d4e1d768c06fa4b5f8ee
+  metadata.gz: 4bf7ec4153a996c0c625cd7782c6f42d20ab2e77ff1c865b5b5ff2dfaab77fd7c1ea1ed1c0b0af318deb8ac821be04799f66196b1b0b4c375582ee2dcd201916
+  data.tar.gz: 642fcbbfcdb5d979391dd1463fabf399ef4f30bae48bdbe88c7af11c5b665caaa3a36446beda8acc4c0b7d7035b9139568d028d98c1142479caffdef5207e118

data/lib/grape/generator/cli.rb

@@ -35,12 +35,9 @@ module Grape
           work_dir = current_dir.join(name)
         end
 
-        params = build_params(work_dir, app_name)
+        params = { app: {name: app_name} }
         Dir[File.join(template_base, "**", "{*.*,.keep}")].each do |src|
           dst = Pathname.new src.sub(template_base, work_dir.to_path)
-          if dst.basename.to_path == "app_api.rb.erb"
-            dst = dst.dirname.join("#{params[:app][:name_underscore]}_api.rb.erb")
-          end
           template(src, dst.sub_ext("").to_path, params)
         end
 
@@ -51,17 +48,18 @@ module Grape
 
           Dir[File.join(template_rails, "**", "{*.*,.keep}")].each do |src|
             dst = Pathname.new src.sub(template_rails, work_dir.to_path)
-            if dst.basename.to_path == "app_api.rb.erb"
-              dst = dst.dirname.join("#{params[:app][:name_underscore]}_api.rb.erb")
-            end
             dst_path = dst.sub_ext("").to_path
             template(src, dst_path, params.merge(force: :true))
           end
 
           inside(work_dir, @config) do
-            exec(["mv #{setup_dir.to_path} #{rails_dir.to_path}", "bundle install" ])
+            exec(["mv #{setup_dir.to_path} #{rails_dir.to_path}"])
           end
         end
+
+        inside(work_dir, @config) do |dst|
+          exec([ "bundle install --path vendor/bundle --without production" ])
+        end
       rescue
         puts $!.backtrace
         error_and_exit($!.message)
@@ -98,18 +96,6 @@ module Grape
         end
 
         def build_params(work_dir, app_name)
-          params = { app: {name: app_name} }
-          inside(work_dir, @config) do |dst|
-            template(File.join(template_base, "Gemfile.erb"), work_dir.join("Gemfile").to_path)
-            exec([ "bundle install --path vendor/bundle --without production" ])
-            params[:app][:name_classify], params[:app][:name_underscore] = run_ruby(
-              [
-                "require 'active_support'",
-                "require 'active_support/core_ext'",
-                "puts '#{app_name}'.classify + ',' + '#{app_name}'.underscore"
-              ]).split(',')
-          end
-          params
         end
 
         def database_gem_entry(database)

data/lib/grape/generator/templates/base/app/apis/base.rb.erb

@@ -0,0 +1,24 @@
+require_relative 'concerns/error_handler'
+
+module API
+  class Base < Grape::API
+    include ErrorHandler
+
+    content_type :json, 'application/json'
+    format :json
+    default_format :json
+
+    helpers do
+      def logger
+        env['app.logger'] #API.logger
+      end
+    end
+
+    get '/' do
+      { status: 'alive' }
+    end
+
+    # require_relative 'resources/resources_api'
+    # mount ResourcesAPI
+  end
+end

data/lib/grape/generator/templates/base/app/apis/concerns/error_handler.rb.erb

@@ -0,0 +1,31 @@
+module API
+  class Error < StandardError; end 
+  class AuthenticationFailed < Error; end 
+  class PermissionDenied < Error; end 
+  class TooMenyRequests < Error; end 
+  class ResourceNotFound < Error; end 
+
+  ERROR_MAPPING = { 
+    Grape::Exceptions::ValidationErrors   => 400,
+    Grape::Exceptions::InvalidMessageBody => 400,
+    AuthenticationFailed                  => 401,
+    PermissionDenied                      => 403,
+    ResourceNotFound                      => 404,
+    TooMenyRequests                       => 429 
+  }   
+
+  module ErrorHandler
+    extend ActiveSupport::Concern
+
+    included do
+      rescue_from :all do |e| 
+        code = ERROR_MAPPING[e.class] || 500 
+        if code == 500 && ENV["RACK_ENV"] != "production"
+          raise e
+        else
+          error!({reason: Rack::Utils::HTTP_STATUS_CODES[code]}, code)
+        end 
+      end
+    end
+  end 
+end

data/lib/grape/generator/templates/base/config.ru.erb

@@ -1,10 +1,9 @@
-<% name = config[:app][:name_classify] %>
 #!/usr/bin/env rackup
 require File.expand_path("../config/boot", __FILE__)
 
 require "active_support"
 logger = ActiveSupport::Logger.new("log/#{ENV["RACK_ENV"]}.log")
 logger.level = ENV["RACK_ENV"] == "production" ? Logger::INFO : Logger::DEBUG
-use <%= name %>::AppLogger, logger
+use API::AppLogger, logger
 
-run <%= name %>::API
+run API::Base

data/lib/grape/generator/templates/base/config/boot.rb.erb

@@ -6,7 +6,7 @@ Bundler.require(:default, ENV["RACK_ENV"].to_sym)
 
 Dir[File.expand_path('../../app/models/*.rb', __FILE__)].each{|f| require f }
 
-module <%= config[:app][:name_classify] %>
+module API
   class AppLogger < Rack::CommonLogger
     def initialize(app, logger)
       super
@@ -20,6 +20,6 @@ module <%= config[:app][:name_classify] %>
 end
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 $LOAD_PATH.unshift(File.expand_path("../../app/apis", __FILE__))
-require '<%= config[:app][:name_underscore] %>_api'
+require 'base'
 
 require_relative 'environment'

data/lib/grape/generator/templates/rails/app/apis/concerns/error_handler.rb.erb

@@ -0,0 +1,33 @@
+module API
+  class Error < StandardError; end 
+  class AuthenticationFailed < Error; end 
+  class PermissionDenied < Error; end 
+  class TooMenyRequests < Error; end 
+  class ResourceNotFound < Error; end 
+
+  ERROR_MAPPING = { 
+    Grape::Exceptions::ValidationErrors   => 400,
+    Grape::Exceptions::InvalidMessageBody => 400,
+    ActiveRecord::RecordInvalid           => 400,
+    AuthenticationFailed                  => 401,
+    PermissionDenied                      => 403,
+    ResourceNotFound                      => 404,
+    ActiveRecord::RecordNotFound          => 404,
+    TooMenyRequests                       => 429 
+  }   
+
+  module ErrorHandler
+    extend ActiveSupport::Concern
+
+    included do
+      rescue_from :all do |e| 
+        code = ERROR_MAPPING[e.class] || 500 
+        if code == 500 && ENV["RACK_ENV"] != "production"
+          raise e
+        else
+          error!({reason: Rack::Utils::HTTP_STATUS_CODES[code]}, code)
+        end 
+      end
+    end
+  end 
+end

data/lib/grape/generator/templates/rails/config.ru.erb

@@ -1,14 +1,13 @@
-<% name = config[:app][:name_classify] %>
 #!/usr/bin/env rackup
 require File.expand_path("../config/boot", __FILE__)
 
 require "active_support"
 logger = ActiveSupport::Logger.new("log/#{ENV["RACK_ENV"]}.log")
 logger.level = ENV["RACK_ENV"] == "production" ? Logger::INFO : Logger::DEBUG
-use <%= name %>::AppLogger, logger
+use API::AppLogger, logger
 
 ActiveRecord::Base.logger = logger
 ActiveRecord::Base.schema_format = :sql
 use ActiveRecord::ConnectionAdapters::ConnectionManagement
 
-run <%= name %>::API
+run API::Base

data/lib/grape/generator/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Generator
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - arukoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,8 +75,8 @@ files:
 - lib/grape/generator/templates/.gitignore.erb
 - lib/grape/generator/templates/base/Gemfile.erb
 - lib/grape/generator/templates/base/Rakefile.erb
-- lib/grape/generator/templates/base/app/apis/app_api.rb.erb
-- lib/grape/generator/templates/base/app/apis/errors.rb.erb
+- lib/grape/generator/templates/base/app/apis/base.rb.erb
+- lib/grape/generator/templates/base/app/apis/concerns/error_handler.rb.erb
 - lib/grape/generator/templates/base/app/apis/resources/.keep
 - lib/grape/generator/templates/base/config.ru.erb
 - lib/grape/generator/templates/base/config/boot.rb.erb
@@ -84,7 +84,7 @@ files:
 - lib/grape/generator/templates/base/lib/tasks/routes.rake.erb
 - lib/grape/generator/templates/base/log/.keep
 - lib/grape/generator/templates/rails/Gemfile.erb
-- lib/grape/generator/templates/rails/app/apis/errors.rb.erb
+- lib/grape/generator/templates/rails/app/apis/concerns/error_handler.rb.erb
 - lib/grape/generator/templates/rails/config.ru.erb
 - lib/grape/generator/templates/rails/lib/tasks/db.rake.erb
 - lib/grape/generator/version.rb

data/lib/grape/generator/templates/base/app/apis/app_api.rb.erb

@@ -1,31 +0,0 @@
-require_relative 'errors'
-
-module <%= config[:app][:name_classify] %>
-  class API < Grape::API
-    content_type :json, 'application/json'
-    format :json
-    default_format :json
-
-    rescue_from :all do |e| 
-      code = Errors::ERROR_MAPPING[e.class] || 500 
-      if code == 500 && ENV["RACK_ENV"] != "production"
-        raise e
-      else
-        error!({reason: Errors.error_reason(code)}, code)
-      end 
-    end
-
-    helpers do
-      def logger
-        env['app.logger'] #API.logger
-      end
-    end
-
-    get '/' do
-      { status: 'alive' }
-    end
-
-    # require_relative 'resources/resources_api'
-    # mount ResourcesAPI
-  end
-end

data/lib/grape/generator/templates/base/app/apis/errors.rb.erb

@@ -1,25 +0,0 @@
-module <%= config[:app][:name_classify] %>
-  class Errors
-    class << self
-      def error_reason(code)
-        Rack::Utils::HTTP_STATUS_CODES[code]
-      end 
-    end 
-
-    class Error < StandardError; end 
-    class AuthenticationFailed < Error; end 
-    class PermissionDenied < Error; end 
-    class TooMenyRequests < Error; end 
-    class ResourceNotFound < Error; end 
-
-    ERROR_MAPPING = { 
-      Grape::Exceptions::ValidationErrors   => 400,
-      Grape::Exceptions::InvalidMessageBody => 400,
-      AuthenticationFailed                  => 401,
-      PermissionDenied                      => 403,
-      ResourceNotFound                      => 404,
-      TooMenyRequests                       => 429 
-    }   
-  end 
-end
-

data/lib/grape/generator/templates/rails/app/apis/errors.rb.erb

@@ -1,27 +0,0 @@
-module <%= config[:app][:name_classify] %>
-  class Errors
-    class << self
-      def error_reason(code)
-        Rack::Utils::HTTP_STATUS_CODES[code]
-      end 
-    end 
-
-    class Error < StandardError; end 
-    class AuthenticationFailed < Error; end 
-    class PermissionDenied < Error; end 
-    class TooMenyRequests < Error; end 
-    class ResourceNotFound < Error; end 
-
-    ERROR_MAPPING = { 
-      Grape::Exceptions::ValidationErrors   => 400,
-      Grape::Exceptions::InvalidMessageBody => 400,
-      ActiveRecord::RecordInvalid           => 400,
-      AuthenticationFailed                  => 401,
-      PermissionDenied                      => 403,
-      ResourceNotFound                      => 404,
-      ActiveRecord::RecordNotFound          => 404,
-      TooMenyRequests                       => 429 
-    }   
-  end 
-end
-