golf 0.5.0 → 0.5.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    golf (0.4.14)
+    golf (0.5.2)
       hpricot
       json
       rack

data/lib/golf/compiler.rb

@@ -10,6 +10,10 @@ module Golf
       self.golfpath = "#{golfpath}/golfapp"
       puts "golf #{Golf::VERSION}: starting compiler in #{@golfpath}..."
       puts "golf #{Golf::VERSION}: is valid golfapp?: #{Golf::Compiler.valid?(@golfpath)}"
+      puts "golf #{Golf::VERSION}: loading filters in #{golfpath}/filters"
+      Dir["#{golfpath}/filters/*.rb"].each do |path|
+        require path
+      end
     end
 
     def self.valid?(dir)
@@ -140,8 +144,9 @@ module Golf
             filter = element.attributes["filter"]
             filter_name = filter.capitalize.to_sym
             if Golf::Filter.constants.include?(filter_name)
-              element.raw_string = Golf::Filter.const_get(filter_name).transform(element.to_s)
-              element.remove_attribute("filter")
+              element.remove_attribute('filter')
+              res = Golf::Filter.const_get(filter_name).transform(element.to_s)
+              element.swap(res)
             end
           end
           return doc.to_s

data/lib/golf/version.rb

@@ -1,3 +1,3 @@
 module Golf
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

data/resources/jquery.golf.js

@@ -417,160 +417,32 @@ window.d          = Debug("GOLF");
 window.Debug      = Debug;
 window.Component  = Component;
 
-// serverside mods to jQuery
-
-if (serverside) {
-
-  if (!window.forcebot) {
-    $.fx.off = true;
-
-    $.fn.fadeIn = $.fn.slideDown = function(speed, callback) {
-      return $.fn.show.call(this, 0, callback);
-    };
-
-    $.fn.fadeOut = $.fn.slideUp = function(speed, callback) {
-      return $.fn.hide.call(this, 0, callback);
-    };
-
-    // this is problematic because the js css manipulations are not carried
-    // over in proxy mode; needs to be in a style tag maybe
-    //(function(fadeTo) {
-    //  jQuery.fn.fadeTo = function(speed, opacity, callback) {
-    //    return fadeTo.call(this, 0, opacity, callback);
-    //  };
-    //})(jQuery.fn.fadeTo);
-
-    $.fn.slideToggle = function(speed, callback) {
-      return $.fn.toggle.call(this, 0, callback);
-    };
-
-    $.fn.show = (function(show) {
-      return function(speed, callback) {
-        return show.call(this, 0, callback);
-      };
-    })($.fn.show);
+// install overrides on jQ DOM manipulation methods to accomodate components
 
-    $.fn.hide = (function(hide) {
-      return function(speed, callback) {
-        return hide.call(this, 0, callback);
-      };
-    })($.fn.hide);
+(function() {
 
+    // this is to prevent accidentally reloading the page
     $.fn.bind = (function(bind) {
       var lastId = 0;
       return function(name, fn) {
-        var jself   = $(this);
-        var _href   = jself.attr("href");
-        var _golfid = jself.attr("golfid");
-        if (name == "click") {
-          if (!_golfid) {
-            ++lastId;
-            jself.attr("golfid", lastId);
-          }
-          if (_href) {
-            jself.data("_golf_oldfn", fn);
-
-            if (_href && _href.charAt(0) != "#")
-              jself.data("_golf_oldhref", 
-                  "/"+_href.replace(/^(http:\/\/)?([^\/]\/?)*\/\//g, ""));
-            else if (jself.attr("href"))
-              jself.data("_golf_oldhref", _href.replace(/^#/, ""));
-
-            jself.attr({
-              rel:  "nofollow",
-              href: "?target="+lastId+"&event=onclick"
-            });
-            fn = function() {
-              var argv = Array.prototype.slice.call(arguments);
-              if ($(this).data("_golf_oldfn").apply(jss, argv) !== false) {
-                $(this).attr("href", servletUrl+$(this).data("_golf_oldhref"));
-                $.golf.location($(this).data("_golf_oldhref"));
-              }
-            };
-          } else {
-            var a = "<a rel='nofollow' href='?target="+lastId+
-              "&amp;event=onclick'></a>";
-            jself.wrap(a);
-            jself._golf_addClass("golfproxylink");
-          }
-        } else if (name == "submit") {
-          if (!_golfid) {
-            ++lastId;
-            jself.attr("golfid", lastId);
-            jself.append(
-              "<input type='hidden' name='event' value='onsubmit'/>");
-            jself.append(
-              "<input type='hidden' name='target' value='"+lastId+"'/>");
-            if (!$.golf.events[lastId])
-              $.golf.events[lastId] = [];
-          }
-          $.golf.events[jself.attr("golfid")].push(fn);
+        var jself = $(this);
+        if (name == "submit") {
+          var oldfn = fn;
+          fn = function() {
+            var argv = Array.prototype.slice.call(arguments);
+            try {
+              oldfn.apply(this, argv);
+            } catch(e) {
+              d(e.stack);
+              $.golf.errorPage("Oops!", "<code>"+e.toString()+"</code>");
+            }
+            return false;
+          };
         }
         return bind.call(jself, name, fn);
       };
     })($.fn.bind);
 
-    $.fn.trigger = (function(trigger) {
-      return function(type, data) {
-        var jself = $(this);
-        // FIXME: this is here because hunit stops firing js submit events
-        if (type == "submit") {
-          var tmp = $.golf.events[jself.attr("golfid")];
-          return $.each(tmp, function(){
-            this.call(jself, type, data);
-          });
-        } else {
-          return trigger.call($(this), type, data);
-        }
-      };
-    })($.fn.trigger);
-  }
-
-  $.fn.val = (function(val) {
-    return function(newVal) {
-      if (arguments.length == 0)
-        return $.trim(val.call($(this)));
-      else
-        return val.call($(this), newVal);
-    };
-  })($.fn.val);
-
-  $.ajax = (function(ajax) {
-    return function(options) {
-      options.async = false;
-      return ajax(options);
-    };
-  })($.ajax);
-
-} else {
-
-  $.fn.bind = (function(bind) {
-    var lastId = 0;
-    return function(name, fn) {
-      var jself = $(this);
-      if (name == "submit") {
-        var oldfn = fn;
-        fn = function() {
-          var argv = Array.prototype.slice.call(arguments);
-          try {
-            oldfn.apply(this, argv);
-          } catch(e) {
-            d(e.stack);
-            $.golf.errorPage("Oops!", "<code>"+e.toString()+"</code>");
-          }
-          return false;
-        };
-      }
-      return bind.call(jself, name, fn);
-    };
-  })($.fn.bind);
-
-}
-
-// install overrides on jQ DOM manipulation methods to accomodate components
-
-(function() {
-
     $.each(
       [
         "append",

data/test/test_compiler.rb

@@ -30,11 +30,11 @@ class CompilerTest < Test::Unit::TestCase
     b = JSON.parse @compiler.component_json
     assert_equal a.keys.sort,b.keys.sort
     assert_equal a,b
-    puts a["HelloWorld"]["html"]
-    puts b["HelloWorld"]["html"]
-    a.keys.each do |key|
-      puts "#{key} should be #{a[key].hash}, but was #{b[key].hash}"
-    end
+    #puts a["HelloWorld"]["html"]
+    #puts b["HelloWorld"]["html"]
+    #a.keys.each do |key|
+    #  puts "#{key} should be #{a[key].hash}, but was #{b[key].hash}"
+    #end
   end
 
   def test_res_generation

metadata

@@ -2,7 +2,7 @@
 name: golf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - Micha Niskin, Alan Dipert, Julio Capote