honkster-jelly 0.8.7 → 0.8.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 8
-:patch: 7
+:patch: 8
 :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.7
+ *  version 0.8.8
  *
  * Copyright (c) 2009 Pivotal Labs
  * Licensed under the MIT license.

data/jelly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jelly}
-  s.version = "0.8.7"
+  s.version = "0.8.8"
 
   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-06}
+  s.date = %q{2010-01-08}
   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 = [
@@ -41,9 +41,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{a sweet unobtrusive javascript framework for jQuery and Rails}
   s.test_files = [
-    "spec/helpers/jelly_helper_spec.rb",
+    "spec/jelly/jelly_controller_spec.rb",
+     "spec/jelly/common_spec.rb",
+     "spec/jelly/jelly_helper_spec.rb",
      "spec/spec_suite.rb",
-     "spec/controllers/jelly_controller_spec.rb",
      "spec/spec_helper.rb",
      "spec/rails_root/test/performance/browsing_test.rb",
      "spec/rails_root/test/test_helper.rb",

data/lib/jelly/common.rb

@@ -4,7 +4,11 @@ module Jelly
       {"method" => method, "arguments" => arguments}
     end
 
-    def jelly_attach_component_definition_hash(component_name, *args)
+    def jelly_callback_attach_hash(components=jelly_attachments)
+      {"attach" => components}
+    end
+
+    def jelly_attachment_hash(component_name, *args)
       {'component' => component_name, 'arguments' => args}
     end
   end

data/lib/jelly/jelly_helper.rb

@@ -16,7 +16,7 @@ module JellyHelper
     attach_javascript_component("Jelly.Page", controller.controller_path.camelcase, controller.action_name)
     <<-HTML
       #{window_token_javascript_tag}
-      #{attach_javascript_component_javascript_tag(jelly_attached_components)}
+      #{attach_javascript_component_javascript_tag(jelly_attachments)}
     HTML
   end
 
@@ -34,13 +34,13 @@ module JellyHelper
   end
 
   def clear_jelly_attached
-    jelly_attached_components.clear
+    jelly_attachments.clear
   end
 
   def attach_javascript_component(component_name, *args)
-    key = jelly_attach_component_definition_hash(component_name, *args)
-    unless jelly_attached_components.include? key
-      jelly_attached_components << key
+    key = jelly_attachment_hash(component_name, *args)
+    unless jelly_attachments.include? key
+      jelly_attachments << key
     end
   end
 
@@ -49,8 +49,8 @@ module JellyHelper
     attach_javascript_component(component_name, *args)
   end
 
-  def jelly_attached_components
-    @jelly_attached_components ||= []
+  def jelly_attachments
+    @jelly_attachments ||= []
   end
 
 end

data/spec/jelly/common_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+
+describe Jelly::Common do
+  attr_reader :fixture
+  before do
+    @fixture = Class.new do
+      include Jelly::Common
+    end.new
+  end
+
+  describe "#jelly_callback_hash" do
+    it "creates a hash with a method and arguments" do
+      fixture.jelly_callback_hash("my_method", 1, 2, 3).should == {
+        "method" => "my_method",
+        "arguments" => [1, 2, 3]
+      }
+    end
+  end
+
+  describe "#jelly_callback_attach_hash" do
+    context "when passed attachments" do
+      it "creates a hash with the attach param being set to the given attachments" do
+        attachments = [
+          fixture.jelly_attachment_hash("Foo", 1, 2),
+          fixture.jelly_attachment_hash("Bar", 3),
+        ]
+        fixture.jelly_callback_attach_hash(attachments).should == {
+          "attach" => attachments
+        }
+      end
+    end
+
+    context "when not passed attachments" do
+      it "creates a hash with the attach param being set to #jelly_attachments" do
+        attachments = [
+          fixture.jelly_attachment_hash("Foo", 1, 2),
+          fixture.jelly_attachment_hash("Bar", 3),
+        ]
+        stub(fixture).jelly_attachments {attachments}
+        fixture.jelly_callback_attach_hash.should == {
+          "attach" => attachments
+        }
+      end
+    end
+  end
+end

data/spec/{controllers → jelly}/jelly_controller_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
-describe ApplicationController do
+describe ApplicationController, :type => :controller do
 
   describe "#jelly_callback" do
     attr_reader :template

data/spec/{helpers → jelly}/jelly_helper_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
-describe JellyHelper do
+describe JellyHelper, :type => :helper do
 
   def jelly_attach_arguments(html)
     JSON.parse(Regexp.new('Jelly\.attach\.apply\(Jelly, (.*)\);').match(html)[1])
@@ -61,7 +61,7 @@ describe JellyHelper do
       helper.attach_javascript_component("MyComponent", 'arg1', 'arg2', 'arg3')
       helper.attach_javascript_component("MyComponent", 'arg1', 'arg2', 'arg3')
       helper.attach_javascript_component("MyComponent", 'arg1', 'arg2', 'arg5')
-      assigns[:jelly_attached_components].should == [
+      assigns[:jelly_attachments].should == [
         {'component' => "MyComponent", 'arguments' => ['arg1', 'arg2', 'arg3']},
         {'component' => "MyComponent", 'arguments' => ['arg1', 'arg2', 'arg5']},
       ]
@@ -70,7 +70,7 @@ describe JellyHelper do
     it "adds a call to Jelly.attach in an $(document).ready block" do
       helper.attach_javascript_component("MyComponent", 'arg1', 'arg2', 'arg3')
       expected_args = ['arg1','arg2','arg3'].to_json
-      assigns[:jelly_attached_components].should == [
+      assigns[:jelly_attachments].should == [
         {'component' => "MyComponent", 'arguments' => ['arg1', 'arg2', 'arg3']}
       ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-jelly
 version: !ruby/object:Gem::Version 
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors: 
 - Pivotal Labs, Inc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,9 +78,10 @@ signing_key:
 specification_version: 3
 summary: a sweet unobtrusive javascript framework for jQuery and Rails
 test_files: 
-- spec/helpers/jelly_helper_spec.rb
+- spec/jelly/jelly_controller_spec.rb
+- spec/jelly/common_spec.rb
+- spec/jelly/jelly_helper_spec.rb
 - spec/spec_suite.rb
-- spec/controllers/jelly_controller_spec.rb
 - spec/spec_helper.rb
 - spec/rails_root/test/performance/browsing_test.rb
 - spec/rails_root/test/test_helper.rb