honkster-jelly 0.13.1 → 0.13.2

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

@@ -1,7 +1,7 @@
 /**
  *  Jelly. a sweet unobtrusive javascript framework for Rails
  *
- *  version 0.13.1
+ *  version 0.13.2
  *
  * Copyright (c) 2009 Pivotal Labs
  * Licensed under the MIT license.

data/lib/jelly/jelly_helper.rb

@@ -4,7 +4,7 @@ module JellyHelper
   def application_jelly_files(jelly_files_path_from_javascripts = '', rails_root = RAILS_ROOT)
     rails_root = File.expand_path(rails_root)
     (
-      Dir[File.expand_path("#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/components/**/*.js")] +
+    Dir[File.expand_path("#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/components/**/*.js")] +
       Dir[File.expand_path("#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/pages/**/*.js")]
     ).map do |path|
       path.gsub("#{rails_root}/public/javascripts/", "").gsub(/\.js$/, "")
@@ -29,17 +29,21 @@ module JellyHelper
     jelly_ops.clear
   end
 
-  def jelly_attach(component_name, *args)
-    op = jelly_attach_op(component_name, *args)
-    unless jelly_ops.include? op
-      jelly_ops << op
-    end
+  def jelly_attach(component_name, *args, &block)
+    jelly_add_op jelly_attach_op(component_name, *args), &block
+  end
+
+  def jelly_notify(message_name, *args, &block)
+    jelly_add_op jelly_notify_op(message_name, *args), &block
   end
 
-  def jelly_notify(message_name, *args)
-    op = jelly_notify_op(message_name, *args)
+  def jelly_add_op(op, &block)
     unless jelly_ops.include? op
-      jelly_ops << op
+      if block
+        yield(op)
+      else
+        jelly_ops << op
+      end
     end
   end
 

data/spec/jelly/jelly_helper_spec.rb

@@ -2,24 +2,28 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe JellyHelper, :type => :helper do
 
-  def jelly_ops(html)
+  after do
+    helper.jelly_clear_ops()
+  end
+
+  def parse_jelly_ops(html)
     JSON.parse(Regexp.new('Jelly\.run\.apply\(Jelly, (.*)\);').match(html)[1])
   end
 
   describe "#spread_jelly" do
     before do
       stub_controller = mock! do |controller|
-        controller.controller_path {'my_fun_controller'}
-        controller.action_name {'super_good_action'}
+        controller.controller_path { 'my_fun_controller' }
+        controller.action_name { 'super_good_action' }
       end
-      stub(helper).controller {stub_controller}
+      stub(helper).controller { stub_controller }
     end
 
     it "should create a javascript include tag that attaches the Jelly.Location and Jelly.Page components" do
       output = helper.spread_jelly
       output.should include('<script type="text/javascript">')
       doc = Nokogiri::HTML(output)
-      ops = jelly_ops(doc.at("script").inner_html)
+      ops = parse_jelly_ops(doc.at("script").inner_html)
       ops.should include(["attach", "Jelly.Location"])
       ops.should include(["attach", "Jelly.Page", 'MyFunController', 'super_good_action'])
     end
@@ -46,40 +50,144 @@ describe JellyHelper, :type => :helper do
   end
 
   describe "#jelly_attach" do
-    before do
-      def helper.form_authenticity_token
-        "12345"
+    context "when not given a block" do
+      it "fails to add multiple calls to Jelly.attach for the same component" do
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3')
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3')
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg5')
+        helper.jelly_ops.should == [
+          ["attach", "MyComponent", 'arg1', 'arg2', 'arg3'],
+          ["attach", "MyComponent", 'arg1', 'arg2', 'arg5'],
+        ]
       end
-    end
 
-    after do
-      helper.jelly_clear_ops()
+      it "adds an attach op to jelly_ops" do
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3')
+        helper.jelly_ops.should(
+          include(
+            ["attach", "MyComponent", 'arg1', 'arg2', 'arg3']
+          )
+        )
+
+        html = helper.spread_jelly
+        doc = Nokogiri::HTML(html)
+        document_ready_tag = doc.at("script")
+        document_ready_part = document_ready_tag.inner_html.split("\n")[2]
+        arguments = parse_jelly_ops(document_ready_part)
+        arguments.should include(["attach", "MyComponent", 'arg1', 'arg2', 'arg3'])
+      end
     end
 
-    it "fails to add multiple calls to Jelly.attach for the same component" do
-      helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3')
-      helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3')
-      helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg5')
-      helper.instance_variable_get(:@jelly_ops).should == [
-        ["attach", "MyComponent", 'arg1', 'arg2', 'arg3'],
-        ["attach", "MyComponent", 'arg1', 'arg2', 'arg5'],
-      ]
+    context "when given a block" do
+      it "fails to add multiple calls to Jelly.attach for the same component" do
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg5') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_ops.should == [
+          ["attach", "MyComponent", 'arg1', 'arg2', 'arg5'],
+          ["attach", "MyComponent", 'arg1', 'arg2', 'arg3'],
+        ]
+      end
+
+      it "passes the attach op into the block so it can be added to jelly_ops" do
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3')
+        helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg5') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_ops.should(
+          include(
+            ["attach", "MyComponent", 'arg1', 'arg2', 'arg3']
+          )
+        )
+
+        html = helper.spread_jelly
+        doc = Nokogiri::HTML(html)
+        document_ready_tag = doc.at("script")
+        document_ready_part = document_ready_tag.inner_html.split("\n")[2]
+        arguments = parse_jelly_ops(document_ready_part)
+        helper.jelly_ops[0..1].should == [
+          ["attach", "MyComponent", 'arg1', 'arg2', 'arg5'],
+          ["attach", "MyComponent", 'arg1', 'arg2', 'arg3'],
+        ]
+      end
     end
 
-    it "adds a call to Jelly.attach" do
-      helper.jelly_attach("MyComponent", 'arg1', 'arg2', 'arg3')
-      helper.instance_variable_get(:@jelly_ops).should include(
-        ["attach", "MyComponent", 'arg1', 'arg2', 'arg3']
-      )
-
-      html = helper.spread_jelly
-      doc = Nokogiri::HTML(html)
-      document_ready_tag = doc.at("script")
-      document_ready_part = document_ready_tag.inner_html.split("\n")[2]
-      arguments = jelly_ops(document_ready_part)
-      arguments.should include(["attach", "MyComponent", 'arg1', 'arg2', 'arg3'])
+  end
+
+  describe "#jelly_notify" do
+    context "when not given a block" do
+      it "fails to add multiple calls to Jelly.attach for the same component" do
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg3')
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg3')
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg5')
+        helper.jelly_ops.should == [
+          ["notify", "myMessage", 'arg1', 'arg2', 'arg3'],
+          ["notify", "myMessage", 'arg1', 'arg2', 'arg5'],
+        ]
+      end
+
+      it "adds an attach op to jelly_ops" do
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg3')
+        helper.jelly_ops.should(
+          include(
+            ["notify", "myMessage", 'arg1', 'arg2', 'arg3']
+          )
+        )
+
+        html = helper.spread_jelly
+        doc = Nokogiri::HTML(html)
+        document_ready_tag = doc.at("script")
+        document_ready_part = document_ready_tag.inner_html.split("\n")[2]
+        arguments = parse_jelly_ops(document_ready_part)
+        arguments.should include(["notify", "myMessage", 'arg1', 'arg2', 'arg3'])
+      end
     end
 
+    context "when given a block" do
+      it "fails to add multiple calls to Jelly.attach for the same component" do
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg3') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg3') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg5') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_ops.should == [
+          ["notify", "myMessage", 'arg1', 'arg2', 'arg5'],
+          ["notify", "myMessage", 'arg1', 'arg2', 'arg3'],
+        ]
+      end
+
+      it "passes the attach op into the block so it can be added to jelly_ops" do
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg3')
+        helper.jelly_notify("myMessage", 'arg1', 'arg2', 'arg5') do |op|
+          helper.jelly_ops.unshift op
+        end
+        helper.jelly_ops.should(
+          include(
+            ["notify", "myMessage", 'arg1', 'arg2', 'arg3']
+          )
+        )
+
+        html = helper.spread_jelly
+        doc = Nokogiri::HTML(html)
+        document_ready_tag = doc.at("script")
+        document_ready_part = document_ready_tag.inner_html.split("\n")[2]
+        arguments = parse_jelly_ops(document_ready_part)
+        helper.jelly_ops[0..1].should == [
+          ["notify", "myMessage", 'arg1', 'arg2', 'arg5'],
+          ["notify", "myMessage", 'arg1', 'arg2', 'arg3'],
+        ]
+      end
+    end
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: honkster-jelly
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors: 
 - Pivotal Labs, Inc