honkster-jelly 0.8.1 → 0.8.2

data/VERSION.yml

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

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

@@ -24,7 +24,7 @@ if(!window.Jelly) Jelly = new Object();
       dataType: 'json',
       cache: false,
       success : function(callbacks) {
-        Jelly.notifyObservers.call(observers, callbacks);
+        Jelly.Observers.notify.call(observers, callbacks);
       }
     }, otherParams);
   };

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

@@ -2,7 +2,7 @@
  *  Jelly. a sweet unobtrusive javascript framework
  *  for jQuery and Rails
  *
- *  version 0.8.1
+ *  version 0.8.2
  *
  * Copyright (c) 2009 Pivotal Labs
  * Licensed under the MIT license.

data/jelly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jelly}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pivotal Labs, Inc"]

data/lib/jelly/jelly_controller.rb

@@ -5,6 +5,7 @@ module JellyController
   def jelly_callback(callback_base_name = @action_name, options = {}, &block)
     raw_jelly_callback(options) do
       arguments = block.try(:call) || []
+      arguments = [arguments] unless arguments.is_a?(Array)
       jelly_callback_hash("on_#{callback_base_name}", *arguments).merge(options)
     end
   end

data/spec/controllers/jelly_controller_spec.rb

@@ -15,6 +15,54 @@ describe ApplicationController do
       @controller.respond_to?(:jelly_callback).should be_true
     end
 
+    describe "Arguments block" do
+      context "when an Array is returned from the block" do
+        it "sets the arguments to be an Array around the Hash" do
+          @controller.send(:jelly_callback, 'foo', :format => :json) do
+            ["foo", "bar"]
+          end
+          callback = JSON.parse(response.body)
+          callback["method"].should == "on_foo"
+          callback["arguments"].should == ["foo", "bar"]
+        end
+      end
+
+      context "when a non-array is returned in the block" do
+        context "when the argument is a Hash" do
+          it "sets the arguments to be an Array around the Hash" do
+            @controller.send(:jelly_callback, 'foo', :format => :json) do
+              {"foo" => "bar"}
+            end
+            callback = JSON.parse(response.body)
+            callback["method"].should == "on_foo"
+            callback["arguments"].should == [{"foo" => "bar"}]
+          end
+        end
+
+        context "when the argument is a String" do
+          it "sets the arguments to be an Array around the argument" do
+            @controller.send(:jelly_callback, 'foo', :format => :json) do
+              "foobar"
+            end
+            callback = JSON.parse(response.body)
+            callback["method"].should == "on_foo"
+            callback["arguments"].should == ["foobar"]
+          end
+        end
+
+        context "when the argument is a Number" do
+          it "sets the arguments to be an Array around the argument" do
+            @controller.send(:jelly_callback, 'foo', :format => :json) do
+              12345
+            end
+            callback = JSON.parse(response.body)
+            callback["method"].should == "on_foo"
+            callback["arguments"].should == [12345]
+          end
+        end
+      end
+    end
+
     context "when given a format" do
       describe "json" do
         it "responds with a json hash, even if the request is not xhr" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-jelly
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Pivotal Labs, Inc