RubyGems - nyara - Versions diffs - 0.1.pre.0 → 0.1.pre.1 - Mend

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

Files changed (67) hide show

checksums.yaml +4 -4
data/bin/nyara +2 -14
data/changes +3 -0
data/example/factorial.rb +19 -0
data/example/hello.rb +5 -0
data/example/project.rb +11 -0
data/example/stream.rb +14 -0
data/ext/extconf.rb +19 -0
data/ext/hashes.c +160 -57
data/ext/inc/ary_intern.h +36 -0
data/ext/route.cc +2 -1
data/ext/url_encoded.c +1 -0
data/lib/nyara.rb +1 -0
data/lib/nyara/command.rb +60 -79
data/lib/nyara/config.rb +19 -1
data/lib/nyara/controller.rb +64 -7
data/lib/nyara/hashes/config_hash.rb +3 -20
data/lib/nyara/hashes/header_hash.rb +2 -2
data/lib/nyara/hashes/param_hash.rb +1 -0
data/lib/nyara/nyara.rb +45 -37
data/lib/nyara/part.rb +2 -2
data/lib/nyara/reload.rb +63 -64
data/lib/nyara/route.rb +7 -6
data/lib/nyara/session.rb +4 -0
data/lib/nyara/templates/{Gemfile → Gemfile.tt} +4 -0
data/lib/nyara/templates/Linnerfile +28 -0
data/lib/nyara/templates/Rakefile +16 -2
data/lib/nyara/templates/app/assets/files/favicon.ico +1 -0
data/lib/nyara/templates/app/assets/files/robots.txt +5 -0
data/lib/nyara/templates/app/assets/scripts/app.coffee +4 -0
data/lib/nyara/templates/app/assets/scripts/module-example.coffee +4 -0
data/lib/nyara/templates/app/assets/styles/app.scss +2 -0
data/lib/nyara/templates/app/controllers/application_controller.rb +8 -0
data/lib/nyara/templates/app/views/layouts/application.erb.tt +12 -0
data/lib/nyara/templates/config/application.rb +4 -0
data/lib/nyara/templates/config/{database.yml → database.yml.tt} +3 -3
data/lib/nyara/templates/config/production.rb +2 -0
data/lib/nyara/view.rb +6 -2
data/nyara.gemspec +3 -1
data/rakefile +7 -26
data/spec/apps/reload.rb +35 -0
data/spec/command_spec.rb +24 -10
data/spec/config_spec.rb +19 -8
data/spec/controller_spec.rb +14 -0
data/spec/evented_io_spec.rb +3 -1
data/spec/ext_route_spec.rb +25 -3
data/spec/hashes_spec.rb +45 -21
data/spec/integration_spec.rb +28 -2
data/spec/path_helper_spec.rb +7 -0
data/spec/performance_spec.rb +1 -1
data/spec/public/test.css +1 -0
data/{lib/nyara/templates/public/robot.txt → spec/public/test.jpg} +0 -0
data/spec/public/test.js +1 -0
data/spec/reload_spec.rb +50 -0
data/spec/route_spec.rb +4 -4
data/spec/spec_helper.rb +15 -9
data/spec/url_encoded_spec.rb +5 -0
data/spec/view_spec.rb +7 -0
data/spec/views/_partial.slim +1 -1
data/tools/bug.rb +53 -0
data/tools/hello.rb +49 -0
data/tools/memcheck.rb +33 -0
metadata +73 -41
data/ext/inc/status_codes.inc +0 -64
data/lib/nyara/templates/app/views/layouts/application.erb +0 -12
data/lib/nyara/templates/public/css/app.css +0 -1
data/lib/nyara/templates/public/js/app.js +0 -1

data/lib/nyara/templates/app/assets/files/favicon.ico ADDED Viewed

	@@ -0,0 +1 @@
1	+ favicon.ico

data/lib/nyara/templates/app/assets/files/robots.txt ADDED Viewed

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

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

@@ -0,0 +1,4 @@
+# Linner let 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/scripts/module-example.coffee ADDED Viewed

@@ -0,0 +1,4 @@
+# see app.coffee for how to use a module
+module.exports =
+  bounce: ->
+    console.log 'bounce from module example'

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

	@@ -0,0 +1,2 @@
1	+ // You may:
2	+ // @import "compass"

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

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

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

@@ -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="<%%= 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/config/application.rb CHANGED Viewed

@@ -5,6 +5,8 @@ configure do
   set :env, ENV['NYARA_ENV'] || 'development'
   set :views, 'app/views'
+  set :assets, "app/assets"
   set :session, :name, '_aaa'
@@ -14,6 +16,8 @@ configure do
   ## 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'

data/lib/nyara/templates/config/{database.yml → database.yml.tt} RENAMED Viewed

@@ -8,7 +8,7 @@ development:
     default:
       hosts:
         - 127.0.0.1:27017
-      database: '<%= app_name %>_dev'
+      database: '<%= @app_name %>_dev'
 test:
   <<: *defaults
@@ -16,7 +16,7 @@ test:
     default:
       hosts:
         - 127.0.0.1:27017
-      database: '<%= app_name %>_test'
+      database: '<%= @app_name %>_test'
 # set these environment variables on your prod server
 production:
@@ -25,4 +25,4 @@ production:
     default:
       hosts:
         - 127.0.0.1:27017
-      database: '<%= app_name %>'
+      database: '<%= @app_name %>'

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

@@ -4,5 +4,7 @@ configure do
   # set :workers, 4
   set :logger, true
+  set :manifest, (YAML.load_file Nyara.project_path 'public/manifest.yml')
   # todo after_fork
 end

data/lib/nyara/view.rb CHANGED Viewed

@@ -171,8 +171,7 @@ module Nyara
           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
+            Tilt.new path
           end
           # partly precompiled
           RENDER[meth] = TiltRenderable.new t
@@ -210,6 +209,7 @@ 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,6 +220,10 @@ 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

data/nyara.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "nyara"
-  s.version = "0.1.pre.0"
+  s.version = "0.1.pre.1"
   s.author = "Zete Lui"
   s.email = "nobody@example.com"
   s.homepage = "https://github.com/luikore/nyara"
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.0.3'
   s.add_runtime_dependency 'tilt', '>= 1.3'
   s.add_runtime_dependency 'listen', '>= 1.1.3'
+  s.add_runtime_dependency 'thor', '>= 0.18'
   s.rdoc_options += %w[
     -v
@@ -33,5 +34,6 @@ Gem::Specification.new do |s|
     -x ext/inc/.*
     -x .*\.o
     -x .*\.bundle
+    -x .*\.so
   ]
 end

data/rakefile CHANGED Viewed

@@ -3,13 +3,9 @@ require "rake"
 Dir.chdir __dir__
 status_file = "ext/inc/status_codes.h"
-version_file = "ext/inc/version.inc"
 makefile = "ext/Makefile"
 extconf = "ext/extconf.rb"
-desc "code generate"
-task :gen => [version_file]
 desc "generate #{status_file}"
 file status_file => __FILE__ do
   puts "generating: #{status_file}"
@@ -27,25 +23,8 @@ file status_file => __FILE__ do
   f.close
 end
-desc "generate #{version_file}"
-file version_file => ['nyara.gemspec', __FILE__] do
-  puts "generating: #{version_file}"
-  lines = File.readlines('nyara.gemspec')
-  version = nil
-  lines.each do |line|
-    if line =~ /s\.version =/
-      version = line[/\d+(\.\d+)*(\.pre\.\d+)?/]
-      break
-    end
-  end
-  abort 'version not found' unless version
-  File.open version_file, 'w' do |f|
-    f.puts %Q{#define NYARA_VERSION "#{version}"}
-  end
-end
 desc "generate makefile"
-file makefile => extconf do
+file makefile => [extconf, 'nyara.gemspec', __FILE__] do
   Dir.chdir 'ext' do
     sh 'make clean' if File.exist?('Makefile')
     sh 'ruby extconf.rb'
@@ -65,16 +44,18 @@ task :test => :build do
 end
 desc "build and test"
-task :default => [:gen, :test]
+task :default => :test
 desc "build and install gem"
-task :gem => 'gen' do
+task :gem do
   Dir.glob('*.gem') do |f|
     sh 'rm', f
   end
+  # we need to run gem command without the mess of bundler
+  ENV['RUBYOPT'] &&= ENV['RUBYOPT'].gsub /\S*bundler\S*/, ''
   sh 'gem', 'build', 'nyara.gemspec'
   gem_package = Dir.glob('*.gem').first
-  sh 'gem', 'install', '--rdoc', '--ri', gem_package
+  sh 'gem', 'install', '-l', '--rdoc', '--ri', gem_package
 end
 desc "clean"
@@ -146,7 +127,7 @@ end
 desc "audit arity of rb_define_method/rb_define_singleton_method"
 task :audit_arity do
   Dir.glob 'ext/*.{c,cc}' do |f|
-    puts "validatign #{f}"
+    puts "validating #{f}"
     arities = {}
     data = File.read f
     data.scan /^(?:static )?VALUE (\w+)\((.+)\)/ do |func, params|

data/spec/apps/reload.rb ADDED Viewed

@@ -0,0 +1,35 @@
+# reload views and files
+require_relative "../../lib/nyara"
+if ENV['RELOAD_ROOT']
+  configure do
+    set :logger, false
+  end
+else
+  puts "running outside spec, ENV['RELOAD_ROOT'] is nil, creating root dir"
+  require 'tmpdir'
+  require 'pry'
+  ENV['RELOAD_ROOT'] = Dir.mktmpdir 'root'
+  Dir.mkdir ENV['RELOAD_ROOT'] + '/views'
+  File.open ENV['RELOAD_ROOT'] + '/reloadee.rb', 'w' do |f|
+    f << "RELOADEE = 1"
+  end
+  File.open ENV['RELOAD_ROOT'] + '/views/index.slim', 'w' do |f|
+    f << "== 1"
+  end
+end
+configure do
+  set :port, 3004
+  set :root, ENV['RELOAD_ROOT']
+  set :app_files, 'reloadee.rb'
+end
+get '/views' do
+  render 'index'
+end
+get '/app' do
+  send_string RELOADEE
+end

data/spec/command_spec.rb CHANGED Viewed

@@ -2,34 +2,48 @@ require_relative "spec_helper"
 module Nyara
   describe Command do
-    it "#help" do
-      assert_include(stdout { Nyara::Command.help }, "Usage")
+    before :each do
+      @command = Command.new
     end
     it "#version" do
-      assert_equal(stdout { Nyara::Command.version }.strip, "Nyara #{Nyara::VERSION}")
+      assert_equal(capture(:stdout) { @command.version }.strip, "Nyara #{Nyara::VERSION}")
     end
-    describe "#new_project" do
-      before :all do
+    it "#generate" do
+      pending
+    end
+    it "#server" do
+      pending
+    end
+    it "#console" do
+      pending
+    end
+    describe "#new" do
+      before :each do
+        GC.stress = false
         @tmp_dir = Dir.mktmpdir 'nyara'
         @old_dir = File.dirname __dir__
         FileUtils.mkdir_p(@tmp_dir)
         @app_name = "app_#{Time.now.to_i}"
-        @stdout = stdout do
-          Dir.chdir @tmp_dir do
-            Nyara::Command.new_project(@app_name)
+        Dir.chdir @tmp_dir do
+          @stdout = capture(:stdout) do
+            @command = Command.new
+            @command.new(@app_name)
           end
         end
       end
-      after :all do
+      after :each do
         FileUtils.rm_rf(@tmp_dir)
       end
       describe "should create app dir" do
         it "should run finish" do
-          assert_include(@stdout, "Enjoy!")
+          assert_include(@stdout, "👻")
         end
         it "should copy same files into new dir" do

data/spec/config_spec.rb CHANGED Viewed

@@ -34,25 +34,26 @@ module Nyara
       assert_equal 3000, Config['port']
     end
-    it "views and public default" do
-      Config[:root] = '/root'
+    it "views, assets and public default" do
+      Config[:root] = __dir__
       Config.init
       assert_equal nil, Config['public']
-      assert_equal '/root/views', Config['views']
+      assert_equal __dir__ + '/views', Config['views']
+      assert_equal nil, Config['assets']
     end
     context "#project_path" do
       before :each do
         Config.configure do
           reset
-          set :root, '/a'
+          set :root, __dir__
           init
         end
       end
       it "works" do
         path = Config.project_path 'b/../../c', false
-        assert_equal '/c', path
+        assert_equal File.dirname(__dir__) + '/c', path
       end
       it "restrict mode ensures dir safety" do
@@ -62,18 +63,18 @@ module Nyara
       it "restrict mode allows '..' if it doesn't get outside" do
         path = Config.project_path 'b/../c', true
-        assert_equal '/a/c', path
+        assert_equal __dir__ + '/c', path
       end
     end
     it "#public_path" do
       Config.configure do
-        set :root, '/root'
+        set :root, __dir__
         set :public, 'a'
         init
       end
       path = Config.public_path '/b'
-      assert_equal '/root/a/b', path
+      assert_equal __dir__ + '/a/b', path
     end
     it "#views_path" do
@@ -86,6 +87,16 @@ module Nyara
       assert_equal '/', path
     end
+    it "#assets_path" do
+      Config.configure do
+        set :root, '/'
+        set :assets, '/a'
+        init
+      end
+      path = Config.assets_path '../..', false
+      assert_equal '/', path
+    end
     it "env helpers" do
       Config.set :env, 'test'
       assert_equal true, Config.test?

data/spec/controller_spec.rb CHANGED Viewed

@@ -20,5 +20,19 @@ module Nyara
       assert_equal nil, AChildController.controller_name
       assert_equal 'll', AChildController.default_layout
     end
+    context "argument validation" do
+      class DummyController < Controller
+        get '/' do
+        end
+      end
+      it "#redirect_to checks first parameter" do
+        c = DummyController.new Ext.request_new
+        assert_raise ArgumentError do
+          c.redirect_to '/'
+        end
+      end
+    end
   end
 end

data/spec/evented_io_spec.rb CHANGED Viewed

@@ -8,10 +8,12 @@ module Nyara
         exec 'ruby', __dir__ + '/apps/connect.rb'
       end
       GC.stress = false
-      sleep 1.8 # wait for server startup
+      sleep 2.3 # wait for server startup
     end
     after :all do
+      Process.kill :TERM, @server
+      sleep 0.2
       Process.kill :KILL, @server
     end

data/spec/ext_route_spec.rb CHANGED Viewed

@@ -23,17 +23,27 @@ module Nyara
         @controller = 'stub2'
       }
       @e3 = Route.new{
+        @http_method = 'GET'
+        @scope = '/hello'
+        @prefix = '/hello'
+        @suffix = '(\d+)'
+        @id = :'#third'
+        @conv = [:to_i]
+        @controller = 'stub3'
+      }
+      @e4 = Route.new{
         @http_method = 'GET'
         @scope = '/a目录'
         @prefix = '/a目录/'
         @suffix = '(\d+)-(\d+)-(\d+)'
         @id = :'#dir'
         @conv = [:to_i, :to_i, :to_i]
-        @controller = 'stub3'
+        @controller = 'stub4'
       }
       Ext.register_route @e1
       Ext.register_route @e2
       Ext.register_route @e3
+      Ext.register_route @e4
     end
     after :all do
@@ -42,11 +52,12 @@ module Nyara
     it '#register_route sub-prefix optimization' do
       rules = Ext.list_route['GET']
-      assert_equal 3, rules.size
+      assert_equal 4, rules.size
       assert_equal false, rules[0].first # first
       assert_equal true, rules[1].first  # is sub of prev
-      assert_equal false, rules[2].first # not sub of prev
+      assert_equal true, rules[2].first  # is sub of prev
+      assert_equal false, rules[3].first # not sub of prev
     end
     it '#lookup_route' do
@@ -55,11 +66,22 @@ module Nyara
       assert_equal @e2.controller, cont
       assert_equal [:'#second'], args
+      scope, cont, args = Ext.lookup_route 'GET', '/hello.js', nil
+      assert_equal @e2.scope, scope
+      assert_equal @e2.controller, cont
+      assert_equal [:'#second'], args
       scope, cont, args = Ext.lookup_route 'GET', '/hello/3world', nil
       assert_equal @e1.scope, scope
       assert_equal @e1.controller, cont
       assert_equal [:'#1', 3], args
+      # same prefix as @e2, but should not be affected by @e2
+      scope, cont, args = Ext.lookup_route 'GET', '/hello3', nil
+      assert_equal @e3.scope, scope
+      assert_equal @e3.controller, cont
+      assert_equal [:'#third', 3], args
       scope, _ = Ext.lookup_route 'GET', '/world', nil
       assert_equal nil, scope