RubyGems - gin - Versions diffs - 1.0.4 → 1.1.0 - Mend

gin 1.0.4 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

data/History.rdoc +16 -0
data/Manifest.txt +12 -2
data/README.rdoc +33 -0
data/Rakefile +5 -0
data/TODO.rdoc +7 -0
data/bin/gin +158 -0
data/lib/gin.rb +19 -2
data/lib/gin/app.rb +420 -173
data/lib/gin/cache.rb +65 -0
data/lib/gin/config.rb +174 -18
data/lib/gin/constants.rb +4 -0
data/lib/gin/controller.rb +219 -11
data/lib/gin/core_ext/gin_class.rb +16 -0
data/lib/gin/errorable.rb +16 -2
data/lib/gin/filterable.rb +29 -19
data/lib/gin/reloadable.rb +1 -1
data/lib/gin/request.rb +11 -0
data/lib/gin/router.rb +185 -61
data/lib/gin/rw_lock.rb +109 -0
data/lib/gin/test.rb +702 -0
data/public/gin.css +15 -3
data/test/app/layouts/bar.erb +9 -0
data/test/app/layouts/foo.erb +9 -0
data/test/app/views/bar.erb +1 -0
data/test/mock_app.rb +94 -0
data/test/mock_config/invalid.yml +2 -0
data/test/test_app.rb +160 -45
data/test/test_cache.rb +57 -0
data/test/test_config.rb +108 -13
data/test/test_controller.rb +201 -11
data/test/test_errorable.rb +1 -1
data/test/test_gin.rb +9 -0
data/test/test_helper.rb +3 -1
data/test/test_router.rb +33 -0
data/test/test_rw_lock.rb +65 -0
data/test/test_test.rb +627 -0
metadata +86 -6
data/.autotest +0 -23
data/.gitignore +0 -7

data/public/gin.css CHANGED Viewed

@@ -1,15 +1,27 @@
 body {
-  font-family: Helvetica Neue, Helvetica, Sans-Serif;
   background-color: #eee;
   margin: 50px;
 }
+body, h1 {
+  font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-weight: 100;
+}
+h1, strong {
+  color: #444;
+}
+a {
+  color: #9fbb4a;
+}
 .canvas {
   border: 1px solid #ccc;
   padding: 12px;
   padding-top: 10px;
-  border-radius: 15px;
+  border-radius: 10px;
   box-shadow: 3px 3px 10px #aaa;
   background-color: #fff;
   margin: 0 auto;
@@ -29,7 +41,7 @@ body {
   border: 1px solid #ccc;
   overflow: scroll;
   background-color: #efefef;
-  border-radius: 10px;
+  border-radius: 7px;
   box-shadow: 3px 3px -10px #aaa;
 }

data/test/app/layouts/bar.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Bar Layout</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/test/app/layouts/foo.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Foo Layout</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/test/app/views/bar.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ Value is <%= test_val %>

data/test/mock_app.rb ADDED Viewed

@@ -0,0 +1,94 @@
+class MockApp < Gin::App
+  class FooController < Gin::Controller
+    controller_name "foo"
+    layout "foo"
+    def index
+      view :bar, locals: {test_val: "LOCAL"}
+    end
+    def login
+      set_cookie "foo_session", "12345",
+        expires: Time.parse("Fri, 01 Jan 2100 00:00:00 -0000")
+      "OK"
+    end
+    def supercookie
+      set_cookie "supercookie", "SUPER!",
+        expires:  Time.parse("Fri, 01 Jan 2100 00:00:00 -0000"),
+        domain:   "mockapp.com",
+        path:     "/",
+        secure:   true,
+        httponly: true
+      "OK"
+    end
+  end
+  class BarController < Gin::Controller
+    controller_name "bar"
+    def show id
+      "SHOW #{id}!"
+    end
+    def index
+      raise "OH NOES"
+    end
+    def see_other
+      redirect "http://example.com", 301
+    end
+  end
+  class ApiController < Gin::Controller
+    controller_name "api"
+    def pdf
+      content_type 'application/pdf'
+      'fake pdf'
+    end
+    def json
+      content_type :json
+      '{"foo":1234}'
+    end
+    def bson
+      content_type 'application/bson'
+      BSON.serialize({'foo' => 1234}).to_s
+    end
+    def xml
+      content_type :xml
+      '<foo>1234</foo>'
+    end
+    def plist
+      content_type 'application/plist'
+      <<-STR
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">
+<dict>\n\t<key>foo</key>\n\t<integer>1234</integer>\n</dict>\n</plist>
+      STR
+    end
+  end
+  logger StringIO.new
+  root_dir "test/app"
+  autoreload false
+  mount BarController do
+    get :show, "/:id"
+    get :index, "/"
+    defaults
+  end
+  mount FooController
+  mount ApiController
+end

data/test/mock_config/invalid.yml ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ - foo
2	+ blah: bad yaml

data/test/test_app.rb CHANGED Viewed

@@ -73,22 +73,17 @@ end
 class AppTest < Test::Unit::TestCase
   class NamespacedApp < Gin::App; end
+  FOO_ROUTER = FooApp.router
   def setup
-    FooApp.instance_variable_set("@environment", nil)
-    FooApp.instance_variable_set("@asset_host", nil)
-    FooApp.instance_variable_set("@middleware", nil)
-    FooApp.instance_variable_set("@instance", nil)
-    FooApp.instance_variable_set("@config", nil)
-    FooApp.instance_variable_set("@config_dir", nil)
-    FooApp.instance_variable_set("@error_delegate", nil)
-    FooApp.instance_variable_set("@public_dir", nil)
-    FooApp.instance_variable_set("@session", nil)
-    FooApp.instance_variable_set("@protection", nil)
-    FooApp.instance_variable_set("@autoreload", nil)
+    FooApp.setup
+    FooApp.options[:router] = FOO_ROUTER
     @error_io = StringIO.new
-    @app  = FooApp.new @error_io
-    @rapp = FooApp.new lambda{|env| [200,{'Content-Type'=>'text/html'},["HI"]]}, @error_io
+    FooApp.logger(@error_io)
+    @app  = FooApp.new
+    @rapp = FooApp.new lambda{|env| [200,{'Content-Type'=>'text/html'},["HI"]]}
   end
@@ -99,9 +94,9 @@ class AppTest < Test::Unit::TestCase
   def test_class_proxies
     proxies = [:protection, :sessions, :session_secret, :middleware,
-      :error_delegate, :router, :root_dir, :public_dir, :load_config, :config,
-      :config_dir, :environment, :development?, :test?, :staging?, :production?,
-      :mime_type, :asset_host_for, :asset_host, :asset_version]
+      :error_delegate, :router, :root_dir, :public_dir, :environment,
+      :mime_type, :asset_host, :options, :config, :autoreload, :md5s,
+      :templates]
     proxies.each do |name|
       assert FooApp.respond_to?(name), "Gin::App should respond to #{name}"
@@ -145,15 +140,19 @@ class AppTest < Test::Unit::TestCase
   def test_autoreload
+    FooApp.setup
     FooApp.environment "production"
+    @app = FooApp.new
     assert_equal false, FooApp.autoreload
     assert_equal false, @app.autoreload
     FooApp.autoreload true
+    @app = FooApp.new
     assert_equal true, FooApp.autoreload
     assert_equal true, @app.autoreload
     FooApp.autoreload false
+    @app = FooApp.new
     assert_equal false, FooApp.autoreload
     assert_equal false, @app.autoreload
   end
@@ -161,10 +160,12 @@ class AppTest < Test::Unit::TestCase
   def test_autoreload_dev
     FooApp.environment "development"
+    @app = FooApp.new
     assert_equal true, FooApp.autoreload
     assert_equal true, @app.autoreload
     FooApp.autoreload false
+    @app = FooApp.new
     assert_equal false, FooApp.autoreload
     assert_equal false, @app.autoreload
   end
@@ -202,31 +203,139 @@ class AppTest < Test::Unit::TestCase
   def test_config_dir
     assert_equal File.join(FooApp.root_dir, "config"), FooApp.config_dir
+    assert_equal File.join(FooApp.root_dir, "config"), FooApp.config.dir
+    assert_equal File.join(FooApp.root_dir, "config"), @app.config.dir
     FooApp.config_dir "/foo/blah"
     assert_equal "/foo/blah", FooApp.config_dir
+    assert_equal "/foo/blah", FooApp.config.dir
+    assert_equal "/foo/blah", @app.config.dir
+  end
+  def test_config_env
+    assert_equal 'development', FooApp.environment
+    assert_equal 'development', FooApp.config.environment
+    assert_equal 'development', @app.config.environment
+    FooApp.environment "production"
+    assert_equal "production", FooApp.config.environment
+    assert_equal "production", @app.config.environment
+  end
+  def test_config_reload
+    assert_equal false, FooApp.config_reload
+    assert_equal false, FooApp.config.ttl
+    assert_equal false, @app.config.ttl
+    FooApp.config_reload 300
+    assert_equal 300, FooApp.config.ttl
+    assert_equal 300, @app.config.ttl
+  end
+  def test_config_logger
+    assert_equal @error_io, FooApp.logger
+    assert_equal @error_io, FooApp.config.logger
+    assert_equal @error_io, @app.config.logger
+    FooApp.logger "mock_logger"
+    assert_equal "mock_logger", FooApp.config.logger
+    assert_equal "mock_logger", @app.config.logger
   end
   def test_config
-    assert Gin::Config === FooApp.config
-    assert FooApp.config.instance_variable_get("@data").empty?
+    @app = FooApp.new
+    assert Gin::Config === @app.config
+    assert @app.config == FooApp.config
+    assert @app.config.instance_variable_get("@data").empty?
   end
   def test_config_with_dir
+    FooApp.setup
     FooApp.config_dir "./test/mock_config"
-    assert_equal 1, FooApp.config.backend['connections']
+    @app = FooApp.new
+    assert_equal 1, FooApp.config['backend.connections']
+    assert_equal 1, @app.config['backend.connections']
   end
-  def test_load_config
-    FooApp.config
-    FooApp.config_dir "./test/mock_config"
-    assert_raises(NoMethodError){ FooApp.config.backend }
+  def test_layout
+    assert_equal :layout, FooApp.layout
+    assert_equal :layout, @app.layout
+    FooApp.layout "foo"
+    assert_equal "foo", FooApp.layout
+    assert_equal :layout, @app.layout
+    @app = FooApp.new
+    assert_equal "foo", @app.layout
+  end
+  def test_layouts_dir
+    assert_equal File.join(FooApp.root_dir, "layouts"), FooApp.layouts_dir
+    FooApp.root_dir "test/foo"
+    assert_equal File.join(FooApp.root_dir, "layouts"), FooApp.layouts_dir
+    assert_equal File.join(@app.root_dir, "layouts"), @app.layouts_dir
+  end
+  def test_views_dir
+    assert_equal File.join(FooApp.root_dir, "views"), FooApp.views_dir
+    FooApp.root_dir "test/foo"
+    assert_equal File.join(FooApp.root_dir, "views"), FooApp.views_dir
+    assert_equal File.join(@app.root_dir, "views"), @app.views_dir
+  end
+  def test_template_engines
+    FooApp.setup
+    default = Tilt.mappings.merge(nil => [Tilt::ERBTemplate])
+    assert_equal default, FooApp.options[:template_engines]
+    assert_equal default, @app.template_engines
+    FooApp.default_template Tilt::ERBTemplate, "custom", "thing"
+    assert_equal default, @app.template_engines
+    @app = FooApp.new
+    assert_equal [Tilt::ERBTemplate], @app.template_engines['custom']
+    assert_equal [Tilt::ERBTemplate], @app.template_engines['thing']
+    FooApp.default_template Tilt::HamlTemplate
+    assert_equal [Tilt::HamlTemplate, Tilt::ERBTemplate],
+      FooApp.options[:template_engines][nil]
+  end
+  def test_template_for
+    FooApp.default_template Tilt::ERBTemplate, "erb"
+    @app = FooApp.new root_dir: "./test/app"
+    template = @app.template_for "./test/app/layouts/foo"
+    assert Tilt::ERBTemplate === template
+    assert_equal "./test/app/layouts/foo.erb", template.file
+  end
+  def test_template_for_invalid
+    @app = FooApp.new root_dir: "./test/app"
+    template = @app.template_for "./test/app/layouts/ugh"
+    assert_nil template
+  end
-    FooApp.load_config
-    assert FooApp.config.backend
+  def test_template_files
+    @app = FooApp.new root_dir: "./test/app"
+    files = @app.template_files "./test/app/layouts/foo"
+    assert_equal ["./test/app/layouts/foo.erb"], files
+    files = @app.template_files "./test/app/layouts/ugh"
+    assert_equal [], files
   end
@@ -242,7 +351,7 @@ class AppTest < Test::Unit::TestCase
     assert_equal [FooMiddleware, :foo, :bar], FooApp.middleware[0]
     assert !FooMiddleware.called?
-    myapp = FooApp.new @error_io
+    myapp = FooApp.new logger: @error_io
     myapp.call({'rack.input' => "", 'PATH_INFO' => '/foo', 'REQUEST_METHOD' => 'GET'})
     assert FooMiddleware.called?
@@ -276,8 +385,8 @@ class AppTest < Test::Unit::TestCase
   def test_call_rack_app
     env   = {'rack.input' => "", 'PATH_INFO' => '/bad', 'REQUEST_METHOD' => 'GET'}
     expected = [200, {'Content-Length'=>"5"}, "AHOY!"]
-    myapp = lambda{|env| expected }
-    @app = FooApp.new myapp, @error_io
+    myapp = lambda{|_| expected }
+    @app = FooApp.new myapp
     resp = @app.call env
     assert_equal expected, resp
@@ -310,6 +419,7 @@ class AppTest < Test::Unit::TestCase
   def test_dispatch_not_found
     FooApp.environment 'test'
+    @app = FooApp.new
     env = {'rack.input' => "", 'PATH_INFO' => '/foo', 'REQUEST_METHOD' => 'GET'}
     resp = @app.dispatch env, FooController, :bad
@@ -322,6 +432,7 @@ class AppTest < Test::Unit::TestCase
   def test_dispatch_no_handler
     FooApp.environment 'test'
+    @app = FooApp.new
     env = {'rack.input' => "", 'PATH_INFO' => '/foo', 'REQUEST_METHOD' => 'GET'}
     resp = @app.dispatch env, FooController, nil
@@ -338,6 +449,7 @@ class AppTest < Test::Unit::TestCase
   def test_dispatch_error
     FooApp.environment 'test'
+    @app = FooApp.new
     env  = {'rack.input' => "", 'PATH_INFO' => '/bad', 'REQUEST_METHOD' => 'GET'}
     resp = @app.dispatch env, FooController, :error
@@ -350,6 +462,7 @@ class AppTest < Test::Unit::TestCase
   def test_handle_error
     FooApp.error_delegate ErrDelegate
+    @app = FooApp.new
     env = {'rack.input' => "", 'PATH_INFO' => '/bad', 'REQUEST_METHOD' => 'GET'}
     err = ArgumentError.new("Unexpected Argument")
@@ -365,6 +478,7 @@ class AppTest < Test::Unit::TestCase
   def test_handle_error_no_delegate
     FooApp.environment "production"
+    @app = FooApp.new
     env = {'rack.input' => "", 'PATH_INFO' => '/bad', 'REQUEST_METHOD' => 'GET'}
     resp = @app.handle_error ArgumentError.new("Unexpected Argument"), env
@@ -377,6 +491,7 @@ class AppTest < Test::Unit::TestCase
   def test_handle_error_bad_delegate
     FooApp.environment "production"
     FooApp.error_delegate BadErrDelegate
+    @app = FooApp.new
     env = {'rack.input' => "", 'PATH_INFO' => '/bad', 'REQUEST_METHOD' => 'GET'}
     err = ArgumentError.new("Unexpected Argument")
@@ -395,7 +510,7 @@ class AppTest < Test::Unit::TestCase
     env = {'rack.input' => "", 'PATH_INFO' => '/bad', 'REQUEST_METHOD' => 'GET'}
     err = ArgumentError.new("Unexpected Argument")
     old_handler = Gin::Controller.error_handlers[Exception]
-    Gin::Controller.error_handlers[Exception] = lambda{|err| raise Gin::Error, "FRAMEWORK IST KAPUT"}
+    Gin::Controller.error_handlers[Exception] = lambda{|_| raise Gin::Error, "FRAMEWORK IST KAPUT"}
     assert_raises(Gin::Error){ @app.handle_error err, env }
   ensure
@@ -423,11 +538,12 @@ class AppTest < Test::Unit::TestCase
   def test_asset_version
     old_dir = FooApp.public_dir
     FooApp.public_dir File.dirname(__FILE__)
+    @app = FooApp.new
     md5_cmd = RUBY_PLATFORM =~ /darwin/ ? 'md5 -q' : 'md5sum'
     expected = `#{md5_cmd} #{__FILE__}`[0...8]
-    assert_equal expected, FooApp.asset_version(File.basename(__FILE__))
+    assert_equal expected, @app.asset_version(File.basename(__FILE__))
   ensure
     FooApp.public_dir old_dir
@@ -438,24 +554,27 @@ class AppTest < Test::Unit::TestCase
     FooApp.asset_host do |name|
       "http://#{File.extname(name)[1..-1] << "." if name}foo.com"
     end
-    assert_equal "http://js.foo.com", FooApp.asset_host_for("app.js")
+    @app = FooApp.new
     assert_equal "http://js.foo.com", @app.asset_host_for("app.js")
   end
   def test_asset_host
     FooApp.asset_host "http://example.com"
+    @app = FooApp.new
     assert_equal "http://example.com", FooApp.asset_host
     assert_equal "http://example.com", @app.asset_host
     FooApp.asset_host{ "https://foo.com" }
-    assert_equal "https://foo.com", FooApp.asset_host
+    @app = FooApp.new
+    assert_equal Proc, FooApp.asset_host.class
     assert_equal "https://foo.com", @app.asset_host
   end
   def test_asset
     FooApp.public_dir "./test/mock_config"
+    @app = FooApp.new
     assert @app.asset("backend.yml") =~ %r{/gin/test/mock_config/backend\.yml$}
     assert @app.asset("500.html") =~ %r{/gin/public/500\.html$}
@@ -466,6 +585,7 @@ class AppTest < Test::Unit::TestCase
   def test_bad_asset
     FooApp.public_dir "./test/mock_config"
+    @app = FooApp.new
     assert_nil @app.asset("bad_file")
     assert_nil @app.asset("../../History.rdoc")
@@ -511,6 +631,7 @@ class AppTest < Test::Unit::TestCase
     env['PATH_INFO'] = '/backend.yml'
     FooApp.public_dir "./test/mock_config"
+    @app = FooApp.new
     assert @app.static!(env)
     assert env['gin.static'] =~ %r{/gin/test/mock_config/backend\.yml$}
@@ -531,8 +652,8 @@ class AppTest < Test::Unit::TestCase
   def test_init
     @app = FooApp.new
-    assert_equal $stdout, @app.logger, "logger should default to $stdout"
-    assert_equal $stdout, @rapp.logger, "logger should default to $stdout"
+    assert_equal @error_io, @app.logger, "logger should default to class logger"
+    assert_equal @error_io, @rapp.logger, "logger should default to class logger"
     assert_nil @app.rack_app, "Rack application should be nil by default"
     assert Proc === @rapp.rack_app, "Rack application should be a Proc"
     assert Gin::Router === @app.router, "Should have a Gin::Router"
@@ -556,10 +677,7 @@ class AppTest < Test::Unit::TestCase
   def test_default_environment
-    assert FooApp.development?
-    assert !FooApp.test?
-    assert !FooApp.staging?
-    assert !FooApp.production?
+    assert_equal 'development', FooApp.environment
   end
@@ -572,18 +690,15 @@ class AppTest < Test::Unit::TestCase
   def test_environment
-    FooApp.instance_variable_set("@environment", nil)
     ENV['RACK_ENV'] = 'production'
-    assert !FooApp.development?
-    assert !FooApp.test?
-    assert !FooApp.staging?
-    assert FooApp.production?
+    FooApp.setup
+    assert_equal 'production', FooApp.environment
   end
   def test_inst_environment
-    FooApp.instance_variable_set("@environment", nil)
     ENV['RACK_ENV'] = 'production'
+    FooApp.setup
     @app = FooApp.new
     assert !@app.development?
     assert !@app.test?
@@ -595,9 +710,9 @@ class AppTest < Test::Unit::TestCase
   def test_set_environment
     %w{development test staging production}.each do |name|
       FooApp.environment name
+      @app = FooApp.new
       mname = name + "?"
       assert @app.send(mname), "Instance environment should be #{name}"
-      assert FooApp.send(mname), "Class environment should be #{name}"
     end
   end