gin 1.0.4 → 1.1.0

data/test/test_cache.rb

@@ -0,0 +1,57 @@
+require 'test/test_helper'
+
+class CacheTest < Test::Unit::TestCase
+
+  def setup
+    @cache = Gin::Cache.new
+  end
+
+
+  def test_write_timeout
+    assert_equal 0.05, @cache.write_timeout
+    @cache.write_timeout = 0.1
+    assert_equal 0.1, @cache.write_timeout
+    assert_equal 0.1, @cache.instance_variable_get("@lock").write_timeout
+  end
+
+
+  def test_write_thread_safe
+    @cache[:num] = 0
+    threads = []
+    10.times do
+      threads << Thread.new{ @cache[:num] += 1 }
+    end
+    threads.each(&:join)
+
+    assert_equal 10, @cache[:num]
+  end
+
+
+  def test_has_key
+    assert !@cache.has_key?(:num)
+    @cache[:num] = 123
+    assert @cache.has_key?(:num)
+  end
+
+
+  def test_cache_value
+    val = @cache.cache :num, 1234
+    assert_equal 1234, val
+    assert_equal 1234, @cache[:num]
+
+    val = @cache.cache :num, 5678
+    assert_equal 1234, val
+    assert_equal 1234, @cache[:num]
+  end
+
+
+  def test_cache_block
+    val = @cache.cache(:num){ 1234 }
+    assert_equal 1234, val
+    assert_equal 1234, @cache[:num]
+
+    val = @cache.cache(:num){ 5678 }
+    assert_equal 1234, val
+    assert_equal 1234, @cache[:num]
+  end
+end

data/test/test_config.rb

@@ -3,31 +3,126 @@ require 'gin/config'
 
 class ConfigTest < Test::Unit::TestCase
 
-  def config_dir
-    File.expand_path("../mock_config", __FILE__)
+  CONFIG_DIR = File.expand_path("../mock_config", __FILE__)
+
+  def setup
+    @error_io = StringIO.new
+    @config = Gin::Config.new "development",
+                dir: CONFIG_DIR, logger: @error_io, ttl: 300
   end
 
 
   def test_config_dev
-    config = Gin::Config.new "development", config_dir
-
-    assert_equal "localhost", config.memcache['host']
-    assert_equal 1, config.memcache['connections']
+    assert_equal "localhost", @config['memcache.host']
+    assert_equal 1, @config['memcache.connections']
 
-    assert_equal "dev.backend.example.com", config.backend['host']
+    assert_equal "dev.backend.example.com", @config['backend.host']
 
-    assert_raises(NoMethodError){ config.not_a_config }
+    assert_nil @config['not_a_config']
   end
 
 
   def test_config_unknown_env
-    config = Gin::Config.new "foo", config_dir
+    @config = Gin::Config.new "foo", dir: CONFIG_DIR
+
+    assert_equal "example.com", @config['memcache.host']
+    assert_equal 5, @config['memcache.connections']
+
+    assert_equal "backend.example.com", @config['backend.host']
+
+    assert_nil @config['not_a_config']
+  end
+
+
+  def test_set
+    assert !@config.has?('foo'), "Config shouldn't have foo available"
+    assert_nil @config['foo']
+
+    @config.set 'foo', 1234
+    assert_equal 1234, @config['foo']
+  end
+
+
+  def test_load_all
+    assert @config.instance_variable_get("@data").empty?
+    @config.load!
+    assert_equal %w{backend memcache},
+                 @config.instance_variable_get("@data").keys
+  end
+
+
+  def test_bracket
+    assert_equal "localhost", @config['memcache.host']
+    assert_equal 1, @config['memcache.connections']
+  end
+
+
+  def test_invalid_yaml
+    assert_raise Psych::SyntaxError do
+      YAML.load_file @config.send(:filepath_for, 'invalid')
+    end
+    assert_nil @config.load_config('invalid')
+  end
+
+
+  def test_get
+    assert_equal "localhost", @config.get('memcache')['host']
+    @config.set('memcache', 'host' => 'example.com')
+    assert_equal "example.com", @config.get('memcache')['host']
+  end
+
+
+  def test_get_non_existant
+    assert_raise Gin::MissingConfig do
+      @config.get('non_existant')
+    end
+
+    assert_nil @config.get('non_existant', true)
+  end
+
+
+  def test_get_reload
+    @config['memcache']
+    @config.set('memcache', 'host' => 'example.com')
+    @config.instance_variable_set("@load_times", 'memcache' => Time.now - (@config.ttl + 1))
+    @config.instance_variable_set("@mtimes", 'memcache' => Time.now)
+    assert_equal 'localhost', @config.get('memcache')['host']
+  end
+
+
+  def test_get_reload_no_change
+    @config['memcache']
+    @config.set('memcache', 'host' => 'example.com')
+    @config.instance_variable_set("@load_times", 'memcache' => Time.now - (@config.ttl + 1))
+    assert_equal 'example.com', @config.get('memcache')['host']
+
+    last_check = @config.instance_variable_get("@load_times")['memcache']
+    assert Time.now - last_check <= 1
+  end
+
+
+  def test_current
+    assert !@config.current?('memcache')
+    assert @config['memcache']
+    assert @config.current?('memcache')
+
+    @config.instance_variable_set("@load_times", 'memcache' => Time.now)
+    assert @config.current?('memcache')
+  end
+
+
+  def test_current_expired
+    @config.instance_variable_set("@load_times", 'memcache' => Time.now - (@config.ttl + 1))
+    assert !@config.current?('memcache')
+  end
 
-    assert_equal "example.com", config.memcache['host']
-    assert_equal 5, config.memcache['connections']
 
-    assert_equal "backend.example.com", config.backend['host']
+  def test_current_no_ttl
+    assert @config['memcache']
+    @config.instance_variable_set("@load_times", 'memcache' => Time.now - (@config.ttl + 1))
+    assert !@config.current?('memcache')
 
-    assert_raises(NoMethodError){ config.not_a_config }
+    @config.ttl = false
+    assert @config.current?('memcache')
   end
 end

data/test/test_controller.rb

@@ -18,6 +18,9 @@ class AppController < Gin::Controller
   error Gin::BadRequest do
     body "Bad Request"
   end
+
+
+  layout :foo
 end
 
 class TestController < Gin::Controller
@@ -26,7 +29,15 @@ class TestController < Gin::Controller
   end
 end
 
+module BarHelper
+  def test_val
+    "BarHelper"
+  end
+end
+
 class BarController < AppController
+  include BarHelper
+
   before_filter :stop, :only => :delete do
     FILTERS_RUN << :stop
     halt 404, "Not Found"
@@ -57,6 +68,9 @@ end
 
 class ControllerTest < Test::Unit::TestCase
   class MockApp < Gin::App
+
+    root_dir "test/app"
+
     mount BarController do
       get :show, "/:id"
       get :delete, :rm_bar
@@ -66,10 +80,33 @@ class ControllerTest < Test::Unit::TestCase
   end
 
 
+  class MockTemplateEngine
+    attr_reader :file
+
+    class << self
+      attr_accessor :default_mime_type
+    end
+
+    def initialize file
+      @file = file
+    end
+
+    def render scope, locals
+      "mock render"
+    end
+
+    def default_mime_type
+      self.class.default_mime_type
+    end
+  end
+
+
   def setup
-    MockApp.instance_variable_set("@environment", nil)
-    MockApp.instance_variable_set("@asset_host", nil)
-    @app  = MockApp.new StringIO.new
+    MockTemplateEngine.default_mime_type = nil
+    MockApp.options[:environment] = 'test'
+    MockApp.options[:asset_host] = nil
+    BarController.instance_variable_set("@layout", nil)
+    @app  = MockApp.new logger: StringIO.new
     @ctrl = BarController.new(@app, rack_env)
   end
 
@@ -88,6 +125,156 @@ class ControllerTest < Test::Unit::TestCase
   end
 
 
+  def test_class_layout
+    assert_equal :foo, BarController.layout
+    assert_equal :foo, AppController.layout
+    assert_nil TestController.layout
+
+    BarController.layout :bar
+    assert_equal :bar, BarController.layout
+  end
+
+
+  def test_layout
+    assert_equal :foo, @ctrl.layout
+    BarController.layout :bar
+    assert_equal :bar, @ctrl.layout
+
+    @ctrl = TestController.new @app, {}
+    assert_equal @app.layout, @ctrl.layout
+  end
+
+
+  def test_template_path
+    assert_equal File.join(@app.views_dir, "foo"),
+                  @ctrl.template_path("foo")
+    assert_equal File.join(@app.root_dir, "foo"),
+                  @ctrl.template_path("/foo")
+    assert_equal File.join(@app.layouts_dir, "foo"),
+                  @ctrl.template_path("foo", true)
+    assert_equal File.join(@app.views_dir, "bar/foo"),
+                  @ctrl.template_path("*/foo")
+  end
+
+
+  def test_view
+    str = @ctrl.view :bar
+    assert(/Foo Layout/ === str)
+    assert(/BarHelper/ === str)
+    assert_equal File.join(@app.layouts_dir, "foo.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].first
+    assert_equal File.join(@app.views_dir, "bar.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].last
+  end
+
+
+  def test_view_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]
+  end
+
+
+  def test_view_other_layout
+    str = @ctrl.view :bar, layout: "bar.erb"
+    assert(/Bar Layout/ === str)
+    assert(/BarHelper/ === str)
+    assert_equal File.join(@app.layouts_dir, "bar.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].first
+    assert_equal File.join(@app.views_dir, "bar.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].last
+  end
+
+
+  def test_view_no_layout
+    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]
+  end
+
+
+  def test_view_missing
+    assert_raises(Gin::TemplateMissing){ @ctrl.view :missing }
+  end
+
+
+  def test_view_locals
+    str = @ctrl.view :bar, locals: {test_val: "LOCAL"}
+    assert(/Foo Layout/ === str)
+    assert(str !~ /BarHelper/)
+    assert(/Value is LOCAL/ === str)
+    assert_equal File.join(@app.layouts_dir, "foo.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].first
+    assert_equal File.join(@app.views_dir, "bar.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].last
+  end
+
+
+  def test_view_scope
+    scope = Struct.new(:test_val).new("SCOPED")
+    str = @ctrl.view :bar, scope: scope
+    assert(/Foo Layout/ === str)
+    assert(str !~ /BarHelper/)
+    assert(/Value is SCOPED/ === str)
+    assert_equal File.join(@app.layouts_dir, "foo.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].first
+    assert_equal File.join(@app.views_dir, "bar.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].last
+  end
+
+
+  def test_view_engine
+    str = @ctrl.view :bar, engine: MockTemplateEngine
+    assert(/Foo Layout/ === str)
+    assert(str !~ /BarHelper/)
+    assert(/mock render/ === str)
+    assert_equal File.join(@app.layouts_dir, "foo.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].first
+    assert_equal File.join(@app.views_dir, "bar.erb"),
+                  @ctrl.env[Gin::Constants::GIN_TEMPLATES].last
+  end
+
+
+  def test_view_layout_engine
+    str = @ctrl.view :bar, layout_engine: MockTemplateEngine
+    assert_equal "mock render", str
+  end
+
+
+  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"
+    assert_equal "application/xml;charset=UTF-8",
+                 @ctrl.response[Gin::Constants::CNT_TYPE]
+  end
+
+
+  def test_view_template_content_type
+    @ctrl.response[Gin::Constants::CNT_TYPE] = nil
+    MockTemplateEngine.default_mime_type = "application/json"
+    @ctrl.view :bar, engine: MockTemplateEngine
+    assert_equal "application/json;charset=UTF-8",
+                 @ctrl.response[Gin::Constants::CNT_TYPE]
+  end
+
+
+  def test_view_default_content_type
+    @ctrl.content_type "text/html"
+    MockTemplateEngine.default_mime_type = "application/json"
+    @ctrl.view :bar, engine: MockTemplateEngine
+    assert_equal "text/html;charset=UTF-8",
+                 @ctrl.response[Gin::Constants::CNT_TYPE]
+  end
+
+
+  def test_config
+    assert_equal @ctrl.app.config.object_id, @ctrl.config.object_id
+  end
+
+
   def test_etag
     @ctrl.etag("my-etag")
     assert_equal "my-etag".inspect, @ctrl.response['ETag']
@@ -198,7 +385,7 @@ class ControllerTest < Test::Unit::TestCase
     assert_equal "public, must-revalidate, max-age=60",
                  @ctrl.response['Cache-Control']
 
-    assert_equal (time + 60).httpdate, @ctrl.response['Expires']
+    assert_equal((time + 60).httpdate, @ctrl.response['Expires'])
   end
 
 
@@ -237,7 +424,6 @@ class ControllerTest < Test::Unit::TestCase
 
   def test_set_cookie
     exp = Time.now + 360
-    cookie = {:value => "user@example.com", :expires => exp}
 
     @ctrl.set_cookie "test", "user@example.com", :expires => exp
     expected = "test=user%40example.com; expires=#{exp.gmtime.strftime("%a, %d %b %Y %H:%M:%S -0000")}"
@@ -303,6 +489,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_dispatch_error
+    @app.options[:environment] = 'development'
     @ctrl.content_type :json
     @ctrl.send(:dispatch, :index)
     assert_equal [:f1, :f2], BarController::FILTERS_RUN
@@ -316,7 +503,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_dispatch_error_nondev
-    MockApp.environment "prod"
+    @app.options[:environment] = "prod"
     @ctrl.send(:dispatch, :index)
 
     assert_equal 500, @ctrl.response.status
@@ -328,7 +515,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_dispatch_bad_request_nondev
-    MockApp.environment "prod"
+    @app.options[:environment] = "prod"
     @ctrl = TestController.new @app, rack_env
     @ctrl.params.delete('id')
     @ctrl.send(:dispatch, :show)
@@ -341,7 +528,7 @@ class ControllerTest < Test::Unit::TestCase
 
 
   def test_dispatch_not_found_nondev
-    MockApp.environment "prod"
+    @app.options[:environment] = "prod"
     @ctrl = TestController.new @app, rack_env
     @ctrl.params.delete('id')
     @ctrl.send(:dispatch, :not_found)
@@ -414,9 +601,12 @@ end
     old_public_dir = MockApp.public_dir
     MockApp.public_dir File.dirname(__FILE__)
 
-    file_id  = MockApp.md5 __FILE__
+    @app = MockApp.new
+    file_id  = @app.md5 __FILE__
     expected = "/test_controller.rb?#{file_id}"
 
+    @ctrl = BarController.new(@app, rack_env)
+
     assert_equal 8, file_id.length
     assert_equal expected, @ctrl.asset_url(File.basename(__FILE__))
 
@@ -431,10 +621,10 @@ end
 
 
   def test_asset_url_w_host
-    MockApp.asset_host "http://example.com"
+    @app.options[:asset_host] = "http://example.com"
     assert_equal "http://example.com/foo.jpg", @ctrl.asset_url("foo.jpg")
 
-    MockApp.asset_host do |file|
+    @app.options[:asset_host] = proc do |file|
       file =~ /\.js$/ ? "http://js.example.com" : "http://img.example.com"
     end
     assert_equal "http://js.example.com/foo.js",   @ctrl.asset_url("foo.js")