useless 0.0.6 → 0.0.7

data/lib/useless.rb

@@ -0,0 +1,4 @@
+$:.push File.expand_path('../lib', __FILE__)
+
+module Useless
+end

data/lib/useless/fs.rb

@@ -0,0 +1,32 @@
+require 'mongo'
+
+module Useless
+  # Useless::FS is a minimal wrapper around Mongo::Grid.
+  class FS
+
+    def self.for_env(env = nil)
+      mongo = Useless::Mongo.for_env(env)
+      self.new(mongo)
+    end
+
+    def initialize(mongo)
+      @mongo = mongo
+    end
+
+    def put(file, opts = {})
+      @mongo.grid.put(file, opts)
+    end
+
+    class FileNotFound < StandardError; end
+
+    def get(id)
+      @mongo.grid.get(id)
+
+    # To preserve the abstraction, raise our own exception when a file isn't
+    # found
+    rescue ::Mongo::GridFileNotFound => e
+      raise FileNotFound, e.message
+    end
+  end
+
+end

data/lib/useless/logger.rb

@@ -0,0 +1,48 @@
+require 'logger'
+
+module Useless
+  # Useless::Logger is a wrapper around Logger for the purposes of decorating.
+  class Logger
+    attr_accessor :request_id
+
+    def initialize(io = $stdout)
+      @logger = ::Logger.new(io)
+    end
+
+    def level=(level)
+      @logger.level = level
+    end
+
+    def level
+      @logger.level
+    end
+
+    def fatal(message)
+      add ::Logger::FATAL, message
+    end
+
+    def error(message)
+      add ::Logger::ERROR, message
+    end
+
+    def warn(message)
+      add ::Logger::WARN, message
+    end
+
+    def info(message)
+      add ::Logger::INFO, message
+    end
+
+    def debug(message)
+      add ::Logger::DEBUG, message
+    end
+
+    private
+
+    def add(level, message)
+      formatted_message = message
+      formatted_message = "[#{@request_id}] #{formatted_message}" if @request_id
+      @logger.add level, formatted_message
+    end
+  end
+end

data/lib/useless/mongo.rb

@@ -0,0 +1,15 @@
+require 'low/mongo'
+
+module Useless
+  module Mongo
+    # Returns an instance of the appropriate `Low::Mongo` helper class based upon the
+    # `RACK_ENV` environment variable (or the `env` parameter, if specified).
+    def self.for_env(env = nil)
+      case (env || ENV['RACK_ENV'])
+      when 'test'       then Low::Mongo::Local.new 'useless_test'
+      when 'production' then Low::Mongo::Remote.new ENV['MONGOLAB_URI']
+      else                   Low::Mongo::Local.new 'useless_development'
+      end
+    end
+  end
+end

data/lib/useless/rack.rb

@@ -1,5 +1,3 @@
-$:.push File.expand_path('../lib', __FILE__)
-
 require 'low/rack/log_level'
 require 'low/rack/rack_errors'
 require 'low/rack/request_id'
@@ -7,27 +5,17 @@ require 'low/rack/request_logger'
 require 'low/rack/subdomain_map'
 require 'low/scoped_logger'
 
+require 'useless/rack/middleware/exceptions'
+require 'useless/rack/middleware/assets'
+require 'useless/rack/middleware/mongo'
+require 'useless/rack/middleware/fs'
+require 'useless/rack/middleware/doc'
+require 'useless/rack/middleware/authentication/query_string'
+require 'useless/rack/middleware/authentication/request_header'
+require 'useless/rack/base'
+
 module Useless
   class Rack
-    autoload :Base, 'useless/rack/base'
-    autoload :Doc, 'useless/rack/doc'
-    autoload :FS, 'useless/rack/fs'
-    autoload :Logger, 'useless/rack/logger'
-    autoload :Mongo, 'useless/rack/mongo'
-
-    module Middleware
-      autoload :Assets, 'useless/rack/middleware/assets'
-      autoload :Doc, 'useless/rack/middleware/doc'
-      autoload :Exceptions, 'useless/rack/middleware/exceptions'
-      autoload :FS, 'useless/rack/middleware/fs'
-      autoload :Mongo, 'useless/rack/middleware/mongo'
-
-      module Authentication
-        autoload :AccessToken, 'useless/rack/middleware/authentication/access_token'
-        autoload :QueryString, 'useless/rack/middleware/authentication/query_string'
-        autoload :RequestHeader, 'useless/rack/middleware/authentication/request_header'
-      end
-    end
 
     def self.mongo
       @mongo ||= Mongo.for_env
@@ -65,5 +53,6 @@ module Useless
         run Low::Rack::SubdomainMap.new(Base.new, @map)
       end.call(env)
     end
+
   end
 end

data/lib/useless/rack/base/files.rb

@@ -1,3 +1,5 @@
+require 'useless/fs'
+
 module Useless
   class Rack
     class Base
@@ -22,7 +24,7 @@ module Useless
         # Two things can go wrong, and they'll both raise an error:
         #   * the specified ID is not a valid object ID
         #   * there is no file corresponding to the ID in the FS
-        rescue BSON::InvalidObjectId, Useless::Rack::FS::FileNotFound
+        rescue BSON::InvalidObjectId, Useless::FS::FileNotFound
           [404, {'Content-Type' => 'text/plain'}, "File not found: #{id}"]
         end
       end

data/lib/useless/rack/middleware/authentication/query_string.rb

@@ -1,3 +1,5 @@
+require 'useless/rack/middleware/authentication/access_token'
+
 module Useless
   class Rack
     module Middleware

data/lib/useless/rack/middleware/authentication/request_header.rb

@@ -1,3 +1,5 @@
+require 'useless/rack/middleware/authentication/access_token'
+
 module Useless
   class Rack
     module Middleware

data/lib/useless/rack/middleware/doc.rb

@@ -1,3 +1,5 @@
+require 'useless/rack/doc'
+
 module Useless
   class Rack
     module Middleware

data/lib/useless/version.rb

@@ -1,3 +1,3 @@
 module Useless
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/useless/{rack/fs_spec.rb → fs_spec.rb}

@@ -1,12 +1,14 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'useless/fs'
 
-describe Useless::Rack::FS do
+describe Useless::FS do
   it 'should allow for files to be added and retrieved via .put and .get' do
     original_file = File.open(asset_path('muffin-milk.jpg'))
-    original_file_id = Useless::Rack.fs.put(original_file)
-    stored_file = Useless::Rack.fs.get(original_file_id)
+    fs = Useless::FS.for_env('test')
+    original_file_id = fs.put(original_file)
+    stored_file = fs.get(original_file_id)
 
-    # Useless::Rack::FS stores the file as an un-encoded binary blob, so in order to
+    # Useless::FS stores the file as an un-encoded binary blob, so in order to
     # compare, we must strip the encoding, i.e. force a binary encoding.
     original_file.rewind
     original_blob = original_file.read
@@ -16,7 +18,7 @@ describe Useless::Rack::FS do
 
   describe '.get' do
     it 'should raise Useless::FS::FileNotFound if the specified ID doesn\'t exist' do
-      -> { Useless::Rack.fs.get('nonexistant') }.should raise_error(Useless::Rack::FS::FileNotFound)
+      -> { Useless::FS.for_env('test').get('nonexistant') }.should raise_error(Useless::FS::FileNotFound)
     end
   end
 end

data/spec/useless/{rack/logger_spec.rb → logger_spec.rb}

@@ -1,10 +1,11 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'useless/logger'
 
-describe Useless::Rack::Logger do
+describe Useless::Logger do
   describe '#fatal' do
     it 'should emit a fatal message' do
       io = StringIO.new
-      logger = Useless::Rack::Logger.new(io)
+      logger = Useless::Logger.new(io)
       logger.fatal 'Oh noes!'
 
       io.rewind; message = io.read
@@ -16,7 +17,7 @@ describe Useless::Rack::Logger do
   describe '#error' do
     it 'should emit an error message' do
       io = StringIO.new
-      logger = Useless::Rack::Logger.new(io)
+      logger = Useless::Logger.new(io)
       logger.error 'Wrong!'
 
       io.rewind; message = io.read
@@ -28,7 +29,7 @@ describe Useless::Rack::Logger do
   describe '#warn' do
     it 'should emit a warn message' do
       io = StringIO.new
-      logger = Useless::Rack::Logger.new(io)
+      logger = Useless::Logger.new(io)
       logger.warn 'Watchout!'
 
       io.rewind; message = io.read
@@ -40,7 +41,7 @@ describe Useless::Rack::Logger do
   describe '#info' do
     it 'should emit an info message' do
       io = StringIO.new
-      logger = Useless::Rack::Logger.new(io)
+      logger = Useless::Logger.new(io)
       logger.info 'Such and such'
 
       io.rewind; message = io.read
@@ -52,7 +53,7 @@ describe Useless::Rack::Logger do
   describe '#debug' do
     it 'should emit a debug message' do
       io = StringIO.new
-      logger = Useless::Rack::Logger.new(io)
+      logger = Useless::Logger.new(io)
       logger.debug '101011'
 
       io.rewind; message = io.read
@@ -62,7 +63,7 @@ describe Useless::Rack::Logger do
 
     it 'should emit nothing if the level is too high' do
       io = StringIO.new
-      logger = Useless::Rack::Logger.new(io)
+      logger = Useless::Logger.new(io)
       logger.level = ::Logger::INFO
       logger.debug '101011'
 
@@ -74,7 +75,7 @@ describe Useless::Rack::Logger do
   describe '#request_id' do
     it 'should append the specified ID to all messages' do
       io = StringIO.new
-      logger = Useless::Rack::Logger.new(io)
+      logger = Useless::Logger.new(io)
       logger.request_id = 'abc123'
       logger.info 'Yadda'
 

data/spec/useless/{rack/mongo_spec.rb → mongo_spec.rb}

@@ -1,9 +1,10 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'useless/mongo'
 
-describe Useless::Rack::Mongo do
+describe Useless::Mongo do
   describe '.for_env' do
     it 'should return a instance for \'useless_development\' if \'development\' is specified' do
-      mongo = Useless::Rack::Mongo.for_env('development')
+      mongo = Useless::Mongo.for_env('development')
       mongo.database.should == 'useless_development'
     end
 
@@ -11,7 +12,7 @@ describe Useless::Rack::Mongo do
       original_rack_env = ENV['RACK_ENV']
       begin
         ENV['RACK_ENV'] = 'development'
-        mongo = Useless::Rack::Mongo.for_env
+        mongo = Useless::Mongo.for_env
         mongo.database.should == 'useless_development'
       ensure
         ENV['RACK_ENV'] = original_rack_env
@@ -19,7 +20,7 @@ describe Useless::Rack::Mongo do
     end
 
     it 'should return a instance for \'useless_test\' if \'test\' is specified' do
-      mongo = Useless::Rack::Mongo.for_env('test')
+      mongo = Useless::Mongo.for_env('test')
       mongo.database.should == 'useless_test'
     end
 
@@ -27,7 +28,7 @@ describe Useless::Rack::Mongo do
       original_rack_env = ENV['RACK_ENV']
       begin
         ENV['RACK_ENV'] = 'test'
-        mongo = Useless::Rack::Mongo.for_env
+        mongo = Useless::Mongo.for_env
         mongo.database.should == 'useless_test'
       ensure
         ENV['RACK_ENV'] = original_rack_env
@@ -38,7 +39,7 @@ describe Useless::Rack::Mongo do
       original_mongolab_uri = ENV['MONGOLAB_URI']
       begin
         ENV['MONGOLAB_URI'] = 'mongodb://mongo.com'
-        mongo = Useless::Rack::Mongo.for_env('production')
+        mongo = Useless::Mongo.for_env('production')
         mongo.uri.should == 'mongodb://mongo.com'
       ensure
         ENV['MONGOLAB_URI'] = original_mongolab_uri
@@ -51,7 +52,7 @@ describe Useless::Rack::Mongo do
       begin
         ENV['RACK_ENV'] = 'production'
         ENV['MONGOLAB_URI'] = 'mongodb://mongo.com'
-        mongo = Useless::Rack::Mongo.for_env
+        mongo = Useless::Mongo.for_env
         mongo.uri.should == 'mongodb://mongo.com'
       ensure
         ENV['RACK_ENV'] = original_rack_env

data/spec/useless/rack/base/files_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'useless/rack/base/files'
 
 describe 'useless.io/files' do
   include Rack::Test::Methods

data/spec/useless/rack/middleware/authentication/query_string_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'useless/rack/middleware/authentication/query_string'
 
 describe Useless::Rack::Middleware::Authentication::QueryString do
   def authenticated_app

data/spec/useless/rack/middleware/authentication/request_header_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'useless/rack/middleware/authentication/request_header'
 
 describe Useless::Rack::Middleware::Authentication::RequestHeader do
   def authenticated_app

data/spec/useless/rack/middleware/exceptions_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'useless/rack/middleware/exceptions'
 
 describe Useless::Rack::Middleware::Exceptions do
   it 'should proxy transparently if nothing goes wrong in the main app' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: useless
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -136,13 +136,15 @@ files:
 - README.md
 - Rakefile
 - assets/application.css
+- lib/useless.rb
+- lib/useless/fs.rb
+- lib/useless/logger.rb
+- lib/useless/mongo.rb
 - lib/useless/rack.rb
 - lib/useless/rack/base.rb
 - lib/useless/rack/base/doc.rb
 - lib/useless/rack/base/files.rb
 - lib/useless/rack/doc.rb
-- lib/useless/rack/fs.rb
-- lib/useless/rack/logger.rb
 - lib/useless/rack/middleware/assets.rb
 - lib/useless/rack/middleware/authentication/access_token.rb
 - lib/useless/rack/middleware/authentication/query_string.rb
@@ -151,17 +153,16 @@ files:
 - lib/useless/rack/middleware/exceptions.rb
 - lib/useless/rack/middleware/fs.rb
 - lib/useless/rack/middleware/mongo.rb
-- lib/useless/rack/mongo.rb
 - lib/useless/version.rb
 - spec/spec_helper.rb
 - spec/support/assets/muffin-milk.jpg
+- spec/useless/fs_spec.rb
+- spec/useless/logger_spec.rb
+- spec/useless/mongo_spec.rb
 - spec/useless/rack/base/files_spec.rb
-- spec/useless/rack/fs_spec.rb
-- spec/useless/rack/logger_spec.rb
 - spec/useless/rack/middleware/authentication/query_string_spec.rb
 - spec/useless/rack/middleware/authentication/request_header_spec.rb
 - spec/useless/rack/middleware/exceptions_spec.rb
-- spec/useless/rack/mongo_spec.rb
 - useless.gemspec
 homepage: https://github.com/khy/useless.rb
 licenses: []
@@ -190,10 +191,10 @@ summary: The useless.io Ruby library.
 test_files:
 - spec/spec_helper.rb
 - spec/support/assets/muffin-milk.jpg
+- spec/useless/fs_spec.rb
+- spec/useless/logger_spec.rb
+- spec/useless/mongo_spec.rb
 - spec/useless/rack/base/files_spec.rb
-- spec/useless/rack/fs_spec.rb
-- spec/useless/rack/logger_spec.rb
 - spec/useless/rack/middleware/authentication/query_string_spec.rb
 - spec/useless/rack/middleware/authentication/request_header_spec.rb
 - spec/useless/rack/middleware/exceptions_spec.rb
-- spec/useless/rack/mongo_spec.rb

data/lib/useless/rack/fs.rb

@@ -1,25 +0,0 @@
-module Useless
-  class Rack
-    # Useless::FS is a minimal wrapper around Mongo::Grid.
-    class FS
-      class FileNotFound < StandardError; end
-
-      def initialize(mongo)
-        @mongo = mongo
-      end
-
-      def put(file, opts = {})
-        @mongo.grid.put(file, opts)
-      end
-
-      def get(id)
-        @mongo.grid.get(id)
-
-      # To preserve the abstraction, raise our own exception when a file isn't
-      # found
-      rescue ::Mongo::GridFileNotFound => e
-        raise FileNotFound, e.message
-      end
-    end
-  end
-end

data/lib/useless/rack/logger.rb

@@ -1,50 +0,0 @@
-require 'logger'
-
-module Useless
-  class Rack
-    # Useless::Logger is a wrapper around Logger for the purposes of decorating.
-    class Logger
-      attr_accessor :request_id
-
-      def initialize(io = $stdout)
-        @logger = ::Logger.new(io)
-      end
-
-      def level=(level)
-        @logger.level = level
-      end
-
-      def level
-        @logger.level
-      end
-
-      def fatal(message)
-        add ::Logger::FATAL, message
-      end
-
-      def error(message)
-        add ::Logger::ERROR, message
-      end
-
-      def warn(message)
-        add ::Logger::WARN, message
-      end
-
-      def info(message)
-        add ::Logger::INFO, message
-      end
-
-      def debug(message)
-        add ::Logger::DEBUG, message
-      end
-
-      private
-
-      def add(level, message)
-        formatted_message = message
-        formatted_message = "[#{@request_id}] #{formatted_message}" if @request_id
-        @logger.add level, formatted_message
-      end
-    end
-  end
-end

data/lib/useless/rack/mongo.rb

@@ -1,17 +0,0 @@
-require 'low/mongo'
-
-module Useless
-  class Rack
-    module Mongo
-      # Returns an instance of the appropriate `Low::Mongo` helper class based upon the
-      # `RACK_ENV` environment variable (or the `env` parameter, if specified).
-      def self.for_env(env = nil)
-        case (env || ENV['RACK_ENV'])
-        when 'test'       then Low::Mongo::Local.new 'useless_test'
-        when 'production' then Low::Mongo::Remote.new ENV['MONGOLAB_URI']
-        else                   Low::Mongo::Local.new 'useless_development'
-        end
-      end
-    end
-  end
-end