honkster-jelly 0.8.3 → 0.8.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 8
-:patch: 3
+:patch: 4
 :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.3
+ *  version 0.8.4
  *
  * 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.3"
+  s.version = "0.8.4"
 
   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

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

data/spec/controllers/jelly_controller_spec.rb

@@ -3,11 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 describe ApplicationController do
 
   describe "#jelly_callback" do
-    attr_reader :response
+    attr_reader :template
     before do
-      @response = Struct.new(:body).new
       stub(@controller).render do |params|
-        response.body = ERB.new(params[:inline]).result(@controller.send(:binding))
+        @template = ActionView::Base.new(@controller.class.view_paths, {}, @controller)
+        template.send(:_evaluate_assigns_and_ivars)
+        response.body = ERB.new(params[:inline]).result(template.send(:binding))
       end
     end
 
@@ -16,6 +17,17 @@ describe ApplicationController do
     end
 
     describe "Arguments block" do
+      describe "self" do
+        it "runs with the binding of the ERB template" do
+          self_in_block = nil
+          @controller.send(:jelly_callback, 'foo', :format => :json) do
+            self_in_block = self
+            12345
+          end
+          self_in_block.should == template
+        end
+      end
+
       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

metadata

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