kenny_dialoggins 1.0.5 → 1.0.6

data/.specification

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: kenny_dialoggins
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Coroutine
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -05:00
+date: 2010-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 3
@@ -44,7 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 3
@@ -94,7 +91,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -103,7 +99,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/README.rdoc

@@ -32,6 +32,7 @@ What's that, you want more details?  You got it, buddy.
 <tt>render_dialog</tt> always needs a unique id for its first argument.  After that, it will
 take the same options as <tt>ActionController::Base#render</tt>.  It'll also take a few more, namely:
 
+* <tt>:id</tt> - an element id for the generated dialog.  If not provided, the value provided as the first argument to render_dialog will be used.
 * <tt>:class</tt> - a css class name that will be appended to the outermost div to facilitate multiple styles
 * <tt>:before_show</tt> - a Javascript function that will be invoked before the dialog is shown
 * <tt>:after_show</tt> - a Javascript function that will be invoked after the dialog has become visible

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/kenny_dialoggins.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kenny_dialoggins}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Coroutine", "Tim Lowrimore", "John Dugan"]

data/lib/generators/kenny_dialoggins/templates/kenny_dialoggins.js

@@ -33,11 +33,12 @@ KennyDialoggins.Dialog = function(content, options) {
     this._hideListener  = this._generateHideListener();
     this._isShowing     = false;
     
-    this._class         = options["class"]      || ""
-    this._beforeShow    = options["beforeShow"] || Prototype.emptyFunction
-    this._afterShow     = options["afterShow"]  || Prototype.emptyFunction
-    this._beforeHide    = options["beforeHide"] || Prototype.emptyFunction
-    this._afterHide     = options["afterHide"]  || Prototype.emptyFunction
+    this._id            = options["id"];
+    this._class         = options["class"]      || "";
+    this._beforeShow    = options["beforeShow"] || Prototype.emptyFunction;
+    this._afterShow     = options["afterShow"]  || Prototype.emptyFunction;
+    this._beforeHide    = options["beforeHide"] || Prototype.emptyFunction;
+    this._afterHide     = options["afterHide"]  || Prototype.emptyFunction;
     
     this._makeDialog();
     this.setContent(content);
@@ -186,7 +187,7 @@ Object.extend(KennyDialoggins.Dialog.prototype, {
      */
     _makeDialog: function() {
         if (!this._element) {
-            this._element = new Element("DIV");
+            this._element = new Element("DIV", { id: this._id });
             this._element.addClassName("kenny_dialoggins_dialog");
             if (this._class) {
                 this._element.addClassName(this._class);

data/lib/kenny_dialoggins/helpers.rb

@@ -6,6 +6,7 @@ module Coroutine
       # to this method is the dialog's <tt>id</tt>.  The id is required and should be unique.
       # Further options may be provided; those that are specific to the dialog are:
       #
+      # * <tt>:id</tt> - an element id for the generated dialog.  If not provided, the value provided as the first argument to render_dialog will be used.
       # * <tt>:class</tt> - a css class name that will be appended to the outermost div to facilitate multiple styles
       # * <tt>:before_show</tt> - a Javascript function that will be invoked before the dialog is shown
       # * <tt>:after_show</tt> - a Javascript function that will be invoked after the dialog has become visible
@@ -22,7 +23,7 @@ module Coroutine
       # #
       # # <script type="text/javascript">
       # #   //<![CDATA[
-      # #     KennyDialoggins.Dialog.instances['foo_dialog'] = new KennyDialoggins.Dialog('Hello, Foo!', {});
+      # #     KennyDialoggins.Dialog.instances['foo_dialog'] = new KennyDialoggins.Dialog('Hello, Foo!', {'id':'foo_dialog'});
       # #   //]]>
       # # </script>
       # <%= render_dialog :foo_dialog, :partial => "foo" %>
@@ -35,7 +36,7 @@ module Coroutine
       # # Generates:
       # # <script type="text/javascript">
       # #   //<![CDATA[
-      # #     KennyDialoggins.Dialog.instances['foo_dialog'] = new KennyDialoggins.Dialog('Hello, Foo!', {beforeShow:function() { alert('bar!') }});
+      # #     KennyDialoggins.Dialog.instances['foo_dialog'] = new KennyDialoggins.Dialog('Hello, Foo!', {'id':'foo_dialog', 'beforeShow':function() { alert('bar!') }});
       # #   //]]>
       # # </script>
       # <%= render_dialog :foo_dialog, :partial => "foo", :before_show => "function() { alert('bar!') }" %>
@@ -46,7 +47,12 @@ module Coroutine
       def render_dialog(id, options = {}, &block)
         options[:inline]    = capture(&block) if block_given?
         render_options      = extract_dialog_render_options(options)
-        javascript_options  = dialog_options_to_js(extract_dialog_javascript_options(options))
+        javascript_options  = extract_dialog_javascript_options(options)
+        
+        # In the event an id is not provided in the options, we'll use the
+        # dialog id.
+        javascript_options[:id] ||= id
+        javascript_options  = dialog_options_to_js(javascript_options)
         
         content = escape_javascript(render(render_options))
         
@@ -82,7 +88,7 @@ module Coroutine
       # javascript library.
       #
       def dialog_javascript_option_keys
-        [:class, :before_show, :after_show, :before_hide, :after_hide]
+        [:class, :id, :before_show, :after_show, :before_hide, :after_hide]
       end
       
       

data/test/kenny_dialoggins/helpers_test.rb

@@ -46,7 +46,7 @@ class KennyDialogginsHelpersTest < ActionView::TestCase
     text      = "Who wants to play volleyball on a court with a four-foot net?"
     expected  = "<script type=\"text/javascript\">\n" \
                 "//<![CDATA[\n" \
-                "KennyDialoggins.Dialog.instances['danger_zone'] = new KennyDialoggins.Dialog('" + text + "', {});\n" \
+                "Event.observe(window, 'load', function() { KennyDialoggins.Dialog.instances['danger_zone'] = new KennyDialoggins.Dialog('" + text + "', {'id':'danger_zone'}) });\n" \
                 "//]]>\n" \
                 "</script>"
     actual    = @view.render_dialog(:danger_zone, :text => text)
@@ -54,6 +54,19 @@ class KennyDialogginsHelpersTest < ActionView::TestCase
     assert_equal expected, actual
   end
   
+  def test_render_dialog_with_id
+    text      = "I secretly likes me some Bone Thugs. Woot! --Kenny"
+    id        = "bone_thugs_dialog"
+    expected  = "<script type=\"text/javascript\">\n" \
+                "//<![CDATA[\n" \
+                "Event.observe(window, 'load', function() { KennyDialoggins.Dialog.instances['thuggin'] = new KennyDialoggins.Dialog('" + text + "', {'id':'" + id + "'}) });\n" \
+                "//]]>\n" \
+                "</script>"
+                
+    actual    = @view.render_dialog(:thuggin, :text => text, :id => id)
+                
+    assert_equal expected, actual
+  end
   
   # verify show dialog returns proper javascript command.
   def test_show_dialog
@@ -72,18 +85,4 @@ class KennyDialogginsHelpersTest < ActionView::TestCase
     assert_equal expected, actual
   end
   
-  
-  # verify private function converts ruby hash to javascript hash properly.
-  def test_dialog_options_to_js
-    options = { 
-                :before_show => "function{ alert('hello, world!'); }", 
-                :after_show => "function{ alert('goodbye, world!'); }"
-              }
-    
-    expected  = "{beforeShow:#{options[:before_show]},afterShow:#{options[:after_show]}}"
-    actual    = @view.dialog_options_to_js_proxy(options)
-
-    assert_equal expected, actual
-  end
-  
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kenny_dialoggins
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Coroutine
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -42,6 +44,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -91,6 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -99,13 +103,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Dead simple, beautiful dialogs for Rails.