honkster-jelly 0.7.6 → 0.7.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 7
-:patch: 6
+:patch: 7
 :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.7.6
+ *  version 0.7.7
  *
  * 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.7.5"
+  s.version = "0.7.7"
 
   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

@@ -3,22 +3,40 @@ module JellyController
   include Jelly::Common
 
   def jelly_callback(callback_base_name = @action_name, options = {}, &block)
+    options[:format] ||= if request.xhr?
+      :json
+    elsif params[:callback]
+      :jsonp
+    else
+      :iframe
+    end
     render :inline => jelly_callback_erb("on_#{callback_base_name}", options, block)
   end
 
   def jelly_callback_erb(callback_name, options, block)
+    options[:format] ||= :json
     @callback_name = callback_name
     @options = options
     @block = block
-    erb = <<-ERB
+    case options[:format].to_sym
+      when :iframe
+        "<textarea>#{jelly_callback_erb_template}</textarea>"
+      when :jsonp
+        @jsonp_callback = params[:callback]
+        jelly_callback_erb_template
+      else
+        jelly_callback_erb_template
+    end
+  end
+
+  def jelly_callback_erb_template
+    <<-ERB
       <%= begin
         args = @block ? instance_eval(&@block) : []
         args = [args] unless args.is_a?(Array)
-        jelly_callback_hash(@callback_name, *args).reverse_merge(@options).to_json
+        json = {"method" => @callback_name, "arguments" => args}.reverse_merge(@options).to_json
+        @jsonp_callback ? "\#{@jsonp_callback}(\#{json});" : json
       end %>
     ERB
-    request.xhr? ? erb : "<textarea>#{erb}</textarea>"
   end
-
-
 end

data/spec/controllers/jelly_controller_spec.rb

@@ -3,25 +3,78 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 describe ApplicationController do
 
   describe "#jelly_callback" do
+    attr_reader :response
     before do
-      @controller.stub!(:render)
+      @response = Struct.new(:body).new
+      stub(@controller).render do |params|
+        response.body = ERB.new(params[:inline]).result(@controller.send(:binding))
+      end
     end
 
     it "have the method included" do
       @controller.respond_to?(:jelly_callback).should be_true
     end
 
-    it "should render inline the return of jelly_callback_erb" do
-      block = lambda{'foo yo'}
-      mock_erb = "whatever"
-      @controller.should_receive(:jelly_callback_erb).with("on_foo", {}, block).and_return(mock_erb)
-      @controller.should_receive(:render).with(:inline => mock_erb)
-      @controller.send(:jelly_callback, "foo", &block)
+    context "when the request is XHR" do
+      before do
+        stub(request).xhr? {true}
+      end
+
+      it "responds with a json hash" do
+        @controller.send(:jelly_callback, 'foo', {'bar' => 'baz'}) do
+          "grape"
+        end
+        callback = JSON.parse(response.body)
+        callback["method"].should == "on_foo"
+        callback["arguments"].should == ["grape"]
+        callback["bar"].should == "baz"
+      end
+
+    end
+
+    context "when the request is not XHR" do
+      before do
+        stub(request).xhr? {false}
+      end
+
+      context "when there is a callback param" do
+        before do
+          @controller.params[:callback] = "Jelly.notifyObservers"
+        end
+
+        it "responds with a call to the given callback method with the json as an argument" do
+          @controller.send(:jelly_callback, 'foo', {'bar' => 'baz'}) do
+            "grape"
+          end
+          json = Regexp.new('Jelly\.notifyObservers\((.*)\);').match(response.body)[1]
+          callback = JSON.parse(json)
+          callback["method"].should == "on_foo"
+          callback["arguments"].should == ["grape"]
+          callback["bar"].should == "baz"
+        end
+      end
+
+      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(:jelly_callback, 'foo', {'bar' => 'baz'}) do
+            "grape"
+          end
+          body = response.body
+          body.should =~ /^<textarea>/
+          body.should =~ /<\/textarea>$/
+          doc = Nokogiri::HTML(body)
+
+          callback = JSON.parse(doc.at("textarea").inner_html)
+          callback["method"].should == "on_foo"
+          callback["arguments"].should == ["grape"]
+          callback["bar"].should == "baz"
+        end
+      end
     end
 
     describe "#jelly_callback_erb" do
       before do
-        request.stub!(:xhr?).and_return(true)
+        stub(request).xhr? {true}
       end
 
       context "with options" do
@@ -30,7 +83,8 @@ describe ApplicationController do
           JSON.parse(ERB.new(erb).result(@controller.send(:binding))).should == {
             'method' => 'foo',
             'arguments' => ['grape'],
-            'bar' => 'baz'
+            'bar' => 'baz',
+            'format' => 'json'
           }
         end
 
@@ -39,7 +93,8 @@ describe ApplicationController do
           JSON.parse(ERB.new(erb).result(@controller.send(:binding))).should == {
             'method' => 'foo',
             'arguments' => [],
-            'bar' => 'baz'
+            'bar' => 'baz',
+            'format' => 'json'
           }
         end
 
@@ -48,7 +103,8 @@ describe ApplicationController do
           JSON.parse(ERB.new(erb).result(@controller.send(:binding))).should == {
             'method' => 'foo',
             'arguments' => [],
-            'bar' => 'baz'
+            'bar' => 'baz',
+            'format' => 'json'
           }
         end
       end
@@ -58,7 +114,8 @@ describe ApplicationController do
           erb = @controller.send(:jelly_callback_erb, 'foo', {}, lambda{'grape'})
           JSON.parse(ERB.new(erb).result(@controller.send(:binding))).should == {
             'method' => 'foo',
-            'arguments' => ['grape']
+            'arguments' => ['grape'],
+            'format' => 'json'
           }
         end
 
@@ -66,7 +123,8 @@ describe ApplicationController do
           erb = @controller.send(:jelly_callback_erb, 'foo', {}, lambda{['grape','tangerine']})
           JSON.parse(ERB.new(erb).result(@controller.send(:binding))).should == {
             'method' => 'foo',
-            'arguments' => ['grape','tangerine']
+            'arguments' => ['grape','tangerine'],
+            'format' => 'json'
           }
         end
 
@@ -74,7 +132,8 @@ describe ApplicationController do
           erb = @controller.send(:jelly_callback_erb, 'foo', {}, nil)
           JSON.parse(ERB.new(erb).result(@controller.send(:binding))).should == {
             'method' => 'foo',
-            'arguments' => []
+            'arguments' => [],
+            'format' => 'json'
           }
         end
       end
@@ -84,35 +143,10 @@ describe ApplicationController do
         erb = @controller.send(:jelly_callback_erb, 'foo', {}, block)
         JSON.parse(ERB.new(erb).result(@controller.send(:binding))).should == {
           'method' => 'foo',
-          'arguments' => ['<div class="foo"></div>']
+          'arguments' => ['<div class="foo"></div>'],
+          'format' => 'json'
         }
       end
-
-      context "when the request is not an XHR" do
-        before do
-          request.stub!(:xhr?).and_return(false)
-        end
-
-        it "should wrap json response in a textarea tag to support File Uploads in an iframe target (see: http://malsup.com/jquery/form/#code-samples)" do
-          erb = @controller.send(:jelly_callback_erb, 'foo', {'bar' => 'baz'}, lambda{'grape'})
-          result = ERB.new(erb).result(@controller.send(:binding))
-          result.should =~ /^<textarea>/
-          result.should =~ /<\/textarea>$/
-        end
-      end
-
-      context "when the request is an XHR" do
-        before do
-          request.stub!(:xhr?).and_return(true)
-        end
-
-        it "should not do the textarea nonsense" do
-          erb = @controller.send(:jelly_callback_erb, 'foo', {'bar' => 'baz'}, lambda{'grape'})
-          ERB.new(erb).result(@controller.send(:binding)).should_not =~ /textarea/
-        end
-
-      end
-
     end
   end
 end

data/spec/helpers/jelly_helper_spec.rb

@@ -8,9 +8,12 @@ describe JellyHelper do
 
   describe "#spread_jelly" do
     before do
-      stub_controller = mock(Object, :controller_path => 'my_fun_controller', :action_name => 'super_good_action')
-      helper.should_receive(:controller).any_number_of_times.and_return(stub_controller)
-      helper.should_receive(:form_authenticity_token).and_return('areallysecuretoken')
+      stub_controller = mock! do |controller|
+        controller.controller_path {'my_fun_controller'}
+        controller.action_name {'super_good_action'}
+      end
+      stub(helper).controller {stub_controller}
+      mock(helper).form_authenticity_token {'areallysecuretoken'}
     end
 
     it "should create a javascript include tag that attaches the Jelly.Location and Jelly.Page components" do

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
 require 'rubygems'
 gem "test-unit"
 require 'test/unit'
+require 'rr'
 
 class Test::Unit::TestCase
   class << self
@@ -27,6 +28,7 @@ $LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
 require "jelly"
 
 Spec::Runner.configure do |configuration|
+  configuration.mock_with :rr
 end
 
 class Spec::ExampleGroup

metadata

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