bang-bang 0.1.6 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bang-bang (0.1.5)
+    bang-bang (0.1.6)
       activesupport (>= 2.0.0)
       honkster-addressable (>= 2.2.3)
       mustache

data/README.markdown

@@ -1,25 +1,25 @@
-# TrueWeb
+# BangBang
 
-TrueWeb is a lightweight Sinatra web VC stack. Currently, it doesn't have strong opinions, to allow flexibility to discover good idioms.
+BangBang is a lightweight Sinatra web VC stack. Currently, it doesn't have strong opinions, to allow flexibility to discover good idioms.
 
 ## Basic Layout
 
-TrueWeb has a basic app structure, similar to Rails.
+BangBang has a basic app structure, similar to Rails.
 Right now, no conventions are "forced" on you. This is done to allow experimentation and keep things lightweight.
 
 You pick the model library.
 
 Right now there are no generators.
 
-### TrueWeb::Controller
+### BangBang::Controller
 
-TrueWeb::Controller is a subclass of Sinatra::Base.
+BangBang::Controller is a subclass of Sinatra::Base.
 It's meant to provide an encapsulated unit of functionality within your app.
 How you group your actions is up to you.
 
 ### NamedRoutes
 
-TrueWeb uses the [named-routes](https://github.com/btakita/named-routes) library.
+BangBang uses the [named-routes](https://github.com/btakita/named-routes) library.
 
 Here is a good pattern to follow:
 

data/lib/bang-bang/controller.rb

@@ -5,21 +5,8 @@ module BangBang
 
     class_inheritable_accessor :config
     extend(Module.new do
-      def uris
-        config.uris
-      end
-
-      def views_class
-        config.views_class
-      end
-
-      def path(*args, &block)
-        uris.path(*args, &block)
-      end
-
-      def services
-        config.services
-      end
+      delegate :uris, :views_class, :services, :to => :config
+      delegate :path, :to => :uris
     end)
 
     TEMPLATE_TYPE_NAME = "Template"

data/lib/bang-bang/version.rb

@@ -1,3 +1,3 @@
 module BangBang
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/bang-bang.rb

@@ -18,27 +18,22 @@ module BangBang
   end
 
   module ClassMethods
-    attr_accessor :controller, :application_name, :named_routes, :stderr_dir, :stdout_dir, :root_dir, :views_class
+    attr_accessor :application_name, :named_routes, :stderr_dir, :stdout_dir, :root_dir, :views_class
     alias_method :uris, :named_routes
-    delegate :define_routes, :to => :controller
 
     include ::BangBang::EnvMethods
 
     def init(params={})
-      self.controller        = params[:controller] || raise(ArgumentError, "You must provide an :controller param")
       self.application_name   = params[:application_name] || raise(ArgumentError, "You must provide an :application_name param")
       self.root_dir          = params[:root_dir] || raise(ArgumentError, "You must provide a :root_dir param")
       self.named_routes       = params[:named_routes] || raise(ArgumentError, "You must provide a :named_routes param")
       self.views_class        = params[:views_class] || raise(ArgumentError, "You must provide a :views_class param")
-      self.controller.config = self
 
       plugins.init
     end
 
-    def app
-      @app ||= Rack::Builder.new do
-        run controller
-      end.to_app
+    def register_controller(controller)
+      controller.config = self
     end
 
     def register_service(path, &block)

data/spec/fixture-app/app.rb

@@ -11,6 +11,7 @@ module FixtureApp
   class Controller < ::BangBang::Controller
     set :dump_errors, false
   end
+  register_controller Controller
 
   class Views < ::BangBang::Views
   end
@@ -20,7 +21,6 @@ module FixtureApp
 end
 
 FixtureApp.init(
-  :controller => FixtureApp::Controller,
   :application_name => "fixture-app",
   :root_dir => File.dirname(__FILE__),
   :named_routes => FixtureApp::Routes,

metadata

@@ -2,7 +2,7 @@
 name: bang-bang
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brian Takita