honkster-honkster-jelly 0.2.0 → 0.3.0

data/README.markdown

@@ -26,9 +26,8 @@ Then install the required JavaScript files by running this command in your Rails
 
 Then, in your layout, add the following:
 
-    <%= javascript_include_tag :jelly %>
-    <%= javascript_include_tag *page_specific_javascript_files %>
-    <%= init_specific_javascript %>
+    <%= javascript_include_tag :jelly, *application_jelly_files %>
+    <%= spread_jelly %>
 
 This will include the required JavaScripts for jelly and activate the current page.  The `:jelly` javascript expansion
 includes jQuery.  If you already have jQuery included in the page, use the `:only_jelly` expansion instead.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

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

@@ -5,13 +5,15 @@
 
   $.ajaxWithJelly.params = function(otherParams) {
     otherParams = otherParams || {};
-    otherParams['data'] = $.extend(otherParams['data'], {
-      authenticity_token: _token
-    });
+
+    if (otherParams.type && otherParams.type != "GET") {
+      otherParams['data'] = $.extend(otherParams['data'], {
+        authenticity_token: window._token
+      });      
+    }
     return $.extend({
       dataType: 'json',
       cache: false,
-      type: 'POST',
       success : $.ajaxWithJelly.onSuccess
     }, otherParams);
   };

data/honkster-jelly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{honkster-jelly}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   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

@@ -1,12 +1,12 @@
 module JellyHelper
 
-  def page_specific_javascript_files(jelly_files_path_from_javascripts = '', rails_root = RAILS_ROOT)
+  def application_jelly_files(jelly_files_path_from_javascripts = '', rails_root = RAILS_ROOT)
     Dir["#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/pages/**/*.js"].map do |path|
       path.gsub("#{rails_root}/public/javascripts/", "").gsub(/\.js$/, "")
     end
   end
 
-  def init_specific_javascript
+  def spread_jelly
     javascript_tag <<-JS
       window._token = '#{form_authenticity_token}'
       Jelly.activatePage('#{controller.controller_path.camelcase}', '#{controller.action_name}');

data/spec/helpers/jelly_helper_spec.rb

@@ -7,16 +7,16 @@ describe "JellyHelper" 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')
-      output = helper.init_specific_javascript
+      output = helper.spread_jelly
       output.should include('<script type="text/javascript">')
       output.should include("Jelly.activatePage('MyFunController', 'super_good_action');")
     end
   end
 
-  describe "#page_specific_javascript_files" do
+  describe "#application_jelly_files" do
     it "returns the javascript files in the given path" do
       my_rails_root = File.join(File.dirname(__FILE__), '/../fixtures')
-      files = helper.page_specific_javascript_files("foo", my_rails_root)
+      files = helper.application_jelly_files("foo", my_rails_root)
       files.should_not be_empty
       files.should =~ ['foo/pages/lions', 'foo/pages/tigers', 'foo/pages/bears']
     end

metadata

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