sharp 0.3.6 → 0.3.7

data/.ruby-gemset

@@ -0,0 +1 @@
+sharp

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/bin/sharp

@@ -4,6 +4,7 @@ require 'sharp'
 
 case ARGV[0]
 when "console"
+  ENV['SHARP_COMMAND'] ||= 'console'
   require File.expand_path('app/boot', Dir.pwd)
   require 'irb'
   ARGV.clear

data/lib/sharp.rb

@@ -12,11 +12,13 @@ require 'sharp/config'
 require 'sharp/view'
 require 'sharp/generator'
 require 'sharp/version'
+require 'sharp/logging'
+require 'sharp/rack'
 
 module Sharp
   class << self
     attr_reader :app
-    delegate :logger, :logger=, :boot, :root, :router, :env, :config, :route, :get, :post, :put, :delete, :head, :to => :app
+    delegate :logger, :logger=, :boot, :root, :router, :env, :command, :config, :route, :get, :post, :put, :delete, :head, :to => :app
     delegate :routes, :to => :router
   end
 
@@ -33,120 +35,53 @@ module Sharp
   end
 
   class Application
-    DEFAULT_ENV = {
-      "SCRIPT_NAME" => "",
-      "SERVER_NAME" => "localhost",
-      "SERVER_PORT" => "80",
-      "HTTP_HOST" => "localhost",
-      "HTTP_ACCEPT" => "*/*",
-      "HTTP_USER_AGENT" => "Sharp #{VERSION}",
-      "rack.input" => StringIO.new,
-      "rack.errors" => StringIO.new,
-      "rack.url_scheme" => "http"
-    }.freeze
-
-    attr_reader :root, :router
-
-    def self.boot(root)
-      app = new(root)
-      app.boot
-      app
-    end
+    include Logging
+    include Rack
+
+    attr_reader :root
 
     def initialize(root)
       @root = Pathname.new(root)
     end
 
     def boot
-      if @booted
-        false
-      else
-        pre_initialization
-        load_i18n
-        load_load_path
-        load_routes
-        post_initialization
-        finish_boot
+      unless booted?
+        logger.info "Booting Sharp #{VERSION} #{env} #{command}..."
+        ms = Benchmark.ms do
+          pre_initialization
+          load_i18n
+          load_load_path
+          load_routes
+          post_initialization
+          finish_boot
+        end
+        logger.info("Booted in %0.1fms" % ms)
       end
+      self
     end
 
-    def router
-      @router ||= Rack::Router.new
-    end
-
-    # Generates a Rack env Hash
-    def self.env(method, path, env={})
-      uri = URI.parse(path)
-      DEFAULT_ENV.merge(env || {}).merge(
-        'REQUEST_METHOD' => method.to_s.upcase,
-        'PATH_INFO' => uri.path,
-        'QUERY_STRING' => uri.query,
-        'rack.input' => StringIO.new)
-    end
-
-    def route(method, path, env={})
-      router.match(self.class.env(method, path, env={}))
-    end
-
-    def get(path, env={})
-      router.call(self.class.env(:get, path, env={}))
-    end
-
-    def post(path, env={})
-      router.call(self.class.env(:post, path, env={}))
-    end
-
-    def put(path, env={})
-      router.call(self.class.env(:put, path, env={}))
-    end
-
-    def delete(path, env={})
-      router.call(self.class.env(:delete, path, env={}))
-    end
-
-    def head(path, env={})
-      router.call(self.class.env(:head, path, env={}))
-    end
-
+    # This represents which environment is being used.
+    # This is controlled via the RACK_ENV environment variable.
+    #
+    # @return [Symbol] The environment
     def env
       @env ||= ENV['RACK_ENV'].present? ? ENV['RACK_ENV'].to_sym : :development
     end
 
-    def logger
-      @logger ||= begin
-        logger = if ENV['SHARP_LOGGER'].to_s.downcase == 'stdout'
-          Logger.new(STDOUT)
-        else
-          log_dir = root.join("log")
-          unless File.exists?(log_dir)
-            FileUtils.mkdir(log_dir)
-          end
-          Logger.new(File.join(log_dir, "#{env}.log"))
-        end
-
-        logger.formatter = logger_formatter
-        logger
-      end
-    end
-
-    def objects_logger_is_attached_to
-      @objects_logger_is_attached_to ||= [self]
-    end
-
-    def attach_logger(obj)
-      objects_logger_is_attached_to << obj
-      obj.logger = logger
-    end
-
-    def logger=(logger)
-      objects_logger_is_attached_to.each do |object|
-        object.logger = logger
-      end
-    end
-
-    def logger_formatter
-      @logger_formatter ||= proc do |severity, datetime, progname, msg|
-        "#{datetime} #{severity} #{msg}\n"
+    # The command represents what external command is running Sharp. Typical values are:
+    #
+    # * *server* - A rack server like WEBrick, Thin, Unicorn, Puma, etc.
+    # * *console* - An IRB session
+    #
+    # If Sharp is just being run in a script or something, this will be nil.
+    # You can set this to any value you like using the SHARP_COMMAND environment variable.
+    #
+    # @return [Symbol|nil] The command running sharp
+    def command
+      if defined? @command
+        @command
+      else
+        @command = ENV['SHARP_COMMAND'].downcase.to_sym if ENV['SHARP_COMMAND'].present?
       end
     end
 
@@ -161,35 +96,56 @@ module Sharp
     protected
 
     def pre_initialization
-      attach_logger(Rack::Action)
-      Dir.glob(root.join("app/initializers/pre/*.rb")) {|file| load file }
+      attach_logger(::Rack::Action)
+      Dir.glob(root.join("app/initializers/pre/*.rb")) do |file|
+        ms = Benchmark.ms { load file }
+        logger.info("Loaded pre-initializer #{file.sub(/^#{root}\/+/,'')} in %0.1fms" % ms)
+      end
     end
 
     def load_i18n
-      if Object.const_defined?("I18n")
-        Dir.glob(root.join("config/locales/*.yml")) do |file|
-          I18n.load_path << file
+      ms = Benchmark.ms do
+        if Object.const_defined?("I18n")
+          Dir.glob(root.join("config/locales/*.yml")) do |file|
+            I18n.load_path << file
+          end
         end
       end
+      logger.info("Loaded i18n in %0.1fms" % ms)
     end
 
     def load_load_path
       load_path.each do |path|
         $:.unshift(root.join(path))
-        Dir.glob(root.join("#{path}/**/*.rb")) {|file| require file }
+        n = 0
+        ms = Benchmark.ms do
+          Dir.glob(root.join("#{path}/**/*.rb")) do |file|
+            require file
+            n += 1
+          end
+        end
+        logger.info("Required #{n} #{"file".pluralize(n)} in #{path} in %0.1fms" % ms)
       end
     end
 
     def load_routes
-      require File.expand_path "app/routes", root
+      ms = Benchmark.ms { require File.expand_path "app/routes", root }
+      logger.info("Loaded #{router.routes.size} #{"routes".pluralize(router.routes.size)} in %0.1fms" % ms)
     end
 
     def post_initialization
-      Dir.glob(root.join("app/initializers/post/*.rb")) {|file| load file }
+      Dir.glob(root.join("app/initializers/post/*.rb")) do |file|
+        ms = Benchmark.ms { load file }
+        logger.info("Loaded post-initializer #{file.sub(/^#{root}\/+/,'')} in %0.1fms" % ms)
+      end
     end
 
     def finish_boot
       @booted = true
     end
+
+    def booted?
+      !!@booted
+    end
   end
 end

data/lib/sharp/logging.rb

@@ -0,0 +1,85 @@
+module Sharp
+  module Logging
+
+    # http://stackoverflow.com/a/6407200/41984
+    class MultiIO
+      def initialize(*targets)
+        @targets = targets
+      end
+
+      def add_target(target)
+        @targets << target
+      end
+
+      def write(*args)
+        @targets.each {|t| t.write(*args)}
+      end
+
+      def close
+        @targets.each(&:close)
+      end
+    end
+
+    def log_file
+      @log_file ||= begin
+        log_dir = root.join("log")
+
+        unless File.exists?(log_dir)
+          FileUtils.mkdir(log_dir)
+        end
+
+        File.expand_path("#{env}.log", log_dir)
+      end
+    end
+
+    def log_io
+      @log_io ||= begin
+        io = MultiIO.new(File.open(log_file, 'a'))
+
+        if env == :development && [:server, :console].include?(command)
+          io.add_target(STDOUT)
+        end
+
+        io
+      end
+    end
+
+    def log_level
+      @log_level ||= begin
+        ENV['SHARP_LOG_LEVEL'] ||= env == :production ? 'info' : 'debug'
+        Logger.const_get(ENV['SHARP_LOG_LEVEL'].upcase)
+      end
+    end
+
+    def logger
+      @logger ||= begin
+        logger = Logger.new(log_io)
+        logger.formatter = logger_formatter
+        logger.level = log_level
+        logger
+      end
+    end
+
+    def objects_logger_is_attached_to
+      @objects_logger_is_attached_to ||= [self]
+    end
+
+    def attach_logger(obj)
+      objects_logger_is_attached_to << obj
+      obj.logger = logger
+    end
+
+    def logger=(logger)
+      objects_logger_is_attached_to.each do |object|
+        object.logger = logger
+      end
+    end
+
+    def logger_formatter
+      @logger_formatter ||= proc do |severity, datetime, progname, msg|
+        "#{datetime} #{severity} #{msg}\n"
+      end
+    end
+
+  end
+end

data/lib/sharp/rack.rb

@@ -0,0 +1,63 @@
+module Sharp
+  module Rack
+    DEFAULT_ENV = {
+      "SCRIPT_NAME" => "",
+      "SERVER_NAME" => "localhost",
+      "SERVER_PORT" => "80",
+      "HTTP_HOST" => "localhost",
+      "HTTP_ACCEPT" => "*/*",
+      "HTTP_USER_AGENT" => "Sharp #{VERSION}",
+      "rack.input" => StringIO.new,
+      "rack.errors" => StringIO.new,
+      "rack.url_scheme" => "http"
+    }.freeze
+
+    def self.included(cls)
+      cls.class_eval do
+        extend ClassMethods
+
+        attr_writer :router
+      end
+    end
+
+    module ClassMethods
+      # Generates a Rack env Hash
+      def env(method, path, env={})
+        uri = URI.parse(path)
+        DEFAULT_ENV.merge(env || {}).merge(
+          'REQUEST_METHOD' => method.to_s.upcase,
+          'PATH_INFO' => uri.path,
+          'QUERY_STRING' => uri.query,
+          'rack.input' => StringIO.new)
+      end
+    end
+
+    def router
+      @router ||= ::Rack::Router.new
+    end
+
+    def route(method, path, env={})
+      router.match(self.class.env(method, path, env={}))
+    end
+
+    def get(path, env={})
+      router.call(self.class.env(:get, path, env={}))
+    end
+
+    def post(path, env={})
+      router.call(self.class.env(:post, path, env={}))
+    end
+
+    def put(path, env={})
+      router.call(self.class.env(:put, path, env={}))
+    end
+
+    def delete(path, env={})
+      router.call(self.class.env(:delete, path, env={}))
+    end
+
+    def head(path, env={})
+      router.call(self.class.env(:head, path, env={}))
+    end
+  end
+end

data/lib/sharp/version.rb

@@ -1,3 +1,3 @@
 module Sharp
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/sharp.gemspec

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

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: sharp
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
+  prerelease: 
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   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: curtain
   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: rack-router
   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: rack-action
   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'
 description: A Ruby and Rack-based web framework
@@ -75,7 +84,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .yardopts
 - Gemfile
 - LICENSE.txt
@@ -87,6 +97,8 @@ files:
 - lib/sharp/action.rb
 - lib/sharp/config.rb
 - lib/sharp/generator.rb
+- lib/sharp/logging.rb
+- lib/sharp/rack.rb
 - lib/sharp/version.rb
 - lib/sharp/view.rb
 - sharp.gemspec
@@ -115,25 +127,26 @@ files:
 - template/vendor/assets/stylesheets/.gitkeep
 homepage: http://github.com/pjb3/sharp
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Ruby and Rack-based web framework
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: cf65dbc4e7f862641ed2fa05e82b8e458baeaa00
-  data.tar.gz: 807ca9b84328f0a12e6ed1ec8764753607b750c4
-SHA512:
-  metadata.gz: a05dd4be7be6089c5306ba0412c1763bc0cde434541f3d4bf62efe198dd87382b4a7a977607f8e9a953468cc8bcad153c22b05ab9a37250ce8da36edd46c4ec0
-  data.tar.gz: 73aea111c4fd89353d918b30eaba5b748ad3b2c9f0e73b92c0b0c57ab833291f71c3ead0af01c3f4a85a492ab5498226aa5088458adf9a14ed5b70aaafbf377d

data/.rvmrc

@@ -1 +0,0 @@
-rvm 2.0.0@sharp --create