honkster-jelly 0.8.4 → 0.8.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 8
-:patch: 4
+:patch: 6
 :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.4
+ *  version 0.8.6
  *
  * Copyright (c) 2009 Pivotal Labs
  * Licensed under the MIT license.
@@ -20,150 +20,132 @@ if (!Function.prototype.bind) {
     }
   }
 }
-Jelly.init = function() {
-  this.observers = [];
-  this.observers.pending = [];
-  this.attach = this.Observers.attach;
-  this.notifyObservers = this.Observers.notify;
-  this.Components.initCalled = false;
-  this.Pages.init();
-  var self = this;
-  $(document).ready(function() {
-    self.Components.init();
-  });
-};
-
-Jelly.Components = {
+$.extend(Jelly, {
   init: function() {
-    for (var i = 0; i < Jelly.observers.pending.length; i++) {
-      Jelly.Observers.initPending.call(Jelly.observers, Jelly.observers.pending[i]);
-    }
-    this.initCalled = true;
-  }
-};
+    this.observers = [];
+    this.attach = this.Observers.attach;
+    this.notifyObservers = this.Observers.notify;
+    this.Pages.init();
+  },
 
-Jelly.Observers = {
-  attach: function() {
-    if (this == Jelly) {
-      return Jelly.Observers.attach.apply(this.observers, arguments);
-    }
-    this.pending = this.pending || [];
-    for (var i = 0; i < arguments.length; i++) {
-      var definition = arguments[i];
-      var component = (typeof definition.component == "string") ?
-                      eval(definition.component) :
-                      definition.component;
-      var evaluatedDefinition = {
-        component: component,
-        arguments: definition.arguments
-      };
-      this.pending.push(evaluatedDefinition);
-      if (Jelly.Components.initCalled) {
-        Jelly.Observers.initPending.call(this, evaluatedDefinition);
+  Observers: {
+    attach: function() {
+      if (this == Jelly) {
+        return Jelly.Observers.attach.apply(this.observers, arguments);
       }
-    }
-  },
+      for (var i = 0; i < arguments.length; i++) {
+        var definitionOrComponent = arguments[i];
+        var observer;
+        if (definitionOrComponent.component) {
+          var component = Jelly.Observers.evaluateComponent(definitionOrComponent.component);
+          if (component.init) {
+            observer = component.init.apply(component, definitionOrComponent.arguments) || component;
+          } else {
+            observer = component;
+          }
+        } else {
+          observer = Jelly.Observers.evaluateComponent(definitionOrComponent);
+        }
+        this.push(observer);
+      }
+    },
 
-  initPending: function(definition) {
-    var observer;
-    if (definition.component.init) {
-      observer = definition.component.init.apply(definition.component, definition.arguments);
-    }
-    this.push(observer ? observer : definition.component);
-  },
+    evaluateComponent: function(component) {
+      return (typeof component == "string") ? eval(component) : component;
+    },
 
-  notify: function(callbacks) {
-    if (this == Jelly) {
-      return Jelly.Observers.notify.apply(this.observers, arguments);
-    }
-    if (!$.isArray(callbacks)) {
-      callbacks = [callbacks];
-    }
+    notify: function(callbacks) {
+      if (this == Jelly) {
+        return Jelly.Observers.notify.apply(this.observers, arguments);
+      }
+      if (!$.isArray(callbacks)) {
+        callbacks = [callbacks];
+      }
 
-    var observers = this.slice(0);
-    for (var i = 0; i < callbacks.length; i++) {
-      var callback = callbacks[i];
+      var observers = this.slice(0);
+      for (var i = 0; i < callbacks.length; i++) {
+        var callback = callbacks[i];
 
-      // Deprecate 'on' in favor of making each page action a Component.
-      if (callback.on) {
-        var additionalObserver = eval(callback.on);
-        if (observers.indexOf(additionalObserver) == -1) {
-          observers.push(additionalObserver);
+        // Deprecate 'on' in favor of making each page action a Component.
+        if (callback.on) {
+          var additionalObserver = eval(callback.on);
+          if (observers.indexOf(additionalObserver) == -1) {
+            observers.push(additionalObserver);
+          }
         }
-      }
 
-      for (var j = 0; j < observers.length; j++) {
-        var observer = observers[j];
-        if (observer[callback.method]) {
-          if (observer.detach && observer.detach()) {
-            Jelly.Observers.garbageCollectObserver.call(this, observer);
-          } else {
-            observer[callback.method].apply(observer, callback.arguments);
+        if (callback.method) {
+          for (var j = 0; j < observers.length; j++) {
+            var observer = observers[j];
+            if (observer[callback.method]) {
+              if (observer.detach && observer.detach()) {
+                Jelly.Observers.garbageCollectObserver.call(this, observer);
+              } else {
+                observer[callback.method].apply(observer, callback.arguments);
+              }
+            }
           }
         }
+
+        if (callback.attach) {
+          Jelly.Observers.attach.apply(this, callback.attach);
+        }
       }
+    },
 
-      if (callback.attach) {
-        Jelly.Observers.attach.apply(this, callback.attach);
+    garbageCollectObserver: function(observer) {
+      var index = this.indexOf(observer);
+      if (index > -1) {
+        Jelly.Observers.remove.call(this, index, index + 1);
       }
-    }
-  },
+    },
 
-  garbageCollectObserver: function(observer) {
-    var index = this.indexOf(observer);
-    if (index > -1) {
-      Jelly.Observers.remove.call(this, index, index + 1);
+    remove: function(from, to) {
+      var rest = this.slice((to || from) + 1 || this.length);
+      this.length = from < 0 ? this.length + from : from;
+      return this.push.apply(this, rest);
     }
   },
 
-  remove: function(from, to) {
-    var rest = this.slice((to || from) + 1 || this.length);
-    this.length = from < 0 ? this.length + from : from;
-    return this.push.apply(this, rest);
-  }
-};
+  Pages: {
+    init: function() {
+      this.all = {};
+      Jelly.all = this.all; // Deprecated
+    },
 
-Jelly.Pages = {
-  init: function() {
-    this.all = {};
-    Jelly.all = this.all; // Deprecated
-  },
-
-  add: function(name) {
-    var page = new Jelly.Page.Constructor(name);
-    for (var i = 1; i < arguments.length; i++) {
-      $.extend(page, arguments[i]);
+    add: function(name) {
+      var page = new Jelly.Page.Constructor(name);
+      for (var i = 1; i < arguments.length; i++) {
+        $.extend(page, arguments[i]);
+      }
+      return page;
     }
-    return page;
-  }
-};
-Jelly.add = Jelly.Pages.add; // Deprecated
-
-Jelly.Page = {
-  init: function(controllerName, actionName) {
-    var page = Jelly.Pages.all[controllerName] || new Jelly.Page.Constructor(controllerName);
-    window.page = page;
-    if (page.all) page.all();
-    if (page[actionName]) page[actionName].call(page);
-    page.loaded = true;
-    return page;
   },
-  Constructor: function(name) {
-    this.loaded = false;
-    this.documentHref = Jelly.Location.documentHref;
-
-    this.name = name;
-    Jelly.Pages.all[name] = this;
-  }
-};
 
-Jelly.Location = {
-  init: function() {
+  Page: {
+    init: function(controllerName, actionName) {
+      var page = Jelly.Pages.all[controllerName] || new Jelly.Page.Constructor(controllerName);
+      window.page = page;
+      if (page.all) page.all();
+      if (page[actionName]) page[actionName].call(page);
+      page.loaded = true;
+      return page;
+    },
+    Constructor: function(name) {
+      this.loaded = false;
+      this.documentHref = Jelly.Location.documentHref;
+
+      this.name = name;
+      Jelly.Pages.all[name] = this;
+    }
   },
 
-  on_redirect: function(location) {
-    top.location.href = location;
+  Location: {
+    on_redirect: function(location) {
+      top.location.href = location;
+    }
   }
-};
+});
+Jelly.add = Jelly.Pages.add; // Deprecated
 
 Jelly.init();

data/jelly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jelly}
-  s.version = "0.8.4"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pivotal Labs, Inc"]
-  s.date = %q{2009-12-29}
+  s.date = %q{2010-01-05}
   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 = [

data/lib/jelly/jelly_controller.rb

@@ -12,10 +12,10 @@ module JellyController
 
   def raw_jelly_callback(options={}, &block)
     options.symbolize_keys!
-    options[:format] ||= if request.xhr?
-      :json
-    elsif params[:callback]
+    options[:format] ||= if params[:callback]
       :jsonp
+    elsif request.xhr?
+      :json
     else
       :iframe
     end

data/lib/jelly/jelly_helper.rb

@@ -17,7 +17,6 @@ module JellyHelper
     <<-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
 
@@ -26,11 +25,6 @@ module JellyHelper
   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
       $(document).ready(function() {
@@ -51,18 +45,12 @@ module JellyHelper
   end
 
   def attach_javascript_component_on_ready(component_name, *args)
-    key = jelly_attach_component_definition_hash(component_name, *args)
-    unless jelly_attached_components_on_ready.include? key
-      jelly_attached_components_on_ready << key
-    end
+    warn "attach_javascript_component_on_ready is deprecated since attach_javascript_component adds components to be attached in a $(document).ready block\n#{puts caller.join("\n\t")}"
+    attach_javascript_component(component_name, *args)
   end
 
   def jelly_attached_components
     @jelly_attached_components ||= []
   end
 
-  def jelly_attached_components_on_ready
-    @jelly_attached_components_on_ready ||= []
-  end
-
 end

data/spec/controllers/jelly_controller_spec.rb

@@ -123,31 +123,31 @@ describe ApplicationController do
       end
     end
 
-    context "when the request is XHR" do
+    context "when there is a callback param" do
       before do
-        stub(request).xhr? {true}
+        @controller.params[:callback] = "Jelly.notifyObservers"
       end
 
-      it "responds with a json hash" do
-        @controller.send(:jelly_callback, 'foo', {'bar' => 'baz'}) do
-          "grape"
+      context "when the request is XHR" do
+        before do
+          stub(request).xhr? {true}
         end
-        callback = JSON.parse(response.body)
-        callback["method"].should == "on_foo"
-        callback["arguments"].should == ["grape"]
-        callback["bar"].should == "baz"
-      end
-
-    end
 
-    context "when the request is not XHR" do
-      before do
-        stub(request).xhr? {false}
+        it "responds with a call to the given callback method with the json as an argument" do
+          @controller.send(:jelly_callback, 'foo', {'bar' => 'baz'}) do
+            "grape"
+          end
+          json = Regexp.new('Jelly\.notifyObservers\((.*)\);').match(response.body)[1]
+          callback = JSON.parse(json)
+          callback["method"].should == "on_foo"
+          callback["arguments"].should == ["grape"]
+          callback["bar"].should == "baz"
+        end
       end
 
-      context "when there is a callback param" do
+      context "when the request is not XHR" do
         before do
-          @controller.params[:callback] = "Jelly.notifyObservers"
+          stub(request).xhr? {false}
         end
 
         it "responds with a call to the given callback method with the json as an argument" do
@@ -161,22 +161,47 @@ describe ApplicationController do
           callback["bar"].should == "baz"
         end
       end
+    end
 
-      context "when there is not a callback param" do
-        it "wraps the json response in a textarea tag to support File Uploads in an iframe target (see: http://malsup.com/jquery/form/#code-samples)" do
+    context "when there is not a callback param" do
+      context "when the request is XHR" do
+        before do
+          stub(request).xhr? {true}
+        end
+
+        it "responds with a json hash" do
           @controller.send(:jelly_callback, 'foo', {'bar' => 'baz'}) do
             "grape"
           end
-          body = response.body
-          body.should =~ /^<textarea>/
-          body.should =~ /<\/textarea>$/
-          doc = Nokogiri::HTML(body)
-
-          callback = JSON.parse(doc.at("textarea").inner_html)
+          callback = JSON.parse(response.body)
           callback["method"].should == "on_foo"
           callback["arguments"].should == ["grape"]
           callback["bar"].should == "baz"
         end
+
+      end
+
+      context "when the request is not XHR" do
+        before do
+          stub(request).xhr? {false}
+        end
+
+        context "when there is not a callback param" do
+          it "wraps the json response in a textarea tag to support File Uploads in an iframe target (see: http://malsup.com/jquery/form/#code-samples)" do
+            @controller.send(:jelly_callback, 'foo', {'bar' => 'baz'}) do
+              "grape"
+            end
+            body = response.body
+            body.should =~ /^<textarea>/
+            body.should =~ /<\/textarea>$/
+            doc = Nokogiri::HTML(body)
+
+            callback = JSON.parse(doc.at("textarea").inner_html)
+            callback["method"].should == "on_foo"
+            callback["arguments"].should == ["grape"]
+            callback["bar"].should == "baz"
+          end
+        end
       end
     end
   end

data/spec/helpers/jelly_helper_spec.rb

@@ -67,7 +67,7 @@ describe JellyHelper do
       ]
     end
 
-    it "adds a call to Jelly.attach in the javascript content" 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 == [
@@ -76,26 +76,8 @@ describe JellyHelper do
 
       html = helper.spread_jelly
       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']})
-    end
-
-    it "adds a call to Jelly.attach in the javascript_on_ready content" do
-      helper.attach_javascript_component_on_ready("MyComponent", 'arg1', 'arg2', 'arg3')
-
-      assigns[:jelly_attached_components_on_ready].should == [
-        {'component' => "MyComponent", 'arguments' => ['arg1', 'arg2', 'arg3']}
-      ]
-
-      html = helper.spread_jelly
-      doc = Nokogiri::HTML(html)
-      document_ready_tag = doc.css("script")[2]
+      document_ready_tag = doc.css("script")[1]
       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']})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-jelly
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors: 
 - Pivotal Labs, Inc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -08:00
+date: 2010-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency