jelly 0.5.9 → 0.6.5

data/Rakefile

@@ -25,7 +25,7 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "jelly"
+    gemspec.name = ENV["GEM_PREFIX"] ? "#{ENV["GEM_PREFIX"]}-jelly" : "jelly"
     gemspec.summary = "a sweet unobtrusive javascript framework for jQuery and Rails"
     gemspec.description = "Jelly provides a set of tools and conventions for creating rich ajax/javascript web applications with jQuery and Ruby on Rails."
     gemspec.email = "opensource@pivotallabs.com"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 5
-:patch: 9
+:minor: 6
+:patch: 5
 :build: 
 :major: 0

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

@@ -11,87 +11,84 @@
  *
  */
 
-if(!window.Jelly) Jelly = new Object();
-Jelly.all = {};
-
-Jelly.add = function(name) {
-  var page = new Jelly.Page(name);
-  for(var i=1; i < arguments.length; i++) {
-    $.extend(page, arguments[i]);
-  }
-  return page;
-};
-
-var page;
-Jelly.activatePage = function(controllerName, actionName) {
-  page = Jelly.all[controllerName] || new Jelly.Page(controllerName);
-  $(document).ready(function(){
-    Jelly._activatePage(actionName);
+if (!window.Jelly) Jelly = new Object();
+Jelly.init = function() {
+  this.components = [];
+  Jelly.Pages.init();
+  $(document).ready(function() {
+    Jelly.Components.init();
   });
 };
 
-Jelly._activatePage = function(actionName){
-  Jelly.initComponents();
-  if(page.all) page.all();
-  if(page[actionName]) page[actionName].call(page);
-  page.loaded = true;
-};
-
-Jelly.initComponents = function() {
-  $.protify(page.components).each(function(componentAndArgs) {
-    var component = componentAndArgs[0];
-    var args = componentAndArgs[1] || [];
-    if(component.init) component.init.apply(component, args);
-  });
+Jelly.attach = function(component, args) {
+  this.components.push([component, args]);
 };
 
 Jelly.notifyObservers = function(params) {
   var context = params.on ? eval(params.on) : page;
-  if(context[params.method]) {
+  if (context[params.method]) {
     context[params.method].apply(context, params.arguments);
   }
-  $.protify(page.components).each(function(componentAndArgs) {
+  $.protify(Jelly.components).each(function(componentAndArgs) {
     var component = componentAndArgs[0];
-    if(component[params.method]) {
+    if (component[params.method] && component != context) {
       component[params.method].apply(component, params.arguments);
     }
   });
 };
 
+Jelly.Components = {
+  init: function() {
+    $.protify(Jelly.components).each(function(componentAndArgs) {
+      var component = componentAndArgs[0];
+      var args = componentAndArgs[1] || [];
+      if (component.init) component.init.apply(component, args);
+    });
+  }
+};
+
+Jelly.Pages = {
+  init: function() {
+    this.all = {};
+    Jelly.all = this.all; // Deprecated
+  },
+
+  add: function(name) {
+    var page = new Jelly.Page(name);
+    for (var i = 1; i < arguments.length; i++) {
+      $.extend(page, arguments[i]);
+    }
+    return page;
+  }
+};
+Jelly.add = Jelly.Pages.add; // Deprecated
+
 Jelly.Page = function(name) {
+  this.documentHref = Jelly.Location.documentHref;
+
   this.name = name;
   this.components = [];
-  Jelly.all[name] = this;
+  Jelly.Pages.all[name] = this;
 };
-
 Jelly.Page.prototype.loaded = false;
 Jelly.Page.prototype.all = function() {
 };
-Jelly.Page.prototype.documentHref = function() {
-  return document.location.href;
-};
-Jelly.Page.prototype.on_redirect = function(location){
-  top.location.href = location;
+
+Jelly.Page.init = function(controllerName, actionName) {
+  var page = Jelly.Pages.all[controllerName] || new Jelly.Page(controllerName);
+  window.page = page;
+  if (page.all) page.all();
+  if (page[actionName]) page[actionName].call(page);
+  page.loaded = true;
 };
 
-Jelly.Page.prototype.attach = function(component, args) {
-  var methodNames = [];
-  for(var methodName in component.pageMixin) {
-    methodNames.push(methodName);
+Jelly.Location = {
+  init: function() {
+  },
+
+  on_redirect: function(location) {
+    top.location.href = location;
   }
-  var self = this;
-  $.protify(methodNames).each(function(methodName) {
-    // TODO: is anybody using these before_/after_ hooks?  if not, delete them and use components as observers
-    self[methodName] = function() {
-      if(this['before_' + methodName]) {
-        this['before_' + methodName].apply(this, arguments);
-      }
-      var returnValue = component.pageMixin[methodName].apply(this, arguments);
-      if(this['after_' + methodName]) {
-        this['after_' + methodName].apply(this, arguments);
-      }
-      return returnValue;
-    };
-  });
-  page.components.push([component, args]);
 };
+
+Jelly.init();

data/jelly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jelly}
-  s.version = "0.5.9"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pivotal Labs, Inc"]
-  s.date = %q{2009-10-30}
+  s.date = %q{2009-11-19}
   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 = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "install.rb",
      "jelly.gemspec",
      "lib/jelly.rb",
+     "lib/jelly/common.rb",
      "lib/jelly/jelly_controller.rb",
      "lib/jelly/jelly_helper.rb",
      "tasks/jelly_tasks.rake",
@@ -42,23 +43,24 @@ Gem::Specification.new do |s|
   s.summary = %q{a sweet unobtrusive javascript framework for jQuery and Rails}
   s.test_files = [
     "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",
+     "spec/helpers/jelly_helper_spec.rb",
      "spec/rails_root/app/controllers/application_controller.rb",
      "spec/rails_root/app/helpers/application_helper.rb",
+     "spec/rails_root/config/boot.rb",
      "spec/rails_root/config/environment.rb",
-     "spec/rails_root/config/environments/production.rb",
      "spec/rails_root/config/environments/development.rb",
+     "spec/rails_root/config/environments/production.rb",
      "spec/rails_root/config/environments/test.rb",
-     "spec/rails_root/config/routes.rb",
-     "spec/rails_root/config/boot.rb",
      "spec/rails_root/config/initializers/backtrace_silencers.rb",
-     "spec/rails_root/config/initializers/new_rails_defaults.rb",
-     "spec/rails_root/config/initializers/mime_types.rb",
      "spec/rails_root/config/initializers/inflections.rb",
+     "spec/rails_root/config/initializers/mime_types.rb",
+     "spec/rails_root/config/initializers/new_rails_defaults.rb",
      "spec/rails_root/config/initializers/session_store.rb",
-     "spec/helpers/jelly_helper_spec.rb"
+     "spec/rails_root/config/routes.rb",
+     "spec/rails_root/test/performance/browsing_test.rb",
+     "spec/rails_root/test/test_helper.rb",
+     "spec/spec_helper.rb",
+     "spec/spec_suite.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/jelly.rb

@@ -1,5 +1,6 @@
 raise "Jelly must be used in a Rails environment." unless defined?(ActionController)
 
+require 'jelly/common'
 require 'jelly/jelly_controller'
 require 'jelly/jelly_helper'
 

data/lib/jelly/common.rb

@@ -0,0 +1,7 @@
+module Jelly
+  module Common
+    def jelly_callback_hash(method, *arguments)
+      {"method" => method, "arguments" => arguments}
+    end
+  end
+end

data/lib/jelly/jelly_controller.rb

@@ -1,5 +1,6 @@
 module JellyController
   protected
+  include Jelly::Common
 
   def jelly_callback(callback_base_name = @action_name, options = {}, &block)
     render :inline => jelly_callback_erb("on_#{callback_base_name}", options, block)
@@ -13,7 +14,7 @@ module JellyController
       <%= begin
         args = @block ? instance_eval(&@block) : []
         args = [args] unless args.is_a?(Array)
-        {"method" => @callback_name, "arguments" => args}.reverse_merge(@options).to_json
+        jelly_callback_hash(@callback_name, *args).reverse_merge(@options).to_json
       end %>
     ERB
     request.xhr? ? erb : "<textarea>#{erb}</textarea>"

data/lib/jelly/jelly_helper.rb

@@ -1,15 +1,21 @@
 module JellyHelper
+  include Jelly::Common
 
   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|
+    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}/pages/**/*.js")]
+    ).map do |path|
       path.gsub("#{rails_root}/public/javascripts/", "").gsub(/\.js$/, "")
     end
   end
 
   def spread_jelly
+    attach_javascript_component("Jelly.Location")
+    attach_javascript_component("Jelly.Page", controller.controller_path.camelcase, controller.action_name)
     javascript_tag <<-JS
       window._token = '#{form_authenticity_token}'
-      Jelly.activatePage('#{controller.controller_path.camelcase}', '#{controller.action_name}');
       #{@content_for_javascript}
       $(document).ready(function() {
         #{@content_for_javascript_on_ready}
@@ -23,7 +29,7 @@ module JellyHelper
 
   def attach_javascript_component(component_name, *args)
     @jelly_attached_components ||= []    
-    key = "page.attach(#{component_name}, #{args.to_json});"
+    key = "Jelly.attach(#{component_name}, #{args.to_json});"
     unless @jelly_attached_components.include? key
       @jelly_attached_components << key
       content_for(:javascript, key)
@@ -32,7 +38,7 @@ module JellyHelper
 
   def attach_javascript_component_on_ready(component_name, *args)
     @jelly_attached_components_on_ready ||= []
-    key = "page.attach(#{component_name}, #{args.to_json});"
+    key = "Jelly.attach(#{component_name}, #{args.to_json});"
     unless @jelly_attached_components_on_ready.include? key
       @jelly_attached_components_on_ready << key
       content_for(:javascript_on_ready, key)

data/spec/controllers/jelly_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe ApplicationController do
 

data/spec/helpers/jelly_helper_spec.rb

@@ -1,24 +1,39 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
-describe "JellyHelper" do
+describe JellyHelper do
 
-  describe "#init_specific_javascript" do
-    it "should create a javascript include tag to initialize the Page object" do
+  describe "#spread_jelly" do
+    before 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')
+    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">')
-      output.should include("Jelly.activatePage('MyFunController', 'super_good_action');")
+      output.should include("Jelly.attach(Jelly.Location, #{[].to_json});")
+      output.should include("Jelly.attach(Jelly.Page, #{['MyFunController', 'super_good_action'].to_json});")
     end
   end
 
   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.application_jelly_files("foo", my_rails_root)
-      files.should_not be_empty
-      files.should =~ ['foo/pages/lions', 'foo/pages/tigers', 'foo/pages/bears']
+    context "when passing in a jelly path" do
+      it "returns the javascript files in /javascipts/:jelly_path/pages and /javascipts/:jelly_path/components" do
+        my_rails_root = File.join(File.dirname(__FILE__), '/../fixtures')
+        files = helper.application_jelly_files("foo", my_rails_root)
+        files.should_not be_empty
+        files.should =~ ['foo/components/paw', 'foo/components/teeth', 'foo/pages/lions', 'foo/pages/tigers', 'foo/pages/bears']
+      end
+    end
+
+    context "when not passing in a jelly path" do
+      it "returns the javascript files in /javascipts/pages and /javascipts/components" do
+        my_rails_root = File.join(File.dirname(__FILE__), '/../fixtures')
+        files = helper.application_jelly_files("", my_rails_root)
+        files.should_not be_empty
+        files.should =~ ['components/component1', 'pages/page1']
+      end
     end
   end
 
@@ -30,23 +45,23 @@ describe "JellyHelper" do
       helper.clear_jelly_attached()
     end
 
-    it "fails to add multiple calls to page.attach for the same component" do
+    it "fails to add multiple calls to Jelly.attach for the same component" 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[:content_for_javascript].should == 'page.attach(MyComponent, ["arg1","arg2","arg3"]);page.attach(MyComponent, ["arg1","arg2","arg5"]);'
+      assigns[:content_for_javascript].should == 'Jelly.attach(MyComponent, ["arg1","arg2","arg3"]);Jelly.attach(MyComponent, ["arg1","arg2","arg5"]);'
     end
 
-    it "adds a call to page.attach in the javascript content" do
+    it "adds a call to Jelly.attach in the javascript content" do
       helper.attach_javascript_component("MyComponent", 'arg1', 'arg2', 'arg3')
       expected_args = ['arg1','arg2','arg3'].to_json
-      assigns[:content_for_javascript].should == "page.attach(MyComponent, #{expected_args});"
+      assigns[:content_for_javascript].should == "Jelly.attach(MyComponent, #{expected_args});"
     end
 
-    it "adds a call to page.attach in the javascript_on_ready content" do
+    it "adds a call to Jelly.attach in the javascript_on_ready content" do
       helper.attach_javascript_component_on_ready("MyComponent", 'arg1', 'arg2', 'arg3')
       expected_args = ['arg1','arg2','arg3'].to_json
-      assigns[:content_for_javascript_on_ready].should == "page.attach(MyComponent, #{expected_args});"
+      assigns[:content_for_javascript_on_ready].should == "Jelly.attach(MyComponent, #{expected_args});"
     end
 
   end

data/spec/rails_root/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/spec/spec_helper.rb

@@ -4,10 +4,26 @@ ENV["RAILS_ENV"] ||= 'test'
 ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/rails_root'
 require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
 require 'rubygems'
+gem "test-unit"
+require 'test/unit'
+
+class Test::Unit::TestCase
+  class << self
+    def inherited(sub_class)
+      super
+      DESCENDANTS << sub_class
+    end
+    alias_method :inherited_without_test_unit_gem_inherited_fix, :inherited
+    alias_method :inherited, :inherited_without_test_unit_gem_inherited_fix
+  end
+end
+
 require 'spec'
 require 'spec/rails'
+require 'spec/autorun'
 
-require File.dirname(__FILE__) + "/../lib/jelly"
+$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
+require "jelly"
 
 Spec::Runner.configure do |configuration|
 end

data/spec/spec_suite.rb

@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/{controllers,helpers}/**/*_spec.rb"].each do |file|
+  require file
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jelly
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.6.5
 platform: ruby
 authors: 
 - Pivotal Labs, Inc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - install.rb
 - jelly.gemspec
 - lib/jelly.rb
+- lib/jelly/common.rb
 - lib/jelly/jelly_controller.rb
 - lib/jelly/jelly_helper.rb
 - tasks/jelly_tasks.rake
@@ -96,3 +97,4 @@ test_files:
 - spec/rails_root/test/performance/browsing_test.rb
 - spec/rails_root/test/test_helper.rb
 - spec/spec_helper.rb
+- spec/spec_suite.rb