rocketio 0.1.0 → 0.2.0

data/test/render/layout_test.rb

@@ -8,7 +8,7 @@ spec :Views do
       }
       b = mock_controller(a) {
       }
-      assert(b.initialize_controller.layout) == :master
+      assert(b.new.layout) == :master
     end
 
     it 'overrides layout inherited from superclass' do
@@ -18,7 +18,7 @@ spec :Views do
       b = mock_controller(a) {
         layout :baster
       }
-      assert(b.initialize_controller.layout) == :baster
+      assert(b.new.layout) == :baster
     end
 
     it 'can use `inherit` to override layout inherited from superclass' do
@@ -31,12 +31,12 @@ spec :Views do
       c = mock_controller(a) {
         import :layout, from: b
       }
-      assert(c.initialize_controller.layout) == :baster
+      assert(c.new.layout) == :baster
     end
 
     it 'renders without layout if no default layout set' do
       app mock_controller {
-        def get; render; end
+        def index; render; end
       }
       get
       assert(last_response).is_ok_with_body('/')
@@ -45,7 +45,7 @@ spec :Views do
     it 'renders without layout if default layout set to false' do
       app mock_controller {
         layout false
-        def get; render; end
+        def index; render; end
       }
       get
       assert(last_response).is_ok_with_body('/')
@@ -55,15 +55,17 @@ spec :Views do
       app mock_controller {
         layout :layout
         def var; @var end
-        def get;  render(layout: nil); end
-        def post; @var = 'x'; render(layout: false); end
-        def put;  @var = 'y'; render; end
+        def index; render(layout: nil); end
+        def b; @var = 'x'; render(layout: false); end
+        def c; @var = 'y'; render; end
       }
       get
       assert(last_response).is_ok_with_body('/')
-      post
+
+      get :b
       assert(last_response).is_ok_with_body('x')
-      put
+
+      get :c
       assert(last_response).is_ok_with_body("=y=\n")
     end
 
@@ -71,7 +73,7 @@ spec :Views do
       app mock_controller {
         define_layout(:master) {'=<%= yield %>='}
         layout :master
-        def get; render; end
+        def index; render; end
       }
       get
       assert(last_response).is_ok_with_body('=/=')
@@ -81,7 +83,7 @@ spec :Views do
       app mock_controller {
         define_layout(:layout) {'-<%= yield %>-'}
         layout :layout
-        def get; render; end
+        def index; render; end
       }
       get
       assert(last_response).is_ok_with_body('-/-')
@@ -92,18 +94,20 @@ spec :Views do
         define_layout(:x) {'x<%= yield %>'}
         define_layout(:y) {'y<%= yield %>'}
         layout :x
-        def get; render {''}; end
-        def post; render(layout: :y) {''}; end
+        def index; render {''}; end
+        def b; render(layout: :y) {''}; end
       }
+
       get
       assert(last_response).is_ok_with_body('x')
-      post
+
+      get :b
       assert(last_response).is_ok_with_body('y')
     end
 
     it 'accepts layout as :template option' do
       app mock_controller {
-        def get; render_layout(template: '+<%= yield %>+') {'='}; end
+        def index; render_layout(template: '+<%= yield %>+') {'='}; end
       }
       get
       assert(last_response).is_ok_with_body('+=+')
@@ -111,7 +115,7 @@ spec :Views do
 
     it 'raises ArgumentError if both layout name and :template option given' do
       app mock_controller {
-        def get; render_layout(:x, template: '+<%= yield %>+') {'='}; end
+        def index; render_layout(:x, template: '+<%= yield %>+') {'='}; end
       }
       assert {get}.raise ArgumentError, /both/i
     end

data/test/render/layouts_test.rb

@@ -7,7 +7,7 @@ spec :layouts do
         define_layout(:a) {'a'}
       }
       b = mock_controller(a) {
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.layouts[:a]) == 'a'
     end
 
@@ -17,7 +17,7 @@ spec :layouts do
       }
       b = mock_controller(a) {
         define_layout(:b) {'b'}
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.layouts[:a]) == 'a'
       assert(b.__send__ b.layouts[:b]) == 'b'
     end
@@ -28,7 +28,7 @@ spec :layouts do
       }
       b = mock_controller(a) {
         define_layout(:x) {'b'}
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.layouts[:x]) == 'b'
     end
 
@@ -41,7 +41,7 @@ spec :layouts do
       }
       c = mock_controller(a) {
         import :layouts, from: b
-      }.initialize_controller
+      }.new
       assert(c.__send__ c.layouts[:x]) == 'b'
     end
 
@@ -54,7 +54,7 @@ spec :layouts do
       }
       c = mock_controller(a) {
         import :layouts, from: b
-      }.initialize_controller
+      }.new
       assert(c.__send__ c.layouts[:a]) == 'a'
       assert(c.__send__ c.layouts[:b]) == 'b'
     end
@@ -66,7 +66,7 @@ spec :layouts do
       b = mock_controller {
         define_layout(:x) {'b'}
         import :layouts, from: a
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.layouts[:x]) == 'a'
     end
 
@@ -77,7 +77,7 @@ spec :layouts do
       b = mock_controller {
         define_layout(:b) {'b'}
         import :layouts, from: a
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.layouts[:a]) == 'a'
       assert(b.__send__ b.layouts[:b]) == 'b'
     end
@@ -89,7 +89,7 @@ spec :layouts do
       b = mock_controller {
         import :layouts, from: a
         define_layout(:x) {'b'}
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.layouts[:x]) == 'b'
     end
   end
@@ -98,7 +98,7 @@ spec :layouts do
     it 'uses a file with same name if only name given' do
       c = mock_controller {
         define_layout :master
-      }.initialize_controller
+      }.new
       assert(c.render_layout(:master) {'yo'}) == "master yo layout\n"
     end
 
@@ -106,28 +106,28 @@ spec :layouts do
       layout = rand.to_s
       c = mock_controller {
         define_layout layout
-      }.initialize_controller
+      }.new
       assert {c.render_layout(layout) {}}.raise RocketIO::TemplateError
     end
 
     it 'uses given file - file resides in controller dirname' do
       c = mock_controller {
         define_layout :master, file: :layout
-      }.initialize_controller
+      }.new
       assert(c.render_layout(:master) {'yo'}) == "=yo=\n"
     end
 
     it 'uses given file - file resides outside controller dirname' do
       c = mock_controller {
         define_layout :master, file: './layouts/master'
-      }.initialize_controller
+      }.new
       assert(c.render_layout(:master) {'yo'}) == "outside yo layout\n"
     end
 
     it 'accepts a block for given file' do
       c = mock_controller {
         define_layout :master, file: -> {@outside ? './layouts/master' : :master}
-      }.initialize_controller
+      }.new
       assert(c.render_layout(:master) {'yo'}) == "master yo layout\n"
       c.instance_variable_set(:@outside, true)
       assert(c.render_layout(:master) {'yo'}) == "outside yo layout\n"
@@ -136,7 +136,7 @@ spec :layouts do
     it 'accepts a block and uses returned value as layout without searching for file' do
       c = mock_controller {
         define_layout(:master) {@admin ? ':<%= yield %>:' : '|<%= yield %>|'}
-      }.initialize_controller
+      }.new
       assert(c.render_layout(:master) {'yo'}) == "|yo|"
       c.instance_variable_set(:@admin, true)
       assert(c.render_layout(:master) {'yo'}) == ":yo:"

data/test/render/render_test.rb

@@ -2,11 +2,12 @@ require 'setup'
 
 spec :Views do
   context :cache do
+
     engine = Tilt::ERBTemplate
     path = File.expand_path('../templates/a', __FILE__)
-    define_method(:file) {mock_controller(:a).initialize_controller.send(:find_template, path, 'get', engine)}
-    define_method(:read) {mock_controller(:a).initialize_controller.send(:read_template, file).__id__}
-    define_method(:compile) {|tpl| mock_controller(:a).initialize_controller.send(:compile_template, tpl, engine).__id__}
+    define_method(:file) {mock_controller(:a).new.send(:find_template, path, 'get', engine)}
+    define_method(:read) {mock_controller(:a).new.send(:read_template, file).__id__}
+    define_method(:compile) {|tpl| mock_controller(:a).new.send(:compile_template, tpl, engine).__id__}
 
     it 'resolves template path only once' do
       cache_id = file.__id__
@@ -28,23 +29,25 @@ spec :Views do
   end
 
   context :scope do
+
     it 'uses controller instance for scope' do
       app mock_controller {
         before {@var = :val}
-        def post; render; end
+        def b; render; end
       }
-      post
+      get :b
       assert(last_response).is_ok_with_body('val')
     end
+
     it 'uses custom scope' do
       app mock_controller {
         before {@var = :val}
-        def post
+        def b
           scope = Class.new {def initialize; @var = :vax; end}.new
           render(scope: scope)
         end
       }
-      post
+      get :b
       assert(last_response).is_ok_with_body('vax')
     end
   end
@@ -52,9 +55,9 @@ spec :Views do
   context :locals do
     it 'makes :locals accessible via attributes' do
       app mock_controller {
-        def put; render(locals: {var: :val}); end
+        def c; render(locals: {var: :val}); end
       }
-      put
+      get :c
       assert(last_response).is_ok_with_body('val')
     end
   end
@@ -62,7 +65,7 @@ spec :Views do
   context 'implicit templates' do
     it 'uses the folder controller resides in as default path' do
       app controller = mock_controller(:a) {
-        def get; render end
+        def index; render end
       }
       get
       assert(last_response).is_ok_with_body '/a'
@@ -72,8 +75,8 @@ spec :Views do
   context 'defined templates' do
     it 'prefers defined templates over files' do
       app mock_controller {
-        define_template(:get) {'x'}
-        def get; render end
+        define_template(:index) {'x'}
+        def index; render end
       }
       get
       assert(last_response).is_ok_with_body 'x'
@@ -84,7 +87,7 @@ spec :Views do
         define_template(:t) {'t'}
         define_layout(:x) {'x<%= yield %>x'}
         layout(:x)
-        def get; render(:t) end
+        def index; render(:t) end
       }
       get
       assert(last_response).is_ok_with_body 'xtx'
@@ -93,7 +96,7 @@ spec :Views do
 
   it 'uses given block for template' do
     app mock_controller {
-      def get; render {'x'} end
+      def index; render {'x'} end
     }
     get
     assert(last_response).is_ok_with_body 'x'

data/test/render/template_vars_test.rb

@@ -6,7 +6,7 @@ spec :template_vars do
       a = mock_controller {
         define_template_var(:a, 'a')
       }
-      b = mock_controller(a) {}.initialize_controller
+      b = mock_controller(a) {}.new
       assert(b.template_vars[:a]) == 'a'
     end
 
@@ -16,7 +16,7 @@ spec :template_vars do
       }
       b = mock_controller(a) {
         define_template_var(:b, 'b')
-      }.initialize_controller
+      }.new
       assert(b.template_vars[:a]) == 'a'
       assert(b.template_vars[:b]) == 'b'
     end
@@ -27,7 +27,7 @@ spec :template_vars do
       }
       b = mock_controller(a) {
         define_template_var(:a, 'b')
-      }.initialize_controller
+      }.new
       assert(b.template_vars[:a]) == 'b'
     end
 
@@ -40,7 +40,7 @@ spec :template_vars do
       }
       c = mock_controller(a) {
         import :template_vars, from: b
-      }.initialize_controller
+      }.new
       assert(c.template_vars[:a]) == 'b'
     end
 
@@ -53,7 +53,7 @@ spec :template_vars do
       }
       c = mock_controller(a) {
         import :template_vars, from: b
-      }.initialize_controller
+      }.new
       assert(c.template_vars[:a]) == 'a'
       assert(c.template_vars[:b]) == 'b'
     end
@@ -65,7 +65,7 @@ spec :template_vars do
       b = mock_controller {
         define_template_var(:a, 'b')
         import :template_vars, from: a
-      }.initialize_controller
+      }.new
       assert(b.template_vars[:a]) == 'a'
     end
   end
@@ -76,7 +76,7 @@ spec :template_vars do
       c = mock_controller {
         define_template(:get) {'<%= x %>'}
         define_template_var(:x, 'y')
-      }.initialize_controller
+      }.new
       assert(c.render(:get)) == 'y'
     end
 
@@ -84,7 +84,7 @@ spec :template_vars do
       c = mock_controller {
         define_template(:get) {'<%= x %>'}
         define_template_var(:x, -> {'y'})
-      }.initialize_controller
+      }.new
       assert(c.render(:get)) == 'y'
     end
 
@@ -92,7 +92,7 @@ spec :template_vars do
       c = mock_controller {
         define_template(:get) {'<%= x %>'}
         define_template_var(:x) {'y'}
-      }.initialize_controller
+      }.new
       assert(c.render(:get)) == 'y'
     end
 

data/test/render/templates_test.rb

@@ -7,7 +7,7 @@ spec :templates do
         define_template(:a) {'a'}
       }
       b = mock_controller(a) {
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.templates[:a]) == 'a'
     end
 
@@ -17,7 +17,7 @@ spec :templates do
       }
       b = mock_controller(a) {
         define_template(:b) {'b'}
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.templates[:a]) == 'a'
       assert(b.__send__ b.templates[:b]) == 'b'
     end
@@ -28,7 +28,7 @@ spec :templates do
       }
       b = mock_controller(a) {
         define_template(:x) {'b'}
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.templates[:x]) == 'b'
     end
 
@@ -41,7 +41,7 @@ spec :templates do
       }
       c = mock_controller(a) {
         import :templates, from: b
-      }.initialize_controller
+      }.new
       assert(c.__send__ c.templates[:x]) == 'b'
     end
 
@@ -54,7 +54,7 @@ spec :templates do
       }
       c = mock_controller(a) {
         import :templates, from: b
-      }.initialize_controller
+      }.new
       assert(c.__send__ c.templates[:a]) == 'a'
       assert(c.__send__ c.templates[:b]) == 'b'
     end
@@ -66,7 +66,7 @@ spec :templates do
       b = mock_controller {
         define_template(:x) {'b'}
         import :templates, from: a
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.templates[:x]) == 'a'
     end
 
@@ -77,7 +77,7 @@ spec :templates do
       b = mock_controller {
         define_template(:b) {'b'}
         import :templates, from: a
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.templates[:a]) == 'a'
       assert(b.__send__ b.templates[:b]) == 'b'
     end
@@ -89,7 +89,7 @@ spec :templates do
       b = mock_controller {
         import :templates, from: a
         define_template(:x) {'b'}
-      }.initialize_controller
+      }.new
       assert(b.__send__ b.templates[:x]) == 'b'
     end
   end
@@ -98,37 +98,37 @@ spec :templates do
 
     it 'uses a file with same name if only name given' do
       c = mock_controller {
-        define_template :get
-      }.initialize_controller
-      assert(c.render(:get)) == "/"
+        define_template :index
+      }.new
+      assert(c.render(:index)) == "/"
     end
 
     it 'raises a TemplateError if there is no file with same name' do
       template = rand.to_s
       c = mock_controller {
         define_template template
-      }.initialize_controller
+      }.new
       assert {c.render(template)}.raise RocketIO::TemplateError
     end
 
     it 'uses given file - file resides in controller dirname' do
       c = mock_controller {
         define_template :get, file: :items
-      }.initialize_controller
+      }.new
       assert(c.render(:get)) == "items\n"
     end
 
     it 'uses given file - file resides outside controller dirname' do
       c = mock_controller {
         define_template :get, file: './templates/a/get'
-      }.initialize_controller
+      }.new
       assert(c.render(:get)) == "hi\n"
     end
 
     it 'accepts a block for given file' do
       c = mock_controller {
         define_template :master, file: -> {@outside ? './templates/a/get' : :items}
-      }.initialize_controller
+      }.new
       assert(c.render(:master)) == "items\n"
       c.instance_variable_set(:@outside, true)
       assert(c.render(:master)) == "hi\n"
@@ -137,7 +137,7 @@ spec :templates do
     it 'accepts a block and uses returned value as template without searching for file' do
       c = mock_controller {
         define_template(:master) {@admin ? 'admin' : 'user'}
-      }.initialize_controller
+      }.new
       assert(c.render(:master)) == "user"
       c.instance_variable_set(:@admin, true)
       assert(c.render(:master)) == "admin"