right-rails 0.6.0 → 1.0.0

data/spec/lib/right_rails/helpers/forms_spec.rb

@@ -9,53 +9,251 @@ describe RightRails::Helpers::Forms do
   
   def url_for(options)   options end
   def escape_javascript(str) str end
-  
-  it "should generate a #calendar_field_tag" do
-    calendar_field_tag('name', 'value').should == 
-      %Q{<input id="name" name="name" rel="calendar" type="text" value="value" />}
-    
-    @_right_scripts.should == ['calendar']
+  def rightjs_required_files
+    RightRails::Helpers.required_js_files(self)
   end
   
-  it "should generate a #calendar_field_tag with options" do
-    calendar_field_tag('name', 'value', :format => '%Y/%m/%d').should ==
-      %Q{<input data-calendar-options="{format:'%Y/%m/%d'}" id="name" name="name" rel="calendar" type="text" value="value" />}
+  before :each do
+    RightRails::Config.reset!
   end
   
-  it "should generate a #autocomplete_field_tag" do
-    autocomplete_field_tag('name', 'value', :url => '/foo').should ==
-      %Q{<input autocomplete="off" id="name" name="name" rel="autocompleter[/foo]" type="text" value="value" />}
+  describe ".calendar_field" do
+    it "should generate a basic calendar_field_tag" do
+      calendar_field_tag('name', 'value').should == 
+        %Q{<input data-calendar="{}" id="name" name="name" type="text" value="value" />}
+
+      rightjs_required_files.should include('right/calendar')
+    end
+
+    it "should generate a calendar_field_tag with options" do
+      calendar_field_tag('name', 'value', :format => '%Y/%m/%d').should ==
+        %Q{<input data-calendar="{format:'%Y/%m/%d'}" id="name" }+
+          %Q{name="name" type="text" value="value" />}
+    end
+  
+    it "should generate a basic calendar_field" do
+      calendar_field('model', 'method').should ==
+        %Q{<input data-calendar="{}" id="model_method" name="model[method]" size="30" type="text" />}
+    end
+  
+    it "should generate a calendar_field with options" do
+      calendar_field('model', 'method', :hide_on_pick => true).should ==
+        %Q{<input data-calendar="{hideOnPick:true}" id="model_method" }+
+          %Q{name="model[method]" size="30" type="text" />}
+    end
+    
+    describe "in RightJS 1 mode" do
+      before :each do
+        RightRails::Config.rightjs_version = 1
+      end
       
-    @_right_scripts.should == ['autocompleter']
+      it "should generate a basic calendar_field_tag" do
+        calendar_field_tag('name', 'value').should == 
+          %Q{<input id="name" name="name" rel="calendar" type="text" value="value" />}
+
+        rightjs_required_files.should include('right/calendar')
+      end
+
+      it "should generate a calendar_field_tag with options" do
+        calendar_field_tag('name', 'value', :format => '%Y/%m/%d').should ==
+          %Q{<input data-calendar-options="{format:'%Y/%m/%d'}" id="name" name="name" }+
+            %Q{rel="calendar" type="text" value="value" />}
+      end
+    
+      it "should generate a basic calendar_field" do
+        calendar_field('model', 'method').should ==
+          %Q{<input id="model_method" name="model[method]" rel="calendar" size="30" type="text" />}
+      end
+    
+      it "should generate a calendar_field with options" do
+        calendar_field('model', 'method', :hide_on_pick => true).should ==
+          %Q{<input data-calendar-options="{hideOnPick:true}" id="model_method" }+
+            %Q{name="model[method]" rel="calendar" size="30" type="text" />}
+      end
+    end
   end
   
-  it "should generate a #autocomplete_field_tag with options" do
-    autocomplete_field_tag('name', 'value', :url => '/foo', :spinner => 'spinner', :min_length => 2).should ==
-      %Q{<input autocomplete="off" data-autocompleter-options="{minLength:2,spinner:'spinner'}" id="name" name="name" rel="autocompleter[/foo]" type="text" value="value" />}
-  end
+  describe ".autocomplete_field" do
+    it "should generate a basic autocomplete_field_tag" do
+      autocomplete_field_tag('name', 'value', :url => '/foo').should ==
+        %Q{<input autocomplete="off" data-autocompleter="{url:'/foo'}" id="name" name="name" type="text" value="value" />}
+
+      rightjs_required_files.should include('right/autocompleter')
+    end
+
+    it "should generate an autocomplete_field_tag with options" do
+      autocomplete_field_tag('name', 'value', :url => '/foo', :spinner => 'spinner', :min_length => 2).should ==
+        %Q{<input autocomplete="off" data-autocompleter="{minLength:2,spinner:'spinner',url:'/foo'}" }+
+          %Q{id="name" name="name" type="text" value="value" />}
+    end
   
-  it "should generate a #slider_tag with options" do
-    slider_tag('some_field', 22, :min => 10, :max => 40).should ==
-      %Q{<input id="some_field" name="some_field" type="hidden" value="22" />\n<script type="text/javascript">\n//<![CDATA[\nnew Slider({max:40,min:10,value:22}).insertTo('some_field','after').assignTo('some_field');\n//]]>\n</script>}
-  end
+    it "should generate a basic autocomplete_field" do
+      autocomplete_field('object', 'method', :url => '/foo').should ==
+        %Q{<input autocomplete="off" data-autocompleter="{url:'/foo'}" id="object_method" name="object[method]" size="30" type="text" />}
+    end
   
-  it "should generate a #rater_tag" do
-    rater_tag('some_field', 2).should ==
-      %Q{<input id="some_field" name="some_field" type="hidden" value="2" />\n<script type="text/javascript">\n//<![CDATA[\nnew Rater({value:2}).insertTo('some_field','after').assignTo('some_field');\n//]]>\n</script>}
+    it "should generate an autocomplete_field with options" do
+      autocomplete_field('object', 'method', :url => '/foo', :fx_name => 'fade').should ==
+        %Q{<input autocomplete="off" data-autocompleter="{fxName:'fade',url:'/foo'}" id="object_method" }+
+          %Q{name="object[method]" size="30" type="text" />}
+    end
+    
+    describe "in RightJS 1 mode" do
+      before :each do
+        RightRails::Config.rightjs_version = 1
+      end
+      
+      it "should generate a basic autocomplete_field_tag" do
+        autocomplete_field_tag('name', 'value', :url => '/foo').should ==
+          %Q{<input autocomplete="off" id="name" name="name" rel="autocompleter[/foo]" type="text" value="value" />}
+
+        rightjs_required_files.should include('right/autocompleter')
+      end
+
+      it "should generate an autocomplete_field_tag with options" do
+        autocomplete_field_tag('name', 'value', :url => '/foo', :spinner => 'spinner', :min_length => 2).should ==
+          %Q{<input autocomplete="off" data-autocompleter-options="{minLength:2,spinner:'spinner'}" }+
+            %Q{id="name" name="name" rel="autocompleter[/foo]" type="text" value="value" />}
+      end
+    
+      it "should generate a basic autocomplete_field" do
+        autocomplete_field('object', 'method', :url => '/foo').should ==
+          %Q{<input autocomplete="off" id="object_method" name="object[method]" rel="autocompleter[/foo]" size="30" type="text" />}
+      end
+    
+      it "should generate an autocomplete_field with options" do
+        autocomplete_field('object', 'method', :url => '/foo', :fx_name => 'fade').should ==
+          %Q{<input autocomplete="off" data-autocompleter-options="{fxName:'fade'}" id="object_method" }+
+            %Q{name="object[method]" rel="autocompleter[/foo]" size="30" type="text" />}
+      end
+    end
   end
   
-  it "should generate the #rater_display tag" do
-    rater_display(4).should ==
-      %Q{<div class="right-rater right-rater-disabled"><div class="right-rater-glow">&#9733;</div><div class="right-rater-glow">&#9733;</div><div class="right-rater-glow">&#9733;</div><div class="right-rater-glow">&#9733;</div><div>&#9733;</div></div>}
+  describe ".slider" do
+    
+    it "should generate a basic slider_tag" do
+      slider_tag('some_field', 22).should ==
+        %Q{<input id="some_field" name="some_field" type="hidden" value="22" />\n}+
+          %Q{<script type="text/javascript">\n//<![CDATA[\n}+
+            %Q{new Slider({value:22}).insertTo('some_field','after').assignTo('some_field');\n}+
+          %Q{//]]>\n}+
+        %Q{</script>}
+    end
+  
+    it "should generate a slider_tag with options" do
+      slider_tag('some_field', 22, :min => 10, :max => 40).should ==
+        %Q{<input id="some_field" name="some_field" type="hidden" value="22" />\n}+
+          %Q{<script type="text/javascript">\n//<![CDATA[\n}+
+            %Q{new Slider({max:40,min:10,value:22}).insertTo('some_field','after').assignTo('some_field');\n}+
+          %Q{//]]>\n}+
+        %Q{</script>}
+    end
+  
+    it "should generate a slider with options" do
+      model = {}
+      model.should_receive('method').twice.and_return(22)
+      should_receive(:instance_variable_get).twice.with('@object').and_return(model)
+      
+      slider('object', 'method', :value => 22, :min => 20, :max => 80).should ==
+        %Q{<input id="object_method" name="object[method]" type="hidden" value="22" />\n}+
+          %Q{<script type="text/javascript">\n//<![CDATA[\n}+
+            %Q{new Slider({max:80,min:20,value:22}).insertTo('object_method','after').assignTo('object_method');\n}+
+          %Q{//]]>\n}+
+        %Q{</script>}
+    end
   end
   
-  it "should generate a #colorpicker_field_tag" do
-    colorpicker_field_tag('name', '#FF0').should == 
-      %Q{<input id=\"name\" name=\"name\" rel=\"colorpicker\" type=\"text\" value=\"#FF0\" />}
+  describe ".rater" do
+    it "should generate a simple rater" do
+      model = {}
+      model.should_receive('method').twice.and_return(2)
+      should_receive(:instance_variable_get).twice.with('@object').and_return(model)
+      
+      rater('object', 'method', :value => 2).should ==
+        %Q{<input id="object_method" name="object[method]" type="hidden" value="2" />\n}+
+        %Q{<script type="text/javascript">\n//<![CDATA[\n}+
+          %Q{new Rater({value:2}).insertTo('object_method','after').assignTo('object_method');\n}+
+        %Q{//]]>\n</script>}
+    end
+  
+    it "should generate a #rater_tag" do
+      rater_tag('some_field', 2).should ==
+        %Q{<input id="some_field" name="some_field" type="hidden" value="2" />\n}+
+        %Q{<script type="text/javascript">\n//<![CDATA[\n}+
+          %Q{new Rater({value:2}).insertTo('some_field','after').assignTo('some_field');\n}+
+        %Q{//]]>\n</script>}
+    end
+    
+    it "should generate the #rater_display tag" do
+      rater_display(4).should ==
+        %Q{<div class="rui-rater rui-rater-disabled">}+
+          %Q{<div class="active">&#9733;</div>}+
+          %Q{<div class="active">&#9733;</div>}+
+          %Q{<div class="active">&#9733;</div>}+
+          %Q{<div class="active">&#9733;</div>}+
+          %Q{<div>&#9733;</div>}+
+        %Q{</div>}
+    end
+    
+    describe "in RightJS 1 mode" do
+      before :each do
+        RightRails::Config.rightjs_version = 1
+      end
+      
+      it "should generate the #rater_display tag" do
+        rater_display(4).should ==
+          %Q{<div class="right-rater right-rater-disabled">}+
+            %Q{<div class="right-rater-glow">&#9733;</div>}+
+            %Q{<div class="right-rater-glow">&#9733;</div>}+
+            %Q{<div class="right-rater-glow">&#9733;</div>}+
+            %Q{<div class="right-rater-glow">&#9733;</div>}+
+            %Q{<div>&#9733;</div>}+
+          %Q{</div>}
+      end
+    end
   end
   
-  it "should generate a #colorpicker_field_tag with options" do
-    colorpicker_field_tag('name', '#FF0', :format => 'rgb').should == 
-      %Q{<input data-colorpicker-options=\"{format:'rgb'}\" id=\"name\" name=\"name\" rel=\"colorpicker\" type=\"text\" value=\"#FF0\" />}
+  describe ".colorpicker" do
+    it "should generate a simple colorpicker_field_tag" do
+      colorpicker_field_tag('name', '#FF0').should == 
+        %Q{<input data-colorpicker="{}" id="name" name="name" type="text" value="#FF0" />}
+    end
+
+    it "should generate a colorpicker_field_tag with options" do
+      colorpicker_field_tag('name', '#FF0', :format => 'rgb').should == 
+        %Q{<input data-colorpicker="{format:'rgb'}" }+
+          %Q{id="name" name="name" type="text" value="#FF0" />}
+    end
+  
+    it "should generate a colorpicker_field with options" do
+      colorpicker_field('object', 'method', :fx_name => 'slide').should ==
+        %Q{<input data-colorpicker="{fxName:'slide'}" id="object_method" }+
+          %Q{name="object[method]" size="30" type="text" />}
+    end
+    
+    describe "in RightJS 1 mode" do
+      before :each do
+        RightRails::Config.rightjs_version = 1
+      end
+      
+      it "should generate a simple colorpicker_field_tag" do
+        colorpicker_field_tag('name', '#FF0').should == 
+          %Q{<input id="name" name="name" rel="colorpicker" type="text" value="#FF0" />}
+      end
+
+      it "should generate a colorpicker_field_tag with options" do
+        colorpicker_field_tag('name', '#FF0', :format => 'rgb').should == 
+          %Q{<input data-colorpicker-options="{format:'rgb'}" }+
+            %Q{id="name" name="name" rel="colorpicker" type="text" value="#FF0" />}
+      end
+    
+      it "should generate a colorpicker_field with options" do
+        colorpicker_field('object', 'method', :fx_name => 'slide').should ==
+          %Q{<input data-colorpicker-options="{fxName:'slide'}" id="object_method" }+
+            %Q{name="object[method]" rel="colorpicker" size="30" type="text" />}
+      end
+    end
   end
+  
+  
 end

data/spec/lib/right_rails/helpers/misc_spec.rb

@@ -9,7 +9,7 @@ describe RightRails::Helpers::Misc do
   
   # fraking Rails 3 replacement
   def javascript_tag(script)
-    __rjs_hs(%Q{<script type="text/javascript">\n//<![CDATA[\n#{script}\n//]]>\n</script>})
+    RightRails::Helpers.html_safe(%Q{<script type="text/javascript">\n//<![CDATA[\n#{script}\n//]]>\n</script>})
   end
   
   # stubbing those two
@@ -21,6 +21,14 @@ describe RightRails::Helpers::Misc do
     content
   end
   
+  def rightjs_required_files
+    RightRails::Helpers.required_js_files(self)
+  end
+  
+  before :each do 
+    RightRails::Config.reset!
+  end
+  
   
   it "should provide the basic #flashes builder" do
     should_receive(:flash).any_number_of_times.and_return({
@@ -78,18 +86,39 @@ describe RightRails::Helpers::Misc do
   
   describe "#link_to_lightbox" do
     it "should generate the link" do
-      link_to_lightbox('boo', 'boo').should == '<a href="boo" rel="lightbox">boo</a>'
-      @_right_scripts.should == ['lightbox']
+      link_to_lightbox('boo', 'boo').should == '<a href="boo" data-lightbox="{}">boo</a>'
+      rightjs_required_files.should include('right/lightbox')
     end
-    
+  
     it "should generate lightbox with roadtrip" do
       link_to_lightbox('boo', 'boo', :roadtrip => true).should ==
-        %Q{<a href="boo" rel="lightbox[roadtrip]">boo</a>}
+        %Q{<a href="boo" data-lightbox="{group:'true'}">boo</a>}
     end
-    
+  
     it "should generate lightbox with options" do
       link_to_lightbox('boo', 'boo', :hide_on_out_click => false).should ==
-        %Q{<a href="boo" data-lightbox-options="{hideOnOutClick:false}" rel="lightbox">boo</a>}
+        %Q{<a href="boo" data-lightbox="{hideOnOutClick:false}">boo</a>}
+    end
+    
+    describe "in RightJS 1 mode" do
+      before :each do 
+        RightRails::Config.rightjs_version = 1
+      end
+      
+      it "should generate the link" do
+        link_to_lightbox('boo', 'boo').should == '<a href="boo" rel="lightbox">boo</a>'
+        rightjs_required_files.should include('right/lightbox')
+      end
+    
+      it "should generate lightbox with roadtrip" do
+        link_to_lightbox('boo', 'boo', :roadtrip => true).should ==
+          %Q{<a href="boo" rel="lightbox[roadtrip]">boo</a>}
+      end
+    
+      it "should generate lightbox with options" do
+        link_to_lightbox('boo', 'boo', :hide_on_out_click => false).should ==
+          %Q{<a href="boo" data-lightbox-options="{hideOnOutClick:false}" rel="lightbox">boo</a>}
+      end
     end
   end
   
@@ -98,59 +127,98 @@ describe RightRails::Helpers::Misc do
       tabs(:id => 'my-tabs') {
         tab("Tab 1", :id => 'tab-1'){ 'content 1' }
         tab("Tab 2", :id => 'tab-2'){ 'content 2' }
-      }.should == %Q{<ul id=\"my-tabs\"><ul><li><a href=\"#tab-1\">Tab 1</a></li>\n<li><a href=\"#tab-2\">Tab 2</a></li></ul>\n<li id=\"tab-1\">content 1</li>\n<li id=\"tab-2\">content 2</li>\n</ul>\n<script type=\"text/javascript\">\n//<![CDATA[\nnew Tabs('my-tabs');\n//]]>\n</script>}
+      }.should == %Q{<ul id="my-tabs"><ul><li><a href="#tab-1">Tab 1</a></li>\n<li><a href="#tab-2">Tab 2</a></li></ul>\n<li id="tab-1">content 1</li>\n<li id="tab-2">content 2</li>\n</ul>\n<script type="text/javascript">\n//<![CDATA[\nnew Tabs('my-tabs', {});\n//]]>\n</script>}
       
-      @_right_scripts.should == ['tabs']
+      rightjs_required_files.should include('right/tabs')
     end
     
     it "should generate tabs with id prefix" do
       tabs(:id => 'my-tabs', :id_prefix => 'foo-') {
         tab("Tab 1", :id => 'tab-1'){ 'content 1' }
         tab("Tab 2", :id => 'tab-2'){ 'content 2' }
-      }.should == %Q{<ul data-tabs-options=\"{idPrefix:'foo-'}\" id=\"my-tabs\"><ul><li><a href=\"#tab-1\">Tab 1</a></li>\n<li><a href=\"#tab-2\">Tab 2</a></li></ul>\n<li id=\"foo-tab-1\">content 1</li>\n<li id=\"foo-tab-2\">content 2</li>\n</ul>\n<script type=\"text/javascript\">\n//<![CDATA[\nnew Tabs('my-tabs');\n//]]>\n</script>}
+      }.should == %Q{<ul id="my-tabs"><ul><li><a href="#tab-1">Tab 1</a></li>\n<li><a href="#tab-2">Tab 2</a></li></ul>\n<li id="foo-tab-1">content 1</li>\n<li id="foo-tab-2">content 2</li>\n</ul>\n<script type="text/javascript">\n//<![CDATA[\nnew Tabs('my-tabs', {idPrefix:'foo-'});\n//]]>\n</script>}
     end
     
     it "should generate remote tabs" do
       tabs(:id => 'my-tabs') {
         tab("Tab 1", :url => '/tab/1')
         tab("Tab 2", :url => '/tab/2')
-      }.should == %Q{<ul id=\"my-tabs\"><ul><li><a href=\"/tab/1\">Tab 1</a></li>\n<li><a href=\"/tab/2\">Tab 2</a></li></ul>\n</ul>\n<script type=\"text/javascript\">\n//<![CDATA[\nnew Tabs('my-tabs');\n//]]>\n</script>}
+      }.should == %Q{<ul id="my-tabs"><ul><li><a href="/tab/1">Tab 1</a></li>\n<li><a href="/tab/2">Tab 2</a></li></ul>\n</ul>\n<script type="text/javascript">\n//<![CDATA[\nnew Tabs('my-tabs', {});\n//]]>\n</script>}
     end
     
     it "should generate carousel tabs" do
       tabs(:id => 'my-tabs', :type => :carousel) {
         tab("Tab 1", :id => 'tab-1'){ 'content 1' }
         tab("Tab 2", :id => 'tab-2'){ 'content 2' }
-      }.should == %Q{<ul class=\"right-tabs-carousel\" id=\"my-tabs\"><ul><li><a href=\"#tab-1\">Tab 1</a></li>\n<li><a href=\"#tab-2\">Tab 2</a></li></ul>\n<li id=\"tab-1\">content 1</li>\n<li id=\"tab-2\">content 2</li>\n</ul>\n<script type=\"text/javascript\">\n//<![CDATA[\nnew Tabs('my-tabs');\n//]]>\n</script>}
+      }.should == %Q{<ul class="#{RightRails::Helpers.css_prefix}-tabs-carousel" id="my-tabs"><ul><li><a href="#tab-1">Tab 1</a></li>\n<li><a href="#tab-2">Tab 2</a></li></ul>\n<li id="tab-1">content 1</li>\n<li id="tab-2">content 2</li>\n</ul>\n<script type="text/javascript">\n//<![CDATA[\nnew Tabs('my-tabs', {});\n//]]>\n</script>}
     end
     
     it "should generate harmonica tabs" do
       tabs(:id => 'my-tabs', :type => :harmonica) {
         tab("Tab 1", :id => 'tab-1'){ 'content 1' }
         tab("Tab 2", :id => 'tab-2'){ 'content 2' }
-      }.should == %Q{<dl id=\"my-tabs\"><dt><a href=\"#tab-1\">Tab 1</a></dt>\n<dd id=\"tab-1\">content 1</dd>\n<dt><a href=\"#tab-2\">Tab 2</a></dt>\n<dd id=\"tab-2\">content 2</dd></dl>\n<script type=\"text/javascript\">\n//<![CDATA[\nnew Tabs('my-tabs');\n//]]>\n</script>}
+      }.should == %Q{<dl id="my-tabs"><dt><a href="#tab-1">Tab 1</a></dt>\n<dd id="tab-1">content 1</dd>\n<dt><a href="#tab-2">Tab 2</a></dt>\n<dd id=\"tab-2\">content 2</dd></dl>\n<script type="text/javascript">\n//<![CDATA[\nnew Tabs('my-tabs', {});\n//]]>\n</script>}
     end
   end
   
   describe "#resizable generator" do
+    
     it "should generate a simple resizable" do
-      resizable {
-        "bla bla bla"
-      }.should == %Q{<div class=\"right-resizable\"><div class=\"right-resizable-content\">bla bla bla</div><div class=\"right-resizable-handle\"></div></div>}
-      
-      @_right_scripts.should == ['resizable']
-    end
+      resizable { "bla bla bla" }.should == 
+      %Q{<div class="rui-resizable">}+
+        %Q{<div class="rui-resizable-content">bla bla bla</div>}+
+        %Q{<div class="rui-resizable-handle"></div>}+
+      %Q{</div>}
     
+      rightjs_required_files.should include('right/resizable')
+    end
+  
     it "should generate a resizable with directions" do
-      resizable(:direction => :bottom) {
-        'boo'
-      }.should == %Q{<div class=\"right-resizable-bottom\"><div class=\"right-resizable-content\">boo</div><div class=\"right-resizable-handle\"></div></div>}
+      resizable(:direction => :bottom) { 'boo' }.should == 
+      %Q{<div class="rui-resizable-bottom">}+
+        %Q{<div class="rui-resizable-content">boo</div>}+
+        %Q{<div class="rui-resizable-handle"></div>}+
+      %Q{</div>}
     end
-    
+  
     it "should generate a resizable with constraints" do
-      resizable(:min_width => 100, :maxHeight => '10em'){
-        'boo'
-      }.should == %Q{<div class=\"right-resizable\" data-resizable-options=\"{maxHeight:'10em',minWidth:100}\"><div class=\"right-resizable-content\">boo</div><div class=\"right-resizable-handle\"></div></div>}
+      resizable(:min_width => 100, :maxHeight => '10em'){ 'boo' }.should == 
+      %Q{<div class="rui-resizable" data-resizable="{maxHeight:'10em',minWidth:100}">}+
+        %Q{<div class="rui-resizable-content">boo</div>}+
+        %Q{<div class="rui-resizable-handle"></div>}+
+      %Q{</div>}
+    end
+    
+    describe "in RightJS 1 mode" do
+      before :each do
+        RightRails::Config.rightjs_version = 1
+      end
+      
+      it "should generate a simple resizable" do
+        resizable { "bla bla bla" }.should == 
+        %Q{<div class="right-resizable">}+
+          %Q{<div class="right-resizable-content">bla bla bla</div>}+
+          %Q{<div class="right-resizable-handle"></div>}+
+        %Q{</div>}
+      
+        rightjs_required_files.should include('right/resizable')
+      end
+    
+      it "should generate a resizable with directions" do
+        resizable(:direction => :bottom) { 'boo' }.should == 
+        %Q{<div class="right-resizable-bottom">}+
+          %Q{<div class="right-resizable-content">boo</div>}+
+          %Q{<div class="right-resizable-handle"></div>}+
+        %Q{</div>}
+      end
+    
+      it "should generate a resizable with constraints" do
+        resizable(:min_width => 100, :maxHeight => '10em'){ 'boo' }.should == 
+        %Q{<div class="right-resizable" data-resizable-options="{maxHeight:'10em',minWidth:100}">}+
+          %Q{<div class="right-resizable-content">boo</div>}+
+          %Q{<div class="right-resizable-handle"></div>}+
+        %Q{</div>}
+      end
     end
   end
 end

data/spec/lib/right_rails/helpers/rails_spec.rb

@@ -45,6 +45,20 @@ describe RightRails::Helpers::Rails do
   # stubbing the convertion methods
   def url_for(url)               url    end
   def protect_against_forgery?() false  end
+  def rightjs_required_files
+    RightRails::Helpers.required_js_files(self)
+  end
+    
+  before :each do
+    RightRails::Config.reset!
+  end
+    
+  describe "#include_javascript_tag" do
+    it "should load the RightJS scripts by default" do
+      should_receive(:rightjs_scripts).and_return('right.js')
+      include_javascript_tag(:default).should == 'right.js'
+    end
+  end
   
   describe "#remote_function" do
     it "should generatorate a simple request" do
@@ -111,6 +125,21 @@ describe RightRails::Helpers::Rails do
       remote_function(:url => '/foo', :confirm => 'Sure?').should == 
         "if(confirm('Sure?')){Xhr.load('/foo')}"
     end
+    
+    describe "in safe-mode" do
+      before :each do
+        RightRails::Config.safe_mode = true
+      end
+      
+      it "should prefix the 'Xhr' calls" do
+        remote_function(:url => '/foo').should == "RightJS.Xhr.load('/foo')"
+      end
+      
+      it "should prefix the '$' calls" do
+        remote_function(:url => '/foo', :update => 'boo').should ==
+          "RightJS.Xhr.load('/foo',{onComplete:function(request){RightJS.$('boo').update(this.text)}})"
+      end
+    end
   end
   
   describe "#link_to_function" do
@@ -157,13 +186,19 @@ describe RightRails::Helpers::Rails do
   
   describe "#form_remote_tag" do
     it "should generate a simple remote form".should do
-      form_remote_tag(:url => '/boo').should ==
-        %Q{<form action="/boo" method="post" onsubmit="$(this).send(); return false;">}
+      form_remote_tag(:url => '/boo').should =~
+        /<form[^>]+#{Regexp.escape(%Q{action="/boo" method="post" onsubmit="$(this).send(); return false;">})}/
     end
     
     it "should generate a proper remote form with options" do
-      form_remote_tag(:url => '/boo', :spinner => 'spinner').should ==
-        %Q{<form action="/boo" method="post" onsubmit="$(this).send({spinner:'spinner'}); return false;">}
+      form_remote_tag(:url => '/boo', :spinner => 'spinner').should =~
+        /<form[^>]+#{Regexp.escape(%Q{action="/boo" method="post" onsubmit="$(this).send({spinner:'spinner'}); return false;">})}/
+    end
+    
+    it "should prefix '$' with RightJS. in safe-mode" do
+      RightRails::Config.safe_mode = true
+      form_remote_tag(:url => '/boo').should =~
+        /<form[^>]+#{Regexp.escape(%Q{action="/boo" method="post" onsubmit="RightJS.$(this).send(); return false;">})}/
     end
   end
   
@@ -176,14 +211,14 @@ describe RightRails::Helpers::Rails do
   
   it "should generate #draggable_element_js" do
     draggable_element_js(:element_id, :revert => true).should == 'new Draggable("element_id", {revert:true});'
-    @_right_scripts.should == ['dnd']
+    rightjs_required_files.should include('right/dnd')
   end
   
   it "should generate #drop_receiving_element_js" do
     drop_receiving_element_js(:element_id, :url => '/boo').should == 
       %Q{new Droppable("element_id", {onDrop:function(draggable){Xhr.load('/boo',{params:'id=' + encodeURIComponent(draggable.element.id)})}});}
-      
-    @_right_scripts.should == ['dnd']
+    
+    rightjs_required_files.should include('right/dnd')
   end
   
   it "should generate #sortable_element_js" do