honkster-jelly 0.7.1 → 0.7.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 7
-:patch: 1
+:patch: 2
 :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.0
+ *  version 0.7.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.7.1"
+  s.version = "0.7.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_helper.rb

@@ -14,19 +14,31 @@ module JellyHelper
   def spread_jelly
     attach_javascript_component("Jelly.Location")
     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_on_document_ready_javascript_tag(jelly_attached_components_on_ready)}
+    HTML
+  end
+
+  def window_token_javascript_tag
+    javascript_tag("window._token = '#{form_authenticity_token}';")
+  end
+
+  def attach_javascript_component_javascript_tag(*components)
+    components = [components].flatten
+    javascript_tag("Jelly.attach.apply(Jelly, #{components.to_json});")
+  end
+
+  def attach_javascript_component_on_document_ready_javascript_tag(*components)
+    components = [components].flatten
     javascript_tag <<-JS
-      #{javascript_set_window_token}
-      Jelly.attach.apply(Jelly, #{jelly_attached_components.to_json});
       $(document).ready(function() {
-        Jelly.attach.apply(Jelly, #{jelly_attached_components_on_ready.to_json});
-      });
+        Jelly.attach.apply(Jelly, #{components.to_json});
+      }
     JS
   end
 
-  def javascript_set_window_token
-    "window._token = '#{form_authenticity_token}';"
-  end
-
   def clear_jelly_attached
     jelly_attached_components.clear
   end

data/spec/helpers/jelly_helper_spec.rb

@@ -16,7 +16,8 @@ describe JellyHelper do
     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">')
-      argument = jelly_attach_arguments(output)
+      doc = Nokogiri::HTML(output)
+      argument = jelly_attach_arguments(doc.css("script")[1].inner_html)
       argument.should include({'component' => "Jelly.Location", 'arguments' => []})
       argument.should include({'component' => "Jelly.Page", 'arguments' => ['MyFunController', 'super_good_action']})
     end
@@ -71,8 +72,10 @@ describe JellyHelper do
       ]
 
       html = helper.spread_jelly
-      pre_document_ready_part = html.split("\n")[0..3].join("\n")
-      pre_document_ready_part.split("\n")[0].should_not include("$(document).ready(function() {")
+      doc = Nokogiri::HTML(html)
+      pre_document_ready_tag = doc.css("script")[1]
+      pre_document_ready_tag.inner_html.should_not include("$(document).ready(function() {")
+      pre_document_ready_part = pre_document_ready_tag.inner_html.split("\n")[2]
 
       arguments = jelly_attach_arguments(pre_document_ready_part)
       arguments.should include({'component' => "MyComponent", 'arguments' => ['arg1', 'arg2', 'arg3']})
@@ -86,8 +89,11 @@ describe JellyHelper do
       ]
 
       html = helper.spread_jelly
-      document_ready_part = html.split("\n")[4..-1].join("\n")
-      document_ready_part.split("\n")[0].should include("$(document).ready(function() {")
+      doc = Nokogiri::HTML(html)
+      document_ready_tag = doc.css("script")[2]
+      document_ready_tag.inner_html.should include("$(document).ready(function() {")
+
+      document_ready_part = document_ready_tag.inner_html.split("\n")[3]
       arguments = jelly_attach_arguments(document_ready_part)
       arguments.should include({'component' => "MyComponent", 'arguments' => ['arg1', 'arg2', 'arg3']})
     end

data/spec/spec_helper.rb

@@ -21,6 +21,7 @@ end
 require 'spec'
 require 'spec/rails'
 require 'spec/autorun'
+require 'nokogiri'
 
 $LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
 require "jelly"

metadata

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