golf 0.1.8 → 0.2.0

data/lib/golf/compiler.rb

@@ -1,23 +1,62 @@
 module Golf
   class Compiler
 
-    def initialize(golfpath = "components")
+    def initialize(golfpath = ".")
+      puts "starting up in #{golfpath}"
       @golfpath = golfpath
     end
 
     def generate_componentsjs
-      puts "compiling components in #{@golfpath}..."
-      component_preamble = 'jQuery.golf.components='
-      components = {}
-      if File.exists?(@golfpath) and File.directory?(@golfpath)
-        Dir["#{@golfpath}/**/*.html"].each do |path|
-          name = path.split('/').last.gsub('.html','')
-          html = File.read(path)
-          components = components.merge({ name => { "name" => name, "html" => html }})
-        end
+      "jQuery.golf.components=#{component_json};jQuery.golf.res=#{res_json};jQuery.golf.plugins=#{plugin_json};jQuery.golf.scripts=#{script_json};jQuery.golf.styles=#{style_json};jQuery.golf.setupComponents();"
+    end
+
+    def component_json
+      traverse("#{@golfpath}/components", "html")
+    end
+
+    def res_json
+      results = { "Gemfile" => "Gemfile", "plugins" => {},"config.ru" => "config.ru", "404.txt" => "404.txt" }
+      Dir["#{@golfpath}/plugins/*.js"].each do |path|
+        results["plugins"] = results["plugins"].merge({ File.basename(path) => "plugins/#{File.basename(path)}"})
       end
-      component_preamble << JSON.dump(components) << ';' << 'jQuery.golf.res={};jQuery.golf.plugins={};jQuery.golf.scripts={};jQuery.golf.styles={};jQuery.golf.setupComponents();'
+      JSON.dump(results)
     end
     
+    def plugin_json
+      traverse("#{@golfpath}/plugins", "js")
+    end
+
+    def script_json
+      traverse("#{@golfpath}/scripts", "js")
+    end
+
+    def style_json
+      traverse("#{@golfpath}/styles", "css")
+    end
+
+    def traverse(dir, type)
+      results = {}
+      if File.exists?(dir) and File.directory?(dir)
+        Dir["#{dir}/**/*.#{type}"].each do |path|
+          if type == "html"
+            name = package_name(path)
+          else
+            name = path.split('/').last.gsub(".#{type}",'')
+          end
+          data = File.read(path)
+          results = results.merge({ name => { "name" => name, "#{type}" => data }})
+        end
+      end
+      JSON.dump(results)
+    end
+
+    def package_name(path)
+      path_arr = path.split('/')
+      i = path_arr.index('components')
+      name_segment = (path_arr.length - 1) - i
+      path_arr.slice(i + 1, name_segment - 1).join('.')
+    end
+
+
   end
 end

data/lib/golf/version.rb

@@ -1,3 +1,3 @@
 module Golf
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/test/test_compiler.rb

@@ -3,16 +3,22 @@ require 'test_helper'
 class CompilerTest < Test::Unit::TestCase
 
   def setup
-    @compiler = Golf::Compiler.new(File.expand_path("../data/components", __FILE__))
+    @compiler = Golf::Compiler.new(File.expand_path("../twitter_compiled", __FILE__))
   end
 
 
   def test_componentsjs_generation
     componentjs = @compiler.generate_componentsjs
-    known_good = 'jQuery.golf.components={"HelloWorld":{"name":"HelloWorld","html":"<div><styletype=\"text/golf\">div.container{border:1pxsolidred;}</style><scripttype=\"text/golf\">function(){$(\".container\").append(\"<h1>Hello,world!</h1>\");}</script><divclass=\"container\"></div></div>"}};jQuery.golf.res={};jQuery.golf.plugins={};jQuery.golf.scripts={};jQuery.golf.styles={};jQuery.golf.setupComponents();'
+    known_good = File.read(File.expand_path("../twitter_compiled/components.js", __FILE__))
+    assert_equal componentjs.gsub(' ','').gsub('\n','').gsub('\\',''), known_good.gsub(' ','').gsub('\n','').gsub('\\','')
+  end
+
+
+  def test_package_name_resolution
+    result = @compiler.package_name '/asd/asdasd/components/golf/twitter/Tweet/Tweet.html'
+    assert_equal 'golf.twitter.Tweet', result
 
-    assert_equal componentjs.gsub(' ','').gsub('\n',''), known_good.gsub(' ','').gsub('\n','')
-    
   end
 
+
 end

data/test/twitter_compiled/404.txt

@@ -0,0 +1 @@
+not found

data/test/twitter_compiled/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem 'rack'
+gem 'rack-contrib'
+gem 'rack-rewrite'
+gem 'golf'

data/test/twitter_compiled/components/golf/twitter/Search/Search.html

@@ -0,0 +1,29 @@
+<div>
+  <style type="text/golf">
+  </style>
+
+  <script type="text/golf">
+    function(query) {
+      var search = $.require("twitter").search;
+
+      search(query, function(i, tweet) {
+        $(".results").append(new Component.golf.twitter.Tweet(tweet));
+        $(".numresults").text(i+1);
+      });
+
+      $("form").submit(function() {
+        $.golf.location("/"+$("input[name='query']").val()+"/");
+      });
+    }
+  </script>
+
+  <div class="content">
+    <h1>Twitter Search</h1>
+    <form>
+      <input type="text" name="query"/>
+      <input type="submit"/>
+    </form>
+    <p><span class="numresults">0</span> results:</p>
+    <ul class="results"/>
+  </div>
+</div>

data/test/twitter_compiled/components/golf/twitter/Tweet/Tweet.html

@@ -0,0 +1,16 @@
+<li>
+  <style type="text/golf">
+    span.user {
+      color: green;
+    }
+  </style>
+
+  <script type="text/golf">
+    function(tweet) {
+      $(".user").text(tweet.from_user);
+      $(".text").text(tweet.text);
+    }
+  </script>
+
+  <span class="user">A user</span> says: <span class="text">Some things.</span>
+</li>

data/test/twitter_compiled/components.js

@@ -0,0 +1 @@
+jQuery.golf.components={"golf.twitter.Tweet":{"name":"golf.twitter.Tweet","html":"<li>\n  <style type=\"text/golf\">\n    span.user {\n      color: green;\n    }\n  <\/style>\n\n  <script type=\"text/golf\">\n\n    function(tweet) {\n      $(\".user\").text(tweet.from_user);\n      $(\".text\").text(tweet.text);\n    }\n  \n<\/script>\n\n  <span class=\"user\">A user<\/span> says: <span class=\"text\">Some things.<\/span>\n<\/li>\n"},"golf.twitter.Search":{"name":"golf.twitter.Search","html":"<div>\n  <style type=\"text/golf\">\n  <\/style>\n\n  <script type=\"text/golf\">\n\n    function(query) {\n      var search = $.require(\"twitter\").search;\n\n      search(query, function(i, tweet) {\n        $(\".results\").append(new Component.golf.twitter.Tweet(tweet));\n        $(\".numresults\").text(i+1);\n      });\n\n      $(\"form\").submit(function() {\n        $.golf.location(\"/\"+$(\"input[name='query']\").val()+\"/\");\n      });\n    }\n  \n<\/script>\n\n  <div class=\"content\">\n    <h1>Twitter Search<\/h1>\n    <form>\n      <input type=\"text\" name=\"query\"/>\n      <input type=\"submit\"/>\n    <\/form>\n    <p><span class=\"numresults\">0<\/span> results:<\/p>\n    <ul class=\"results\"/>\n  <\/div>\n<\/div>\n"}};jQuery.golf.res={"Gemfile":"Gemfile","plugins":{"twitter.js":"plugins/twitter.js"},"config.ru":"config.ru","404.txt":"404.txt"};jQuery.golf.plugins={"twitter":{"name":"twitter","js":"(function() {\n\n    exports.search = function(query, callback) {\n      $.getJSON(\n        \"http://search.twitter.com/search.json?q=\"+escape(query)+\"&callback=?\",\n        function(data) {\n          $.each(data.results, function(i, tweet) {\n            callback(i, tweet);\n          });\n        }\n      );\n    };\n\n})();\n"}};jQuery.golf.scripts={"00-myscript":{"name":"00-myscript","js":""}};jQuery.golf.styles={"main":{"name":"main","css":""}};jQuery.golf.setupComponents();

data/test/twitter_compiled/config.ru

@@ -0,0 +1,7 @@
+require 'bundler'
+require 'golf'
+require 'rack'
+require 'rack/contrib'
+
+use Golf::Rack
+run Rack::NotFound.new('404.txt')

data/test/twitter_compiled/controller.js

@@ -0,0 +1,9 @@
+$.golf.defaultRoute = "/golf/";
+
+$.golf.controller = [
+  { route: "/(.*)/",
+    action: function(container, params) {
+      container.append(new Component.golf.twitter.Search(unescape(params[1])));
+    }
+  }
+];

data/test/{data → twitter_compiled}/index.html

@@ -19,9 +19,6 @@
           servletUrl.substring(0, servletUrl.length - "index.html".length));
     </script>
     <script type="text/javascript" src="jquery.js"></script>
-    <script type="text/javascript">
-      jQuery.golf = {};
-    </script>
     <script type="text/javascript" src="jquery.address.js"></script>
     <script type="text/javascript" src="jquery.golf.js"></script>
     <script type="text/javascript" src="components.js"></script>

data/test/{data → twitter_compiled}/jquery.golf.js

@@ -41,7 +41,6 @@ function Component() {
 function Debug(prefix) {
   return function(text) {
     text = prefix+": "+text;
-    window.devmode = true;
     if (window.devmode && window.console && window.console.log)
       console.log(text);
     else if (window.serverside)

data/test/twitter_compiled/plugins/twitter.js

@@ -0,0 +1,14 @@
+(function() {
+
+    exports.search = function(query, callback) {
+      $.getJSON(
+        "http://search.twitter.com/search.json?q="+escape(query)+"&callback=?",
+        function(data) {
+          $.each(data.results, function(i, tweet) {
+            callback(i, tweet);
+          });
+        }
+      );
+    };
+
+})();

metadata

@@ -2,7 +2,7 @@
 name: golf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors: 
 - Micha Niskin, Alan Dipert, Julio Capote
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -07:00
+date: 2011-04-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,18 +89,25 @@ files:
 - templates/twitter/plugins/twitter.js
 - templates/twitter/scripts/00-myscript.js
 - templates/twitter/styles/main.css
-- test/data/app_error.html
-- test/data/components.js
-- test/data/components/HelloWorld/HelloWorld.html
-- test/data/controller.js
-- test/data/index.html
-- test/data/jquery.address.js
-- test/data/jquery.golf.js
-- test/data/jquery.js
-- test/data/welcome2golf.html
 - test/test_compiler.rb
 - test/test_helper.rb
 - test/test_rack.rb
+- test/twitter_compiled/404.txt
+- test/twitter_compiled/Gemfile
+- test/twitter_compiled/app_error.html
+- test/twitter_compiled/components.js
+- test/twitter_compiled/components/golf/twitter/Search/Search.html
+- test/twitter_compiled/components/golf/twitter/Tweet/Tweet.html
+- test/twitter_compiled/config.ru
+- test/twitter_compiled/controller.js
+- test/twitter_compiled/index.html
+- test/twitter_compiled/jquery.address.js
+- test/twitter_compiled/jquery.golf.js
+- test/twitter_compiled/jquery.js
+- test/twitter_compiled/plugins/twitter.js
+- test/twitter_compiled/scripts/00-myscript.js
+- test/twitter_compiled/styles/main.css
+- test/twitter_compiled/welcome2golf.html
 has_rdoc: true
 homepage: http://golf.github.com
 licenses: []

data/test/data/components/HelloWorld/HelloWorld.html

@@ -1,13 +0,0 @@
-<div>
-  <style type="text/golf">
-    div.container {
-      border: 1px solid red;
-    }
-  </style>
-  <script type="text/golf">
-    function() {
-      $(".container").append("<h1>Hello, world!</h1>");
-    }
-  </script>
-  <div class="container"></div>
-</div>

data/test/data/components.js

@@ -1 +0,0 @@
-jQuery.golf.components={"HelloWorld":{"name":"HelloWorld","html":"<div>\n  <style type=\"text/golf\">\n    div.container {\n      border: 1px solid red;\n    }\n  <\/style>\n  <script type=\"text/golf\">\n\n    function() {\n      $(\".container\").append(\"<h1>Hello, world!<\/h1>\");\n    }\n  \n<\/script>\n  <div class=\"container\"><\/div>\n<\/div>\n"}};jQuery.golf.res={};jQuery.golf.plugins={};jQuery.golf.scripts={};jQuery.golf.styles={};jQuery.golf.setupComponents();

data/test/data/controller.js

@@ -1,7 +0,0 @@
-$.golf.controller = [
-  { route: ".*",
-    action: function(container, params) {
-      container.empty().append(new Component.HelloWorld());
-    }
-  }
-];