socks 0.0.5.alpha → 0.0.7.beta

data/CHANGELOG

@@ -1,3 +1,7 @@
+- 0.0.7.beta
+	* Got server running
+	* Cleaned up app structure
+
 - 0.0.5.alpha
 	* Executable created
 	* README creation and testing

data/README.md

@@ -41,6 +41,10 @@ $ socks start
 
 See LICENSE (MIT).
 
+## TODO
+
+See TODO.md
+
 ## Thanks
 
 I'd like to thank [Sickill](https://github.com/sickill) for his amazing Rack web framework tutorial. Without it, it would be a much harder time getting Socks to work!

data/Rakefile

@@ -3,6 +3,7 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 task :default => [ :spec ]
+task :test    => [ :spec ]
 
 desc 'Run RSpec tests'
 RSpec::Core::RakeTask.new

data/TODO.md

@@ -0,0 +1,7 @@
+TODO
+====
+
+* Make Rack actually render route contents
+* Add templates for erb, markdown, possibly HAML, etc.
+* Add assets with CSS or SASS support and Javascript and possibly Coffeescript
+  support

data/bin/socks

@@ -24,20 +24,26 @@ command :new do |c|
     config_ru = "# config.ru is used for running rack-based applications. Please do not edit this file without proper understanding of Rack
 # or some bad things may happen.
 
-require \"#{app}\"
 
 # Bundler setup
-require 'bundler'
+require \"bundler/setup\"
 Bundler.setup
-Bundler.require
+
+# http_router
+require File.expand_path(\"../config/router.rb\", __FILE__)
+
+# Controllers
+Dir[\"#{app}/app/controllers\" + \"*.rb\"].each do |file|
+  require file
+end
 
 # Used so Rack can automatically get updated to file contents without
 # a ten second cooldown
 use Rack::Reloader, 0
 
-# Used for automatically getting stylesheet and javascript data into
-# your markup templates, as well as running the app.
-run Rack::Cascade.new([Rack::File.new('assets'), #{app.capitalize}])"
+# Used to run your router (app!)
+# Go to config/router.rb to declare routes
+run #{app.capitalize}::Router"
 
     gemfile = "# List dependencies for your app in your Gemfile, then run the `bundle` command
 
@@ -53,10 +59,10 @@ gem \"rack\"
 gem \"thin\"
 
 # Or use Foreman
-# gem \"foreman\"
+gem \"foreman\"
 
-# Use Usher for routes (required)
-gem 'usher'
+# Use HttpRouter for routes (required)
+gem \"http_router\"
 
 # Use Warden for authentication
 # gem \"warden\"
@@ -66,17 +72,28 @@ gem \"rspec\""
 
     gitignore = ".DS_Store"
 
+    procfile = "web: bundle exec rackup config.ru -p 4000"
+
     app_template = "require \"socks\""
 
+    router_template = "# Declare the paths to your routes here.
+require \"http_router\"
+module #{app.capitalize}
+  Router = HttpRouter.new do
+    # See what you can do at https://github.com/joshbuddy/http_router 
+  end
+end
+    "
+
     # -------------------------------------------------------------------------
     #                                Creation                                 |
     # ------------------------------------------------------------------------- 
 
     FileUtils.mkdir app
     FileUtils.cd app
-    FileUtils.mkdir %w( views assets app )
-    FileUtils.touch "#{app}.rb"
-    FileUtils.touch %w( config.ru Gemfile .gitignore )
+    FileUtils.mkdir %w( app config )
+    FileUtils.mkdir %w( app/controllers app/views ) # Sub-dirs
+    FileUtils.touch %w( config.ru Gemfile .gitignore Procfile )
 
     # -------------------------------------------------------------------------
     #                           File Initialization                           |
@@ -86,9 +103,38 @@ gem \"rspec\""
     system("echo '#{config_ru}' >> config.ru")
     system("echo '#{gemfile}' >> Gemfile")
     system("echo '#{gitignore}' >> .gitignore")
+    system("echo '#{procfile}' >> Procfile")
     
     system("echo '#{app_template}' >> #{app}.rb")
 
+    system("echo '#{router_template}' >> config/router.rb")
+
+  end
+end
+
+command :controller do |c|
+  c.syntax = 'socks controller [options]'
+  c.description = 'Create a template for something'
+  c.action do |args, options|
+    cont = args[0]
+
+    cont_template = "# Specify pages in the controller
+    
+# e.g.
+#
+# def index
+#   \"This is a socks app!\"
+# end
+#
+    
+class #{cont.capitalize}Controller < Socks::BaseController
+  # ...
+end
+    "
+
+    FileUtils.touch "app/controllers/#{cont}_controller.rb"
+    system("echo '#{cont_template}' >> app/controllers/#{cont}_controller.rb")
+
   end
 end
 
@@ -96,7 +142,7 @@ command :start do |c|
   c.syntax = 'socks start [options]'
   c.description = 'Startup a Rack server'
   c.action do |args, options| 
-    system('rackup -Ilib -p 4000') # Startup server including code in lib/ that runs on port 4000
+    system('foreman start') # Startup server including code in lib/ that runs on port 4000
   end
 end
 
@@ -108,3 +154,6 @@ command :version do |c|
   end
 end
 
+# -------------------------------------------------------------------------
+#                                Helpers                                  |
+# -------------------------------------------------------------------------

data/lib/socks/base_controller.rb

@@ -0,0 +1,20 @@
+require 'rack'
+
+module Socks
+  class BaseController
+    def call(env)
+      @request = Rack::Request.new(env)
+      @response = Rack::Response.new
+      resp_text = self.send(env['x-rack.action-name'])
+      @response.write(resp_text)
+      @respone.finish
+    end
+
+    def self.action(name)
+      lambda do |env|
+        env['x-rack.action-name'] = name
+        self.new.call(env)
+      end
+    end
+  end
+end

data/lib/socks/version.rb

@@ -1,3 +1,3 @@
 module Socks
-  VERSION = "0.0.5.alpha"
+  VERSION = "0.0.7.beta"
 end

data/lib/socks.rb

@@ -1,4 +1,5 @@
 require "socks/version"
+require "socks/base_controller"
 require "socks/templates"
 
 module Socks

data/skel/config_ru

@@ -0,0 +1,17 @@
+# config.ru is used for running rack-based applications. Please do not edit this file without proper understanding of Rack
+# or some bad things may happen.
+
+require \"#{app}\"
+
+# Bundler setup
+require 'bundler'
+Bundler.setup
+Bundler.require
+
+# Used so Rack can automatically get updated to file contents without
+# a ten second cooldown
+use Rack::Reloader, 0
+
+# Used for automatically getting stylesheet and javascript data into
+# your markup templates, as well as running the app.
+run Rack::Cascade.new([Rack::File.new('assets'), #{app.capitalize}])

data/socks.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   # Rack HTTP
   gem.add_dependency "rack"
-  gem.add_dependency "usher"
+  gem.add_dependency "http_router"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socks
 version: !ruby/object:Gem::Version
-  version: 0.0.5.alpha
+  version: 0.0.7.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: usher
+  name: http_router
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,10 +123,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/socks
 - lib/socks.rb
+- lib/socks/base_controller.rb
 - lib/socks/templates.rb
 - lib/socks/version.rb
+- skel/config_ru
 - socks.gemspec
 homepage: ''
 licenses: []