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

data/lib/nyara/reload.rb

@@ -0,0 +1,85 @@
+require "listen"
+
+module Nyara
+  # listen to fs events and reload code / views
+  # todo add to development env: require 'nyara/reload'; Reload.listen
+  module Reload
+    # init, should require all files that needs to be reloaded in the given block
+    def self.init
+      @new_classes = []
+      @trace_point = TracePoint.new :class do |tp|
+        @new_classes << tp.self.to_s.to_sym
+      end
+      @file_list = {}
+      @first_load = true
+      yield
+      @first_load = false
+    end
+
+    # NOTE file should end with '.rb'
+    def self.load_file file
+      if consts = @file_list[file]
+        consts.reverse_each do |const|
+          Object.send :remove_const, const
+        end
+      end
+
+      @trace_point.enable
+      old_consts = Object.send :constants
+      if @first_load
+        require file
+      else
+        if l = Nyara.logger
+          l.info "reloading: #{file}"
+        end
+        begin
+          load file
+          @last_error = nil
+        rescue Exception
+          @last_error = $!
+        end
+      end
+      @trace_point.disable
+      added_consts = Object.send(:constants) - old_consts
+
+      added_consts.concat @new_classes
+      @new_classes.clear
+      added_consts.uniq!
+      added_consts.sort!
+
+      @file_list[file] = added_consts
+      @last_error
+    end
+
+    # start listening
+    def self.listen
+      views_path = Config.views_path('/')
+      if views_path
+        if l = Nyara.logger
+          l.info "watching views change under #{views_path}"
+        end
+        Listen.to Config.views_path('/'), relative_paths: true do |modified, added, removed|
+          modified.each do |file|
+            View.on_modified file
+          end
+          removed.each do |file|
+            View.on_removed file
+          end
+        end
+      end
+
+      return unless Config.development?
+      if l = Nyara.logger
+        l.info "watching app change under #{Config['root']}"
+      end
+      Listen.to Config['root'], filter: /\.rb$/, relative_paths: false do |modified, added, removed|
+        (added + modified).uniq.each do |file|
+          load_file file
+        end
+        # (1.0) todo send notification on bad files
+      end
+    end
+
+    # todo (don't forget wiki doc!)
+  end
+end

data/lib/nyara/request.rb

@@ -126,7 +126,7 @@ module Nyara
           b = body # read all the message
           case b
           when String
-            Ext.parse_param q, body
+            ParamHash.parse_param q, body
           when Array
             b.each do |part|
               part.merge_into q

data/lib/nyara/route.rb

@@ -24,6 +24,14 @@ module Nyara
       m
     end
 
+    # nil for get / post
+    def http_method_override
+      m = http_method_to_s
+      if m != 'GET' and m != 'POST'
+        m
+      end
+    end
+
     # enum all combinations of matching selectors
     def selectors
       if classes
@@ -96,6 +104,9 @@ module Nyara
     # private
     # +++
 
+    TOKEN = /%(?:[sz]|(?>\.\d+)?[dfux])/
+    FORWARD_SPLIT = /(?=#{TOKEN})/
+
     # #### Returns
     #
     #     [str_re, conv]
@@ -103,21 +114,32 @@ module Nyara
     def compile_re suffix
       return ['', []] unless suffix
       conv = []
-      re_segs = suffix.split(/(?<=%[dfsuxz])|(?=%[dfsuxz])/).map do |s|
+      segs = suffix.split(FORWARD_SPLIT).flat_map do |s|
+        if (s =~ TOKEN) == 0
+          part1 = s[TOKEN]
+          [part1, s.slice(part1.size..-1)]
+        else
+          s
+        end
+      end
+      re_segs = segs.map do |s|
         case s
-        when '%d'
-          conv << :to_i
-          '(-?[0-9]+)'
-        when '%f'
-          conv << :to_f
-          # just copied from scanf
-          '([-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))'
-        when '%u'
-          conv << :to_i
-          '([0-9]+)'
-        when '%x'
-          conv << :hex
-          '(\h+)'
+        when /\A%(?>\.\d+)?([dfux])\z/
+          case $1
+          when 'd'
+            conv << :to_i
+            '(-?\d+)'
+          when 'f'
+            conv << :to_f
+            # just copied from scanf
+            '([-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))'
+          when 'u'
+            conv << :to_i
+            '(\d+)'
+          when 'x'
+            conv << :hex
+            '(\h+)'
+          end
         when '%s'
           conv << :to_s
           '([^/]+)'
@@ -138,12 +160,16 @@ module Nyara
       raise 'path must start with /' unless path.start_with? '/'
       path = path.sub(/\/$/, '') if path != '/'
 
-      path.split(/(?=%[dfsuxz])/, 2)
+      path.split(FORWARD_SPLIT, 2)
     end
   end
 
   # class methods
   class << Route
+    def routes
+      @routes || []
+    end
+    
     # #### Param
     #
     # * `controller` - string or class which inherits [Nyara::Controller](Controller.html)
@@ -161,7 +187,7 @@ module Nyara
       @global_path_templates = {} # "name#id" => path
       mapped_controllers = {}
 
-      routes = @controllers.flat_map do |scope, c|
+      @routes = @controllers.flat_map do |scope, c|
         if c.is_a?(String)
           c = name2const c
         end
@@ -177,15 +203,15 @@ module Nyara
           @global_path_templates[name + e.id] = e.path_template
         end
       end
-      routes.sort_by! &:prefix
-      routes.reverse!
+      @routes.sort_by! &:prefix
+      @routes.reverse!
 
       mapped_controllers.each do |c, _|
         c.path_templates = @global_path_templates.merge c.path_templates
       end
 
       Ext.clear_route
-      routes.each do |e|
+      @routes.each do |e|
         Ext.register_route e
       end
     end
@@ -213,6 +239,16 @@ module Nyara
       @controllers = []
     end
 
+    def print_routes
+      puts "all routes:"
+      Nyara::Route.routes.each do |route|
+        print (route.id || "").gsub("#", "").rjust(30), " "
+        print route.http_method_to_s.ljust(6), " "
+        print route.path
+        puts ""
+      end
+    end
+
     # private
 
     def const2name c

data/lib/nyara/templates/Gemfile

@@ -1,4 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'nyara', '<%= nyara_version %>'
+gem 'erubis'
+gem 'nyara', '<%= Nyara::VERSION %>', require: 'nyara/nyara'
 gem 'mongoid', '3.1.4'
+
+group :deploy do
+  gem 'rake'
+end
+
+group :test do
+  gem 'rspec'
+end

data/lib/nyara/templates/Rakefile

@@ -1 +1,6 @@
-require 'rake'
+desc "display all routes"
+task :routes do
+  require_relative 'config/application'
+  Nyara.setup
+  Nyara::Route.print_routes
+end

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

@@ -0,0 +1,3 @@
+class ApplicationController < Nyara::Controller
+  set_default_layout 'layouts/application'
+end

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

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

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

@@ -0,0 +1,12 @@
+<!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="/css/app.css">
+  <script type="text/javascript" src="/js/app.js"></script>
+</head>
+<body>
+  <%%== yield %>
+</body>
+</html>

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

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

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

@@ -0,0 +1,34 @@
+require 'bundler'
+Bundler.require :default, ENV['NYARA_ENV'] || 'development'
+
+configure do
+  set :env, ENV['NYARA_ENV'] || 'development'
+
+  set :views, 'app/views'
+
+  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
+
+  # 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/lib/nyara/templates/config/boot.rb

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

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

@@ -0,0 +1,5 @@
+configure do
+  set :port, 3000
+  set :logger, true
+  set :public, 'public'
+end

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

@@ -0,0 +1,8 @@
+configure do
+  set :port, 3000
+  ## worker number can be detected by CPU count
+  # set :workers, 4
+  set :logger, true
+
+  # todo after_fork
+end

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

@@ -0,0 +1,2 @@
+configure do
+end

data/lib/nyara/templates/public/css/app.css

@@ -0,0 +1 @@
+/* Put You css in here */

data/lib/nyara/templates/public/js/app.js

@@ -0,0 +1 @@
+// Put you Javascript in here

data/lib/nyara/templates/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+configure do
+  set :env, 'test'
+end
+require_relative "../config/application"
+require "rspec/autorun"
+
+RSpec.configure do |config|
+  # your configure here
+end

data/lib/nyara/test.rb

@@ -49,7 +49,7 @@ module Nyara
           # merge Set-Cookie
           response.set_cookies.each do |cookie_seg|
             # todo distinguish delete, value and set
-            Ext.parse_url_encoded_seg cookie, cookie_seg, false
+            ParamHash.parse_cookie cookie, cookie_seg
           end
         end
 
@@ -83,7 +83,7 @@ module Nyara
         Session.encode_to_cookie session, cookie
         headers['Cookie'] = Cookie.encode cookie
 
-        request_data = ["#{meth.upcase} #{Ext.escape path, true} HTTP/1.1\r\n"]
+        request_data = ["#{meth.to_s.upcase} #{Ext.escape path, true} HTTP/1.1\r\n"]
         headers.each do |k, v|
           request_data << "#{k}: #{v}\r\n"
         end
@@ -97,6 +97,14 @@ module Nyara
       @_env ||= Env.new
     end
 
+    # #### Call-seq
+    #
+    #     http :trace, '/'
+    #
+    def http *xs
+      env.http *xs
+    end
+
     # #### Call-seq
     #
     #     get '/', headers

data/lib/nyara/view.rb

@@ -1,7 +1,4 @@
 module Nyara
-  module Renderable
-  end
-
   # A support class which provides:
   #
   # - layout / locals for rendering
@@ -25,27 +22,104 @@ module Nyara
     # Path extension (without dot) => stream friendly
     ENGINE_STREAM_FRIENDLY = ParamHash.new
 
+    # meth name => method obj
+    RENDER = {}
+
+    # nested level => layout render, 0 means no layout
+    LAYOUT = {}
+
     autoload :ERB,    File.join(__dir__, "view_handlers/erb")
     autoload :Erubis, File.join(__dir__, "view_handlers/erubis")
     autoload :Haml,   File.join(__dir__, "view_handlers/haml")
     autoload :Slim,   File.join(__dir__, "view_handlers/slim")
 
     class Buffer < Array
+      def initialize parent=nil
+        @parent = parent
+      end
+      attr_reader :parent
+
       alias safe_append= <<
 
       def append= thingy
         self << CGI.escape_html(thingy.to_s)
       end
 
+      alias _join join
       def join
         r = super
         clear
         r
       end
+
+      def push_level
+        Buffer.new self
+      end
+
+      def pop_level
+        @parent << _join
+      end
+
+      def flush instance
+        parents = [self]
+        buf = self
+        while buf = buf.parent
+          parents << buf
+        end
+        parents.reverse_each do |buf|
+          instance.send_chunk buf._join
+          buf.clear
+        end
+      end
+    end
+
+    module Renderable
+      def self.make_render_method file, line, sig, src
+        class_eval <<-RUBY, file, line
+          def render#{sig}
+            #{src}
+          end
+        RUBY
+        instance_method :render
+      end
+
+      def self.make_layout_method nested_level=0
+        sig = 'e'
+        src = "e.call locals"
+        nested_level.times do |i|
+          sig << ", e#{i}"
+          src = "e#{i}.call{ #{src} }"
+        end
+        sig = "#{sig}"
+        class_eval <<-RUBY
+          def layout #{sig}, locals
+            #{src}
+          end
+        RUBY
+        instance_method(:layout).bind self
+      end
+    end
+
+    class TiltRenderable
+      def initialize tilt
+        @tilt = tilt
+      end
+
+      def bind instance
+        @instance = instance
+        self
+      end
+
+      def call locals=nil, &p
+        inst = @instance
+        @instance = nil
+        @tilt.render inst, locals, &p
+      end
     end
 
     class << self
       def init
+        RENDER.delete_if{|k, v| k.start_with?('!') }
         @root = Config['views']
         @meth2ext = {} # meth => ext (without dot)
         @meth2sig = {}
@@ -58,22 +132,18 @@ module Nyara
       attr_reader :root
 
       # NOTE: `path` needs extension
-      def on_delete path
+      def on_removed path
         meth = path2meth path
-        Renderable.class_eval do
-          undef meth
-        end
+        RENDER.delete meth
 
         @meth2ext.delete meth
         @meth2sig.delete meth
       end
 
-      def on_delete_all
+      def on_removed_all
         meths = @meth2sig
-        Renderable.class_eval do
-          meths.each do |meth, _|
-            undef meth
-          end
+        meths.each do |meth, _|
+          RENDER.delete meth
         end
         @meth2sig.clear
         @meth2ext.clear
@@ -84,7 +154,7 @@ module Nyara
       # #### Returns
       #
       # dot_ext for further use
-      def on_update path
+      def on_modified path
         meth = path2meth path
         return unless @meth2sig[meth] # has not been searched before, see also View.template
 
@@ -98,21 +168,14 @@ module Nyara
           sig = @meth2sig[meth].map{|k| "#{k}: nil" }.join ','
           sig = '_={}' if sig.empty?
           sig = "(#{sig})" # 2.0.0-p0 requirement
-          Renderable.class_eval <<-RUBY, path, 0
-            def render#{sig}
-              #{src}
-            end
-            alias :#{meth.inspect} render
-          RUBY
+          RENDER[meth] = Renderable.make_render_method path, 0, sig, src
         else
           t = Dir.chdir @root do
             # todo display template error
             Tilt.new path rescue return
           end
           # partly precompiled
-          Renderable.send :define_method, meth do |locals=nil, &p|
-            t.render self, locals, &p
-          end
+          RENDER[meth] = TiltRenderable.new t
         end
 
         @meth2ext[meth] = ext
@@ -126,22 +189,16 @@ module Nyara
         line = 1
 
         if stream_friendly
-          Renderable.class_eval <<-RUBY, __FILE__, __LINE__
-            def render locals={}
-              @_nyara_locals = locals
-              src = locals.map{|k, _| "\#{k} = @_nyara_locals[:\#{k}];" }.join
-              src << View.precompile(#{ext.inspect}){ @_nyara_view.in }
-              instance_eval src, #{file}, #{line}
-            end
-            alias :#{meth.inspect} render
+          RENDER[meth] = Renderable.make_render_method __FILE__, __LINE__, '(locals={})', <<-RUBY
+            @_nyara_locals = locals
+            src = locals.map{|k, _| "\#{k} = @_nyara_locals[:\#{k}];" }.join
+            src << View.precompile(#{ext.inspect}){ @_nyara_view.in }
+            instance_eval src, #{file}, #{line}
           RUBY
           ENGINE_STREAM_FRIENDLY[ext] = true
         else
-          Renderable.class_eval <<-RUBY, __FILE__, __LINE__
-            def render locals=nil
-              Tilt[#{ext.inspect}].new(#{file}, #{line}){ @_nyara_view.in }.render self, locals
-            end
-            alias :#{meth.inspect} render
+          RENDER[meth] = Renderable.make_render_method __FILE__, __LINE__, '(locals=nil)', <<-RUBY
+            Tilt[#{ext.inspect}].new(#{file}, #{line}){ @_nyara_view.in }.render self, locals
           RUBY
         end
         ENGINE_DEFAULT_CONTENT_TYPES[ext] = default_content_type
@@ -151,7 +208,7 @@ module Nyara
       #
       # #### Returns
       #
-      # `[meth, ext_without_dot]`
+      # `[meth_obj, ext_without_dot]`
       def template path, locals={}
         if File.extname(path).empty?
           Dir.chdir @root do
@@ -165,12 +222,12 @@ module Nyara
 
         meth = path2meth path
         ext = @meth2ext[meth]
-        return [meth, ext] if ext
+        return [RENDER[meth], ext] if ext
 
         @meth2sig[meth] = locals.keys
-        ext = on_update path
+        ext = on_modified path
         raise "template not found or not valid in Tilt: #{path}" unless ext
-        [meth, ext]
+        [RENDER[meth], ext]
       end
 
       # private
@@ -192,11 +249,11 @@ module Nyara
       end
 
       def path2meth path
-        "!!#{path}"
+        "!#{path}"
       end
 
       def engine2meth engine
-        "!:#{engine}"
+        ":#{engine}"
       end
     end
 
@@ -225,59 +282,52 @@ module Nyara
         unless @deduced_content_type = ENGINE_DEFAULT_CONTENT_TYPES[ext]
           raise ArgumentError, "unkown template engine: #{ext.inspect}"
         end
-
-        @layouts = [[meth, ext]]
       else
         raise ArgumentError, "too many options, expected only 1: #{opts.inspect}" if opts.size > 1
-        ext, template = opts.first
-        meth = View.engine2meth ext
+        ext, @in = opts.first
 
         unless @deduced_content_type = ENGINE_DEFAULT_CONTENT_TYPES[ext]
           raise ArgumentError, "unkown template engine: #{ext.inspect}"
         end
 
-        @layouts = [meth]
-        @in = template
+        meth = RENDER[View.engine2meth(ext)]
       end
 
+      @args = [meth.bind(instance)]
       unless layout.is_a?(Array)
         layout = layout ? [layout] : []
       end
       layout.each do |l|
         pair = View.template(l)
         # see notes on View
-        raise "can not use #{meth} as layout" unless ENGINE_STREAM_FRIENDLY[pair[1]]
-        @layouts << pair
+        raise "can not use #{pair[1]} as layout" unless ENGINE_STREAM_FRIENDLY[pair[1]]
+        @args << pair.first.bind(instance)
       end
 
-      @locals = locals
+      @layout_render = (LAYOUT[@args.size] ||= Renderable.make_layout_method(@args.size - 1))
+      @args << locals
+
       @instance = instance
       @instance.instance_variable_set :@_nyara_view, self
       @out = Buffer.new
     end
     attr_reader :deduced_content_type, :in, :out
 
-    def render
-      @rest_layouts = @layouts.dup
-      @instance.send_chunk _render
-      Fiber.yield :term_close
+    def partial
+      @out = @out.push_level
+      res = @layout_render.call *@args
+      @out = @out.pop_level
+      res
     end
 
-    def _render # :nodoc:
-      t, _ = @rest_layouts.pop
-      if @rest_layouts.empty?
-        @instance.send t, @locals
-      else
-        @instance.send t do
-          _render
-        end
-      end
+    def render
+      @instance.send_chunk @layout_render.call *@args
+      Fiber.yield :term_close
     end
 
     def stream
-      @rest_layouts = @layouts.dup
       @fiber = Fiber.new do
-        @rest_result = _render
+        @rest_result = @layout_render.call *@args
         nil
       end
       self
@@ -287,8 +337,7 @@ module Nyara
       r = @fiber.resume
       Fiber.yield r if r
       unless @out.empty?
-        @instance.send_chunk @out.join
-        @out.clear
+        @out.flush @instance
       end
     end