gin 1.1.2 → 1.2.0

data/test/test_config.rb

@@ -8,7 +8,7 @@ class ConfigTest < Test::Unit::TestCase
   def setup
     @error_io = StringIO.new
     @config = Gin::Config.new "development",
-                dir: CONFIG_DIR, logger: @error_io, ttl: 300
+                :dir => CONFIG_DIR, :logger => @error_io, :ttl => 300
   end
 
 
@@ -23,7 +23,7 @@ class ConfigTest < Test::Unit::TestCase
 
 
   def test_config_unknown_env
-    @config = Gin::Config.new "foo", dir: CONFIG_DIR
+    @config = Gin::Config.new "foo", :dir => CONFIG_DIR
 
     assert_equal "example.com", @config['memcache.host']
     assert_equal 5, @config['memcache.connections']
@@ -47,7 +47,7 @@ class ConfigTest < Test::Unit::TestCase
     assert @config.instance_variable_get("@data").empty?
     @config.load!
     assert_equal %w{backend memcache},
-                 @config.instance_variable_get("@data").keys
+                 @config.instance_variable_get("@data").keys.sort
   end
 
 
@@ -58,7 +58,7 @@ class ConfigTest < Test::Unit::TestCase
 
 
   def test_invalid_yaml
-    assert_raise Psych::SyntaxError do
+    assert_raise Gin::Config::SYNTAX_ERROR do
       YAML.load_file @config.send(:filepath_for, 'invalid')
     end
     assert_nil @config.load_config('invalid')

data/test/test_controller.rb

@@ -4,6 +4,11 @@ unless defined? EventMachine
   class EventMachine; end
 end
 
+module FooNamespace
+  class NamespacedController < Gin::Controller
+  end
+end
+
 class AppController < Gin::Controller
   FILTERS_RUN = []
 
@@ -25,7 +30,7 @@ end
 
 class TestController < Gin::Controller
   def show id
-    "SHOW #{id}!"
+    "TEST SHOW #{id}!"
   end
 end
 
@@ -106,7 +111,7 @@ class ControllerTest < Test::Unit::TestCase
     MockApp.options[:environment] = 'test'
     MockApp.options[:asset_host] = nil
     BarController.instance_variable_set("@layout", nil)
-    @app  = MockApp.new logger: StringIO.new
+    @app  = MockApp.new :logger => StringIO.new
     @ctrl = BarController.new(@app, rack_env)
   end
 
@@ -121,6 +126,8 @@ class ControllerTest < Test::Unit::TestCase
       'HTTP_HOST' => 'example.com',
       'rack.input' => '',
       'gin.path_query_hash' => {'id' => 123},
+      'SERVER_NAME' => 'localhost',
+      'SERVER_PORT' => '80'
     }
   end
 
@@ -169,7 +176,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_view_layout_missing
-    str = @ctrl.view :bar, layout: "missing"
+    str = @ctrl.view :bar, :layout => "missing"
     assert_equal "Value is BarHelper\n", str
     assert_equal [File.join(@app.views_dir, "bar.erb")],
                   @ctrl.env[Gin::Constants::GIN_TEMPLATES]
@@ -177,7 +184,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_view_other_layout
-    str = @ctrl.view :bar, layout: "bar.erb"
+    str = @ctrl.view :bar, :layout => "bar.erb"
     assert(/Bar Layout/ === str)
     assert(/BarHelper/ === str)
     assert_equal File.join(@app.layouts_dir, "bar.erb"),
@@ -188,7 +195,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_view_no_layout
-    str = @ctrl.view :bar, layout: false
+    str = @ctrl.view :bar, :layout => false
     assert_equal "Value is BarHelper\n", str
     assert_equal [File.join(@app.views_dir, "bar.erb")],
                   @ctrl.env[Gin::Constants::GIN_TEMPLATES]
@@ -201,7 +208,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_view_locals
-    str = @ctrl.view :bar, locals: {test_val: "LOCAL"}
+    str = @ctrl.view :bar, :locals => {:test_val => "LOCAL"}
     assert(/Foo Layout/ === str)
     assert(str !~ /BarHelper/)
     assert(/Value is LOCAL/ === str)
@@ -214,7 +221,7 @@ class ControllerTest < Test::Unit::TestCase
 
   def test_view_scope
     scope = Struct.new(:test_val).new("SCOPED")
-    str = @ctrl.view :bar, scope: scope
+    str = @ctrl.view :bar, :scope => scope
     assert(/Foo Layout/ === str)
     assert(str !~ /BarHelper/)
     assert(/Value is SCOPED/ === str)
@@ -226,7 +233,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_view_engine
-    str = @ctrl.view :bar, engine: MockTemplateEngine
+    str = @ctrl.view :bar, :engine => MockTemplateEngine
     assert(/Foo Layout/ === str)
     assert(str !~ /BarHelper/)
     assert(/mock render/ === str)
@@ -238,7 +245,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_view_layout_engine
-    str = @ctrl.view :bar, layout_engine: MockTemplateEngine
+    str = @ctrl.view :bar, :layout_engine => MockTemplateEngine
     assert_equal "mock render", str
   end
 
@@ -246,7 +253,7 @@ class ControllerTest < Test::Unit::TestCase
   def test_view_content_type
     @ctrl.content_type "text/html"
     MockTemplateEngine.default_mime_type = "application/json"
-    @ctrl.view :bar, engine: MockTemplateEngine, content_type: "application/xml"
+    @ctrl.view :bar, :engine => MockTemplateEngine, :content_type => "application/xml"
     assert_equal "application/xml;charset=UTF-8",
                  @ctrl.response[Gin::Constants::CNT_TYPE]
   end
@@ -255,7 +262,7 @@ class ControllerTest < Test::Unit::TestCase
   def test_view_template_content_type
     @ctrl.response[Gin::Constants::CNT_TYPE] = nil
     MockTemplateEngine.default_mime_type = "application/json"
-    @ctrl.view :bar, engine: MockTemplateEngine
+    @ctrl.view :bar, :engine => MockTemplateEngine
     assert_equal "application/json;charset=UTF-8",
                  @ctrl.response[Gin::Constants::CNT_TYPE]
   end
@@ -264,7 +271,7 @@ class ControllerTest < Test::Unit::TestCase
   def test_view_default_content_type
     @ctrl.content_type "text/html"
     MockTemplateEngine.default_mime_type = "application/json"
-    @ctrl.view :bar, engine: MockTemplateEngine
+    @ctrl.view :bar, :engine => MockTemplateEngine
     assert_equal "text/html;charset=UTF-8",
                  @ctrl.response[Gin::Constants::CNT_TYPE]
   end
@@ -279,7 +286,7 @@ class ControllerTest < Test::Unit::TestCase
     @ctrl.etag("my-etag")
     assert_equal "my-etag".inspect, @ctrl.response['ETag']
 
-    @ctrl.etag("my-etag", kind: :strong)
+    @ctrl.etag("my-etag", :kind => :strong)
     assert_equal "my-etag".inspect, @ctrl.response['ETag']
 
     @ctrl.etag("my-etag", :strong)
@@ -288,7 +295,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_etag_weak
-    @ctrl.etag("my-etag", kind: :weak)
+    @ctrl.etag("my-etag", :kind => :weak)
     assert_equal 'W/"my-etag"', @ctrl.response['ETag']
 
     @ctrl.etag("my-etag", :weak)
@@ -308,7 +315,7 @@ class ControllerTest < Test::Unit::TestCase
     assert_equal "my-etag".inspect, @ctrl.response['ETag']
 
     rack_env['HTTP_IF_MATCH'] = '*'
-    resp = catch(:halt){ @ctrl.etag "my-etag", new_resource: true }
+    resp = catch(:halt){ @ctrl.etag "my-etag", :new_resource => true }
     assert_equal 412, resp
     assert_equal "my-etag".inspect, @ctrl.response['ETag']
 
@@ -340,7 +347,7 @@ class ControllerTest < Test::Unit::TestCase
 
     rack_env['REQUEST_METHOD'] = 'POST'
     rack_env['HTTP_IF_NONE_MATCH'] = '*'
-    resp = catch(:halt){ @ctrl.etag "my-etag", new_resource: false }
+    resp = catch(:halt){ @ctrl.etag "my-etag", :new_resource => false }
     assert_equal 412, resp
     assert_equal "my-etag".inspect, @ctrl.response['ETag']
   end
@@ -369,11 +376,11 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_cache_control
-    @ctrl.cache_control :public, :must_revalidate, max_age: 60
+    @ctrl.cache_control :public, :must_revalidate, :max_age => 60
     assert_equal "public, must-revalidate, max-age=60",
                  @ctrl.response['Cache-Control']
 
-    @ctrl.cache_control public:true, must_revalidate:false, max_age:'foo'
+    @ctrl.cache_control :public =>true, :must_revalidate =>false, :max_age =>'foo'
     assert_equal "public, max-age=0", @ctrl.response['Cache-Control']
   end
 
@@ -391,7 +398,7 @@ class ControllerTest < Test::Unit::TestCase
 
   def test_expires_time
     time = Time.now + 60
-    @ctrl.expires time, :public, must_revalidate:false, max_age:20
+    @ctrl.expires time, :public, :must_revalidate =>false, :max_age =>20
 
     assert_equal "public, max-age=20",
                  @ctrl.response['Cache-Control']
@@ -403,7 +410,7 @@ class ControllerTest < Test::Unit::TestCase
   def test_expires_str
     time = Time.now + 60
     @ctrl.expires time.strftime("%Y/%m/%d %H:%M:%S"),
-                  :public, must_revalidate:false, max_age:20
+                  :public, :must_revalidate =>false, :max_age =>20
 
     assert_equal "public, max-age=20",
                  @ctrl.response['Cache-Control']
@@ -592,7 +599,7 @@ if RUBY_VERSION =~ /^2.0/
 
   def test_action_arguments_key_parameters
     @ctrl = SpecialCtrl.new nil, rack_env.merge('QUERY_STRING'=>'q=pizza&count=20')
-    assert_equal ["pizza", {count: 20}], @ctrl.send("action_arguments", "find")
+    assert_equal ["pizza", {:count => 20}], @ctrl.send("action_arguments", "find")
   end
 end
 
@@ -663,6 +670,114 @@ end
   end
 
 
+  def test_rewrite
+    resp = catch(:halt){ @ctrl.rewrite BarController, :show, :id => 123 }
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8",
+        "Content-Length"=>"9", "Host"=>"localhost:80"},
+      ["SHOW 123!"]]
+    assert_equal expected, resp
+  end
+
+
+  def test_rewrite_action
+    resp = catch(:halt){ @ctrl.rewrite :show, :id => 123 }
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8",
+        "Content-Length"=>"9", "Host"=>"localhost:80"},
+      ["SHOW 123!"]]
+    assert_equal expected, resp
+  end
+
+
+  def test_rewrite_named_route
+    resp = catch(:halt){ @ctrl.rewrite :show_bar, :id => 123 }
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8",
+        "Content-Length"=>"9", "Host"=>"localhost:80"},
+      ["SHOW 123!"]]
+    assert_equal expected, resp
+  end
+
+
+  def test_rewrite_path
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8",
+        "Content-Length"=>"9", "Host"=>"localhost:80"},
+      ["SHOW 123!"]]
+
+    resp = catch(:halt){ @ctrl.rewrite '/bar/123' }
+    assert_equal expected, resp
+
+    resp = catch(:halt){ @ctrl.rewrite '/bar/:id', :id => 123 }
+    assert_equal expected, resp
+
+    resp = catch(:halt){ @ctrl.rewrite '/bad/path', :id => 123 }
+    assert_equal 404, resp[0]
+  end
+
+
+  def test_rewrite_missing_param
+    assert_raises Gin::Router::PathArgumentError do
+      @ctrl.rewrite :show
+    end
+  end
+
+
+  def test_rewrite_missing_route
+    assert_raises Gin::RouterError do
+      @ctrl.rewrite TestController, :show
+    end
+  end
+
+
+  def test_reroute
+    resp = catch(:halt){ @ctrl.reroute BarController, :show, :id => 456 }
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8", "Content-Length"=>"9"},
+      ["SHOW 456!"]]
+    assert_equal expected, resp
+  end
+
+
+  def test_reroute_action
+    resp = catch(:halt){ @ctrl.reroute :show, :id => 456 }
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8", "Content-Length"=>"9"},
+      ["SHOW 456!"]]
+    assert_equal expected, resp
+  end
+
+
+  def test_reroute_named_route
+    assert_raises Gin::RouterError do
+      @ctrl.rewrite :unknown_route
+    end
+
+    resp = catch(:halt){ @ctrl.reroute :show_bar }
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8", "Content-Length"=>"9"},
+      ["SHOW 123!"]]
+    assert_equal expected, resp
+  end
+
+
+  def test_reroute_missing_param
+    @ctrl.params.delete('id')
+    resp = catch(:halt){ @ctrl.reroute :show }
+    assert_equal 400, resp[0]
+  end
+
+
+  def test_reroute_missing_route
+    resp = catch(:halt){ @ctrl.reroute TestController, :show }
+    expected = [200,
+      {"Content-Type"=>"text/html;charset=UTF-8", "Content-Length"=>"14"},
+      ["TEST SHOW 123!"]]
+    assert_equal expected, resp
+  end
+
+
   def test_url_to
     assert_equal "http://example.com/bar/123",
                   @ctrl.url_to(BarController, :show, :id => 123)
@@ -677,11 +792,11 @@ end
 
 
   def test_path_to
-    assert_equal "/bar/123", @ctrl.path_to(BarController, :show, id: 123)
-    assert_equal "/bar/123", @ctrl.path_to(:show, id: 123)
-    assert_equal "/bar/delete?id=123", @ctrl.path_to(:rm_bar, id: 123)
+    assert_equal "/bar/123", @ctrl.path_to(BarController, :show, :id => 123)
+    assert_equal "/bar/123", @ctrl.path_to(:show, :id => 123)
+    assert_equal "/bar/delete?id=123", @ctrl.path_to(:rm_bar, :id => 123)
     assert_equal "/bar/delete", @ctrl.path_to(:rm_bar)
-    assert_equal "/test?id=123", @ctrl.path_to("/test", id: 123)
+    assert_equal "/test?id=123", @ctrl.path_to("/test", :id => 123)
     assert_equal "/test", @ctrl.path_to("/test")
   end
 
@@ -785,7 +900,7 @@ end
     assert_equal time.httpdate, @ctrl.response['Last-Modified']
 
     date = Date.parse time.to_s
-    expected = Time.new(time.year, time.month, time.day)
+    expected = Time.local(time.year, time.month, time.day)
     @ctrl.last_modified date
     assert_equal expected.httpdate, @ctrl.response['Last-Modified']
   end
@@ -850,7 +965,8 @@ end
       rack_env['HTTP_IF_MODIFIED_SINCE'] = Time.parse("10 Feb 3012").httpdate
       time = Time.now
       @ctrl.status code
-      @ctrl.last_modified time
+      res = catch(:halt){ @ctrl.last_modified time }
+      assert_equal 304, res if code == 200
       assert_equal time.httpdate, @ctrl.response['Last-Modified']
     end
   end
@@ -895,7 +1011,7 @@ end
 
   def test_send_file_last_modified
     mod_date = Time.now
-    catch(:halt){ @ctrl.send_file "./Manifest.txt", last_modified: mod_date }
+    catch(:halt){ @ctrl.send_file "./Manifest.txt", :last_modified => mod_date }
     assert_equal mod_date.httpdate, @ctrl.headers["Last-Modified"]
     assert_nil @ctrl.headers['Content-Disposition']
   end
@@ -934,10 +1050,11 @@ end
 
   def test_content_type_params
     assert_equal "application/json;charset=ASCII-8BIT",
-      @ctrl.content_type(".json", charset: "ASCII-8BIT")
+      @ctrl.content_type(".json", :charset => "ASCII-8BIT")
 
-    assert_equal "application/json;foo=bar, charset=UTF-8",
-      @ctrl.content_type(".json", foo: "bar")
+    ctype, more = @ctrl.content_type(".json", :foo => "bar").split(';')
+    assert_equal "application/json", ctype
+    assert_equal %w{charset=UTF-8 foo=bar}, more.split(', ').sort
   end
 
 
@@ -947,7 +1064,7 @@ end
     end
 
     assert_equal "text/html;charset=UTF-8",
-      @ctrl.content_type('fhwbghd', default: 'text/html')
+      @ctrl.content_type('fhwbghd', :default => 'text/html')
   end
 
 
@@ -994,6 +1111,15 @@ end
   end
 
 
+  def test_class_controller_name_namespaced
+    assert_equal 'foo_namespace/namespaced',
+      FooNamespace::NamespacedController.controller_name
+
+    assert_equal :show_namespaced,
+      FooNamespace::NamespacedController.route_name_for(:show)
+  end
+
+
   def test_class_content_type
     assert_equal "text/html", AppController.content_type
     assert_equal "text/html", BarController.content_type

data/test/test_filterable.rb

@@ -47,7 +47,7 @@ class FilterableTest < Test::Unit::TestCase
 
     private
 
-    def __call_filters__ type, action #:nodoc:
+    def __call_filters__ type, action
       filter(*__send__(:"#{type}_filters_for", action))
     end
   end
@@ -66,11 +66,18 @@ class FilterableTest < Test::Unit::TestCase
       self.class.is_custom_thing
     end
 
+    filter :only_foo do
+      FILTER_CALLS << :only_foo
+      "onlyfoo"
+    end
+
     before_filter :custom_thing
 
     skip_before_filter :find_device
     skip_before_filter :logged_in, :only => [:create, :new]
     skip_after_filter :set_login_cookie, :except => [:logout]
+
+    after_filter :only_foo, :only => :foo
   end
 
 
@@ -99,6 +106,14 @@ class FilterableTest < Test::Unit::TestCase
   end
 
 
+  def test_filter_chain_exceptions
+    assert_equal [:log_action], AppCtrl.after_filters[:foo]
+    assert_equal [:log_action, :only_foo], SessionCtrl.after_filters[:foo]
+    assert_equal [:log_action, :set_login_cookie, :other_filter],
+                  SessionCtrl.after_filters[:logout]
+  end
+
+
   def test_call_filters
     @app_ctrl.send(:__call_filters__, :before, :action)
     assert_equal [:logged_in, :find_device], FILTER_CALLS