gon 4.0.1 → 4.0.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 4.0.2
+
+  * Fixed gon.watch in JS without callback and options
+
 ## 4.0.1
 
   * Removed BlankSlate requirement *Peter Schröder*

data/README.md

@@ -2,8 +2,7 @@
 
 ![Gon. You should try this. If you look closer - you will see an elephant.](https://github.com/gazay/gon/raw/master/doc/logo_small.png)
 
-
-### Build Status ![http://travis-ci.org/gazay/gon](https://secure.travis-ci.org/gazay/gon.png)
+### Build Status [![Build Status](https://secure.travis-ci.org/gazay/gon.png)](http://travis-ci.org/gazay/gon)
 
 If you need to send some data to your js files and you don't want to do this with long way through views and parsing - use this force!
 

data/js/watch.js

@@ -0,0 +1,62 @@
+gon._timers = {};
+
+gon.watch = function(name, possibleOptions, possibleCallback) {
+  var callback, key, options, performAjax, timer, value, _base, _ref, _ref1;
+  if (typeof $ === 'undefined' || $ === null) {
+    return;
+  }
+  if (typeof possibleOptions === 'object') {
+    options = {};
+    _ref = gon.watchedVariables[name];
+    for (key in _ref) {
+      value = _ref[key];
+      options[key] = value;
+    }
+    for (key in possibleOptions) {
+      value = possibleOptions[key];
+      options[key] = value;
+    }
+    callback = possibleCallback;
+  } else {
+    options = gon.watchedVariables[name];
+    callback = possibleOptions;
+  }
+  performAjax = function() {
+    var xhr;
+    xhr = $.ajax({
+      type: options.type || 'GET',
+      url: options.url,
+      data: {
+        _method: options.method,
+        gon_return_variable: true,
+        gon_watched_variable: name
+      }
+    });
+    return xhr.done(callback);
+  };
+  if (options.interval) {
+    timer = setInterval(performAjax, options.interval);
+    if ((_ref1 = (_base = gon._timers)[name]) == null) {
+      _base[name] = [];
+    }
+    return gon._timers[name].push({
+      timer: timer,
+      fn: callback
+    });
+  } else {
+    return performAjax();
+  }
+};
+
+gon.unwatch = function(name, fn) {
+  var index, timer, _i, _len, _ref;
+  _ref = gon._timers[name];
+  for (index = _i = 0, _len = _ref.length; _i < _len; index = ++_i) {
+    timer = _ref[index];
+    if (timer.fn === fn) {
+      clearInterval(timer.timer);
+      gon._timers[name].splice(index, 1);
+      return;
+    }
+  }
+};

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

data/lib/gon/watch.rb

@@ -2,69 +2,7 @@ class Gon
   class Watch < Gon
     class << self
 
-      JS_FUNCTION = \
-        "gon._timers = {};
-
-         gon.watch = function(name, possibleOptions, possibleCallback) {
-           var callback, key, options, performAjax, timer, value, _base, _ref, _ref1;
-           if (typeof $ === 'undefined' || $ === null) {
-             return;
-           }
-           if (typeof possibleOptions === 'object') {
-             options = {};
-             _ref = gon.watchedVariables[name];
-             for (key in _ref) {
-               value = _ref[key];
-               options[key] = value;
-             }
-             for (key in possibleOptions) {
-               value = possibleOptions[key];
-               options[key] = value;
-             }
-             callback = possibleCallback;
-           } else {
-             options = gon.watchedVariables[name];
-             callback = possibleOptions;
-           }
-           performAjax = function() {
-             var xhr;
-             xhr = $.ajax({
-               type: options.type || 'GET',
-               url: options.url,
-               data: {
-                 _method: options.method,
-                 gon_return_variable: true,
-                 gon_watched_variable: name
-               }
-             });
-             return xhr.done(callback);
-           };
-           if (options.interval) {
-             timer = setInterval(performAjax, options.interval);
-             if ((_ref1 = (_base = gon._timers)[name]) == null) {
-               _base[name] = [];
-             }
-             return gon._timers[name].push({
-               timer: timer,
-               fn: callback
-             });
-           } else {
-             return performAjax;
-           }
-         };
-
-         gon.unwatch = function(name, fn) {
-           var index, timer, _i, _len, _ref;
-           _ref = gon._timers[name];
-           for (index = _i = 0, _len = _ref.length; _i < _len; index = ++_i) {
-             timer = _ref[index];
-             if (timer.fn === fn) {
-               clearInterval(timer.timer);
-               gon._timers[name].splice(index, 1);
-               return;
-             }
-           }
-         };"
+      JS_FUNCTION = File.read(File.expand_path('../../../js/watch.js', __FILE__))
 
       def render
         JS_FUNCTION + "window.gon.watchedVariables=#{all_variables.to_json};"
@@ -87,7 +25,7 @@ class Gon
           variable = {}
           @watch_variables ||= {}
           env = Gon::Request.env
-          variable['url'] = env['ORIGINAL_FULLPATH']
+          variable['url'] = env['ORIGINAL_FULLPATH'] || env['REQUEST_URI']
           variable['method'] = env['REQUEST_METHOD']
           variable['name'] = name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -126,6 +126,7 @@ files:
 - doc/logo_small.png
 - doc/top_sample.png
 - gon.gemspec
+- js/watch.js
 - lib/gon.rb
 - lib/gon/base.rb
 - lib/gon/escaper.rb