right-rails 1.2.2 → 1.3.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+2011-11-11 Nikolay Nemshilov
+  o Version 1.3.0
+    * RightJS 2.3.0 upgrade
+    * Plugins/UI update
+    * Rails 3.1 related fixes
+    * Rails 2 support dropped
+
 2011-06-12 Nikolay Nemshilov
   o Version 1.2.2
     * Rails 3.1 assets pipeline support

data/README.rdoc

@@ -29,7 +29,7 @@ Just add the following into your +Gemfile+
 
 If you're on Rails < 3.1 then run the +right_rails+ generator
 
-    script/generate right_rails
+    rails g right_rails
 
 If you're using Rails 3.1 with the pipeline assets handler, then you
 can require things in your +application.js+ file

data/Rakefile

@@ -41,7 +41,7 @@ end
 namespace :rjs do
   CURRENT_DIR         = File.dirname(__FILE__)
 
-  OUTPUT_DIR          = CURRENT_DIR + '/vendor'
+  OUTPUT_DIR          = CURRENT_DIR + '/vendor/assets'
   OUTPUT_JSS_DIR      = OUTPUT_DIR + "/javascripts"
   OUTPUT_IMG_DIR      = OUTPUT_DIR + "/images/rightjs-ui"
 

data/init.rb

@@ -1,6 +1,7 @@
 # Include hook code here
 
 require 'right_rails'
+require 'rjs_renderer'
 
 if defined?(Rails)
   unless ::Rails.version < "3.1"

data/lib/generators/right_rails/right_rails_generator.rb

@@ -7,17 +7,26 @@ class RightRailsGenerator < Rails::Generators::Base
 
   def manifest
     source_path      = File.dirname(__FILE__)
-    images_path      = "#{source_path}/../../../public/images/rightjs-ui"
-    javascripts_path = "#{source_path}/../../../public/javascripts"
+    images_path      = "#{source_path}/../../../vendor/assets/images/rightjs-ui"
+    javascripts_path = "#{source_path}/../../../vendor/assets/javascripts"
 
     # copying the javascript javascript files
-    directory javascripts_path , "public/javascripts/"
-
-    # creating the iframed uploads layout
-    copy_file source_path + "/templates/iframed.html.erb", "app/views/layouts/iframed.html.erb"
+    directory javascripts_path , "public/javascripts"
 
     # copying the images in place
     directory images_path, "public/images/rightjs-ui"
+
+    # patching up the JS files to use images from 'pubic/images'
+    Dir['public/javascripts/right/*.js'].each do |filename|
+      old_content = File.read(filename)
+      new_content = old_content.gsub("url(/assets/rightjs-ui/", "url(/images/rightjs-ui/")
+
+      if old_content != new_content
+        File.open(filename, "w") do |f|
+          f.write new_content
+        end
+      end
+    end
   end
 
   def banner

data/lib/right_rails.rb

@@ -2,7 +2,7 @@
 # The RightRails module. Just a namespace
 #
 module RightRails
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 
   autoload :Config,               'right_rails/config'
   autoload :JavaScriptGenerator,  'right_rails/java_script_generator'

data/lib/right_rails/controller_extensions.rb

@@ -3,14 +3,14 @@
 #
 #
 module RightRails::ControllerExtensions
-  
+
   #
   # This method returns a wrapped RightRails scripts builder
   #
   # USAGE:
   #   def create
   #     @zing = Zing.new(params[:zing])
-  #     
+  #
   #     if @zing.save
   #       flash[:notice] = 'Here you go'
   #       render rjs.insert @zing
@@ -36,21 +36,21 @@ module RightRails::ControllerExtensions
     else
       view_context
     end
-    
+
     wrapper = RenderWrapper.new(template, options)
-        
+
     if block_given?
       wrapper.render_block(&block)
     else
       wrapper
     end
   end
-  
+
 private
-  
+
   #
   # This class wraps the standard JavaScript responses in the controller
-  # 
+  #
   # It delegates all the script generating calls to the JavaScriptGenerator
   # instance, then grabs thre reults and creates a suitable hash of options
   # for the ActionController::Base#render method
@@ -61,30 +61,43 @@ private
       @generator = RightRails::JavaScriptGenerator.new(template)
       @options   = options
     end
-    
+
     def render_block(&block)
       yield(@generator)
       render
     end
-    
+
     def method_missing(name, *args)
       @generator.send(name, *args)
-      render 
+      render
     end
-    
+
     #
     # Compiles the options for the controller#render method
     #
     def render
       result = {:text => @generator.to_s, :content_type => Mime::JS}
-      
+
       # iframed uploads context overloading
       if @template.request.content_type == 'multipart/form-data'
-        result.merge! :content_type => Mime::HTML, :layout => 'iframed.html.erb'
+        result[:content_type] = Mime::HTML
+        result[:layout]       = nil
+        result[:text]         = %Q{
+<!-- iframed uploads JS responses layout -->
+<html>
+  <head>
+    <script type="text/javascript">
+      with (window.parent) {
+        #{result[:text]}
+      }
+    </script>
+  </head>
+</html>
+        }.strip
       end
-      
+
       result.merge! @options
     end
   end
-  
+
 end

data/lib/right_rails/helpers/misc.rb

@@ -9,12 +9,12 @@ module RightRails::Helpers::Misc
     items = flash.collect{ |key, text|
       content_tag(:div, text, :class => key)
     }.sort.join("")
-    
+
     content_tag(:div, RightRails::Helpers.html_safe(items),
       :id => :flashes, :style => (flash.empty? ? 'display: none' : nil))
   end
-  
-  
+
+
   #
   # the autocompletion list result
   #
@@ -30,26 +30,26 @@ module RightRails::Helpers::Misc
   #
   def autocomplete_result(entries, *args)
     return if entries.empty?
-    
+
     options   = args.last.is_a?(Hash) ? args.pop : {}
     highlight = options[:highlight]
     escape    = options[:escape].nil? ? true : options[:escape]
     field     = args.first
-    
-    
+
+
     items     = entries.collect{ |entry|
       entry = entry.send(field) if field
-      text  = highlight ? highlight(entry, highlight) : escape ? h(entry) : entry
-      
+      text  = highlight ? highlight(entry, highlight) : escape ? ERB::Util.html_escape(entry) : entry
+
       content_tag :li, RightRails::Helpers.html_safe(text)
     }.join("")
-    
+
     content_tag :ul, RightRails::Helpers.html_safe(items)
   end
-  
+
   alias_method :autocompleter_result, :autocomplete_result
-  
-  
+
+
   #
   # Generates a link that whil load the refered address in a lightbox
   #
@@ -61,21 +61,21 @@ module RightRails::Helpers::Misc
   #
   def link_to_lightbox(name, url={}, options={}, &block)
     rightjs_require_module 'lightbox'
-    
+
     group = options.delete(:roadtrip) || options.delete(:group)
-    
+
     if RightRails::Config.rightjs_version < 2
       options[:rel] = 'lightbox'
       options[:rel] << "[roadtrip]" if group
     else
       options[:group] = group.to_s if group
     end
-    
+
     RightRails::Helpers.add_unit_options(options, 'lightbox')
-    
+
     link_to name, url, options, &block
   end
-  
+
   #
   # Tabs container generator
   #
@@ -99,25 +99,25 @@ module RightRails::Helpers::Misc
     rightjs_require_module 'tabs'
     @__tabs = []
     yield()
-    
+
     options.stringify_keys!
-    
+
     tabs_type = options.delete('type')
     options['id'] = options.delete('id') || "tabs-#{rand.to_s.split('.').last}"
-    
+
     # checking for the carousel class
     if tabs_type == :carousel
       options['class'] ||= ''
       options['class'] << (options['class'] == '' ? '' : ' ') + "#{RightRails::Helpers.css_prefix}-tabs-carousel"
     end
-    
+
     # extracting the tab id prefix option
     tab_id_prefix = options[:idPrefix] || options['idPrefix'] || options[:id_prefix] || options['id_prefix'] || ''
-    
+
     RightRails::Helpers.add_unit_options(options, 'tabs')
-    
+
     tabs_widget_options = options.delete('data-tabs') || options.delete('data-tabs-options')
-    
+
     # simple tabs and carousels generator
     content = if tabs_type != :harmonica
       # tabs list
@@ -130,12 +130,12 @@ module RightRails::Helpers::Misc
           }.join("\n")
         )
       ) + "\n";
-      
+
       # contents list
       bodies_list = @__tabs.collect{|tab|
         tab[:content] ? content_tag(:li, tab[:content], :id => "#{tab_id_prefix}#{tab[:options][:id]}") + "\n" : ''
       }.join("")
-      
+
       content_tag(:ul, tabs_list + RightRails::Helpers.html_safe(bodies_list), options)
     else
     # the harmonicas generator
@@ -149,26 +149,26 @@ module RightRails::Helpers::Misc
           }.join("\n")
         ), options
       )
-      
+
     end
-    
+
     content = content + RightRails::Helpers.html_safe("\n") + javascript_tag(
       "new Tabs('#{options['id']}', #{tabs_widget_options || '{}'});"
     )
-    
+
     defined?(Rails) && Rails::VERSION::MAJOR < 3 ? concat(content) : content
   end
-  
+
   def tab(title, options={}, &block)
     options[:id] = "tab-#{rand.to_s.split('.').last}" if !options[:id] && !options[:url]
-    
+
     @__tabs << {
       :title   => title,
       :options => options,
       :content => block_given? ? capture(&block) : nil
     }
   end
-  
+
   #
   # The resizable unit helper
   #
@@ -179,23 +179,23 @@ module RightRails::Helpers::Misc
   #
   def resizable(options={}, &block)
     rightjs_require_module 'resizable'
-    
+
     RightRails::Helpers.add_unit_options(options, 'resizable')
-    
+
     options.delete('data-resizable') if options['data-resizable'] == "{}"
-    
+
     options[:class] ||= ''
     options[:class] << " #{RightRails::Helpers.css_prefix}-resizable#{options[:direction] ? "-#{options.delete(:direction)}" : ''}"
     options[:class].strip!
-    
+
     content = content_tag(:div, (
         content_tag(:div, RightRails::Helpers.html_safe(capture(&block)),
           :class => "#{RightRails::Helpers.css_prefix}-resizable-content") +
         content_tag(:div, '', :class => "#{RightRails::Helpers.css_prefix}-resizable-handle")
       ), options
     )
-    
+
     defined?(Rails) && Rails::VERSION::MAJOR < 3 ? concat(content) : content
   end
-  
+
 end

data/lib/right_rails/helpers/rails.rb

@@ -55,6 +55,18 @@ module RightRails::Helpers::Rails
     button_to_remote(value, options, html_options)
   end
 
+  #
+  # Getting back Rails 3.0 kind of method that supports blocks
+  #
+  def button_to_function(name, *args, &block)
+    html_options = args.extract_options!.symbolize_keys
+
+    function = block_given? ? update_page(&block) : args[0] || ''
+    onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
+
+    tag(:input, html_options.merge(:type => 'button', :value => name, :onclick => onclick))
+  end
+
   #
   # Replacing `periodically_call_remote` method
   #
@@ -67,21 +79,28 @@ module RightRails::Helpers::Rails
   #
   # replacing the draggables generator to make our autoscripts stuff working
   #
-  def draggable_element_js(*args)
+  def draggable_element_js(element_id, options)
     rightjs_require_module 'dnd'
-
-    super *args
+    %(new Draggable(#{ActiveSupport::JSON.encode(element_id)}, #{options_for_javascript(options)});)
   end
 
   #
   # replace the droppables generator to be used with RightJS
   #
-  def drop_receiving_element_js(*args)
+  def drop_receiving_element_js(element_id, options={})
     rightjs_require_module 'dnd'
 
-    super(*args).gsub!('Droppables.add', 'new Droppable'
-      ).gsub!('element.id', 'draggable.element.id'
-      ).gsub!('(element)', '(draggable)')
+    options[:with]     ||= "'id=' + encodeURIComponent(draggable.element.id)"
+    options[:onDrop]   ||= "function(draggable){" + remote_function(options) + "}"
+    options.delete_if { |key, value| AJAX_OPTIONS.include?(key) }
+
+    options[:accept] = array_or_string_for_javascript(options[:accept]) if options[:accept]
+    options[:hoverclass] = "'#{options[:hoverclass]}'" if options[:hoverclass]
+
+    # Confirmation happens during the onDrop callback, so it can be removed from the options
+    options.delete(:confirm) if options[:confirm]
+
+    %(new Droppable(#{ActiveSupport::JSON.encode(element_id)}, #{options_for_javascript(options)});)
   end
 
   #
@@ -100,4 +119,28 @@ module RightRails::Helpers::Rails
     script << ")"
   end
 
+# ScriptaculousHelper substitute
+
+  CALLBACKS = Set.new([ :create, :uninitialized, :loading, :loaded, :interactive, :complete, :failure, :success ] + (100..599).to_a)
+  AJAX_OPTIONS = Set.new([ :before, :after, :condition, :url, :asynchronous, :method, :insertion, :position, :form, :with, :update, :script, :type ]).merge(CALLBACKS)
+
+  def array_or_string_for_javascript(option)
+    if option.kind_of?(Array)
+      "['#{option.join('\',\'')}']"
+    elsif !option.nil?
+      "'#{option}'"
+    end
+  end
+
+  def draggable_element(element_id, options = {})
+    javascript_tag(draggable_element_js(element_id, options).chop!)
+  end
+
+  def drop_receiving_element(element_id, options = {})
+    javascript_tag(drop_receiving_element_js(element_id, options).chop!)
+  end
+
+  def sortable_element(element_id, options = {})
+    javascript_tag(sortable_element_js(element_id, options).chop!)
+  end
 end