nyara 0.1.pre.0 → 0.1.pre.1

data/ext/inc/ary_intern.h

@@ -0,0 +1,36 @@
+/* array internals, from ruby source code array.c */
+
+#pragma once
+
+# define ARY_SHARED_P(ary) \
+    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+     FL_TEST((ary),ELTS_SHARED)!=0)
+# define ARY_EMBED_P(ary) \
+    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+     FL_TEST((ary), RARRAY_EMBED_FLAG)!=0)
+
+#define ARY_SET_PTR(ary, p) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RARRAY(ary)->as.heap.ptr = (p); \
+} while (0)
+#define ARY_SET_EMBED_LEN(ary, n) do { \
+    long tmp_n = (n); \
+    assert(ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
+    RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
+} while (0)
+#define ARY_SET_HEAP_LEN(ary, n) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    RARRAY(ary)->as.heap.len = (n); \
+} while (0)
+#define ARY_SET_LEN(ary, n) do { \
+    if (ARY_EMBED_P(ary)) { \
+        ARY_SET_EMBED_LEN((ary), (n)); \
+    } \
+    else { \
+        ARY_SET_HEAP_LEN((ary), (n)); \
+    } \
+    assert(RARRAY_LEN(ary) == (n)); \
+} while (0)

data/ext/route.cc

@@ -254,7 +254,8 @@ RouteResult nyara_lookup_route(enum http_method method_num, VALUE vpath, VALUE a
         if (suffix_len) {
           r.format = extract_ext(suffix, suffix_len);
           if (r.format == Qnil) {
-            break;
+            // suffix not match
+            continue;
           }
         }
         r.args = rb_ary_new3(1, i->id);

data/ext/url_encoded.c

@@ -57,6 +57,7 @@ static long _decode_url_seg(VALUE output, const char*s, long len, char stop_char
 
     } else if (s[i] == '+') {
       FLUSH_UNESCAPED;
+      last_s++;
       rb_str_cat(output, " ", 1);
 
     } else {

data/lib/nyara.rb

@@ -4,6 +4,7 @@ require_relative "nyara/nyara"
 END {
   if $!.nil? and !Nyara.config.test?
     Nyara.setup
+    Nyara.load_app
     Nyara.start_server
   end
 }

data/lib/nyara/command.rb

@@ -1,105 +1,86 @@
-require 'optparse'
-module Nyara
-  module Command
-    extend self
+require "thor"
+require "shellwords"
 
-    def help
-      puts %Q(Usage:
-  nyara new APP_NAME [options]
+module Nyara
+  class Command < Thor
+    include Thor::Actions
+    map '-v' => :version
 
-commands:
-  nyara help\t\t\tShow this message
-  nyara new APP_NAME\t\tTo initialize a new project with default template in current directory.
-  nyara version\t\t\tDisplay current version
-      )
+    def self.source_root
+      __dir__
     end
 
+    desc "version", "Show version"
     def version
       puts "Nyara #{Nyara::VERSION}"
     end
 
-    def new_project(*args)
-      args ||= []
-      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)
-
+    desc "new APP_NAME", "Create a project"
+    method_option :force, aliases: '-f', desc: 'Force override old', type: :boolean, default: false
+    def new name
       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)
+      app_dir = File.expand_path File.join(Dir.pwd, name)
+      @rel_dir = name
+      @app_name = File.basename app_dir
       templte_dir = File.join(File.dirname(__FILE__), "templates")
 
-      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."
-        return
-      end
-
-      Dir.mkdir(app_dir)
-
-      puts "Generate Nyara project..."
-      source_templates = Dir.glob("#{templte_dir}/*")
-      puts source_templates.map{|f| File.basename f }
-      FileUtils.cp_r(source_templates, app_dir)
+      FileUtils.rm_rf(app_dir) if options[:force]
+      directory 'templates', name
 
-      # render template
-      files = Dir.glob("#{app_dir}/**/*")
-      render_opts = {
-        app_name: name
-      }
-      files.each do |fname|
-        if not File.directory?(fname)
-          render_template(fname, render_opts)
-        end
+      create_file app_dir + '/.gitignore' do
+        %w".DS_Store config/session.key config/session_cipher.key".join "\n"
       end
+      generate 'session.key'
+      puts '          \\ 👻  /'
+    ensure
+      @app_name = nil
+      @rel_dir = nil
+    end
 
-      Dir.chdir app_dir do
-        puts "config/session.key"
-        File.open 'config/session.key', 'wb' do |f|
-          f << Session.generate_key
+    desc "generate THING", "(PROJECT) Generate things, THING can be:
+    session.key        # config/session.key
+    session_cipher.key # config/session_cipher.key"
+    def generate thing, app_dir=nil
+      case thing
+      when 'session.key'
+        file = "config/session.key"
+        file = File.join @rel_dir, file if @rel_dir
+        create_file file do
+          Session.generate_key
         end
-
-        puts ".gitignore"
-        File.open '.gitignore', 'w' do |f|
-          f.puts ".DS_Store"
-          f.puts "config/session.key"
+      when 'session_cipher.key'
+        file = 'config/session_cipher.key'
+        file = File.join @rel_dir, file if @rel_dir
+        create_file file do
+          Session.generate_cipher_key
         end
       end
-
-      puts "Enjoy!"
     end
 
-    def run_server(*args)
-      args ||= []
-      system("bundle exec ruby config/boot.rb")
+    desc "server", "(PROJECT) Start server"
+    method_option :environment, aliases: %w'-e -E', default: 'development'
+    def server
+      env = options[:environment].shellescape
+      exec "NYARA_ENV=#{env} ruby config/boot.rb"
     end
 
-    private
-    def render_template(fname, opts = {})
-      renderer = ERB.new(File.read(fname))
-      locals = {
-        app_name: opts[:app_name],
-        nyara_version: Nyara::VERSION
-      }
-      File.open(fname, 'w+') do |f|
-        f.write renderer.result(OpenStruct.new(locals).instance_eval { binding })
+    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?"
+    def console
+      env = options[:environment].shellescape
+      cmd = options[:shell]
+      unless cmd
+        if File.read('Gemfile') =~ /\bpry\b/
+          cmd = 'pry'
+        end
+      end
+      cmd ||= 'irb'
+      if cmd != 'irb'
+        cmd = "bundle exec #{cmd}"
       end
+      exec "NYARA_ENV=#{env} #{cmd} -r./config/application.rb"
     end
 
   end

data/lib/nyara/config.rb

@@ -7,11 +7,14 @@ module Nyara
   # * `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
   #
@@ -51,13 +54,18 @@ module Nyara
       unless self['root']
         set :root, Dir.pwd
       end
-      self['root'] = File.expand_path self['root']
+      self['root'] = File.realpath File.expand_path self['root']
 
+      # todo warn paths not under project?
       self['views'] = project_path(self['views'] || 'views')
       if self['public']
         self['public'] = project_path(self['public'])
       end
 
+      if self['assets']
+        self['assets'] = project_path(self['assets'])
+      end
+
       self.logger = create_logger
 
       assert !self['before_fork'] || self['before_fork'].respond_to?('call')
@@ -111,6 +119,16 @@ module Nyara
       path_under 'views', path, strict
     end
 
+    # Get absoute path under assets path
+    #
+    # #### Options
+    #
+    # * `strict` - return `nil` if path is not under the dir
+    #
+    def assets_path path, strict=true
+      path_under "assets", path, strict
+    end
+
     # Get path under the dir configured `Nyara.config[key]`
     #
     # #### Options

data/lib/nyara/controller.rb

@@ -9,6 +9,11 @@ module Nyara
       #     end
       #
       def http method, path, &blk
+        # special treatment: '/' also maps ''
+        if path == '/'
+          http method, '', &blk
+        end
+
         @routes ||= []
         @used_ids = {}
         method = method.to_s.upcase
@@ -164,6 +169,40 @@ module Nyara
       end
     end
 
+    def self.process_reload request, l
+      if request.http_method == 'POST' and request.path =~ /\A\/reload:([\w-]+)\z/
+        ty = $1
+        files = request.param['files']
+        case ty
+        when 'views-modified'
+          files.each do |f|
+            if l
+              l.info "modified: #{f}"
+            end
+            View.on_removed f
+            View.on_modified f
+          end
+        when 'views-removed'
+          files.each do |f|
+            if l
+              l.info "removed: #{f}"
+            end
+            View.on_removed f
+          end
+        when 'app-modified'
+          files.each do |f|
+            if l
+              l.info "modified: #{f}"
+            end
+            Reload.load_file f
+          end
+        else
+          return false
+        end
+        true
+      end
+    end
+
     def self.dispatch request, instance, args
       if cookie_str = request.header._aref('Cookie')
         ParamHash.parse_cookie request.cookie, cookie_str
@@ -172,25 +211,35 @@ module Nyara
         request.session = Session.decode(request.cookie)
       )
 
+      l = Nyara.logger
+
       if instance
-        if l = Nyara.logger
+        if l
           l.info "#{request.http_method} #{request.path} => #{instance.class}"
+          if %W"POST PUT PATCH".include?(request.http_method)
+            l.info "  params: #{instance.params.inspect}"
+          end
         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"
+          if l
+            l.info "GET #{request.path} => public 200"
           end
           instance = Controller.new request
           instance.send_file path
           return
         end
+      elsif Config.development?
+        if process_reload(request, l)
+          Ext.request_send_data request, "HTTP/1.1 200 OK\r\n\r\n"
+          return
+        end
       end
 
-      if l = Nyara.logger
+      if l
         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"
@@ -207,6 +256,9 @@ module Nyara
       end
 
       template, meth = self.class.path_templates[id.to_s]
+      if template.blank? && meth.blank?
+        raise ArgumentError, "#{id} route not found."
+      end
       r = template % args
 
       if opts
@@ -273,8 +325,11 @@ module Nyara
     end
 
     # Shortcut for `redirect url_to *xs`
-    def redirect_to *xs
-      redirect url_to(*xs)
+    def redirect_to identifier, *xs
+      if identifier !~ /\A\w*#\w++(?:\-\w++)*\z/
+        raise ArgumentError, "not action identifier: #{identifier.inspect}, did you mean `redirect`?"
+      end
+      redirect url_to(identifier, *xs)
     end
 
     # Stop processing and close connection<br>
@@ -479,6 +534,8 @@ module Nyara
         unless content_type
           extname = File.extname(file)
           extname = File.extname(filename) if extname.blank? and filename
+          extname.gsub!(".","")
+        
           content_type = MIME_TYPES[extname] || 'application/octet-stream'
         end
         header['Content-Type'] = content_type
@@ -526,7 +583,7 @@ module Nyara
 
     # Render a template as string
     def partial view_path, locals: nil
-      view = View.new self, view_path, nil, nil, {}
+      view = View.new self, view_path, nil, locals, {}
       view.partial
     end
 

data/lib/nyara/hashes/config_hash.rb

@@ -1,33 +1,16 @@
 module Nyara
   # Extended hash class for the use in configuration.
   class ConfigHash
-    # @private
-    alias _aref [] # :nodoc:
-    # @private
-    alias _aset []= # :nodoc:
-
     # #### Call-seq
     #
-    #     config['a', 'very', 'deep', 'key']
+    #     config['a', 'very', 'deep', '', 'key']
     #
     # Equivalent to
     #
-    #     config['a']['very']['deep']['key'] rescue nil
+    #     config['a']['very']['deep'].last['key'] rescue nil
     #
     def [] *keys
-      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
-          return nil # todo default value?
-        end
-      end
-      h
+      nested_aref keys.map(&:to_s)
     end
 
     # #### Call-seq