bang-bang 0.2.0 → 0.2.1

data/Gemfile.lock

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

data/lib/bang-bang.rb

@@ -13,112 +13,11 @@ require "#{dir}/bang-bang/version"
 require "#{dir}/bang-bang/env_methods"
 
 module BangBang
-  def self.included(mod)
-    mod.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    attr_accessor :application_name, :named_routes, :stderr_dir, :stdout_dir, :root_dir, :views_class
-    alias_method :uris, :named_routes
-
-    include ::BangBang::EnvMethods
-
-    def init(params={})
-      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")
-
-      plugins.init
-    end
-
-    def register_controller(controller)
-      controller.config = self
-    end
-
-    def register_service(path, &block)
-      unless service_dirs.include?(path)
-        service = Service.new(path)
-        services << service
-        service.init(&block)
-      end
-    end
-
-    def service_dirs
-      services.map do |service|
-        service.root_dir
-      end
-    end
-
-    def services
-      @services ||= []
-    end
-
-    def services_by_url_prefix
-      services.group_by do |service|
-        service.url_prefix
-      end
-    end
-
-    def services_by_root_dir
-      services.inject({}) do |memo, service|
-        memo[service.root_dir] = service
-        memo
-      end
-    end
-
-    def stderr_logger
-      @stderr_logger ||= Logger.new(stderr_dir)
-    end
-
-    def stdout_logger
-      @stdout_logger ||= Logger.new(stdout_dir)
-    end
-
-    def plugins
-      @plugins ||= ::BangBang::Plugins::Set.new(self)
-    end
-
-    def lib_dir
-      File.join(root_dir, "lib")
-    end
-
-    def stylesheets_dirs
-      service_subdirectory_dirs "app/stylesheets"
-    end
-
-    def vendor_dir
-      File.join(root_dir, "vendor")
-    end
-
-    def services_dir
-      File.join(root_dir, "services")
-    end
-
-    def service_subdirectory_dirs(relative_directory)
-      service_dirs.flatten.map do |service_path|
-        full_path = File.join(service_path, relative_directory)
-        full_path if File.directory?(full_path)
-      end.compact
-    end
-
-    def stderr_dir
-      "#{root_dir}/log/#{application_name}.#{rack_env}.stderr.log"
-    end
-
-    def stdout_dir
-      "#{root_dir}/log/#{application_name}.#{rack_env}.stdout.log"
-    end
-
-    def remove_generated_files
-      Dir["#{root_dir}/**/public/**/*.generated"].each do |generated_path|
-        FileUtils.rm_f(File.join(File.dirname(generated_path), File.basename(generated_path, ".generated")))
-        FileUtils.rm_f(generated_path)
-      end
-    end
-  end
 end
 
+require "#{dir}/bang-bang/concern"
+require "#{dir}/bang-bang/service_config"
+require "#{dir}/bang-bang/app_config"
 require "#{dir}/bang-bang/controller"
 require "#{dir}/bang-bang/service"
 require "#{dir}/bang-bang/views"

data/lib/bang-bang/app_config.rb

@@ -0,0 +1,36 @@
+module BangBang
+  module AppConfig
+    extend BangBang::Concern
+
+    include ServiceConfig
+
+    module ClassMethods
+      attr_accessor :application_name, :stderr_dir, :stdout_dir
+
+      def init(params={})
+        params[:root_dir] || raise(ArgumentError, "You must provide a :root_dir param")
+        params[:named_routes] || raise(ArgumentError, "You must provide a :named_routes param")
+        params[:views_class] || raise(ArgumentError, "You must provide a :views_class param")
+        self.application_name = params[:application_name] || raise(ArgumentError, "You must provide an :application_name param")
+        params[:app_config] = self
+        super
+      end
+
+      def stderr_logger
+        @stderr_logger ||= Logger.new(stderr_dir)
+      end
+
+      def stdout_logger
+        @stdout_logger ||= Logger.new(stdout_dir)
+      end
+
+      def stderr_dir
+        "#{root_dir}/log/#{application_name}.#{rack_env}.stderr.log"
+      end
+
+      def stdout_dir
+        "#{root_dir}/log/#{application_name}.#{rack_env}.stdout.log"
+      end
+    end
+  end
+end

data/lib/bang-bang/concern.rb

@@ -0,0 +1,69 @@
+module BangBang
+  begin
+    require "active_support/concern"
+    Concern = ActiveSupport::Concern
+  rescue LoadError
+# A typical module looks like this
+#
+#   module M
+#     def self.included(base)
+#       base.send(:extend, ClassMethods)
+#       base.send(:include, InstanceMethods)
+#       scope :foo, :conditions => { :created_at => nil }
+#     end
+#
+#     module ClassMethods
+#       def cm; puts 'I am a class method'; end
+#     end
+#
+#     module InstanceMethods
+#       def im; puts 'I am an instance method'; end
+#     end
+#   end
+#
+# By using <tt>ActiveSupport::Concern</tt> the above module could instead be written as:
+#
+#   module M
+#     extend ActiveSupport::Concern
+#
+#     included do
+#       scope :foo, :conditions => { :created_at => nil }
+#     end
+#
+#     module ClassMethods
+#       def cm; puts 'I am a class method'; end
+#     end
+#
+#     module InstanceMethods
+#       def im; puts 'I am an instance method'; end
+#     end
+#   end
+    module Concern
+      def self.extended(base)
+        base.instance_variable_set("@_dependencies", [])
+      end
+
+      def append_features(base)
+        if base.instance_variable_defined?("@_dependencies")
+          base.instance_variable_get("@_dependencies") << self
+          return false
+        else
+          return false if base < self
+          @_dependencies.each { |dep| base.send(:include, dep) }
+          super
+          base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+          base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
+          base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+        end
+      end
+
+      def included(base = nil, &block)
+        if base.nil?
+          @_included_block = block
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/bang-bang/service.rb

@@ -1,23 +1,23 @@
 module BangBang
   class Service
-    attr_reader :root_dir
+    attr_reader :app_config, :root_dir
     attr_accessor :url_prefix
 
-    def initialize(dir)
+    def initialize(app_config, dir)
+      @app_config = app_config
       @root_dir = dir
     end
 
     def init
-      init_controllers
-      autoload_models
       append_load_paths
       eval_init_rb
+      init_controllers
+      autoload_models
       yield(self) if block_given?
       self
     end
 
     def append_load_paths
-      lib_dir = File.join(root_dir, "lib")
       $LOAD_PATH << lib_dir if File.directory?(lib_dir)
     end
 
@@ -146,6 +146,10 @@ module BangBang
     end
 
     protected
+    def lib_dir
+      File.join(root_dir, "lib")
+    end
+
     def asset_url(file, url_path, cache_buster)
       if cache_buster
         "#{url_path}?_cb=#{File.mtime(file).to_i}"

data/lib/bang-bang/service_config.rb

@@ -0,0 +1,100 @@
+module BangBang
+  module ServiceConfig
+    extend Concern
+
+    module ClassMethods
+      attr_accessor :app_config, :root_dir
+      attr_writer :named_routes, :views_class
+
+      include ::BangBang::EnvMethods
+
+      def init(params={})
+        self.app_config = params[:app_config]
+        self.root_dir = params[:root_dir]
+        self.named_routes = params[:named_routes]
+        self.views_class = params[:views_class]
+
+        plugins.init
+      end
+
+      def named_routes
+        @named_routes || (app_config && app_config.named_routes) || nil
+      end
+      alias_method :uris, :named_routes
+      alias_method :uris=, :named_routes=
+
+      def views_class
+        @views_class || (app_config && app_config.views_class) || nil
+      end
+
+      def register_controller(controller)
+        controller.config = self
+      end
+
+      def register_service(path, &block)
+        unless service_dirs.include?(path)
+          service = Service.new(self, path)
+          services << service
+          service.init(&block)
+        end
+      end
+
+      def service_dirs
+        services.map do |service|
+          service.root_dir
+        end
+      end
+
+      def services
+        @services ||= []
+      end
+
+      def services_by_url_prefix
+        services.group_by do |service|
+          service.url_prefix
+        end
+      end
+
+      def services_by_root_dir
+        services.inject({}) do |memo, service|
+          memo[service.root_dir] = service
+          memo
+        end
+      end
+
+      def plugins
+        @plugins ||= ::BangBang::Plugins::Set.new(self)
+      end
+
+      def lib_dir
+        File.join(root_dir, "lib")
+      end
+
+      def stylesheets_dirs
+        service_subdirectory_dirs "app/stylesheets"
+      end
+
+      def vendor_dir
+        File.join(root_dir, "vendor")
+      end
+
+      def services_dir
+        File.join(root_dir, "services")
+      end
+
+      def service_subdirectory_dirs(relative_directory)
+        service_dirs.flatten.map do |service_path|
+          full_path = File.join(service_path, relative_directory)
+          full_path if File.directory?(full_path)
+        end.compact
+      end
+
+      def remove_generated_files
+        Dir["#{root_dir}/**/public/**/*.generated"].each do |generated_path|
+          FileUtils.rm_f(File.join(File.dirname(generated_path), File.basename(generated_path, ".generated")))
+          FileUtils.rm_f(generated_path)
+        end
+      end
+    end
+  end
+end

data/lib/bang-bang/version.rb

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

data/spec/bang-bang/controller_spec.rb

@@ -3,9 +3,13 @@ require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
 module BangBang
   describe Controller do
     describe "GET /authentication/error-page" do
+      def uris
+        @uris ||= Authentication::Routes.instance
+      end
+
       context "when there is not a rack.logger" do
         it "responds with a 500" do
-          any_instance_of(FixtureApp::Controller) do |controller|
+          any_instance_of(Authentication::Controller) do |controller|
             stub.proxy(controller).env do |env|
               env.delete("rack.logger")
               env

data/spec/bang-bang/service_spec.rb

@@ -6,7 +6,7 @@ module BangBang
       context "when the service has a file matching the given url" do
         it "returns the file path of the static file base on the Service's prefix + file path" do
           authentication_path = "#{FixtureApp.root_dir}/services/authentication"
-          service = Service.new(authentication_path).init
+          service = Service.new(Object.new, authentication_path).init
           service.url_prefix.should == "/authentication"
           service.get_static_file_path("/authentication/javascripts/foo.js").should ==
             File.join(authentication_path, "/public/javascripts/foo.js")
@@ -16,7 +16,7 @@ module BangBang
       context "when the service does not have a file matching the given url" do
         it "returns nil" do
           authentication_path = "#{FixtureApp.root_dir}/services/authentication"
-          service = Service.new(authentication_path).init
+          service = Service.new(Object.new, authentication_path).init
           service.get_static_file_path("i-dont-exist").should be_nil
         end
       end
@@ -25,7 +25,7 @@ module BangBang
     describe "#templates_hash" do
       it "returns a hash of all of the template files" do
         authentication_path = "#{FixtureApp.root_dir}/services/authentication"
-        service = Service.new(authentication_path).init
+        service = Service.new(Object.new, authentication_path).init
 
         hash = service.templates_hash
         hash["/authentication/index.html.ms"].should == File.read(File.join(service.templates_dir, "index.html.ms"))

data/spec/bang-bang/views_spec.rb

@@ -14,7 +14,7 @@ module BangBang
         context "when the presenter file exists" do
           it "evals the presenter file (which is responsible for adding the method)" do
             authentication_path = "#{FixtureApp.root_dir}/services/authentication"
-            service = Service.new(authentication_path).init
+            service = Service.new(Object.new, authentication_path).init
             app_instance = Object.new
             stub(app_instance).services {[service]}
             stub(app_instance).config {FixtureApp}

data/spec/fixture-app/app.rb

@@ -1,9 +1,10 @@
 module FixtureApp
-  include ::BangBang
+  include ::BangBang::AppConfig
 
   def self.app
     @app ||= Rack::Builder.new do
       use Rack::Logger
+      use Authentication::Controller
       run ::FixtureApp::Controller
     end.to_app
   end

data/spec/fixture-app/services/authentication/app/controllers/authentication.rb

@@ -1,4 +1,4 @@
-FixtureApp::Controller.define_routes do
+Authentication::Controller.define_routes do
   def authentication_error_page; end
   get path(:authentication_error_page, "/authentication/error-page") do
     raise "An Error"

data/spec/fixture-app/services/authentication/init.rb

@@ -1 +1,2 @@
+require "#{lib_dir}/authentication"
 self.url_prefix = "/authentication"

data/spec/fixture-app/services/authentication/lib/authentication.rb

@@ -0,0 +1,22 @@
+module Authentication
+  include BangBang::ServiceConfig
+
+  class Controller < ::BangBang::Controller
+    set :dump_errors, false
+  end
+  register_controller Controller
+
+  class Views < ::BangBang::Views
+  end
+
+  class Routes < NamedRoutes::Routes
+  end
+
+  init(
+    :views => Views,
+    :routes => Routes,
+    :root_dir => File.expand_path("#{File.dirname(__FILE__)}/.."),
+    :named_routes => Routes,
+    :views_class => Views
+  )
+end

metadata

@@ -2,7 +2,7 @@
 name: bang-bang
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brian Takita
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 -07:00
+date: 2011-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,11 +174,14 @@ files:
 - Rakefile
 - bang-bang.gemspec
 - lib/bang-bang.rb
+- lib/bang-bang/app_config.rb
+- lib/bang-bang/concern.rb
 - lib/bang-bang/controller.rb
 - lib/bang-bang/env_methods.rb
 - lib/bang-bang/plugins.rb
 - lib/bang-bang/plugins/directory_first_sort.rb
 - lib/bang-bang/service.rb
+- lib/bang-bang/service_config.rb
 - lib/bang-bang/version.rb
 - lib/bang-bang/views.rb
 - spec/bang-bang/controller_spec.rb
@@ -189,6 +192,7 @@ files:
 - spec/fixture-app/services/authentication/app/presenters/index.html.ms.rb
 - spec/fixture-app/services/authentication/app/templates/index.html.ms
 - spec/fixture-app/services/authentication/init.rb
+- spec/fixture-app/services/authentication/lib/authentication.rb
 - spec/fixture-app/services/authentication/public/javascripts/foo.js
 - spec/spec_helper.rb
 - spec/spec_helpers/example_group.rb