nyara 0.1.pre.1 → 0.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8806d56e981db23403ba6662c31af80629c2afd
-  data.tar.gz: 98d333128c7785a3b32e49ffbf4c7cc16f570c16
+  metadata.gz: 3d7c361394cdca151e6d52acc2dcb4e1b197f1b3
+  data.tar.gz: ce33aa73e3be6a53efe0c4013f6bbe95463f88a5
 SHA512:
-  metadata.gz: 79b6568857f0ef7fb6e5bd3d2286f68777554536e4223e592e48cface08b0754c3c4b725a7b52838617f48d1ee969c1aa412e3a3eae0710d5f1ef0d488ed3b7c
-  data.tar.gz: 5790f2a3e825c6eec82c0befab9a9e596894e71996ae922c63ca3bac48a5e1c0caf818cfd5f2a0cbc7347f6eff934ad36139e2ca8d4fd3b4687cd829308977a3
+  metadata.gz: 2450d6d927b7c4b2771dcfdd81c4491a51ab8373a425fa9dea2d0114cd08892306d97a681f973a90f294c79a14b4b0c6abcd931a0138993f88c361760eef0850
+  data.tar.gz: 70e46c7d7353bab07e8e26d3a4023023060dc9fbacc1ef660a2712f52267e73c4427be4c6f3a073f238b05bda64eb8ef5e05ecb1c2729a2eb8f7167558928cc1

data/changes

@@ -1,3 +1,9 @@
+0.1
+
+2013-08-19 project generator now support `--template` and `--orm` options
+           you can see available options with `nyara help new`
+2013-08-17 remove config option `app_files`, add options `watch` and `watch_assets`
+2013-08-17 use un-converted class names in `Config.map`
 2013-08-17 integrate with linner
 2013-08-16 use thor for `nyara` commands
 2013-08-15 (developers) migrated to git subtree, you don't need to hand-update submodules anymore

data/ext/hashes.c

@@ -240,7 +240,6 @@ static VALUE param_hash_nested_aset(VALUE output, VALUE keys, VALUE value) {
 }
 
 // s, len is the raw kv string
-// returns trailing length
 static void _cookie_kv(VALUE output, const char* s, long len) {
   // strip
   for (; len > 0; len--, s++) {
@@ -291,7 +290,6 @@ static VALUE param_hash_parse_cookie(VALUE _, VALUE output, VALUE str) {
 }
 
 // s, len is the raw kv string
-// returns trailing length
 static void _param_kv(VALUE output, const char* s, long len) {
   // strip
   for (; len > 0; len--, s++) {

data/lib/nyara.rb

@@ -4,7 +4,6 @@ require_relative "nyara/nyara"
 END {
   if $!.nil? and !Nyara.config.test?
     Nyara.setup
-    Nyara.load_app
     Nyara.start_server
   end
 }
@@ -23,5 +22,5 @@ end
 end
 
 configure do
-  map '/', 'nyara::simple'
+  map '/', 'Nyara::SimpleController'
 end

data/lib/nyara/command.rb

@@ -4,6 +4,26 @@ require "shellwords"
 module Nyara
   class Command < Thor
     include Thor::Actions
+
+    module FileNames
+      def template_ext
+        options[:template] == 'slim' ? 'slim' : 'erb'
+      end
+
+      def gitignore
+        '.gitignore'
+      end
+    end
+    include FileNames
+
+    module ORM
+      def orm
+        # it can be nil when called as method
+        options[:orm] || 'mongoid'
+      end
+    end
+    include ORM
+
     map '-v' => :version
 
     def self.source_root
@@ -16,7 +36,10 @@ module Nyara
     end
 
     desc "new APP_NAME", "Create a project"
-    method_option :force, aliases: '-f', desc: 'Force override old', type: :boolean, default: false
+    method_option :orm, aliases: %w'-o -O', type: :string, default: 'mongoid',
+                  desc: 'Specify object relationship mapping (ORM)', enum: %w'mongoid activerecord none'
+    method_option :template, aliases: %w'-t -T', type: :string, default: 'erubis',
+                  desc: 'Specify template engine', enum: %w'erubis slim'
     def new name
       require 'fileutils'
 
@@ -25,13 +48,9 @@ module Nyara
       @app_name = File.basename app_dir
       templte_dir = File.join(File.dirname(__FILE__), "templates")
 
-      FileUtils.rm_rf(app_dir) if options[:force]
       directory 'templates', name
-
-      create_file app_dir + '/.gitignore' do
-        %w".DS_Store config/session.key config/session_cipher.key".join "\n"
-      end
       generate 'session.key'
+      generate 'database.yml'
       puts '          \\ 👻  /'
     ensure
       @app_name = nil
@@ -40,7 +59,10 @@ module Nyara
 
     desc "generate THING", "(PROJECT) Generate things, THING can be:
     session.key        # config/session.key
-    session_cipher.key # config/session_cipher.key"
+    session_cipher.key # config/session_cipher.key
+    database.yml       # config/database.yml"
+    method_option :orm, aliases: %w'-o -O', type: :string, default: 'mongoid',
+                  desc: 'Specify ORM (for generating database.yml)', enum: %w'mongoid activerecord'
     def generate thing, app_dir=nil
       case thing
       when 'session.key'
@@ -55,19 +77,42 @@ module Nyara
         create_file file do
           Session.generate_cipher_key
         end
+      when 'database.yml'
+        @app_name ||= File.dirname Dir.pwd
+        file = 'config/database.yml'
+        file = File.join @rel_dir, file if @rel_dir
+        case orm
+        when 'mongoid', 'activerecord'
+          src = "#{__dir__}/optional_templates/#{orm}.yml.erb"
+          create_file file do
+            ERB.new(File.read src).result binding
+          end
+        end
       end
     end
 
     desc "server", "(PROJECT) Start server"
     method_option :environment, aliases: %w'-e -E', default: 'development'
+    method_option :port, aliases: %w'-p -P', type: :numeric
+    method_option :daemon, aliases: %w'-d -D', type: :boolean,
+                  desc: 'run server on the background'
     def server
       env = options[:environment].shellescape
-      exec "NYARA_ENV=#{env} ruby config/boot.rb"
+      cmd = "NYARA_ENV=#{env} ruby config/boot.rb"
+
+      if options[:port]
+        cmd << " -p" << options[:port].shellescape
+      end
+      if options[:daemon]
+        cmd << " -d"
+      end
+      exec cmd
     end
 
     desc "console", "(PROJECT) Start console"
     method_option :environment, aliases: %w'-e -E', default: 'development'
-    method_option :shell, aliases: '-s', desc: "tell me which shell you want to use, pry or irb?"
+    method_option :shell, aliases: %w'-s -S', enum: %w'pry irb',
+                  desc: "Tell me which shell you want to use"
     def console
       env = options[:environment].shellescape
       cmd = options[:shell]
@@ -76,11 +121,12 @@ module Nyara
           cmd = 'pry'
         end
       end
+
       cmd ||= 'irb'
       if cmd != 'irb'
-        cmd = "bundle exec #{cmd}"
+        cmd = "bundle exec pry"
       end
-      exec "NYARA_ENV=#{env} #{cmd} -r./config/application.rb"
+      exec "NYARA_SHELL=1 NYARA_ENV=#{env} #{cmd} -r./config/application.rb"
     end
 
   end

data/lib/nyara/config.rb

@@ -1,22 +1,22 @@
 module Nyara
   # #### Options
   #
-  # * `env`         - environment, default is `'development'`
-  # * `port`        - listen port number
-  # * `workers`     - number of workers
-  # * `host`        - host name used in `url_to` helper
-  # * `root`        - root path, default is `Dir.pwd`
-  # * `views`       - views (templates) directory, relative to root, default is `"views"`
-  # * `assets`      - assets directory, relative to root, default is `"assets"`
-  # * `public`      - static files directory, relative to root, default is `"public"`
-  # * `x_send_file` - header field name for `X-Sendfile` or `X-Accel-Redirect`, see [Nyara::Controller#send_file](Controller#send_file.html-instance_method) for details
-  # * `session`     - see [Nyara::Session](Session.html) for sub options
-  # * `prefer_erb`  - use ERB instead of ERubis for `.erb` templates
-  # * `logger`      - if set, every request is logged, and you can use `Nyara.logger` to do your own logging.
-  # * `app_files`   - application source file glob patterns, they will be required automatically.
-  #    In developemnt mode, this option enables automatic reloading for views and app.
-  # * `before_fork` - a proc to run before forking
-  # * `after_fork`  - a proc to run after forking
+  # * `env`          - environment, default is `'development'`
+  # * `port`         - listen port number, default is 3000. you can pass `-p` in the command line to override it
+  # * `daemon`       - whether run in the background, default is false. you can pass `-d` in the command line to override it
+  # * `workers`      - number of workers
+  # * `host`         - host name used in `url_to` helper
+  # * `root`         - root path, default is `Dir.pwd`
+  # * `views`        - views (templates) directory, relative to root, default is `"views"`
+  # * `public`       - static files directory, relative to root, default is `"public"`
+  # * `x_send_file`  - header field name for `X-Sendfile` or `X-Accel-Redirect`, see [Nyara::Controller#send_file](Controller#send_file.html-instance_method) for details
+  # * `session`      - see [Nyara::Session](Session.html) for sub options
+  # * `prefer_erb`   - use ERB instead of ERubis for `.erb` templates
+  # * `logger`       - if set, every request is logged, and you can use `Nyara.logger` to do your own logging.
+  # * `before_fork`  - a proc to run before forking
+  # * `after_fork`   - a proc to run after forking
+  # * `watch`        - if `true`, watch `app` change and reload automaticly, useful for development. default is `false`
+  # * `watch_assets` - if `true`, watch `app/assets` change with linner (you need `gem install linner` first), useful for development. default is `false`
   #
   # #### logger example
   #

data/lib/nyara/nyara.rb

@@ -76,25 +76,9 @@ module Nyara
       View.init
     end
 
-    # load with Config['app_files']
-    def load_app
-      app_files = Config['app_files']
-      return unless app_files
-
-      Dir.chdir Config.root do
-        # NOTE app_files can be an array
-        Dir.glob Config['app_files'] do |file|
-          require Config.project_path file
-        end
-        if Config.development?
-          require_relative "reload"
-          Reload.listen
-          @reload = Reload
-        end
-      end
-    end
-
     def start_server
+      reconfig_with_command_line_options
+      Process.daemon if Config['daemon']
       port = Config['port']
       env = Config['env']
 
@@ -107,15 +91,21 @@ module Nyara
       when 'test'
         # don't
       else
-        start_watch_assets
+        start_watch
         start_development_server port
       end
     end
 
-    def start_watch_assets
-      return if Config[:assets].blank?
-      Process.fork do
-        exec 'bundle exec linner watch'
+    def start_watch
+      if Config['watch_assets']
+        Process.fork do
+          exec 'bundle exec linner watch'
+        end
+      end
+      if Config['watch']
+        require_relative "reload"
+        Reload.listen
+        @reload = Reload
       end
     end
 
@@ -192,6 +182,25 @@ module Nyara
 
     private
 
+    def reconfig_with_command_line_options argv=ARGV.dup
+      until argv.empty?
+        case opt = argv.shift
+        when '-d', '--daemon'
+          Config['daemon'] = true
+        when '-p', /--port(?:=(\d+))?/
+          port = ($1 || argv.shift)
+          port = port.to_i if port
+          if port >= 0 && port <= 65535
+            Config['port'] = port
+          else
+            raise "invalid port: #{port.inspect}"
+          end
+        else
+          raise "unkown command line option: #{opt}"
+        end
+      end
+    end
+
     def create_tcp_server port
       if (server_fd = ENV['NYARA_FD'].to_i) > 0
         puts "inheriting server fd #{server_fd}"

data/lib/nyara/optional_templates/activerecord.yml.erb

@@ -0,0 +1,26 @@
+# for other databases, see
+# http://guides.rubyonrails.org/configuring.html#configuring-a-database
+
+defaults: &defaults
+  adapter: postgresql
+  encoding: unicode
+  username: postgres
+  ## mysql/mariadb example:
+  # adapter: mysql2
+  # encoding: utf8
+  # username: root
+  password:
+  pool: 5
+  host: localhost
+
+development:
+  <<: *defaults
+  database: <%= @app_name %>_dev
+
+test:
+  <<: *defaults
+  database: <%= @app_name %>_test
+
+production:
+  <<: *defaults
+  database: <%= @app_name %>_prod

data/lib/nyara/route.rb

@@ -167,7 +167,7 @@ module Nyara
     def routes
       @routes || []
     end
-    
+
     # #### Param
     #
     # * `controller` - string or class which inherits [Nyara::Controller](Controller.html)
@@ -240,9 +240,7 @@ module Nyara
     def print_routes
       puts "All routes:"
       Nyara::Route.routes.each do |route|
-        cname = route.controller.to_s
-        cname.gsub!("Controller", "")
-        cname.downcase!
+        cname = const2name route.controller
         print "#{cname}#{route.id}".rjust(30), " "
         print route.http_method_to_s.ljust(6), " "
         print route.path_template
@@ -260,6 +258,7 @@ module Nyara
     end
 
     def name2const name
+      return Module.const_get(name) if name[0] =~ /[A-Z]/
       name = name.gsub /(?<=\b|_)[a-z]/, &:upcase
       name.gsub! '_', ''
       name << 'Controller'

data/lib/nyara/templates/%gitignore%

@@ -0,0 +1,4 @@
+.DS_Store
+config/session.key
+config/session_cipher.key
+public

data/lib/nyara/templates/Gemfile.tt

@@ -1,11 +1,30 @@
 source 'https://rubygems.org'
 
-gem 'erubis'
+# web framework
 gem 'nyara', '<%= Nyara::VERSION %>', require: 'nyara/nyara'
-gem 'mongoid', '3.1.4'
+
+# template engine
+<%- if template_ext == 'erb' -%>
+gem 'erubis'
+<%- else -%>
+gem 'slim'
+<%- end -%>
+
+<%- case orm -%>
+<%- when 'mongoid' -%>
+# orm
+gem 'mongoid', '~> 3.1.4'
+<%- when 'activerecord' -%>
+# orm
+gem 'activerecord', '~> 4.0.0'
+
+# database driver
+gem 'pg'
+# gem 'mysql2'
+<%- end -%>
 
 group :development do
-  gem 'linner', github: "SaitoWu/linner"
+  gem 'linner', github: "SaitoWu/linner", require: false
 end
 
 group :deploy do

data/lib/nyara/templates/Linnerfile

@@ -1,28 +1,45 @@
+# -*- mode: yaml -*-
+# vim: set syntax=yaml:
 paths:
+  # source
   app: "app/assets"
+  # destination
   public: "public"
+
 groups:
+  # js src
   scripts:
+    # load paths for require("some-module")
     paths:
       - app/assets/scripts
+    # assemble k with v
     concat:
       "/assets/app.js": "app/assets/**/*.{js,coffee}"
+    # manage js module dependencies by specifying the concat order
     order:
+      # "..." means any other files
       - "..."
       - app/assets/scripts/app.coffee
+
+  # css src
   styles:
+    # load paths for @import "some-module"
     paths:
       - app/assets/styles
     concat:
       "/assets/app.css": "app/assets/**/[a-z]*.{css,scss,sass}"
+
+  # files to copy directly into `public`
   files:
     paths:
       - app/assets/files
     copy:
       "/": "app/assets/**/*.{ico,txt}"
+
 modules:
   wrapper: "cmd"
   ignored: "{vendor/**/*,app/assets/scripts/app.{js,coffee}}"
   definition: "/assets/app.js"
+
 revision: true
 notification: true

data/lib/nyara/templates/Rakefile

@@ -3,17 +3,16 @@ require "rake"
 desc "print all routes"
 task :routes do
   require_relative "config/application"
-  Nyara.setup
   Nyara::Route.print_routes
 end
 
 namespace :assets do
-  desc "compile assets into public"
+  desc "compile assets into public (requires linner)"
   task :build do
     sh 'bundle exec linner build'
   end
 
-  desc "clean assets in public"
+  desc "clean assets in public (requires linner)"
   task :clean do
     sh 'bundle exec linner clean'
   end

data/lib/nyara/templates/app/assets/scripts/app.coffee

@@ -1,4 +1,6 @@
-# Linner let you organize script assets more easily.
+# coffeescript reference -- http://coffeescript.org
+
+# linner lets you organize script assets more easily
 # see module-example.coffee for how to define a module
 module = require 'module-example'
 module.bounce()

data/lib/nyara/templates/app/assets/styles/app.scss

@@ -1,2 +1,4 @@
-// You may:
+// visit http://compass-style.org/ and see how compass makes your CSS clean and robust
+
 // @import "compass"
+// @import "compass/reset"

data/lib/nyara/templates/app/controllers/application_controller.rb

@@ -1,7 +1,7 @@
 class ApplicationController < Nyara::Controller
   set_default_layout 'layouts/application'
 
-  def asset_path(path)
+  def asset_path path
     if Nyara.production?
       Nyara::Config['manifest'][path]
     else

data/lib/nyara/templates/app/controllers/home_controller.rb

@@ -0,0 +1,5 @@
+class HomeController < ApplicationController
+  get '/' do
+    render 'home/index'
+  end
+end

data/lib/nyara/templates/app/views/home/index.%template_ext%.tt

@@ -0,0 +1,29 @@
+<% if template_ext == 'erb' -%>
+<h1>Congratulations!<h1>
+<h2>You completed the first step of creating an awesome website!</h2>
+
+You may also like to:
+
+<ul>
+  <li><a href="https://github.com/luikore/nyara/wiki/Manual#configure-options">Learn more about nyara</a></li>
+  <li><a href="http://slim-lang.com/">Switch template engine to slim</a></li>
+  <li><a href="https://github.com/SaitoWu/linner">See how assets work</a></li>
+  <li><a href="https://chrome.google.com/webstore/detail/livereload/jnihajbhpnppcggbcgedagnkighmdlei?hl=en">Install the livereload plugin on Chrome</a></li>
+</ul>
+<% else -%>
+h1 Congratulations!
+h2 You completed the first step of creating an awesome website!
+
+| You may also like to:
+
+ul
+  li
+    a href="https://github.com/luikore/nyara/wiki/Manual#configure-options"
+      | Learn more about nyara
+  li
+    a href="https://github.com/SaitoWu/linner"
+      | See how assets work
+  li
+    a href="https://chrome.google.com/webstore/detail/livereload/jnihajbhpnppcggbcgedagnkighmdlei?hl=en"
+      | Install the livereload plugin on Chrome
+<% end -%>

data/lib/nyara/templates/app/views/layouts/application.%template_ext%.tt

@@ -0,0 +1,25 @@
+<% if template_ext == 'erb' -%>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <title><%= @app_name %></title>
+  <link type="text/css" rel="stylesheet" href="<%%= asset_path "/assets/app.css" %>">
+  <script type="text/javascript" src="<%%= asset_path "/assets/app.js" %>"></script>
+</head>
+<body>
+  <%%== yield %>
+</body>
+</html>
+<% else -%>
+doctype html
+html
+  head
+  meta http-equiv="Content-type" content="text/html; charset=utf-8"
+  title
+    | <%= @app_name %>
+  link type="text/css" rel="stylesheet" href=asset_path("/assets/app.css")
+  script type="text/javascript" src=asset_path("/assets/app.js")
+body
+  == yield
+<% end -%>

data/lib/nyara/templates/config/application.rb.tt

@@ -0,0 +1,54 @@
+require 'bundler'
+Bundler.require :default, ENV['NYARA_ENV'] || 'development'
+
+configure do
+  set :env, ENV['NYARA_ENV'] || 'development'
+
+  set :port, ENV['NYARA_PORT']
+
+  # directory containing view templates
+  set :views, 'app/views'
+
+  ## change cookie based session name
+  # set :session, :name, '_aaa'
+
+  ## if you've configured https with nginx:
+  # set :session, :secure, true
+
+  ## default session expires when browser closes.
+  ## if you need time-based expiration, 30 minutes for example:
+  # set :session, :expires, 30 * 60
+
+  # you can regenerate session key with `nyara g session.key`
+  set 'session', 'key', File.read(project_path 'config/session.key')
+
+  # map routing prefix to controllers
+  map '/', 'HomeController'
+
+  # environment specific configure at last
+  require_relative env
+
+  # invoked after forking a worker
+  set :after_fork, ->{
+    <%- case orm -%>
+    <%- when 'mongoid' -%>
+    Mongoid.load!(Nyara.config.project_path('config/database.yml'), Nyara.config.env)
+    <%- when 'activerecord' -%>
+    ActiveRecord::Base.establish_connection Nyara.config.project_path('config/database.yml')
+    <%- end -%>
+  }
+end
+
+# load app
+Dir.glob %w|
+  app/controllers/application_controller.rb
+  app/{helpers,models,controllers}/**/*.rb
+| do |file|
+  require_relative "../#{file}"
+end
+
+# compile routes and finish misc setup stuffs
+Nyara.setup
+
+# connect db in interactive shell
+Nyara.config[:after_fork].call if ENV['NYARA_SHELL']

data/lib/nyara/templates/config/boot.rb

@@ -1,4 +1,3 @@
 require_relative "application"
 
-Nyara.setup
 Nyara.start_server

data/lib/nyara/templates/config/development.rb

@@ -1,5 +1,14 @@
+# config specific to development environment
 configure do
-  set :port, 3000
+  # enable Nyara.logger
   set :logger, true
+
+  # serve static files in public
   set :public, 'public'
+
+  # auto reload app
+  set :watch, true
+
+  # auto re-compile assets
+  set :watch_assets, true
 end

data/lib/nyara/templates/config/production.rb

@@ -1,9 +1,12 @@
+# config specific to production environment
 configure do
-  set :port, 3000
   ## worker number can be detected by CPU count
   # set :workers, 4
+
+  # enable Nyara.logger
   set :logger, true
 
+  # assets manifest is generated by `rake assets:build`
   set :manifest, (YAML.load_file Nyara.project_path 'public/manifest.yml')
 
   # todo after_fork

data/lib/nyara/templates/config/test.rb

@@ -1,2 +1,3 @@
+# config specific to test environment
 configure do
 end

data/lib/nyara/view.rb

@@ -209,7 +209,6 @@ module Nyara
       #
       # `[meth_obj, ext_without_dot]`
       def template path, locals={}
-        raw_path = path
         if File.extname(path).empty?
           Dir.chdir @root do
             paths = Dir.glob("#{path}.{#@ext_list}")
@@ -220,16 +219,12 @@ module Nyara
           end
         end
 
-        if path.blank?
-          raise ArgumentError, "template '#{raw_path}' file not found in view dir."
-        end
-
         meth = path2meth path
         ext = @meth2ext[meth]
         return [RENDER[meth], ext] if ext
 
         @meth2sig[meth] = locals.keys
-        ext = on_modified path
+        ext = on_modified path if path
         raise "template not found or not valid in Tilt: #{path}" unless ext
         [RENDER[meth], ext]
       end

data/nyara.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "nyara"
-  s.version = "0.1.pre.1"
+  s.version = "0.1.pre.2"
   s.author = "Zete Lui"
   s.email = "nobody@example.com"
   s.homepage = "https://github.com/luikore/nyara"
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.files += Dir.glob('spec/**/*')
   s.files += Dir.glob('ext/http-parser/{AUTHORS,CONTRIBUTIONS,LICENSE-MIT}')
   s.files += Dir.glob('ext/multipart-parser-c/README.md')
-  s.files += Dir.glob('lib/nyara/templates/**/*') - %w[.DS_Store]
+  s.files += Dir.glob('lib/nyara/{optional_templates,templates}/**/*') - %w[.DS_Store]
   s.files.uniq!
   s.require_paths = ["lib"]
   s.executables << 'nyara'

data/spec/apps/reload.rb

@@ -23,7 +23,8 @@ end
 configure do
   set :port, 3004
   set :root, ENV['RELOAD_ROOT']
-  set :app_files, 'reloadee.rb'
+  require project_path "reloadee.rb"
+  set :watch, true
 end
 
 get '/views' do

data/spec/command_spec.rb

@@ -32,7 +32,7 @@ module Nyara
         Dir.chdir @tmp_dir do
           @stdout = capture(:stdout) do
             @command = Command.new
-            @command.new(@app_name)
+            @command.new @app_name
           end
         end
       end
@@ -47,15 +47,15 @@ module Nyara
         end
 
         it "should copy same files into new dir" do
-          des_files = filter_files Dir.glob(File.join @tmp_dir, @app_name, "**/*")
+          des_files = filter_files Dir.glob(File.join @tmp_dir, @app_name, "**/{*,.*}")
           assert_not_equal(des_files.count, 0)
-          src_files = filter_files Dir.glob("#{@old_dir}/lib/nyara/templates/**/*")
+          src_files = filter_files Dir.glob("#{@old_dir}/lib/nyara/templates/**/{*,.*}")
           assert_equal(des_files.count, src_files.count)
         end
 
         def filter_files files
           files.select do |f|
-            File.basename(f) !~ /\.DS_Store|\.gitignore|session\.key/
+            !(%w[.DS_Store session.key database.yml].include? File.basename f)
           end
         end
       end

data/spec/config_spec.rb

@@ -128,17 +128,5 @@ module Nyara
       Config.init
       assert_nil Nyara.logger
     end
-
-    it "auto load file" do
-      Config.configure do
-        set :env, 'test'
-        set :root, File.join(__dir__, 'dummy')
-        set :app_files, 'app/**/*.rb'
-      end
-      Config.init
-      Nyara.load_app
-      assert_equal true, Object.const_defined?('DummyModel')
-      assert_equal true, Object.const_defined?('DummyController')
-    end
   end
 end

data/spec/nyara_spec.rb

@@ -0,0 +1,43 @@
+require_relative "spec_helper"
+
+describe Nyara do
+  context ".reconfig_with_command_line_options" do
+    before :each do
+      Nyara.config.reset
+    end
+
+    def config cmd_opts
+      Nyara.send :reconfig_with_command_line_options, cmd_opts
+    end
+
+    it "works" do
+      config %w'-p 1234 -d'
+      assert_equal 1234, Nyara.config['port']
+      assert_equal true, Nyara.config['daemon']
+    end
+
+    it "works without -d" do
+      config %w'-p 100'
+      assert_equal 100, Nyara.config['port']
+      assert_equal true, !Nyara.config['daemon']
+    end
+
+    it "raises for bad options" do
+      assert_raise RuntimeError do
+        config %w'xx'
+      end
+    end
+
+    it "recognizes --daemon and --port" do
+      config %w'--port=1245 --daemon'
+      assert_equal 1245, Nyara.config['port']
+      assert_equal true, Nyara.config['daemon']
+    end
+
+    it "raises for bad port" do
+      assert_raise RuntimeError do
+        config %w'--port 100000'
+      end
+    end
+  end
+end

data/spec/path_helper_spec.rb

@@ -30,9 +30,9 @@ module Nyara
       Config.configure do
         reset
         set 'host', 'yavaeye.com'
-        map '/', 'foo'
-        map '/bar-prefix', 'foo_controller::bar'
-        map '/baz-prefix', 'foo_controller::baz'
+        map '/', 'FooController'
+        map '/bar-prefix', 'FooController::BarController'
+        map '/baz-prefix', 'FooController::BazController'
       end
       Nyara.setup
     end

data/spec/view_spec.rb

@@ -47,16 +47,16 @@ module Nyara
       assert_raise ArgumentError do
         render 'edit', nil, nil, {}
       end
-      
+
       render 'edit.slim', nil, nil, {}
       assert_equal "<div>slim:edit</div>", @instance.result.gsub(/\s/, '')
       render 'edit.haml', nil, nil, {}
       assert_equal "<div>haml:edit</div>", @instance.result.gsub(/\s/, '')
     end
-    
+
     it "raises error with template not found" do
-      assert_raise ArgumentError do
-        render 'asdgasdgasdg'
+      assert_raise RuntimeError do
+        render 'not-exist-template', nil, nil, {}
       end
     end
 

data/tools/hello.rb

@@ -5,7 +5,7 @@ require "pry"
 configure do
   # set :env, 'production'
   # set :workers, 3
-  map '/', 'my'
+  map '/', 'MyController'
   set :root, __dir__
   set :public, '/'
   # set :logger, false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyara
 version: !ruby/object:Gem::Version
-  version: 0.1.pre.1
+  version: 0.1.pre.2
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -94,8 +94,7 @@ files:
 - lib/nyara/route.rb
 - lib/nyara/session.rb
 - lib/nyara/templates/app/controllers/application_controller.rb
-- lib/nyara/templates/app/controllers/welcome_controller.rb
-- lib/nyara/templates/config/application.rb
+- lib/nyara/templates/app/controllers/home_controller.rb
 - lib/nyara/templates/config/boot.rb
 - lib/nyara/templates/config/development.rb
 - lib/nyara/templates/config/production.rb
@@ -125,6 +124,7 @@ files:
 - spec/integration_spec.rb
 - spec/mini_support_spec.rb
 - spec/multipart_spec.rb
+- spec/nyara_spec.rb
 - spec/path_helper_spec.rb
 - spec/performance/escape.rb
 - spec/performance/layout_render.rb
@@ -140,9 +140,7 @@ files:
 - spec/spec_helper.rb
 - spec/url_encoded_spec.rb
 - spec/view_spec.rb
-- tools/bug.rb
 - tools/hello.rb
-- tools/memcheck.rb
 - ext/http-parser/http_parser.h
 - ext/inc/ary_intern.h
 - ext/inc/epoll.h
@@ -191,14 +189,17 @@ files:
 - ext/http-parser/CONTRIBUTIONS
 - ext/http-parser/LICENSE-MIT
 - ext/multipart-parser-c/README.md
+- lib/nyara/optional_templates/activerecord.yml.erb
+- lib/nyara/optional_templates/mongoid.yml.erb
+- lib/nyara/templates/%gitignore%
 - lib/nyara/templates/app/assets/files/favicon.ico
 - lib/nyara/templates/app/assets/files/robots.txt
 - lib/nyara/templates/app/assets/scripts/app.coffee
 - lib/nyara/templates/app/assets/scripts/module-example.coffee
 - lib/nyara/templates/app/assets/styles/app.scss
-- lib/nyara/templates/app/views/layouts/application.erb.tt
-- lib/nyara/templates/app/views/welcome/index.erb
-- lib/nyara/templates/config/database.yml.tt
+- lib/nyara/templates/app/views/home/index.%template_ext%.tt
+- lib/nyara/templates/app/views/layouts/application.%template_ext%.tt
+- lib/nyara/templates/config/application.rb.tt
 - lib/nyara/templates/Gemfile.tt
 - lib/nyara/templates/Linnerfile
 - lib/nyara/templates/Rakefile

data/lib/nyara/templates/app/controllers/welcome_controller.rb

@@ -1,5 +0,0 @@
-class WelcomeController < ApplicationController
-  get '/' do
-    render 'welcome/index'
-  end
-end

data/lib/nyara/templates/app/views/layouts/application.erb.tt

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-  <title><%= @app_name %></title>
-  <link type="text/css" rel="stylesheet" href="<%%= asset_path("/assets/app.css") %>">
-  <script type="text/javascript" src="<%%= asset_path("/assets/app.js") %>"></script>
-</head>
-<body>
-  <%%== yield %>
-</body>
-</html>

data/lib/nyara/templates/app/views/welcome/index.erb

@@ -1 +0,0 @@
-Welcome to use Nyara.

data/lib/nyara/templates/config/application.rb

@@ -1,38 +0,0 @@
-require 'bundler'
-Bundler.require :default, ENV['NYARA_ENV'] || 'development'
-
-configure do
-  set :env, ENV['NYARA_ENV'] || 'development'
-
-  set :views, 'app/views'
-  
-  set :assets, "app/assets"
-
-  set :session, :name, '_aaa'
-
-  ## If you've configured https with nginx:
-  # set :session, :secure, true
-
-  ## Default session expires when browser closes.
-  ## If you need time-based expiration, 30 minutes for example:
-  # set :session, :expires, 30 * 60
-  
-  set 'session', 'key', File.read(project_path 'config/session.key')
-
-  # Routing
-  map '/', 'welcome'
-
-  # Application loading order
-  set :app_files, %w|
-    app/controllers/application_controller.rb
-    app/{helpers,models,controllers}/**/*.rb
-  |
-
-  # Environment specific configure at last
-  require_relative env
-end
-
-# Configure Mongoid
-Mongoid.load!(Nyara.config.project_path('config/database.yml'), Nyara.config.env)
-
-Nyara.load_app

data/tools/bug.rb

@@ -1,53 +0,0 @@
-require_relative "../lib/nyara/nyara"
-
-configure do
-  map '/posts', 'posts'
-end
-
-class ApplicationController < Nyara::Controller
-
-end
-
-class PostsController < ApplicationController
-  meta '#index'
-  get '/' do
-    send_string 'index'
-  end
-
-  meta '#show'
-  get '/%u' do |id|
-    @post = Post.find(id)
-    render "posts/show"
-  end
-
-  meta '#new'
-  get '/new' do
-    @post = Post.new
-    render "posts/new"
-  end
-
-  meta '#create'
-  post '/' do
-    @post = Post.new(params[:post])
-    if @post.save
-      success "Post created."
-      redirect_to 'posts#show', @post.id
-    else
-      render "posts/new"
-    end
-  end
-
-  meta '#edit'
-  get '/%u/edit' do
-    @post = Post.find(id)
-    render 'posts/edit'
-  end
-
-  meta '#update'
-  post '/%u' do |id|
-    @post = Post.find(id)
-  end
-end
-
-Nyara.setup
-Nyara.start_server

data/tools/memcheck.rb

@@ -1,33 +0,0 @@
-require_relative "../lib/nyara/nyara"
-
-module Nyara
-  class SimpleController < Controller
-  end
-end
-
-%w[on tag get post put delete patch options].each do |m|
-  eval <<-RUBY
-  def #{m} *xs, &blk
-    Nyara::SimpleController.#{m} *xs, &blk
-  end
-  RUBY
-end
-
-configure do
-  map '/', 'nyara::simple'
-end
-
-get '/' do
-  send_string 'hello world'
-end
-
-get '/gc' do
-  GC.stress = true
-end
-
-get '/ngc' do
-  GC.stress = false
-end
-
-Nyara.setup
-Nyara.start_server