socks 0.1.8.beta → 0.1.9.beta

data/lib/socks.rb

@@ -1,12 +1,15 @@
-#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__)
+require "socks/config"
+require "socks/router"
 
 module Socks
+
+  def self.config
+    @config ||= Configuration.new
+  end
+
+  def self.configure(attr = {}, &block)
+    config.configure attr, &block
+  end
+
 end

data/lib/socks/config.rb

@@ -0,0 +1,32 @@
+# Allows configuration of your main app using
+# Socks.configure do |config|
+#   ...
+# end
+#
+
+module Socks
+  class Config
+
+    DEFAULT_CONFIG = {
+      option1: 'foo',
+      option2: 'bar'
+    }
+
+    attr_accessor :option1, :option2
+
+    def initialize(attr = {}, &block)
+      configure(DEFAULT_CONFIG.merge(attr), &block)
+    end
+
+    def configure(attr = {})
+      attr.each_pair do |attr, value|
+        self.send("#{attr}=", value)
+      end
+
+      yield self if block_given?
+
+      self
+    end
+
+  end
+end

data/lib/socks/router.rb

@@ -0,0 +1,7 @@
+require 'socks/router_helpers'
+
+module Socks
+    class Router
+      include Socks::RouterHelpers
+    end
+end

data/lib/socks/router_helpers.rb

@@ -0,0 +1,9 @@
+# General helpers for the Socks router
+
+module Socks
+  module RouterHelpers
+    def txt(str)
+      return [200, {'Content-type' => 'text/plain'}, ["#{str}"]]
+    end
+  end
+end

data/lib/socks/version.rb

@@ -1,3 +1,3 @@
 module Socks
-  VERSION = "0.1.8.beta"
+  VERSION = "0.1.9.beta"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socks
 version: !ruby/object:Gem::Version
-  version: 0.1.8.beta
+  version: 0.1.9.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -142,28 +142,15 @@ dependencies:
 description: An in-development web framework using Rack.
 email:
 - beakr@ninjanizr.com
-executables:
-- socks
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- CHANGELOG
-- Gemfile
-- Guardfile
-- LICENSE
-- README.md
-- Rakefile
-- TODO.md
-- 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
-- socks.gemspec
+- lib/socks/config.rb
+- lib/socks/router.rb
+- lib/socks/router_helpers.rb
 homepage: ''
 licenses: []
 post_install_message: 

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.2
-  - 1.9.3
-notifications:
-  recipients:
-    - main@seven7.flowdock.com
-    - beakr@ninjanizr.com
-  on_success: always
-  on_failure: always

data/CHANGELOG

@@ -1,19 +0,0 @@
-- 0.1.8.beta
-	* Setup RSpec as default test framework
-	* Get simple RSpec tests using Rack operating
-
-- 0.0.8.beta
-	* Bug fixes
-	* Cleanup
-
-- 0.0.7.beta
-	* Got server running
-	* Cleaned up app structure
-
-- 0.0.5.alpha
-	* Executable created
-	* README creation and testing
-	* Bundler setup for dependency management
-
-- 0.0.1.alpha
-	* Initial Creation

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Guardfile

@@ -1,19 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 2, :cli => "--color --format documentation" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-end
-

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Chris Clarke
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,95 +0,0 @@
-# Socks
-[![Build Status](https://secure.travis-ci.org/Beakr/socks.png)](http://travis-ci.org/Beakr/socks)
-
-[![Dependency Status](https://gemnasium.com/Beakr/socks.png)](https://gemnasium.com/Beakr/socks)
-
-Socks is a web framework and Ruby library supported by Rack for making complex or very simple webapps fast.
-
-## Why Socks?
-
-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 --pre # General, global install + command-line app
-```
-
-```ruby
-gem 'socks' # For Gemfiles
-
-gem.add_dependency "socks" # For your Gemspec
-```
-## Quick Start
-
-First, create a new Socks app using:
-
-```sh
-$ socks new myapp
-$ cd myapp
-```
-
-Next, go to `config/router.rb` and paste in the following between the `Router = HttpROuter.new do ... end` statement:
-
-```ruby
-get('/') { |env| [200, {'Content-type' => 'text/plain'}, ['This is my first Socks app!']] }
-```
-
-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!
-
-## Adding tests for Socks apps
-
-Socks comes with built-in support for RSpec matchers and DSL. It also comes with a built-in `spec_helper.rb` in the `spec/`directory.
-
-Paste in the following to test the simple Socks app in the quickstart:
-
-```ruby
-require 'spec_helper'
-require File.expand_path("../../config/router.rb", __FILE__)
-
-describe Myapp::Router do
-  let(:request) { Rack::MockRequest.new(Myapp::Router) }
-
-  it 'returns something at /' do
-    request.get('/').should == "This is my first Socks app!"
-  end
-  
-  end
-end
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch `(git checkout -b my-new-feature)`
-3. Commit your changes `(git commit -am 'Added some feature')`
-4. Push to the branch `(git push origin my-new-feature)`
-5. Create new Pull Request
-
-## License
-
-See LICENSE (MIT).
-
-[More on MIT »](http://www.opensource.org/licenses/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!
-
-### *Thanks for using Socks!*

data/Rakefile

@@ -1,9 +0,0 @@
-#!/usr/bin/env rake
-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

@@ -1,6 +0,0 @@
-TODO
-====
-
-* Add templates for erb, markdown, possibly HAML, etc.
-* Add assets with CSS or SASS support and Javascript and possibly Coffeescript
-  support

data/bin/socks

@@ -1,203 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'commander/import'
-require 'socks'
-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]'
-  c.summary = 'Create a new Socks app'
-  c.description = 'Use Rack and other utilities to make a new Socks app from scratch'
-  c.action do |args, opt|
-
-    # Pull out the first arg in args[]
-    app = args[0]
-
-    # -------------------------------------------------------------------------
-    #                              File Contents                              |
-    # -------------------------------------------------------------------------
-    
-    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.
-
-
-# Bundler setup
-require \"bundler/setup\"
-Bundler.setup
-
-# http_router
-require File.expand_path(\"../config/router.rb\", __FILE__)
-
-# Controllers
-Dir[\"../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 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
-
-source \"http://rubygems.org\"
-
-# Socks itself!
-gem \"socks\", \"~> #{Socks::VERSION}\"
-
-# Rack HTTP
-gem \"rack\"
-
-# Startup your server with thin
-gem \"thin\"
-
-# Or use Foreman
-gem \"foreman\"
-
-# Use HttpRouter for routes (required)
-gem \"http_router\"
-
-# Use Warden for authentication
-# gem \"warden\"
-
-group :development, :test do
-  # Use RSpec for tests
-  gem \"rspec\"
-end"
-
-    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"
-
-    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
-    "
-
-    ########################
-    # Spec-helper template #
-    ########################
-    
-    spec_helper = "# Default helpers for your specs are added here
-require \"rspec\"
-require \"rack\"
-"
-
-  dotrspec = "--color
-  --format documentation"
-    
-
-    # -------------------------------------------------------------------------
-    #                                Creation                                 |
-    # ------------------------------------------------------------------------- 
-
-    FileUtils.mkdir app
-    FileUtils.cd app
-    FileUtils.mkdir %w( app config spec )
-    FileUtils.mkdir %w( app/controllers app/views ) # Sub-dirs
-    FileUtils.touch %w( spec/spec_helper.rb .rspec ) # Spec file(s)
-
-    # -------------------------------------------------------------------------
-    #                           File Initialization                           |
-    # -------------------------------------------------------------------------
-    
-
-    system("echo '#{config_ru}' >> config.ru")
-    system("echo '#{gemfile}' >> Gemfile")
-    system("echo '#{rakefile}' >> Rakefile")
-
-    system("echo '#{gitignore}' >> .gitignore")
-    system("echo '#{procfile}' >> Procfile")
-    
-    system("echo '#{app_template}' >> #{app}.rb")
-
-    system("echo '#{router_template}' >> config/router.rb")
-
-    system("echo '#{spec_helper}' >> spec/spec_helper.rb")
-    system("echo '#{dotrspec}' >> .rspec")
-
-    system("bundle")
-
-  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
-
-command :start do |c|
-  c.syntax = 'socks start [options]'
-  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
-
-command :test do |c|
-  c.syntax = 'socks test [options]'
-  c.description = 'Run tests with RSpec'
-  c.action do |args, options|
-    system('rspec .')
-  end
-end
-
-command :version do |c|
-  c.syntax = 'socks version [options]'
-  c.description = 'Display the current version (altertative to --version)'
-  c.action do |args, options|
-    Socks::VERSION
-  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/base_controller.rb

@@ -1,20 +0,0 @@
-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/content_helpers.rb

@@ -1,16 +0,0 @@
-# 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/templates.rb

@@ -1,10 +0,0 @@
-require 'erb'
-
-module Socks
-  class Templates
-    def erb(temp)
-      path = File.expand_path("../../views/#{temp}.erb", __FILE__)
-      ERB.new(temp).result(binding)
-    end
-  end
-end

data/skel/config_ru

@@ -1,17 +0,0 @@
-# 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

@@ -1,27 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/socks/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Chris Clarke"]
-  gem.email         = ["beakr@ninjanizr.com"]
-  gem.description   = %q{An in-development web framework using Rack.}
-  gem.summary       = %q{A WIP web microframework for Ruby using Rack.}
-  gem.homepage      = ""
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "socks"
-  gem.require_paths = ["lib"]
-  gem.version       = Socks::VERSION
- 
-  gem.add_dependency "rack" # Rack HTTP
-  gem.add_dependency "http_router"
-  gem.add_dependency "commander" # For command-line app
-    gem.add_dependency "rspec" # Default testing framework
-
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "guard"
-  gem.add_development_dependency "bundler"
-  gem.add_development_dependency "debugger"
-end