golf 0.2.1 → 0.2.3

data/lib/golf/compiler.rb

@@ -3,7 +3,7 @@ module Golf
 
     def initialize(golfpath = ".")
       puts "starting up in #{golfpath}"
-      @golfpath = golfpath
+      @golfpath = "#{golfpath}/golfapp"
     end
 
     def generate_componentsjs
@@ -51,12 +51,12 @@ module Golf
     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('.')
+      if path.include?('golfapp/components')
+        path.match(/golfapp\/components\/(.*)/)
+        component_path = $1
+        component_path.split('/')[0...-1].join('.')
+      end
     end
 
-
   end
 end

data/lib/golf/rack.rb

@@ -16,17 +16,17 @@ module Golf
         return [404, { 'Content-Type' => 'text/plain', 'Content-Length' => '9'}, ['not found']]
       end
 
-      if File.exists?(env["PATH_INFO"].sub('/','')) and env["PATH_INFO"] != "/"
+      if File.exists?("golfapp/#{env["PATH_INFO"].sub('/','')}") and env["PATH_INFO"] != "/"
         mime = MIME_TYPES[".#{env["PATH_INFO"].split('.').last}"]
-        result = File.read(env["PATH_INFO"].sub('/',''))
+        result = File.read("golfapp/#{env["PATH_INFO"].sub('/','')}")
         return [code, { 'Content-Type' => mime, 'Content-Length' => result.length.to_s}, [result]]
       end
 
       case env["PATH_INFO"]
       when "/"
         mime = MIME_TYPES[".html"]
-        if File.exists?('index.html')
-          result = File.read('index.html')
+        if File.exists?('golfapp/index.html')
+          result = File.read('golfapp/index.html')
         else
           result = @resources["/index.html"]
         end

data/lib/golf/version.rb

@@ -1,3 +1,3 @@
 module Golf
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/test/test_compiler.rb

@@ -9,13 +9,13 @@ class CompilerTest < Test::Unit::TestCase
 
   def test_componentsjs_generation
     componentjs = @compiler.generate_componentsjs
-    known_good = File.read(File.expand_path("../twitter_compiled/components.js", __FILE__))
+    known_good = File.read(File.expand_path("../twitter_compiled/golfapp/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'
+    result = @compiler.package_name '/asd/asdasd/golfapp/components/golf/twitter/Tweet/Tweet.html'
     assert_equal 'golf.twitter.Tweet', result
 
   end

metadata

@@ -2,7 +2,7 @@
 name: golf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Micha Niskin, Alan Dipert, Julio Capote
@@ -74,48 +74,46 @@ files:
 - resources/jquery.js
 - resources/welcome2golf.html
 - templates/new/Gemfile
-- templates/new/components/HelloWorld/HelloWorld.html
 - templates/new/config.ru
-- templates/new/controller.js
-- templates/new/plugins/mylib.js
-- templates/new/scripts/00-myscript.js
-- templates/new/styles/main.css
+- templates/new/golfapp/components/HelloWorld/HelloWorld.html
+- templates/new/golfapp/controller.js
+- templates/new/golfapp/plugins/mylib.js
+- templates/new/golfapp/scripts/00-myscript.js
+- templates/new/golfapp/styles/main.css
 - templates/sinatra/Gemfile
-- templates/sinatra/components/RandomNumber/RandomNumber.html
 - templates/sinatra/config.ru
-- templates/sinatra/controller.js
 - templates/sinatra/demo.rb
-- templates/sinatra/plugins/mylib.js
-- templates/sinatra/scripts/00-myscript.js
-- templates/sinatra/styles/main.css
-- templates/twitter/404.txt
+- templates/sinatra/golfapp/components/RandomNumber/RandomNumber.html
+- templates/sinatra/golfapp/controller.js
+- templates/sinatra/golfapp/plugins/mylib.js
+- templates/sinatra/golfapp/scripts/00-myscript.js
+- templates/sinatra/golfapp/styles/main.css
 - templates/twitter/Gemfile
-- templates/twitter/components/golf/twitter/Search/Search.html
-- templates/twitter/components/golf/twitter/Tweet/Tweet.html
 - templates/twitter/config.ru
-- templates/twitter/controller.js
-- templates/twitter/plugins/twitter.js
-- templates/twitter/scripts/00-myscript.js
-- templates/twitter/styles/main.css
+- templates/twitter/golfapp/components/golf/twitter/Search/Search.html
+- templates/twitter/golfapp/components/golf/twitter/Tweet/Tweet.html
+- templates/twitter/golfapp/controller.js
+- templates/twitter/golfapp/plugins/twitter.js
+- templates/twitter/golfapp/scripts/00-myscript.js
+- templates/twitter/golfapp/styles/main.css
 - 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
+- test/twitter_compiled/golfapp/app_error.html
+- test/twitter_compiled/golfapp/components.js
+- test/twitter_compiled/golfapp/components/golf/twitter/Search/Search.html
+- test/twitter_compiled/golfapp/components/golf/twitter/Tweet/Tweet.html
+- test/twitter_compiled/golfapp/controller.js
+- test/twitter_compiled/golfapp/index.html
+- test/twitter_compiled/golfapp/jquery.address.js
+- test/twitter_compiled/golfapp/jquery.golf.js
+- test/twitter_compiled/golfapp/jquery.js
+- test/twitter_compiled/golfapp/plugins/twitter.js
+- test/twitter_compiled/golfapp/scripts/00-myscript.js
+- test/twitter_compiled/golfapp/styles/main.css
+- test/twitter_compiled/golfapp/welcome2golf.html
 has_rdoc: true
 homepage: http://golf.github.com
 licenses: []

data/templates/twitter/404.txt

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

data/test/twitter_compiled/404.txt

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