right-rails 0.5.3 → 0.6.0

data/lib/right_rails/helpers/misc.rb

@@ -10,7 +10,7 @@ module RightRails::Helpers::Misc
       content_tag(:div, text, :class => key)
     }.sort.join("")
     
-    content_tag(:div, items.send(''.respond_to?(:html_safe) ? :html_safe : :to_s),
+    content_tag(:div, __rjs_hs(items),
       :id => :flashes, :style => (flash.empty? ? 'display: none' : nil))
   end
   
@@ -36,12 +36,15 @@ module RightRails::Helpers::Misc
     escape    = options[:escape].nil? ? true : options[:escape]
     field     = args.first
     
+    
     items     = entries.collect{ |entry|
       entry = entry.send(field) if field
-      content_tag :li, highlight ? highlight(entry, highlight) : escape ? h(entry) : entry
+      text  = highlight ? highlight(entry, highlight) : escape ? h(entry) : entry
+      
+      content_tag :li, __rjs_hs(text)
     }.join("")
     
-    content_tag :ul, items.send(''.respond_to?(:html_safe) ? :html_safe : :to_s)
+    content_tag :ul, __rjs_hs(items)
   end
   
   
@@ -112,11 +115,13 @@ module RightRails::Helpers::Misc
     content = if tabs_type != :harmonica
       # tabs list
       tabs_list = content_tag(:ul,
-        @__tabs.collect{ |tab|
-          content_tag(:li, content_tag(:a, tab[:title],
-            :href => tab[:options][:id] ? "##{tab[:options][:id]}" : tab[:options][:url]
-          ))
-        }.join("\n")
+        __rjs_hs(
+          @__tabs.collect{ |tab|
+            content_tag(:li, content_tag(:a, tab[:title],
+              :href => tab[:options][:id] ? "##{tab[:options][:id]}" : tab[:options][:url]
+            ))
+          }.join("\n")
+        )
       ) + "\n";
       
       # contents list
@@ -124,22 +129,24 @@ module RightRails::Helpers::Misc
         tab[:content] ? content_tag(:li, tab[:content], :id => "#{tab_id_prefix}#{tab[:options][:id]}") + "\n" : ''
       }.join("")
       
-      content_tag(:ul, tabs_list + bodies_list.send("".respond_to?(:html_safe) ? :html_safe : :to_s), options)
+      content_tag(:ul, tabs_list + __rjs_hs(bodies_list), options)
     else
     # the harmonicas generator
       content_tag(:dl,
-        @__tabs.collect{ |tab|
-          content_tag(:dt, content_tag(:a, tab[:title],
-            :href => tab[:options][:id] ? "##{tab[:options][:id]}" : tab[:options][:url]
-          )) + "\n" +
-          content_tag(:dd, tab[:content] || '', :id => tab[:options][:id] ? "#{tab_id_prefix}#{tab[:options][:id]}" : nil)
-        }.join("\n"),
+        __rjs_hs(
+          @__tabs.collect{ |tab|
+            content_tag(:dt, content_tag(:a, tab[:title],
+              :href => tab[:options][:id] ? "##{tab[:options][:id]}" : tab[:options][:url]
+            )) + "\n" +
+            content_tag(:dd, tab[:content] || '', :id => tab[:options][:id] ? "#{tab_id_prefix}#{tab[:options][:id]}" : nil)
+          }.join("\n")
+        ),
         options
       )
       
     end
     
-    concat(content + "\n".send("".respond_to?(:html_safe) ? :html_safe : :to_s) + javascript_tag("new Tabs('#{options['id']}');"))
+    concat(content + __rjs_hs("\n") + javascript_tag("new Tabs('#{options['id']}');"))
   end
   
   def tab(title, options={}, &block)
@@ -152,6 +159,31 @@ module RightRails::Helpers::Misc
     }
   end
   
+  #
+  # The resizable unit helper
+  #
+  # USAGE:
+  #   <% resizable(:direction => 'bottom', :minHeight => '100px') do %>
+  #     Some content in here
+  #   <% end -%>
+  #
+  def resizable(options={}, &block)
+    rightjs_include_module 'resizable'
+    
+    tabs_options = rightjs_unit_options(options, RESIZABLE_OPTION_KEYS)
+    options['data-resizable-options'] = tabs_options unless tabs_options == '{}'
+    
+    options[:class] ||= ''
+    options[:class] << " right-resizable#{options[:direction] ? "-#{options.delete(:direction)}" : ''}"
+    options[:class].strip!
+    
+    concat(content_tag(:div, (
+        content_tag(:div, __rjs_hs(capture(&block)), :class => 'right-resizable-content') +
+        content_tag(:div, '', :class => 'right-resizable-handle')
+      ), options
+    ))
+  end
+  
   TABS_OPTION_KEYS = %w{
     idPrefix
     tabsElement
@@ -181,4 +213,11 @@ module RightRails::Helpers::Misc
     mediaHeight
   }
   
+  RESIZABLE_OPTION_KEYS = %w{
+    minWidth
+    maxWidth
+    minHeight
+    maxHeight
+  }
+  
 end

data/lib/right_rails/java_script_generator.rb

@@ -69,13 +69,13 @@ class RightRails::JavaScriptGenerator
     end
 
     # builds the record HTML code and then insterts it in place
-    def insert(record)
-      self.RR.insert(record.class.table_name, @util.render(record))
+    def insert(record, position=nil)
+      self.RR.insert(*[record.class.table_name, @util.render(record), position].compact)
     end
     
     # generates a script that inserts the record partial, then updates the form and the flashes block
-    def insert_and_care(record)
-      insert(record)
+    def insert_and_care(record, position=nil)
+      insert(record, position)
       @util.template.instance_variable_set("@#{record.class.table_name.singularize}", record.class.new)
       replace_form_for(record.class.new)
       update_flash

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

@@ -69,7 +69,10 @@ describe RightRails::Helpers::Basic do
     end
     
     after :all do 
-      Kernel::RAILS_ENV = 'production'
+      # suppressing the warning coz we're being noughty in here and reassign the constant
+      Kernel::silence_warnings do
+        Kernel::RAILS_ENV = 'production'
+      end
     end
     
     it "should use the source scripts" do

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

@@ -48,4 +48,14 @@ describe RightRails::Helpers::Forms 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>}
   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\" />}
+  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\" />}
+  end
 end

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

@@ -7,6 +7,21 @@ describe RightRails::Helpers::Misc do
   include RightRails::Helpers::Basic
   include RightRails::Helpers::Misc
   
+  # fraking Rails 3 replacement
+  def javascript_tag(script)
+    __rjs_hs(%Q{<script type="text/javascript">\n//<![CDATA[\n#{script}\n//]]>\n</script>})
+  end
+  
+  # stubbing those two
+  def capture(&block)
+    return yield()
+  end
+  
+  def concat(content)
+    content
+  end
+  
+  
   it "should provide the basic #flashes builder" do
     should_receive(:flash).any_number_of_times.and_return({
       :warning => "Warning!",
@@ -79,19 +94,13 @@ describe RightRails::Helpers::Misc do
   end
   
   describe "#tabs generator" do
-    def capture(&block)
-      return yield()
-    end
-    
-    def concat(content)
-      content
-    end
-    
     it "should generate simple tabs" 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>}
+      
+      @_right_scripts.should == ['tabs']
     end
     
     it "should generate tabs with id prefix" do
@@ -122,4 +131,26 @@ describe RightRails::Helpers::Misc do
       }.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
+    
+    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>}
+    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>}
+    end
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Nikolay Nemshilov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 +04:00
+date: 2010-05-16 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -46,6 +46,8 @@ files:
 - javascripts/right-behavior.js
 - javascripts/right-calendar-src.js
 - javascripts/right-calendar.js
+- javascripts/right-colorpicker-src.js
+- javascripts/right-colorpicker.js
 - javascripts/right-dnd-src.js
 - javascripts/right-dnd.js
 - javascripts/right-effects-src.js
@@ -64,6 +66,8 @@ files:
 - javascripts/right-rails.js
 - javascripts/right-rater-src.js
 - javascripts/right-rater.js
+- javascripts/right-resizable-src.js
+- javascripts/right-resizable.js
 - javascripts/right-selectable-src.js
 - javascripts/right-selectable.js
 - javascripts/right-slider-src.js
@@ -82,11 +86,14 @@ files:
 - javascripts/right-ui-i18n-hu.js
 - javascripts/right-ui-i18n-jp.js
 - javascripts/right-ui-i18n-nl.js
+- javascripts/right-ui-i18n-pt-br.js
 - javascripts/right-ui-i18n-ru.js
 - javascripts/right-ui-i18n-ua.js
 - javascripts/right-uploader-src.js
 - javascripts/right-uploader.js
 - javascripts/right.js
+- images/colorpicker.png
+- images/resizable.png
 - lib/right-rails.rb
 - lib/right_rails/controller_extensions.rb
 - lib/right_rails/helpers/basic.rb