mack-javascript/lib/helpers/testing_helpers.rb mack-javascript/lib/rendering/engine/rjs.rb mack-javascript/lib/rendering/type/js.rb mack-javascript/lib/view_helpers/html_helpers.rb mack-javascript/lib/view_helpers/string_helpers.rb mack-javascript/spec/fake_application/app/views/vtt/view_template/bleeding_gums_murphy.js.rjs mack-javascript/spec/lib/view_helpers/view_template_rjs.rb @@ -1,5 +1,5 @@ module Mack - module Javascript + module JavaScript module Framework class Jquery class << self mack-javascript/lib/helpers/jquery_helper.rb @@ -1,5 +1,5 @@ module Mack - module Javascript + module JavaScript module Framework class Prototype @@callbacks = [:uninitialized, :loading, :loaded, :interactive, :complete, :failure, :success ] + mack-javascript/lib/helpers/prototype_helper.rb @@ -1,5 +1,5 @@ module Mack - module Javascript + module JavaScript class ScriptGenerator def initialize @lines = '' @@ -33,13 +33,13 @@ module Mack end def delay(seconds = 1, &block) - self << "setTimeout(function() {\n\n" + yield(Mack::Javascript::ScriptGenerator.new) + "}, #{(seconds * 1000).to_i})" + self << "setTimeout(function() {\n\n" + yield(Mack::JavaScript::ScriptGenerator.new) + "}, #{(seconds * 1000).to_i})" end class << self def framework - "Mack::Javascript::Framework::#{framework_name}".constantize + "Mack::JavaScript::Framework::#{framework_name}".constantize end def framework=(args) @@ -48,7 +48,7 @@ module Mack private def framework_name - @@framework_name ||= app_config.mack.js_framework + @@framework_name ||= app_config.mack.js_framework.camelcase end end mack-javascript/lib/helpers/script_generator.rb @@ -1,19 +1,15 @@ class Vtt::ViewTemplateController include Mack::Controller - def marge_html_markaby_with_layout - @last_name = "Simpson" - render(:action, "marge") + def bleeding_gums_murphy_with_render + @bleeding = true if params[:bleeding] + render(:js, "bleeding_gums_murphy") end - def marge_html_markaby_with_special_layout - @last_name = "Simpson" - render(:action, "marge", :layout => "my_cool") + def bleeding_gums_murphy + @bleeding = true if params[:bleeding] end - def marge_html_markaby_without_layout - @last_name = "Simpson" - render(:action, "marge", :layout => false) - end + end \ No newline at end of file mack-javascript/spec/fake_application/app/controllers/vtt/view_template_controller.rb @@ -3,9 +3,8 @@ Mack::Routes.build do |r| r.resource "admin/users" r.with_options(:controller => "vtt/view_template") do |map| - map.marge_html_markaby_with_layout "/vtt/marge_html_markaby_with_layout", :action => :marge_html_markaby_with_layout - map.marge_html_markaby_without_layout "/vtt/marge_html_markaby_without_layout", :action => :marge_html_markaby_without_layout - map.marge_html_markaby_with_special_layout "/vtt/marge_html_markaby_with_special_layout", :action => :marge_html_markaby_with_special_layout + map.bleeding_gums_murphy "/vtt/bleeding_gums_murphy", :action => :bleeding_gums_murphy, :method => :post, :format => :js + map.bleeding_gums_murphy_with_render "/vtt/bleeding_gums_murphy_with_render", :action => :bleeding_gums_murphy_with_render, :method => :post, :format => :js end r.defaults mack-javascript/spec/fake_application/config/routes.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb") -class Mack::Javascript::Framework::FirstFramework +class Mack::JavaScript::Framework::FirstFramework class << self def replace "I'm in Framework 1" @@ -8,7 +8,7 @@ class Mack::Javascript::Framework::FirstFramework end end -class Mack::Javascript::Framework::SecondFramework +class Mack::JavaScript::Framework::SecondFramework class << self def replace "I'm in Framework 2" @@ -16,17 +16,17 @@ class Mack::Javascript::Framework::SecondFramework end end -describe Mack::Javascript::ScriptGenerator do +describe Mack::JavaScript::ScriptGenerator do before(:each) do - @p = Mack::Javascript::ScriptGenerator.new + @p = Mack::JavaScript::ScriptGenerator.new end it "should respond to 'framework'" do - Mack::Javascript::ScriptGenerator.framework = 'first_framework' - Mack::Javascript::ScriptGenerator.framework.should == Mack::Javascript::Framework::FirstFramework + Mack::JavaScript::ScriptGenerator.framework = 'first_framework' + Mack::JavaScript::ScriptGenerator.framework.should == Mack::JavaScript::Framework::FirstFramework - Mack::Javascript::ScriptGenerator.framework = 'second_framework' - Mack::Javascript::ScriptGenerator.framework.should == Mack::Javascript::Framework::SecondFramework + Mack::JavaScript::ScriptGenerator.framework = 'second_framework' + Mack::JavaScript::ScriptGenerator.framework.should == Mack::JavaScript::Framework::SecondFramework end it "should respond to 'alert'" do @@ -38,15 +38,15 @@ describe Mack::Javascript::ScriptGenerator do @p.assign('this', 'that') @p.to_s.should == "this = \"that\";" - @p = Mack::Javascript::ScriptGenerator.new + @p = Mack::JavaScript::ScriptGenerator.new @p.assign('this', 5) @p.to_s.should == "this = 5;" - @p = Mack::Javascript::ScriptGenerator.new + @p = Mack::JavaScript::ScriptGenerator.new @p.assign('this', {:my => 'hash'}) @p.to_s.should == "this = {\"my\":\"hash\"};" - @p = Mack::Javascript::ScriptGenerator.new + @p = Mack::JavaScript::ScriptGenerator.new @p.assign('this', ['array', 1]) @p.to_s.should == "this = [\"array\",1];" end @@ -62,17 +62,17 @@ describe Mack::Javascript::ScriptGenerator do @p.call('myFunc', 'firstParam', 3) @p.to_s.should == %{myFunc("firstParam",3);} - @p = Mack::Javascript::ScriptGenerator.new + @p = Mack::JavaScript::ScriptGenerator.new @p.call('myFunc', {:stuff => 3}) @p.to_s.should == %{myFunc({"stuff":3});} end it "should properly handle method_missing" do - Mack::Javascript::ScriptGenerator.framework = 'first_framework' + Mack::JavaScript::ScriptGenerator.framework = 'first_framework' @p.replace.should == "I'm in Framework 1;" - @p = Mack::Javascript::ScriptGenerator.new - Mack::Javascript::ScriptGenerator.framework = 'second_framework' + @p = Mack::JavaScript::ScriptGenerator.new + Mack::JavaScript::ScriptGenerator.framework = 'second_framework' @p.replace.should == "I'm in Framework 2;" end end mack-javascript/spec/lib/helpers/js_generator_spec.rb mack-javascript/spec/fake_application/app/views/vtt/view_template/marge.html.mab 5a5202094ea3f0025b9fbd9d071ef3930c26aee1 dsutedja dsutedja@helium.com http://github.com/markbates/mack-more/commit/dba05d792de85fdb868de0d03a666e3b6c4e5aa1 dba05d792de85fdb868de0d03a666e3b6c4e5aa1 2008-07-22T07:07:59-07:00 2008-07-22T07:07:59-07:00 RJS Support 17db17515d57ad45ab48cd765c1ef684b7d12bb7 dsutedja dsutedja@helium.com