sharp 0.0.1 → 0.0.2

data/bin/sharp

@@ -3,7 +3,6 @@
 if ARGV[0] == "console"
   $:.unshift(File.expand_path("lib", Dir.pwd))
   require 'boot'
-  Sharp.boot
   require 'irb'
   ARGV.clear
   IRB.start(Sharp.root)

data/lib/sharp.rb

@@ -8,25 +8,25 @@ require "yaml"
 module Sharp
 
   class << self
+    attr_reader :app
     delegate :logger, :boot, :root, :router, :env, :db, :to => :app
+    delegate :routes, :to => :router
   end
 
-  def self.app(*args, &init_routes)
-    if args.length == 0
-      @app
-    else
-      @app = Application.new(*args, &init_routes)
-    end
+  def self.boot(root)
+    @app = Application.new(root)
+    @app.boot
+    @app
   end
 
   class Application
     attr_reader :root, :router
 
-    def initialize(root, &init_routes)
+    def initialize(root)
       @root = Pathname.new(root)
-      @init_routes = init_routes
     end
 
+    # TODO: Log to a file, command-line option for STDOUT
     def logger
       @logger ||= Logger.new(STDOUT)
     end
@@ -35,25 +35,17 @@ module Sharp
       if @booted
         false
       else
-        preboot
-        $:.unshift(root.join("lib/models"))
-        Dir.glob(root.join("lib/models/*.rb")) {|file| require file }
-        $:.unshift(root.join("lib/actions"))
-        Dir.glob(root.join("lib/actions/*.rb")) {|file| require file }
-        @booted = true
+        pre_boot
+        load_models
+        load_actions
+        load_routes
+        post_boot
+        finish_boot
       end
     end
 
-    def preboot
-      # A hook for plugins to add boot logic
-      db # TODO: Pull out Sequel-specific code
-    end
-
     def router
-      @router ||= begin
-        boot
-        Rack::Router.new(&@init_routes)
-      end
+      @router ||= Rack::Router.new
     end
 
     def env
@@ -74,5 +66,36 @@ module Sharp
     def db_config
       @db_config ||= YAML.load_file(root.join("config/database.yml")).symbolize_keys[env].symbolize_keys
     end
+
+    protected
+    def pre_boot
+      # A hook for plugins to add boot logic
+      db # TODO: Pull out Sequel-specific code
+    end
+
+    # TODO: Make an Array of load paths that you can add to that these are just part of
+    def load_models
+      $:.unshift(root.join("lib/models"))
+      Dir.glob(root.join("lib/models/*.rb")) {|file| require file }
+    end
+
+    def load_actions
+      Rack::Action.logger = logger
+      $:.unshift(root.join("lib/actions"))
+      Dir.glob(root.join("lib/actions/*.rb")) {|file| require file }
+    end
+
+    def load_routes
+      require "routes"
+    end
+
+    def post_boot
+      # A hook for plugins to add boot logic
+    end
+
+    def finish_boot
+      @booted = true
+    end
+
   end
 end

data/lib/sharp/version.rb

@@ -1,3 +1,3 @@
 module Sharp
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/sharp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "sharp"
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.authors       = ["Paul Barry"]
   gem.email         = ["mail@paulbarry.com"]
   gem.description   = %q{A web framework}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sharp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: