apotomo 1.1.0.rc1 → 1.1.0

data/CHANGES.textile

@@ -8,6 +8,7 @@ h3. Changes
   * You can now @#render_widget@ in your widget views to render children.
   * @#widget@ now accepts one arg only (the widget prefix). @widget(:comments)@ sets id to @:comments@. We also removed the start state argument.
   * Start states are no longer accepted, you have to explicitely pass the state to #render_widget. That's why #invoke now requires an explicit state as well.
+  * #replace/#update now append a @;@ to the JavaScript expression. You may pass an arbitrary selector string as first argument (optional).
   * The event is no longer added to #options at triggering time.
   * Options passed in #render_widget are no longer merged with #options. They are passed as state-args to reduce complexity.
   * We no longer have @opts and @params but #options and #params from Cell::Base.

data/lib/apotomo/javascript_generator.rb

@@ -33,8 +33,8 @@ module Apotomo
     module Prototype
       def prototype;              end
       def element(id);            "$(\"#{id}\")"; end
-      def update(id, markup);     element(id) + '.update("'+escape(markup)+'")'; end
-      def replace(id, markup);    element(id) + '.replace("'+escape(markup)+'")'; end
+      def update(id, markup);     element(id) + '.update("'+escape(markup)+'");'; end
+      def replace(id, markup);    element(id) + '.replace("'+escape(markup)+'");'; end
       def update_id(id, markup);  update(id, markup); end
       def replace_id(id, markup); replace(id, markup); end
     end
@@ -42,8 +42,8 @@ module Apotomo
     module Right
       def right;                  end
       def element(id);            "$(\"#{id}\")"; end
-      def update(id, markup);     element(id) + '.update("'+escape(markup)+'")'; end
-      def replace(id, markup);    element(id) + '.replace("'+escape(markup)+'")'; end
+      def update(id, markup);     element(id) + '.update("'+escape(markup)+'");'; end
+      def replace(id, markup);    element(id) + '.replace("'+escape(markup)+'");'; end
       def update_id(id, markup);  update(id, markup); end
       def replace_id(id, markup); replace(id, markup); end
     end
@@ -51,8 +51,8 @@ module Apotomo
     module Jquery
       def jquery;                 end
       def element(id);            "$(\"#{id}\")"; end
-      def update(id, markup);     element(id) + '.html("'+escape(markup)+'")'; end
-      def replace(id, markup);    element(id) + '.replaceWith("'+escape(markup)+'")'; end
+      def update(id, markup);     element(id) + '.html("'+escape(markup)+'");'; end
+      def replace(id, markup);    element(id) + '.replaceWith("'+escape(markup)+'");'; end
       def update_id(id, markup);  update("##{id}", markup); end
       def replace_id(id, markup); replace("##{id}", markup); end
     end

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.1.0.rc1'
+  VERSION = '1.1.0'
 end

data/lib/apotomo/widget/javascript_methods.rb

@@ -1,5 +1,10 @@
 module Apotomo
   module JavascriptMethods
+    # Returns the escaped script.
+    def escape_js(script)
+      Apotomo.js_generator.escape(script)
+    end
+    
     # Wraps the rendered content in a replace statement targeted at your +Apotomo.js_framework+ setting.
     # Use +:selector+ to change the selector.
     #
@@ -28,12 +33,12 @@ module Apotomo
     
   private
     def wrap_in_javascript_for(mode, *args)
-      content = render(*args)
-      options = args.first.is_a?(::Hash) ? args.shift : {}
+      selector  = args.first.is_a?(String) ? args.shift : false
+      content   = render(*args)
       
-      options[:selector] ? 
-        Apotomo.js_generator.send(mode, options[:selector], content) :  # replace(:twitter)
-        Apotomo.js_generator.send("#{mode}_id", name, content)          # replace_id(:twitter)
+      selector ? 
+        Apotomo.js_generator.send(mode, selector, content) :    # replace(:twitter)
+        Apotomo.js_generator.send("#{mode}_id", name, content)  # replace_id(:twitter)
     end
   end
 end

data/test/unit/javascript_generator_test.rb

@@ -18,19 +18,19 @@ class JavascriptGeneratorTest < Test::Unit::TestCase
       end
       
       should "respond to replace" do
-        assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace(:drinks, 'EMPTY!')
+        assert_equal "$(\"drinks\").replace(\"EMPTY!\");", @gen.replace(:drinks, 'EMPTY!')
       end
       
       should "respond to replace_id" do
-        assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace_id("drinks", 'EMPTY!')
+        assert_equal "$(\"drinks\").replace(\"EMPTY!\");", @gen.replace_id("drinks", 'EMPTY!')
       end
       
       should "respond to update" do
-        assert_equal "$(\"drinks\").update(\"<li id=\\\"beer\\\"><\\/li>\")", @gen.update(:drinks, '<li id="beer"></li>')
+        assert_equal "$(\"drinks\").update(\"<li id=\\\"beer\\\"><\\/li>\");", @gen.update(:drinks, '<li id="beer"></li>')
       end
       
       should "respond to update_id" do
-        assert_equal "$(\"drinks\").update(\"EMPTY!\")", @gen.update_id("drinks", 'EMPTY!')
+        assert_equal "$(\"drinks\").update(\"EMPTY!\");", @gen.update_id("drinks", 'EMPTY!')
       end
     end
     
@@ -44,19 +44,19 @@ class JavascriptGeneratorTest < Test::Unit::TestCase
       end
       
       should "respond to replace" do
-        assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace(:drinks, 'EMPTY!')
+        assert_equal "$(\"drinks\").replace(\"EMPTY!\");", @gen.replace(:drinks, 'EMPTY!')
       end
       
       should "respond to replace_id" do
-        assert_equal "$(\"drinks\").replace(\"EMPTY!\")", @gen.replace_id("drinks", 'EMPTY!')
+        assert_equal "$(\"drinks\").replace(\"EMPTY!\");", @gen.replace_id("drinks", 'EMPTY!')
       end
       
       should "respond to update" do
-        assert_equal "$(\"drinks\").update(\"<li id=\\\"beer\\\"><\\/li>\")", @gen.update(:drinks, '<li id="beer"></li>')
+        assert_equal "$(\"drinks\").update(\"<li id=\\\"beer\\\"><\\/li>\");", @gen.update(:drinks, '<li id="beer"></li>')
       end
       
       should "respond to update_id" do
-        assert_equal "$(\"drinks\").update(\"EMPTY!\")", @gen.update_id("drinks", 'EMPTY!')
+        assert_equal "$(\"drinks\").update(\"EMPTY!\");", @gen.update_id("drinks", 'EMPTY!')
       end
     end
     
@@ -70,19 +70,19 @@ class JavascriptGeneratorTest < Test::Unit::TestCase
       end
     
       should "respond to replace" do
-        assert_equal "$(\"#drinks\").replaceWith(\"EMPTY!\")", @gen.replace("#drinks", 'EMPTY!')
+        assert_equal "$(\"#drinks\").replaceWith(\"EMPTY!\");", @gen.replace("#drinks", 'EMPTY!')
       end
       
       should "respond to replace_id" do
-        assert_equal "$(\"#drinks\").replaceWith(\"EMPTY!\")", @gen.replace_id("drinks", 'EMPTY!')
+        assert_equal "$(\"#drinks\").replaceWith(\"EMPTY!\");", @gen.replace_id("drinks", 'EMPTY!')
       end
       
       should "respond to update" do
-        assert_equal "$(\"#drinks\").html(\"<li id=\\\"beer\\\"><\\/li>\")", @gen.update("#drinks", '<li id="beer"></li>')
+        assert_equal "$(\"#drinks\").html(\"<li id=\\\"beer\\\"><\\/li>\");", @gen.update("#drinks", '<li id="beer"></li>')
       end
       
       should "respond to update_id" do
-        assert_equal "$(\"#drinks\").html(\"EMPTY!\")", @gen.update_id("drinks", 'EMPTY!')
+        assert_equal "$(\"#drinks\").html(\"EMPTY!\");", @gen.update_id("drinks", 'EMPTY!')
       end
     end
   end

data/test/unit/render_test.rb

@@ -85,43 +85,49 @@ class RenderTest < ActionView::TestCase
       end
     end
     
-    context "with #update" do
+    context "#update" do
       should "wrap the :text in an update statement" do
         @mum.instance_eval do
           def squeak
             update :text => "squeak!"
           end
         end
-        assert_equal "$(\"#mum\").html(\"squeak!\")", @mum.invoke(:squeak)
+        assert_equal "$(\"#mum\").html(\"squeak!\");", @mum.invoke(:squeak)
       end
       
-      should "accept :selector" do
+      should "accept a selector" do
         @mum.instance_eval do
           def squeak
-            update :text => '<div id="mum">squeak!</div>', :selector => "div#mouse"
+            update "div#mouse", :text => '<div id="mum">squeak!</div>'
           end
         end
-        assert_equal "$(\"div#mouse\").html(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+        assert_equal "$(\"div#mouse\").html(\"<div id=\\\"mum\\\">squeak!<\\/div>\");", @mum.invoke(:squeak)
       end
     end
     
-    context "with #replace" do
+    context "#replace" do
       should "wrap the :text in a replace statement" do
         @mum.instance_eval do
           def squeak
             replace :text => '<div id="mum">squeak!</div>'
           end
         end
-        assert_equal "$(\"#mum\").replaceWith(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+        assert_equal "$(\"#mum\").replaceWith(\"<div id=\\\"mum\\\">squeak!<\\/div>\");", @mum.invoke(:squeak)
       end
       
-      should "accept :selector" do
+      should "accept a selector" do
         @mum.instance_eval do
           def squeak
-            replace :text => '<div id="mum">squeak!</div>', :selector => "div#mouse"
+            replace "div#mouse", :text => '<div id="mum">squeak!</div>'
           end
         end
-        assert_equal "$(\"div#mouse\").replaceWith(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+        assert_equal "$(\"div#mouse\").replaceWith(\"<div id=\\\"mum\\\">squeak!<\\/div>\");", @mum.invoke(:squeak)
+      end
+    end
+    
+    context "#escape_js" do
+      should "escape the string" do
+        assert_equal "<div id=\\\"mum\\\">squeak!<\\/div>", @mum.escape_js('<div id="mum">squeak!</div>')
       end
     end
   end  

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: apotomo
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 1
   - 0
-  - rc1
-  version: 1.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +01:00
+date: 2011-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,13 +204,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: