sinatra-cmd 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4e83a2399ed264aa75cbc4607813e8f3048524
-  data.tar.gz: 31457ae8ecda43b17a3cce64650b532d37c4a4ea
+  metadata.gz: 176f2d20728d9dd8e5af6837185f937feaf136ee
+  data.tar.gz: 72af7c0f65ef1aa9aece11dbe9488bb97b96472e
 SHA512:
-  metadata.gz: 6c791661fd09d4d3134a5de4e4ead759e50e97ca57b61f342bf3e905b4045d3ac72dab597382e504ad3402fb166b58e16b1a692cde307099b81d66a2d323815d
-  data.tar.gz: 33b30684aed317f6cc7a2213e198a45aa7be503215922d02b043762e39d6002793a7b9cc0c6e42639fa3ed657aec1cdaed92a47bede682959fbffe2ad2174ce4
+  metadata.gz: 61eca5a7e8e06f090ca806ffe796bef15c69afa3fbb6c32464d3e5d64630b532827b33a7cb126a190b019665c8ccac9b8a00fc6390bf5e74c3a1ae052ef99cce
+  data.tar.gz: 189a27aeab1b194a28b4a8d0a2676ae92cba3137b021018b6ed37ad07fdfa7ebd442ebe8c1cc23746fad129192f99728a7bbebd301910b014aebf944de1e31e7

data/lib/sinatra_cmd/generator.rb

@@ -35,6 +35,10 @@ module SinatraCmd
       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"
+      copy_file "config/i18n/zh-cn.yml", "#{app_name}/config/i18n/zh-cn.yml"
     end
 
     def setup_appfile

data/lib/sinatra_cmd/version.rb

@@ -1,3 +1,3 @@
 module SinatraCmd
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/templates/config/application.rb.erb

@@ -25,10 +25,12 @@ module <%= app_name.capitalize %>
       headers("Content-Type" => "application/json; charset=UTF-8")
       headers("Access-Control-Allow-Methods" => "POST, GET, PUT, DELETE, OPTION")
 
+      # fix Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
+      # http://stackoverflow.com/questions/5027705/error-in-chrome-content-type-is-not-allowed-by-access-control-allow-headers
+      headers("Access-Control-Allow-Headers" => "Origin, X-Requested-With, Content-Type, Accept")
+
       # For options
       halt 200 if request.request_method == 'OPTIONS'
-
-      halt_with_401 unless %w(127.0.0.1 27.111.214.254 52.74.58.186).include?(request.ip)
     end
   end
 end

data/templates/config/boot.rb.erb

@@ -15,7 +15,7 @@ module Sinatra::Namespace::SharedMethods
 end
 
 module <%= app_name.capitalize %>
-  API_V1 = '/App/1'
+  API_V1 = '/1'
 
   class App < Sinatra::Application
     register Sinatra::Namespace

data/templates/helpers/application.rb.erb

@@ -3,7 +3,10 @@ module <%= app_name.capitalize %>
     def logger
       return @logger unless @logger.nil?
 
-      @logger = Logger.new(File.join(File.expand_path('../../log', __FILE__), "#{ENV['RACK_ENV']}.log"), 'daily')
+      file_path = File.join(File.expand_path('../../log', __FILE__))
+      FileUtils.mkdir_p(file_path)
+
+      @logger = Logger.new(File.join(file_path, "#{ENV['RACK_ENV']}.log"), 'daily')
       @logger.level = Logger::INFO
       @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
       @logger.formatter = proc {|severity, datetime, default_field , msg|

data/templates/helpers/error_handling.rb.erb

@@ -4,25 +4,27 @@ module <%= app_name.capitalize %>
       def halt_with_400(message=nil)
         message ||= t.error_handling.bad_request
         logger.error("400, #{message}")
-        halt 400, json({code: 400, message: message})
+        halt 400, json({code: 400, error: message})
       end
 
       def halt_with_401(message=nil)
         message ||= t.error_handling.authorization_required
+        # realm = "Example"
+        # headers 'WWW-Authenticate' => %(Basic realm="#{realm}")
         logger.error("401, #{message}")
-        halt 401, json({code: 401, message: message})
+        halt 401, json({code: 401, error: message})
       end
 
       def halt_with_403(message=nil)
         message ||= t.error_handling.forbidden
         logger.error("403, #{message}")
-        halt 403, json({code: 403, message: message})
+        halt 403, json({code: 403, error: message})
       end
 
       def halt_with_404
         message = t.error_handling.not_found
         logger.error("404, #{message}")
-        halt 404, json({code: 404, message: message})
+        halt 404, json({code: 404, error: message})
       end
 
       # unprocessable_entity
@@ -42,13 +44,13 @@ module <%= app_name.capitalize %>
           errors << {resource: resource, field: attribute, code: code}
         end
         logger.error("422, Validation failed")
-        halt 422, json({code: 422, message: "Validation failed", errors: errors})
+        halt 422, json({code: 422, error: "Validation failed", errors: errors})
       end
 
       def halt_with_500
         message = "#{t.error_handling.internal_server_error}: #{env['sinatra.error'].message}"
         logger.error("500, #{message}")
-        halt 500, json({code: 500, message: message})
+        halt 500, json({code: 500, error: message})
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cmd
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - CBluowei