socks 0.0.7.beta → 0.0.8.beta

data/CHANGELOG

@@ -1,3 +1,7 @@
+- 0.0.8.beta
+	* Bug fixes
+	* Cleanup
+
 - 0.0.7.beta
 	* Got server running
 	* Cleaned up app structure

data/README.md

@@ -3,32 +3,52 @@
 
 [![Dependency Status](https://gemnasium.com/Beakr/socks.png)](https://gemnasium.com/Beakr/socks)
 
-Socks -- an experiment in Ruby programming by building a small Ruby microframework for the web.
+Socks is a web framework and Ruby library supported by Rack for making complex or very simple webapps fast.
 
-## Using Socks for your app
+## Why Socks?
 
-First, install the gem:
+Socks is as simple as [Sinatra](), yet as complex/powerful as [Rails](). The goal is to be able to write a simple app quickly, and still retain enough power to keep complex/powerful apps going.
+
+## Installation
+
+Choose the one that fits your need:
 
 ```sh
-$ gem install socks
+$ gem install socks --pre # General, global install + command-line app
+```
+
+```ruby
+gem 'socks' # For Gemfiles
+
+gem.add_dependency "socks" # For your Gemspec
 ```
+## Quick Start
 
-And run:
+First, create a new Socks app using:
 
 ```sh
-$ socks new my_app
+$ socks new myapp
+$ cd myapp
 ```
 
-You will recieve the latest directory skeleton and Socks tools to make your app.
+Next, go to `config/router.rb` and paste in the following between the `Router = HttpROuter.new do ... end` statement:
 
-## Running the server
+```ruby
+get('/') { |env| [200, {'Content-type' => 'text/plain'}, ['This is my first Socks app!']] }
+```
 
-Start up a simple Rack Server on `localhost:4000` using:
+Afterward, use:
 
 ```sh
 $ socks start
 ```
 
+To spin up a web server on `localhost:4000`.
+
+Take a look, you should see the following text appear in your web browser:
+
+    This is my first Socks app!
+
 ## Contributing
 
 1. Fork it

data/TODO.md

@@ -1,7 +1,6 @@
 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

@@ -7,6 +7,8 @@ require 'fileutils'
 
 program :version, Socks::VERSION
 program :description, 'A Ruby-Rack-based microframework'
+
+default_command :about
  
 command :new do |c|
   c.syntax = 'socks new [options]'
@@ -33,7 +35,7 @@ Bundler.setup
 require File.expand_path(\"../config/router.rb\", __FILE__)
 
 # Controllers
-Dir[\"#{app}/app/controllers\" + \"*.rb\"].each do |file|
+Dir[\"../app/controllers\" + \"*.rb\"].each do |file|
   require file
 end
 
@@ -70,6 +72,10 @@ gem \"http_router\"
 # Use RSpec for tests
 gem \"rspec\""
 
+    rakefile = "# Socks generates many helpful Rake tasks for you!
+require \"socks\"
+Socks::Tasks.install"
+
     gitignore = ".DS_Store"
 
     procfile = "web: bundle exec rackup config.ru -p 4000"
@@ -93,7 +99,7 @@ end
     FileUtils.cd app
     FileUtils.mkdir %w( app config )
     FileUtils.mkdir %w( app/controllers app/views ) # Sub-dirs
-    FileUtils.touch %w( config.ru Gemfile .gitignore Procfile )
+    FileUtils.touch %w( config.ru Gemfile Rakefile .gitignore Procfile )
 
     # -------------------------------------------------------------------------
     #                           File Initialization                           |
@@ -102,6 +108,8 @@ end
 
     system("echo '#{config_ru}' >> config.ru")
     system("echo '#{gemfile}' >> Gemfile")
+    system("echo '#{rakefile}' >> Rakefile")
+
     system("echo '#{gitignore}' >> .gitignore")
     system("echo '#{procfile}' >> Procfile")
     
@@ -109,6 +117,8 @@ end
 
     system("echo '#{router_template}' >> config/router.rb")
 
+    system("bundle")
+
   end
 end
 
@@ -143,6 +153,7 @@ command :start do |c|
   c.description = 'Startup a Rack server'
   c.action do |args, options| 
     system('foreman start') # Startup server including code in lib/ that runs on port 4000
+    notify "Socks server is up"
   end
 end
 
@@ -154,6 +165,13 @@ command :version do |c|
   end
 end
 
+command :about do |c|
+  c.syntax = 'socks about [options]'
+  c.action do |args, options|
+    system("echo \"\e[32m Usage: socks new APP_NAME\"")
+  end
+end
+
 # -------------------------------------------------------------------------
 #                                Helpers                                  |
 # -------------------------------------------------------------------------

data/lib/socks/content_helpers.rb

@@ -0,0 +1,16 @@
+# Content helpers are used for small responses with Rack (usually in router.rb) for rendering pure text, or HTML.
+
+module Socks
+  class ContentHelpers
+
+    # A pure text formatting
+    def txt(str)
+      [200, {'Content-type' => 'text/plain'}, ["#{str}"]]
+    end
+
+    def html(str)
+      [200, {'Content-type' => 'text/html'}, ["#{str}"]]
+    end
+
+  end
+end

data/lib/socks/version.rb

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

data/lib/socks.rb

@@ -1,6 +1,12 @@
+#Dir.glob(File.dirname(__FILE__) + '/socks/*.rb', &method(:require))
 require "socks/version"
 require "socks/base_controller"
 require "socks/templates"
+require "socks/content_helpers"
+
+## Tasks
+#require File.expand_path("../socks/tasks.rb", __FILE__)
+#require File.expand_path("../socks/rake_tasks.rb", __FILE__)
 
 module Socks
 end

data/socks.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |gem|
   # Rack HTTP
   gem.add_dependency "rack"
   gem.add_dependency "http_router"
+  gem.add_dependency "commander" # For command-line app
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "guard"
   gem.add_development_dependency "bundler"
+  gem.add_development_dependency "debugger"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socks
 version: !ruby/object:Gem::Version
-  version: 0.0.7.beta
+  version: 0.0.8.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An in-development web framework using Rack.
 email:
 - beakr@ninjanizr.com
@@ -127,6 +159,7 @@ files:
 - bin/socks
 - lib/socks.rb
 - lib/socks/base_controller.rb
+- lib/socks/content_helpers.rb
 - lib/socks/templates.rb
 - lib/socks/version.rb
 - skel/config_ru