honkster-jelly 0.7.4 → 0.7.5

data/Rakefile

@@ -25,7 +25,7 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name = ENV["GEM_PREFIX"] ? "#{ENV["GEM_PREFIX"]}-jelly" : "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,4 +1,4 @@
 --- 
 :minor: 7
-:patch: 4
+:patch: 5
 :major: 0

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

@@ -22,12 +22,7 @@ if(!window.Jelly) Jelly = new Object();
     return $.extend({
       dataType: 'json',
       cache: false,
-      success : $.ajaxWithJelly.onSuccess
+      success : Jelly.notifyObservers.bind(Jelly)
     }, otherParams);
   };
-
-  $.ajaxWithJelly.onSuccess = function(json) {
-    Jelly.notifyObservers(json);
-    return true;
-  };
 })(jQuery);

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

@@ -12,9 +12,18 @@
  */
 
 if (!window.Jelly) Jelly = new Object();
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function(object) {
+    var self = this;
+    return function() {
+      return self.apply(object, arguments);
+    }
+  }
+}
 Jelly.init = function() {
   this.components = [];
   this.observers = [];
+  this.notifyObservers = this.Observers.notify;
   this.Components.initCalled = false;
   this.Pages.init();
   var self = this;
@@ -40,67 +49,62 @@ Jelly.attach = function() {
   }
 };
 
-Jelly.notifyObservers = function(params, observers) {
-  if (!observers) {
-    observers = [];
-    for (var i = 0; i < Jelly.observers.length; i++) {
-      observers.push(Jelly.observers[i]);
+Jelly.Components = {
+  init: function() {
+    for (var i = 0; i < Jelly.components.length; i++) {
+      this.initComponentFromDefinition(Jelly.components[i]);
     }
+    this.initCalled = true;
+  },
+  initComponentFromDefinition: function(definition) {
+    var observer;
+    if (definition.component.init) {
+      observer = definition.component.init.apply(definition.component, definition.arguments);
+    }
+    Jelly.observers.push(observer ? observer : definition.component);
+  }
+};
+
+Jelly.Observers = {
+  notify: function(params) {
+    if (this == Jelly) return Jelly.Observers.notify.call(this.observers, params);
+    var observers = this.slice(0);
 
     // Deprecate 'on' in favor of making each page action a Component.
     if (params.on) {
       var additionalObserver = eval(params.on);
-      var additionalObserverAlreadyAnObserver = false;
-      for (var i = 0; i < observers.length; i++) {
-        if (observers[i] == additionalObserver) {
-          additionalObserverAlreadyAnObserver = true;
-          break;
-        }
-      }
-      if (!additionalObserverAlreadyAnObserver) {
+      if (observers.indexOf(additionalObserver) == -1) {
         observers.push(additionalObserver);
       }
     }
-  }
 
-  for (var i = 0; i < observers.length; i++) {
-    var observer = observers[i];
-    if (observer[params.method]) {
-      if (observer.detach && observer.detach()) {
-        this.garbageCollectObserver(observer);
-      } else {
-        observer[params.method].apply(observer, params.arguments);
+    for (var i = 0; i < observers.length; i++) {
+      var observer = observers[i];
+      if (observer[params.method]) {
+        if (observer.detach && observer.detach()) {
+          Jelly.Observers.garbageCollectObserver.call(this, observer);
+        } else {
+          observer[params.method].apply(observer, params.arguments);
+        }
       }
     }
-  }
-};
-
-Jelly.garbageCollectObserver = function(observer) {
-  var index = Jelly.observers.indexOf(observer);
-  if (index > -1) {
-    this.arrayRemove(Jelly.observers, index, index + 1);
-  }
-};
 
-Jelly.arrayRemove = function(array, from, to) {
-  var rest = array.slice((to || from) + 1 || array.length);
-  array.length = from < 0 ? array.length + from : from;
-  return array.push.apply(array, rest);
-};
-
-Jelly.Components = {
-  init: function() {
-    for (var i = 0; i < Jelly.components.length; i++) {
-      this.initComponentFromDefinition(Jelly.components[i]);
+    if (params.attach) {
+      Jelly.attach.apply(Jelly, params.attach);
     }
-    this.initCalled = true;
   },
-  initComponentFromDefinition: function(definition) {
-    var observer;
-    if (definition.component.init) {
-      observer = definition.component.init.apply(definition.component, definition.arguments);
+
+  garbageCollectObserver: function(observer) {
+    var index = this.indexOf(observer);
+    if (index > -1) {
+      Jelly.Observers.remove.call(this, index, index + 1);
     }
-    Jelly.observers.push(observer ? observer : definition.component);
+  },
+
+  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);
   }
 };
 

data/jelly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jelly}
-  s.version = "0.7.4"
+  s.version = "0.7.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-12-18}
+  s.date = %q{2009-12-28}
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-jelly
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Pivotal Labs, Inc
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 -08:00
+date: 2009-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency