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

data/lib/nyara/hashes/header_hash.rb

@@ -8,14 +8,14 @@ module Nyara
     CONTENT_TYPE = 'Content-Type'.freeze
 
     def aref_content_type
-      self._aref CONTENT_TYPE
+      _aref CONTENT_TYPE
     end
 
     def aset_content_type value
       unless value.index 'charset'
         value = "#{value}; charset=UTF-8"
       end
-      self._aset CONTENT_TYPE, value
+      _aset CONTENT_TYPE, value
     end
   end
 end

data/lib/nyara/hashes/param_hash.rb

@@ -3,5 +3,6 @@ module Nyara
   # All keys are stored in String form.
   class ParamHash
     alias has_key? key?
+    private :nested_aset, :nested_aref
   end
 end

data/lib/nyara/nyara.rb

@@ -26,7 +26,6 @@ require_relative "route"
 require_relative "view"
 require_relative "cpu_counter"
 require_relative "part"
-require_relative "command"
 
 module Nyara
   HTTP_STATUS_FIRST_LINES = Hash[HTTP_STATUS_CODES.map{|k,v|[k, "HTTP/1.1 #{k} #{v}\r\n".freeze]}].freeze
@@ -61,7 +60,7 @@ module Nyara
       Config
     end
 
-    %w[logger env production? test? development? project_path views_path public_path].each do |m|
+    %w[logger env production? test? development? project_path assets_path views_path public_path].each do |m|
       eval <<-RUBY
         def #{m} *xs
           Config.#{m} *xs
@@ -77,42 +76,49 @@ 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.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
+          Reload.listen
+          @reload = Reload
         end
       end
     end
 
     def start_server
-      port = Config[:port]
+      port = Config['port']
+      env = Config['env']
 
       if l = logger
-        l.info "starting #{Config[:env]} server at 0.0.0.0:#{port}"
+        l.info "starting #{env} server at 0.0.0.0:#{port}"
       end
-      case Config[:env].to_s
+      case env.to_s
       when 'production'
-        patch_tcp_socket
         start_production_server port
       when 'test'
         # don't
       else
-        patch_tcp_socket
+        start_watch_assets
         start_development_server port
       end
     end
 
+    def start_watch_assets
+      return if Config[:assets].blank?
+      Process.fork do
+        exec 'bundle exec linner watch'
+      end
+    end
+
     def patch_tcp_socket
       if l = logger
         l.info "patching TCPSocket"
@@ -121,17 +127,14 @@ module Nyara
     end
 
     def start_development_server port
-      trap :INT do
-        exit!
-      end
+      create_tcp_server port
+      @workers = []
+      incr_workers nil
 
-      t = Thread.new do
-        server = TCPServer.new '0.0.0.0', port
-        server.listen 1000
-        Ext.init_queue
-        Ext.run_queue server.fileno
-      end
-      t.join
+      trap :INT, &method(:kill_all)
+      trap :QUIT, &method(:kill_all)
+      trap :TERM, &method(:kill_all)
+      Process.waitall
     end
 
     # Signals:
@@ -161,16 +164,7 @@ module Nyara
       workers = Config[:workers]
 
       puts "workers: #{workers}"
-
-      if (server_fd = ENV['NYARA_FD'].to_i) > 0
-        puts "inheriting server fd #{server_fd}"
-        @server = TCPServer.for_fd server_fd
-      end
-      unless @server
-        @server = TCPServer.new '0.0.0.0', port
-        @server.listen 1000
-        ENV['NYARA_FD'] = @server.fileno.to_s
-      end
+      create_tcp_server port
 
       GC.start
       @workers = []
@@ -198,11 +192,24 @@ module Nyara
 
     private
 
+    def create_tcp_server port
+      if (server_fd = ENV['NYARA_FD'].to_i) > 0
+        puts "inheriting server fd #{server_fd}"
+        @server = TCPServer.for_fd server_fd
+      end
+      unless @server
+        @server = TCPServer.new '0.0.0.0', port
+        @server.listen 1000
+        ENV['NYARA_FD'] = @server.fileno.to_s
+      end
+    end
+
     # Kill all workers and exit
     def kill_all sig
       @workers.each do |w|
         Process.kill :KILL, w
       end
+      @reload.stop if @reload
       exit!
     end
 
@@ -254,6 +261,7 @@ module Nyara
     def incr_workers sig
       Config['before_fork'].call if Config['before_fork']
       pid = fork {
+        patch_tcp_socket
         $0 = "(nyara:worker) ruby #{$0}"
         Config['after_fork'].call if Config['after_fork']
 

data/lib/nyara/part.rb

@@ -103,11 +103,11 @@ module Nyara
       keys = ParamHash.split_name(name)
 
       if self['filename']
-        params.nested_aset keys, self
+        params.send :nested_aset, keys, self
       elsif self['type']
         warn "looks like bad part: #{self['header'].inspect}"
       else
-        params.nested_aset keys, CGI.unescape(self['data'])
+        params.send :nested_aset, keys, CGI.unescape(self['data'])
       end
     end
 

data/lib/nyara/reload.rb

@@ -2,84 +2,83 @@ 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
+    extend self
 
-      @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 = $!
+    # NOTE file should end with '.rb'<br>
+    # returns last error
+    def load_file file
+      verbose = $VERBOSE
+      $VERBOSE = nil
+      begin
+        load file
+        @last_error = nil
+      rescue Exception
+        @last_error = $!
+      ensure
+        $VERBOSE = verbose
+      end
+      if l = Nyara.logger
+        if @last_error
+          l.error @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
+    attr_reader :last_error
 
     # 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
+    def listen
+      @port = Config['port']
+      app_path = Config['root']
+      views_path = Config.views_path('/', false)
+      if l = Nyara.logger
+        l.info "watching app and view changes under #{app_path}"
+        unless views_path.start_with?(app_path)
+          l.warn "views not under project dir, changes not watched"
         end
       end
+      @app_listener = hook_app_reload app_path
+      @views_listener = hook_views_reload views_path
+    end
 
-      return unless Config.development?
-      if l = Nyara.logger
-        l.info "watching app change under #{Config['root']}"
+    # cleanup workers
+    def stop
+      if @app_listener.adapter.worker
+        @app_listener.adapter.worker.stop
       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
+      if @views_listener.adapter.worker
+        @views_listener.adapter.worker.stop
       end
     end
 
-    # todo (don't forget wiki doc!)
+    # ---
+    # private
+    # +++
+
+    def hook_app_reload app_path
+      l = Listen.to(app_path).relative_paths(false).filter(/\.rb$/).change do |modified, added, removed|
+        notify 'app-modified', (added + modified).uniq
+      end
+      l.start
+      l
+    end
+
+    def hook_views_reload views_path
+      l = Listen.to(views_path).relative_paths(true).change do |modified, added, removed|
+        notify 'views-modified', (added + modified).uniq
+        notify 'views-removed', removed
+      end
+      l.start
+      l
+    end
+
+    def notify leader, files
+      return if files.empty?
+      data = files.to_query('files')
+      s = TCPSocket.new 'localhost', @port
+      s << "POST /reload:#{leader}\r\nContent-Length: #{data.bytesize}\r\n\r\n" << data
+      s.close
+    end
   end
 end

data/lib/nyara/route.rb

@@ -158,8 +158,6 @@ module Nyara
     def analyse_path path
       raise 'path must contain no new line' if path.index "\n"
       raise 'path must start with /' unless path.start_with? '/'
-      path = path.sub(/\/$/, '') if path != '/'
-
       path.split(FORWARD_SPLIT, 2)
     end
   end
@@ -240,12 +238,15 @@ module Nyara
     end
 
     def print_routes
-      puts "all routes:"
+      puts "All routes:"
       Nyara::Route.routes.each do |route|
-        print (route.id || "").gsub("#", "").rjust(30), " "
+        cname = route.controller.to_s
+        cname.gsub!("Controller", "")
+        cname.downcase!
+        print "#{cname}#{route.id}".rjust(30), " "
         print route.http_method_to_s.ljust(6), " "
-        print route.path
-        puts ""
+        print route.path_template
+        puts
       end
     end
 

data/lib/nyara/session.rb

@@ -133,6 +133,10 @@ module Nyara
       OpenSSL::PKey::DSA.generate 256
     end
 
+    def generate_cipher_key
+      rand(CIPHER_RAND_MAX).to_s(36).ljust CIPHER_BLOCK_SIZE
+    end
+
     # private
 
     def encode64 s

data/lib/nyara/templates/{Gemfile → Gemfile.tt}

@@ -4,6 +4,10 @@ gem 'erubis'
 gem 'nyara', '<%= Nyara::VERSION %>', require: 'nyara/nyara'
 gem 'mongoid', '3.1.4'
 
+group :development do
+  gem 'linner', github: "SaitoWu/linner"
+end
+
 group :deploy do
   gem 'rake'
 end

data/lib/nyara/templates/Linnerfile

@@ -0,0 +1,28 @@
+paths:
+  app: "app/assets"
+  public: "public"
+groups:
+  scripts:
+    paths:
+      - app/assets/scripts
+    concat:
+      "/assets/app.js": "app/assets/**/*.{js,coffee}"
+    order:
+      - "..."
+      - app/assets/scripts/app.coffee
+  styles:
+    paths:
+      - app/assets/styles
+    concat:
+      "/assets/app.css": "app/assets/**/[a-z]*.{css,scss,sass}"
+  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

@@ -1,6 +1,20 @@
-desc "display all routes"
+require "rake"
+
+desc "print all routes"
 task :routes do
-  require_relative 'config/application'
+  require_relative "config/application"
   Nyara.setup
   Nyara::Route.print_routes
 end
+
+namespace :assets do
+  desc "compile assets into public"
+  task :build do
+    sh 'bundle exec linner build'
+  end
+
+  desc "clean assets in public"
+  task :clean do
+    sh 'bundle exec linner clean'
+  end
+end