honkster-jelly 0.8.10 → 0.8.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 8
-:patch: 10
+:patch: 11
 :major: 0

data/generators/jelly/templates/javascripts/jelly.js

@@ -2,7 +2,7 @@
  *  Jelly. a sweet unobtrusive javascript framework
  *  for jQuery and Rails
  *
- *  version 0.8.10
+ *  version 0.8.11
  *
  * Copyright (c) 2009 Pivotal Labs
  * Licensed under the MIT license.
@@ -53,7 +53,7 @@ $.extend(Jelly, {
     },
 
     evaluateComponent: function(component) {
-      return (typeof component == "string") ? eval(component) : component;
+      return eval(component);
     },
 
     pushIfObserver: function(observer) {
@@ -70,16 +70,16 @@ $.extend(Jelly, {
         callbacks = [callbacks];
       }
 
-      var observers = this.slice(0);
+      var pristineObservers = this.slice(0);
+      var observers;
       for (var i = 0; i < callbacks.length; i++) {
         var callback = callbacks[i];
 
         // Deprecate 'on' in favor of making each page action a Component.
         if (callback.on) {
-          var additionalObserver = eval(callback.on);
-          if (observers.indexOf(additionalObserver) == -1) {
-            observers.push(additionalObserver);
-          }
+          observers = [eval(callback.on)];
+        } else {
+          observers = pristineObservers;
         }
 
         if (callback.method) {

data/jelly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jelly}
-  s.version = "0.8.10"
+  s.version = "0.8.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pivotal Labs, Inc"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-01-11}
   s.description = %q{Jelly provides a set of tools and conventions for creating rich ajax/javascript web applications with jQuery and Ruby on Rails.}
   s.email = %q{opensource@pivotallabs.com}
   s.extra_rdoc_files = [

data/lib/jelly/common.rb

@@ -1,10 +1,19 @@
 module Jelly
   module Common
-    def jelly_callback_hash(method, *arguments)
+    def jelly_notify_hash(method, *arguments)
       {"method" => method, "arguments" => arguments}
     end
 
-    def jelly_callback_attach_hash(components=jelly_attachments)
+    def jelly_callback_hash(method, *arguments)
+      warn "jelly_callback_hash has been deprecated. Please use jelly_notify_hash instead"
+      jelly_notify_hash(method, *arguments)
+    end
+
+    def jelly_method_call_hash(object, method, *arguments)
+      {"on" => object, "method" => method, "arguments" => arguments}
+    end
+
+    def jelly_notify_attach_hash (components=jelly_attachments)
       {"attach" => components}
     end
 

data/lib/jelly/jelly_controller.rb

@@ -6,7 +6,7 @@ module JellyController
     raw_jelly_callback(options) do
       arguments = block ? instance_eval(&block) : []
       arguments = [arguments] unless arguments.is_a?(Array)
-      jelly_callback_hash("on_#{callback_base_name}", *arguments).merge(options)
+      jelly_notify_hash("on_#{callback_base_name}", *arguments).merge(options)
     end
   end
 

data/spec/jelly/common_spec.rb

@@ -8,9 +8,19 @@ describe Jelly::Common do
     end.new
   end
 
-  describe "#jelly_callback_hash" do
+  describe "#jelly_notify_hash" do
     it "creates a hash with a method and arguments" do
-      fixture.jelly_callback_hash("my_method", 1, 2, 3).should == {
+      fixture.jelly_notify_hash("my_method", 1, 2, 3).should == {
+        "method" => "my_method",
+        "arguments" => [1, 2, 3]
+      }
+    end
+  end
+
+  describe "#jelly_method_call_hash" do
+    it "creates a hash with a object, method, and arguments" do
+      fixture.jelly_method_call_hash("MyObject", "my_method", 1, 2, 3).should == {
+        "on" => "MyObject",
         "method" => "my_method",
         "arguments" => [1, 2, 3]
       }
@@ -24,7 +34,7 @@ describe Jelly::Common do
           fixture.jelly_attachment_hash("Foo", 1, 2),
           fixture.jelly_attachment_hash("Bar", 3),
         ]
-        fixture.jelly_callback_attach_hash(attachments).should == {
+        fixture.jelly_notify_attach_hash(attachments).should == {
           "attach" => attachments
         }
       end
@@ -37,7 +47,7 @@ describe Jelly::Common do
           fixture.jelly_attachment_hash("Bar", 3),
         ]
         stub(fixture).jelly_attachments {attachments}
-        fixture.jelly_callback_attach_hash.should == {
+        fixture.jelly_notify_attach_hash.should == {
           "attach" => attachments
         }
       end

data/spec/jelly/jelly_controller_spec.rb

@@ -225,7 +225,7 @@ describe ApplicationController, :type => :controller do
           stub(request).xhr? {false}
 
           @controller.send(:raw_jelly_callback, :format => :json) do
-            jelly_callback_hash("foo", "grape").merge('bar' => 'baz')
+            jelly_notify_hash("foo", "grape").merge('bar' => 'baz')
           end
           callback = JSON.parse(response.body)
           callback["method"].should == "foo"
@@ -239,7 +239,7 @@ describe ApplicationController, :type => :controller do
           @controller.params[:callback] = "Jelly.notifyObservers"
 
           @controller.send(:raw_jelly_callback, :format => :jsonp) do
-            jelly_callback_hash("foo", "grape").merge('bar' => 'baz')
+            jelly_notify_hash("foo", "grape").merge('bar' => 'baz')
           end
           json = Regexp.new('Jelly\.notifyObservers\((.*)\);').match(response.body)[1]
           callback = JSON.parse(json)
@@ -252,7 +252,7 @@ describe ApplicationController, :type => :controller do
       describe "iframe" do
         it "responds with a the json in a textarea tag" do
           @controller.send(:raw_jelly_callback, :format => :iframe) do
-            jelly_callback_hash("foo", "grape").merge('bar' => 'baz')
+            jelly_notify_hash("foo", "grape").merge('bar' => 'baz')
           end
           body = response.body
           body.should =~ /^<textarea>/
@@ -274,7 +274,7 @@ describe ApplicationController, :type => :controller do
 
       it "responds with a json hash" do
         @controller.send(:raw_jelly_callback) do
-          jelly_callback_hash("foo", "grape").merge('bar' => 'baz')
+          jelly_notify_hash("foo", "grape").merge('bar' => 'baz')
         end
         callback = JSON.parse(response.body)
         callback["method"].should == "foo"
@@ -296,7 +296,7 @@ describe ApplicationController, :type => :controller do
 
         it "responds with a call to the given callback method with the json as an argument" do
           @controller.send(:raw_jelly_callback) do
-            jelly_callback_hash("foo", "grape").merge('bar' => 'baz')
+            jelly_notify_hash("foo", "grape").merge('bar' => 'baz')
           end
           json = Regexp.new('Jelly\.notifyObservers\((.*)\);').match(response.body)[1]
           callback = JSON.parse(json)
@@ -309,7 +309,7 @@ describe ApplicationController, :type => :controller do
       context "when there is not a callback param" do
         it "wraps the json response in a textarea tag to support File Uploads in an iframe target (see: http://malsup.com/jquery/form/#code-samples)" do
           @controller.send(:raw_jelly_callback) do
-            jelly_callback_hash("foo", "grape").merge('bar' => 'baz')
+            jelly_notify_hash("foo", "grape").merge('bar' => 'baz')
           end
           body = response.body
           body.should =~ /^<textarea>/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-jelly
 version: !ruby/object:Gem::Version 
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors: 
 - Pivotal Labs, Inc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -08:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency