sinatra-cmd 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652d5717aa4178b5698b1c616c49e41d8bac2173
-  data.tar.gz: a6ba25cf24fed7e3ad25be08722c0afed4bcd538
+  metadata.gz: 860b59723bc6fce5d5556ed3976f95df281af964
+  data.tar.gz: b8279af5abd2aafe17c5b7671d1a17bea0f78635
 SHA512:
-  metadata.gz: b11fd3b02089da84227bab3ad80d8948e17c3b26dc3959f561b5da02cc068a09fedb675d46ca993719eb9434cc23fc66fdd715c1db5ac47a73a6cb3905eeb278
-  data.tar.gz: 0cd82ba6214d195720513568272e3e0516b54f8dde5d7549079c2cf6fedae9416e538cc8837085e03a8bf745381034c63be8fe105d711ffba4f1216c1582f9d0
+  metadata.gz: df8b384b25f49cade5699da4abb9432fd62d8c10ec7f6f2d2f5d3c8e2a83a47bd26347fdece865e8593d7d6af1d7560f035614959d9ae50563056ae2da2ea151
+  data.tar.gz: 178fa0785054c9f559cc2d7c08d4284c461f8a1a8ec651cc4453220b018a2fee07f456dd79b5c678bd5a927f921385d0a63c85c6a446e3ffed3d8a2c98f15fdb

data/lib/sinatra_cmd/generator.rb

@@ -30,11 +30,9 @@ module SinatraCmd
     end
 
     def setup_config
-      template "config/database.yml.erb", "#{app_name}/config/database.yml"
       template "config/application.rb.erb", "#{app_name}/config/application.rb"
       template "config/boot.rb.erb", "#{app_name}/config/boot.rb"
       copy_file "config/environment.rb", "#{app_name}/config/environment.rb"
-      copy_file "config/scheduler.rb", "#{app_name}/config/scheduler.rb"
 
       # i18n
       copy_file "config/i18n/en-us.yml", "#{app_name}/config/i18n/en-us.yml"

data/lib/sinatra_cmd/version.rb

@@ -1,3 +1,3 @@
 module SinatraCmd
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/templates/Gemfile

@@ -4,9 +4,6 @@ gem 'sinatra', '~> 1.4.6'
 gem 'sinatra-contrib', '~> 1.4.2', require: false
 gem 'sinatra-r18n', '~> 2.0.3'
 
-gem 'mongoid', '~> 4.0.1'
-gem 'rufus-scheduler', '~> 3.0.9'
-
 group :test, :development do
   gem 'pry', '~> 0.10.1'
   gem 'pry-stack_explorer', '~> 0.4.9.2'

data/templates/config/application.rb.erb

@@ -6,8 +6,6 @@ require File.expand_path('../boot', __FILE__)
   Dir[File.expand_path("../../#{folder}/**/*.rb", __FILE__)].each {|file| require file}
 end
 
-require File.expand_path('../scheduler', __FILE__)
-
 module <%= app_name.capitalize %>
   class App
     # custome register

data/templates/config/boot.rb.erb

@@ -8,14 +8,8 @@ require 'sinatra/reloader' if development?
 require 'sinatra/namespace'
 require 'sinatra/json'
 
-# sinatra and rake namespace global method conflict.
-module Sinatra::Namespace::SharedMethods
-  alias :sinatra_namespace :namespace
-  remove_method :namespace
-end
-
 module <%= app_name.capitalize %>
-  API_V1 = '/1'
+  API_VERSION = '1'
 
   class App < Sinatra::Base
     register Sinatra::Namespace
@@ -23,9 +17,11 @@ module <%= app_name.capitalize %>
     # language automatic changed by params['locale']
     register Sinatra::R18n
 
+    set :logging, true
+
     configure do
       # Mongoid config file load
-      Mongoid.load!(File.expand_path('../database.yml', __FILE__))
+      # Mongoid.load!(File.expand_path('../database.yml', __FILE__))
 
       # Error blocks don't trigger in development mode.
       # https://github.com/sinatra/sinatra/issues/578

data/templates/config/i18n/zh-cn.yml

@@ -1,8 +1,8 @@
 error_handling:
-  bad_request: "Bad request"
-  authorization_required: "Authorization required"
-  forbidden: "Forbidden"
-  not_found: "Not found"
-  internal_server_error: "Internal server error"
+  bad_request: "错误请求"
+  authorization_required: "需要进行验证"
+  forbidden: "被禁止"
+  not_found: "未找到"
+  internal_server_error: "服务器内部错误"
   multi_json:
-    decode: "Problems parsing JSON"
+    decode: "解析JSON出错"

data/templates/routes/demo.rb.erb

@@ -2,7 +2,7 @@
 
 module <%= app_name.capitalize %>
   class App
-    sinatra_namespace <%= app_name.capitalize %>::API_V1 do
+    namespace "/#{<%= app_name.capitalize %>::API_VERSION}" do
       get '/demo' do
         unless params[:error].nil?
           raise 'There are some errors.'

data/templates/spec/spec_helper.rb

@@ -26,4 +26,4 @@ RSpec.configure do |config|
 
   # this should give us Rack test methods
   config.include Rack::Test::Methods
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cmd
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - CBluowei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,11 +79,9 @@ files:
 - templates/config.ru.erb
 - templates/config/application.rb.erb
 - templates/config/boot.rb.erb
-- templates/config/database.yml.erb
 - templates/config/environment.rb
 - templates/config/i18n/en-us.yml
 - templates/config/i18n/zh-cn.yml
-- templates/config/scheduler.rb
 - templates/helpers/application.rb.erb
 - templates/helpers/error_handling.rb.erb
 - templates/routes/demo.rb.erb
@@ -108,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Command for generating sinatra project

data/templates/config/database.yml.erb

@@ -1,84 +0,0 @@
-development:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
-    default:
-      # Defines the name of the default database that Mongoid can connect to.
-      # (required).
-      database: <%= app_name %>_dev
-      # Provides the hosts the default session can connect to. Must be an array
-      # of host:port pairs. (required)
-      hosts:
-        - localhost:27017
-      options:
-
-        # Change whether the session persists in safe mode by default.
-        # (default: false)
-        # safe: false
-
-        # Change the default consistency model to :eventual or :strong.
-        # :eventual will send reads to secondaries, :strong sends everything
-        # to master. (default: :eventual)
-        # consistency: :eventual
-
-        # How many times Moped should attempt to retry an operation after
-        # failure. (default: 30)
-        # max_retries: 30
-
-        # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 1)
-        # retry_interval: 1
-  # Configure Mongoid specific options. (optional)
-  options:
-      raise_not_found_error: false
-    # Configuration for whether or not to allow access to fields that do
-    # not have a field definition on the model. (default: true)
-    # allow_dynamic_fields: true
-
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: false
-
-    # Includes the root model name in json serialization. (default: false)
-    # include_root_in_json: false
-
-    # Include the _type field in serializaion. (default: false)
-    # include_type_for_serialization: false
-
-    # Preload all models in development, needed when models use
-    # inheritance. (default: false)
-    # preload_models: false
-
-    # Protect id and type from mass assignment. (default: true)
-    # protect_sensitive_fields: true
-
-    # Raise an error when performing a #find and the document is not found.
-    # (default: true)
-    # raise_not_found_error: true
-
-    # Raise an error when defining a scope with the same name as an
-    # existing method. (default: false)
-    # scope_overwrite_exception: false
-
-    # Skip the database version check, used when connecting to a db without
-    # admin access. (default: false)
-    # skip_version_check: false
-
-    # User Active Support's time zone in conversions. (default: true)
-    # use_activesupport_time_zone: true
-
-    # Ensure all times are UTC in the app side. (default: false)
-    # use_utc: false
-test:
-  sessions:
-    default:
-      database: <%= app_name %>_test
-      hosts:
-        - localhost:27017
-      options:
-        consistency: :strong
-        # In the test environment we lower the retries and retry interval to
-        # low amounts for fast failures.
-        max_retries: 1
-        retry_interval: 0
-  options:
-      raise_not_found_error: false

data/templates/config/scheduler.rb

@@ -1,6 +0,0 @@
-# scheduler = Rufus::Scheduler.new
-
-# scheduler.cron '* * * * *' do
-#   puts ApiInfo.last
-#   puts Error.last
-# end