nyara 0.0.1.pre.9 → 0.1.pre.0

data/lib/nyara/command.rb

@@ -1,3 +1,4 @@
+require 'optparse'
 module Nyara
   module Command
     extend self
@@ -9,9 +10,6 @@ module Nyara
 commands:
   nyara help\t\t\tShow this message
   nyara new APP_NAME\t\tTo initialize a new project with default template in current directory.
-      options:
-      -f\t\t\tForce override if same name path existed
-
   nyara version\t\t\tDisplay current version
       )
     end
@@ -20,23 +18,33 @@ commands:
       puts "Nyara #{Nyara::VERSION}"
     end
 
-    def new_project(name = nil,*args)
+    def new_project(*args)
       args ||= []
-      force_create = args.include?("-f")
+      opts = {
+        force: false
+      }
+      OptionParser.new do |opt|
+        opt.banner = 'Usage: nyara new APP_NAME [options]'
+        opt.on('-f', 'Force override old') do
+          opts[:force] = true
+        end
+      end.parse(args)
+
       require 'fileutils'
       require "erb"
       require 'ostruct'
       require_relative "view_handlers/erb"
 
+      name = args.shift
       if name.blank?
         puts "Need project name: \n\tnyara new xxx"
         return
       end
 
-      app_dir = File.join(Dir.pwd,name)
-      templte_dir = File.join(File.dirname(__FILE__),"templates")
+      app_dir = File.join(Dir.pwd, name)
+      templte_dir = File.join(File.dirname(__FILE__), "templates")
 
-      FileUtils.rm_rf(app_dir) if force_create
+      FileUtils.rm_rf(app_dir) if opts[:force]
 
       if Dir.exist?(app_dir)
         puts "This has same dir name's '#{name}' existed, Nyara can not override it."
@@ -46,8 +54,9 @@ commands:
       Dir.mkdir(app_dir)
 
       puts "Generate Nyara project..."
-      # Copy source template
-      FileUtils.cp_r(Dir.glob("#{templte_dir}/*"),app_dir)
+      source_templates = Dir.glob("#{templte_dir}/*")
+      puts source_templates.map{|f| File.basename f }
+      FileUtils.cp_r(source_templates, app_dir)
 
       # render template
       files = Dir.glob("#{app_dir}/**/*")
@@ -56,13 +65,31 @@ commands:
       }
       files.each do |fname|
         if not File.directory?(fname)
-          render_template(fname,render_opts)
+          render_template(fname, render_opts)
+        end
+      end
+
+      Dir.chdir app_dir do
+        puts "config/session.key"
+        File.open 'config/session.key', 'wb' do |f|
+          f << Session.generate_key
+        end
+
+        puts ".gitignore"
+        File.open '.gitignore', 'w' do |f|
+          f.puts ".DS_Store"
+          f.puts "config/session.key"
         end
       end
 
       puts "Enjoy!"
     end
 
+    def run_server(*args)
+      args ||= []
+      system("bundle exec ruby config/boot.rb")
+    end
+
     private
     def render_template(fname, opts = {})
       renderer = ERB.new(File.read(fname))
@@ -70,7 +97,7 @@ commands:
         app_name: opts[:app_name],
         nyara_version: Nyara::VERSION
       }
-      File.open(fname,'w+') do |f|
+      File.open(fname, 'w+') do |f|
         f.write renderer.result(OpenStruct.new(locals).instance_eval { binding })
       end
     end

data/lib/nyara/config.rb

@@ -54,16 +54,14 @@ module Nyara
       self['root'] = File.expand_path self['root']
 
       self['views'] = project_path(self['views'] || 'views')
-      self['public'] = project_path(self['public'] || 'public')
+      if self['public']
+        self['public'] = project_path(self['public'])
+      end
 
       self.logger = create_logger
 
-      assert !self['before_fork'] or self['before_fork'].respond_to?('call')
-      assert !self['after_fork'] or self['after_fork'].respond_to?('call')
-
-      if self['public']
-        map '/', PublicController
-      end
+      assert !self['before_fork'] || self['before_fork'].respond_to?('call')
+      assert !self['after_fork'] || self['after_fork'].respond_to?('call')
     end
 
     attr_accessor :logger
@@ -73,11 +71,8 @@ module Nyara
       l = self['logger']
 
       if l == true or l.nil?
-        # see Nyara.summary_request
-        Ext.summary_request true if development?
         ::Logger.new(production? ? project_path('production.log') : STDOUT)
       elsif l.is_a?(Class)
-        Ext.summary_request true if development?
         l.new(production? ? project_path('production.log') : STDOUT)
       elsif l.is_a?(Proc)
         l.call
@@ -140,6 +135,10 @@ module Nyara
       self['env'].to_s
     end
 
+    def root
+      self['root'].to_s
+    end
+
     def development?
       e = env
       e.empty? or e == 'development'
@@ -179,4 +178,5 @@ configure do
   set 'env', 'development'
   set 'views', 'views'
   set 'public', 'public'
+  set 'root', Dir.pwd
 end

data/lib/nyara/controller.rb

@@ -1,8 +1,4 @@
 module Nyara
-  # Contain render methods
-  module Renderable
-  end
-
   Controller = Struct.new :request
   class Controller
     module ClassMethods
@@ -15,9 +11,12 @@ module Nyara
       def http method, path, &blk
         @routes ||= []
         @used_ids = {}
+        method = method.to_s.upcase
 
         action = Route.new
-        action.http_method = HTTP_METHODS[method]
+        unless action.http_method = HTTP_METHODS[method]
+          raise ArgumentError, "missing http method: #{method.inspect}"
+        end
         action.path = path
         action.set_accept_exts @formats
         action.id = @curr_id if @curr_id
@@ -132,8 +131,6 @@ module Nyara
           class_eval <<-RUBY
             def __nyara_tmp_action *xs
               #{senders.join}
-            rescue Exception => e
-              handle_error e
             end
             alias :#{e.id.inspect} __nyara_tmp_action
             undef __nyara_tmp_action
@@ -141,7 +138,7 @@ module Nyara
 
           e.compile self, scope
           e.validate
-          @path_templates[e.id] = e.path_template
+          @path_templates[e.id] = [e.path_template, e.http_method_override]
         end
         @routes
       end
@@ -149,8 +146,6 @@ module Nyara
       attr_accessor :path_templates
     end
 
-    include Renderable
-
     def self.inherited klass
       # note: klass will also have this inherited method
 
@@ -169,17 +164,62 @@ module Nyara
       end
     end
 
+    def self.dispatch request, instance, args
+      if cookie_str = request.header._aref('Cookie')
+        ParamHash.parse_cookie request.cookie, cookie_str
+      end
+      request.flash = Flash.new(
+        request.session = Session.decode(request.cookie)
+      )
+
+      if instance
+        if l = Nyara.logger
+          l.info "#{request.http_method} #{request.path} => #{instance.class}"
+        end
+        instance.send *args
+        return
+      elsif request.http_method == 'GET' and Config['public']
+        path = Config.public_path request.path
+        if File.file?(path)
+          if l = Nyara.logger
+            l.info "GET #{path} => public 200"
+          end
+          instance = Controller.new request
+          instance.send_file path
+          return
+        end
+      end
+
+      if l = Nyara.logger
+        l.info "#{request.http_method} #{request.path} => 404"
+      end
+      Ext.request_send_data request, "HTTP/1.1 404 Not Found\r\nConnection: close\r\nContent-Length: 0\r\n\r\n"
+      Fiber.yield :term_close
+
+    rescue Exception
+      instance.handle_error($!) if instance
+    end
+
     # Path helper
     def path_to id, *args
       if args.last.is_a?(Hash)
         opts = args.pop
       end
 
-      r = self.class.path_templates[id.to_s] % args
+      template, meth = self.class.path_templates[id.to_s]
+      r = template % args
 
       if opts
         format = opts.delete :format
         r << ".#{format}" if format
+        if meth and !opts.key?(:_method) and !opts.key?('_method')
+          opts['_method'] = meth
+        end
+      elsif meth
+        opts = {'_method' => meth}
+      end
+
+      if opts
         r << '?' << opts.to_query unless opts.empty?
       end
       r
@@ -210,7 +250,7 @@ module Nyara
       raise "unsupported redirect status: #{status}" unless HTTP_REDIRECT_STATUS.include?(status)
 
       r = request
-      header = r.header
+      header = r.response_header
       self.status status
 
       uri = URI.parse url_or_path
@@ -219,7 +259,7 @@ module Nyara
         uri.port = request.port
       end
       uri.scheme = r.ssl? ? 'https' : 'http'
-      r.header['Location'] = uri.to_s
+      header['Location'] = uri.to_s
 
       # similar to send_header, but without content-type
       Ext.request_send_data r, HTTP_STATUS_FIRST_LINES[r.status]
@@ -484,6 +524,12 @@ module Nyara
       Fiber.yield :sleep # see event.c for the handler
     end
 
+    # Render a template as string
+    def partial view_path, locals: nil
+      view = View.new self, view_path, nil, nil, {}
+      view.partial
+    end
+
     # One shot render, and terminate the action.
     #
     # #### Call-seq
@@ -545,7 +591,7 @@ module Nyara
     def handle_error e
       if l = Nyara.logger
         l.error "#{e.class}: #{e.message}"
-        l.error e.backtrace
+        l.error e.backtrace.join "\n"
       end
       status 500
       send_header rescue nil

data/lib/nyara/cookie.rb

@@ -14,7 +14,7 @@ module Nyara
     def decode header
       res = ParamHash.new
       if data = header['Cookie']
-        Ext.parse_cookie res, data
+        ParamHash.parse_cookie res, data
       end
       res
     end

data/lib/nyara/hashes/config_hash.rb

@@ -35,30 +35,8 @@ module Nyara
     #     config['a', 'very', 'deep', 'key'] = value
     #
     # All intermediate level ConfigHashes are created automatically
-    def []= *keys, last_key, value
-      h = self
-      keys.each do |key|
-        if h.has_key?(key)
-          if h.is_a?(ConfigHash)
-            h = h._aref key
-          else
-            h = h[key]
-          end
-        else
-          new_h = ConfigHash.new
-          if h.is_a?(ConfigHash)
-            h._aset key, new_h
-          else
-            h[key] = new_h
-          end
-          h = new_h
-        end
-      end
-      if h.is_a?(ConfigHash)
-        h._aset last_key, value
-      else
-        h[last_key] = value
-      end
+    def []= *keys, value
+      nested_aset keys.map(&:to_s), value
     end
   end
 end

data/lib/nyara/nyara.rb

@@ -28,9 +28,6 @@ require_relative "cpu_counter"
 require_relative "part"
 require_relative "command"
 
-# default controllers
-require_relative "controllers/public_controller"
-
 module Nyara
   HTTP_STATUS_FIRST_LINES = Hash[HTTP_STATUS_CODES.map{|k,v|[k, "HTTP/1.1 #{k} #{v}\r\n".freeze]}].freeze
 
@@ -80,6 +77,24 @@ module Nyara
       View.init
     end
 
+    def load_app
+      Dir.chdir Config.root do
+        if Config.development?
+          require_relative "reload"
+          Reload.init do
+            # NOTE app_files can be an array
+            Dir.glob(Config['app_files']).uniq.each do |file|
+              Reload.load_file Config.project_path file
+            end
+          end
+        else
+          Dir.glob Config['app_files'] do |file|
+            require Config.project_path file
+          end
+        end
+      end
+    end
+
     def start_server
       port = Config[:port]
 
@@ -105,13 +120,6 @@ module Nyara
       require_relative "patches/tcp_socket"
     end
 
-    def summary_request method_num, path, controller
-      if l = logger
-        method = HTTP_METHODS.find{|k, v| method_num == v}.first
-        l.info "#{method} #{path} => #{controller}"
-      end
-    end
-
     def start_development_server port
       trap :INT do
         exit!
@@ -210,15 +218,21 @@ module Nyara
     def spawn_new_master sig
       fork do
         @server.close_on_exec = false
-        Dir.chdir START_CTX[:cwd]
-        if File.executable?(START_CTX[0])
-          exec START_CTX[0], *START_CTX[:argv], close_others: false
-        else
-          # gemset env should be correct because env is inherited
-          require "rbconfig"
-          ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-          exec ruby, START_CTX[0], *START_CTX[:argv], close_others: false
-        end
+        reload_all
+      end
+    end
+
+    # Reload everything
+    def reload_all
+      # todo set 1-1024 close_on_exec
+      Dir.chdir START_CTX[:cwd]
+      if File.executable?(START_CTX[0])
+        exec START_CTX[0], *START_CTX[:argv], close_others: false
+      else
+        # gemset env should be correct because env is inherited
+        require "rbconfig"
+        ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+        exec ruby, START_CTX[0], *START_CTX[:argv], close_others: false
       end
     end
 

data/lib/nyara/part.rb

@@ -100,19 +100,22 @@ module Nyara
       end
 
       # NOTE `[` are `]` are escaped in url-encoded, so should not split before decode
-      keys = name.sub(/\]$/, '').split(/\]\[|\[/)
+      keys = ParamHash.split_name(name)
+
       if self['filename']
-        Ext.param_hash_nested_aset params, keys, self
+        params.nested_aset keys, self
       elsif self['type']
         warn "looks like bad part: #{self['header'].inspect}"
       else
-        Ext.param_hash_nested_aset params, keys, CGI.unescape(self['data'])
+        params.nested_aset keys, CGI.unescape(self['data'])
       end
     end
 
     # #### Params
     #
     # - `raw` in binary encoding
+    #
+    # NOTE close connection on error
     def update raw
       case self['mechanism']
       when 'base64'
@@ -148,6 +151,7 @@ module Nyara
       end
     end
 
+    # NOTE close connection on error
     def final
       case self['mechanism']
       when 'base64'