sinatra-cmd 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d75b257f0a1af3176b310e93b31b8e62c688f6
-  data.tar.gz: 16b5f043a1c0d26d7c84db82aeecd7ffa381545d
+  metadata.gz: bf6d2ca4c8af18493b492a03ca92181af8f241b8
+  data.tar.gz: 6f9a362ff2c0e877bce5490ab8b4133cdf1606ee
 SHA512:
-  metadata.gz: 3c4d7bcb36e9af360ac5761d520963a4039353f76c89de8310e8f9791af488b2f9ab7c2a5d9b119e34b5177d67b94067156539ec7cc6bb683fe4e9778ace5007
-  data.tar.gz: c39c119c60985df380801a6dbfdb09b1e39804672739c1f960e8f5363ccfe1f375c7d4ada5a24f79037b1c38c4f6b4bc2584ba7cb185da4d400da327275ebf10
+  metadata.gz: 4550782daa2e2321b4dafc6dc2ab3d65e20b1b48772c6a429c5a7653adecb258e28341ec1fd096ac44fa34c776ea29c9a11a9175df8171cbd3206bd217e8a8f9
+  data.tar.gz: d05d8f6da0859c3b484c9a685bdc6786d22e6a1c08380e4d27f65ca7c8b350fcb98fe3a28eb948197aa5b22c60d9e6a54047c57dff11f7beefdf195d7f546b51

data/lib/sinatra_cmd/generator.rb

@@ -10,8 +10,8 @@ module SinatraCmd
       File.join(File.dirname(__FILE__), "../../", "templates")
     end
 
-    def setup_utils
-      keep_file "#{app_name}/utils"
+    def setup_lib
+      keep_file "#{app_name}/lib"
     end
 
     def setup_helpers

data/lib/sinatra_cmd/version.rb

@@ -1,3 +1,3 @@
 module SinatraCmd
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

data/templates/config/boot.rb.erb

@@ -25,8 +25,10 @@ module <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
 
     configure :development do
       register Sinatra::Reloader
+      also_reload File.join(File.expand_path('../lib/**/*.rb', __FILE__))
     end
 
+    # Mongo Settings
     configure do
       # db_file = File.join(File.expand_path('../mongo_mapper.yml', __FILE__))
 
@@ -37,19 +39,49 @@ module <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
       # mongo_config = YAML::load(ERB.new(File.read(db_file)).result)
       # MongoMapper.setup(mongo_config, ENV['RACK_ENV'])
 
-      # R18n::I18n.default = 'en-us'
-
       # Error blocks don't trigger in development mode.
       # https://github.com/sinatra/sinatra/issues/578
       set :show_exceptions, :after_handler
     end
 
+    # R18n settings
+    configure do
+      # Filter to use Rails named variables:
+      #
+      #   name: "My name is %{name}"
+      #   i18n.name(name: 'Ivan') #=> "My name is Ivan"
+      R18n::Filters.add(String, :named_variables) do |content, config, params|
+        if params.is_a? Hash
+          content = content.clone
+          params.each_pair do |name, value|
+            value = config[:locale].localize(value)
+            if defined? ActiveSupport::SafeBuffer
+              value = ActiveSupport::SafeBuffer.new + value
+            end
+            content.gsub! "%{#{name}}",  value
+            content.gsub! "{{#{name}}}", value
+          end
+        end
+        content
+      end
+      R18n::Filters.on(:named_variables)
+      R18n::I18n.default = 'en-us'
+    end
+
+    # Important
+    before do
+      # We have to set default locale into session,
+      # because of the sinatra-r18n source code doesn't check R18n::I18n.default
+      session[:locale] = R18n::I18n.default
+    end
+
     configure :development, :production do
       file_path = File.join(File.expand_path('../../log', __FILE__))
       FileUtils.mkdir_p(file_path)
 
       # RACK_ENV default to development
       logger = Logger.new(File.join(file_path, "#{ENV['RACK_ENV']}.log"), 'daily')
+      logger.datetime_format = "%Y-%m-%d %H:%M:%S.%L %z"
       logger.level = Logger::DEBUG if development?
       set :logger, logger
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cmd
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - wluo