golf 0.2.4 → 0.2.5

data/lib/golf/cli.rb

@@ -11,7 +11,7 @@ module Golf
       File.expand_path("../../../", __FILE__)
     end
 
-    desc "new [NAME] (optional)[TEMPLATE]", "Creates new golf app, takes NAME and optionally TEMPLATE"
+    desc "new [NAME] (optional)[TEMPLATE]", "Creates new, rack-based golf app, takes NAME and optionally TEMPLATE [twitter, sinatra]"
     def new(name, template = false)
       unless template
         directory("templates/new", name)
@@ -20,6 +20,12 @@ module Golf
       end
     end
 
+    desc "raw", "Dumps a raw hello world golfapp into current dir"
+    def raw
+      directory("templates/raw", "golfapp")
+    end
+
+
     desc "server", "Run the golf app"
     def server
       `rackup`

data/lib/golf/rack.rb

@@ -12,16 +12,14 @@ module Golf
     def call(env)
       code = "200"
       
-      if ['Gemfile','config.ru', 'Gemfile.lock'].include?(env["PATH_INFO"])
-        return [404, { 'Content-Type' => 'text/plain', 'Content-Length' => '9'}, ['not found']]
-      end
-
+      #pass through for overrides
       if File.exists?("golfapp/#{env["PATH_INFO"].sub('/','')}") and env["PATH_INFO"] != "/"
         mime = MIME_TYPES[".#{env["PATH_INFO"].split('.').last}"]
         result = File.read("golfapp/#{env["PATH_INFO"].sub('/','')}")
         return [code, { 'Content-Type' => mime, 'Content-Length' => result.length.to_s}, [result]]
       end
 
+      #regular handling from gem resources/dynamic compilation
       case env["PATH_INFO"]
       when "/"
         mime = MIME_TYPES[".html"]

data/lib/golf/version.rb

@@ -1,3 +1,3 @@
 module Golf
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/templates/raw/golfapp/components/HelloWorld/HelloWorld.html

@@ -0,0 +1,13 @@
+<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/templates/raw/golfapp/controller.js

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

data/templates/twitter/golfapp/components/golf/twitter/Tweet/Tweet.html

@@ -7,8 +7,8 @@
 
   <script type="text/golf">
     function(tweet) {
-      $(".user").text(tweet.from_user);
-      $(".text").text(tweet.text);
+      $(".user").html("<span>"+tweet.from_user+"</span>");
+      $(".text").html("<span>"+tweet.text+"</span>");
     }
   </script>
 

data/templates/twitter/golfapp/controller.js

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

metadata

@@ -2,7 +2,7 @@
 name: golf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Micha Niskin, Alan Dipert, Julio Capote
@@ -80,6 +80,11 @@ files:
 - templates/new/golfapp/plugins/mylib.js
 - templates/new/golfapp/scripts/00-myscript.js
 - templates/new/golfapp/styles/main.css
+- templates/raw/golfapp/components/HelloWorld/HelloWorld.html
+- templates/raw/golfapp/controller.js
+- templates/raw/golfapp/plugins/mylib.js
+- templates/raw/golfapp/scripts/00-myscript.js
+- templates/raw/golfapp/styles/main.css
 - templates/sinatra/Gemfile
 - templates/sinatra/config.ru
 - templates/sinatra/demo.rb