rack-combobot 0.0.3 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-combobot (0.0.2)
+    rack-combobot (0.0.3)
       rack
       rake
 
@@ -12,7 +12,7 @@ GEM
     guard (0.10.0)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-minitest (0.4.0)
+    guard-minitest (0.5.0)
       guard (~> 0.4)
     minitest (2.10.0)
     rack (1.4.0)

data/Guardfile

@@ -1,6 +1,5 @@
 guard 'minitest' do
   watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r|^lib/rack/(.*)\.rb|)       { |m| "spec/rack_#{m[1]}_spec.rb" }
-  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+  watch(%r|^lib/(.*)\.rb|)          { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r|^spec/spec_helper\.rb|)  { "spec" }
 end

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.pattern = "spec/*_spec.rb"
+  t.pattern = "spec/**/*_spec.rb"
 end
 
 task :default => [:test]

data/config.ru

@@ -0,0 +1,6 @@
+require 'rack'
+require './lib/rack-combobot'
+
+use Rack::Combobot, :root => 'spec/public'
+
+run Proc.new {|env| [200, {"Content-Type" => "text/html"}, ["Dummy App"]] }

data/lib/rack/combobot/combination.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+
+module Rack
+  class Combobot
+    class Combination
+      def initialize(root, file_names)
+        @root = root
+
+        @file_contents = fetch_file_contents file_names if file_names
+      end
+
+      def fetch_file_contents(file_names = [])
+        file_names.map do |file_name|
+
+          raise PathError if file_name.include?('..') || file_name.include?("~")
+
+          root_prefix = ::File.expand_path(".", @root) + "/"
+          file_path   = ::File.expand_path(file_name, @root)
+
+          raise PathError unless file_path.start_with?(root_prefix) && ::File.exist?(file_path)
+
+          file_content = ::File.open(file_path, 'r') { |f| f.read }
+        end
+      end
+
+      def combine
+        @combo ||= @file_contents.join
+      end
+
+      class PathError < ArgumentError; end
+    end
+  end
+end

data/lib/rack/combobot.rb

@@ -1,32 +1,45 @@
+# encoding: UTF-8
+
 require "rack/combobot/config"
+require "rack/combobot/combination"
 require "pathname"
 require "uri"
 
 module Rack
   class Combobot
-    def self.configure(*args)
-      new(*args)
-    end
 
     MIME_TYPES = {
       "js"  => "text/javascript",
       "css" => "text/css"
     }
 
-    def initialize(options = {})
+    def initialize(app, options = {})
+      @app = app
+
       root = Pathname.new(options[:root] || Dir.pwd)
       @config = Rack::Combobot::Config.new(root)
     end
 
     # rack request handler
     def call(env)
+      if Rack::Request.new(env).path == '/combobot'
+        combine(env)
+      else
+        @app.call(env)
+      end
+    end
+
+    def combine(env)
       params      = env["QUERY_STRING"]
       file_names  = params.split("&")
-      extention   = file_names[0].split(".").last
+
+      return not_found if file_names.empty?
+
+      extension   = file_names[0].split(".").last
 
       begin
         combo = Combination.new(@config.root, file_names).combine
-        [200, {"Content-Type" => MIME_TYPES[extention]}, [combo]]
+        [200, {"Content-Type" => MIME_TYPES[extension]}, [combo]]
       rescue Combination::PathError
         not_found
       end
@@ -36,30 +49,5 @@ module Rack
       [404, {'Content-Type' => 'text/html'}, ['File not found']]
     end
 
-    class Combination
-      def initialize(root, file_names)
-        @file_contents = combine_files(root, file_names)
-      end
-
-      def combine_files(root, file_names = [])
-        file_names.map do |file_name|
-
-          raise PathError if file_name.include?('..') || file_name.include?("~")
-
-          root_prefix = ::File.expand_path(".", root) + "/"
-          file_path   = ::File.expand_path(file_name, root)
-
-          raise PathError unless file_path.start_with?(root_prefix) && ::File.exist?(file_path)
-
-          file_content = ::File.open(file_path, 'r') { |f| f.read }
-        end
-      end
-
-      def combine
-        @combo ||= @file_contents.join
-      end
-
-      class PathError < ArgumentError; end
-    end
   end
 end

data/rack-combobot.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rack-combobot"
-  s.version     = "0.0.3"
+  s.version     = "0.1.0"
   s.authors     = ["Simon Højberg", "Christopher Meiklejohn"]
   s.email       = ["r.hackr@gmail.com", "christopher.meiklejohn@gmail.com"]
   s.homepage    = "https://github.com/hojberg/rack-combobot"

data/spec/lib/rack/combobot/combination_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Rack::Combobot::Combination do
+  
+  let(:combination) { Rack::Combobot::Combination.new(File.dirname(__FILE__) + '/../../../public', ['js1.js', 'js2.js']) }
+
+  describe 'fetch' do
+
+    it 'fetches files content' do
+      contents = combination.fetch_file_contents(['js1.js', 'js2.js'])
+      contents.must_equal(["function lorem() { return \"a\"; }\n", "function ipsum() { return \"b\"; }\n"])
+    end
+
+    describe 'error handling' do
+      it 'raises PathError when files are not found' do
+        proc { 
+          combination.fetch_file_contents(['js3.js'])
+        }.must_raise  Rack::Combobot::Combination::PathError
+      end
+
+      it 'raises PathError when trying to move outside the root' do
+        proc { 
+          combination.fetch_file_contents(['js1.js', '../../etc/hosts'])
+        }.must_raise  Rack::Combobot::Combination::PathError
+      end
+    end
+  end
+
+  describe 'combination' do
+
+    before do
+      combination.fetch_file_contents(['js1.js', 'js2.js'])
+    end
+
+    it 'combines file content' do
+      combination.combine.must_equal("function lorem() { return \"a\"; }\nfunction ipsum() { return \"b\"; }\n")
+    end
+
+  end
+
+end

data/spec/lib/rack/combobot_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Rack::Combobot do
+  include Rack::Test::Methods
+
+  # the dummy app represents any other middleware in the rack stack
+  let(:dummy_app_response) { [200, {"Content-Type" => "text/html"}, ["Dummy App"]] }
+  let(:dummy_app) { Proc.new {|env| dummy_app_response } }
+
+  before do
+    @app = Rack::Combobot.new(dummy_app, :root => File.dirname(__FILE__) + '/../../public')
+  end
+
+  describe 'routing' do
+
+    # request helpers
+    let(:combobot_request)        { { 'PATH_INFO' => '/combobot' } }
+    let(:combobot_js_request)     { combobot_request.merge({ "QUERY_STRING" => "js1.js&js2.js" })       }
+    let(:combobot_css_request)    { combobot_request.merge({ "QUERY_STRING" => "css1.css&css2.css" })   }
+    let(:combobot_404_request)    { combobot_request.merge({ "QUERY_STRING" => "js3.js&js4.js" })       }
+    let(:combobot_hack_request)   { combobot_request.merge({ "QUERY_STRING" => "js3.js&../../js4.js" }) }
+
+    # response helpers
+    let(:combobot_js_response)    { [200, {"Content-Type" => "text/javascript"}, ["function lorem() { return \"a\"; }\nfunction ipsum() { return \"b\"; }\n"]] }
+    let(:combobot_css_response)   { [200, {"Content-Type" => "text/css"}, [".lorem { background: blue; }\n#lipsum { border: 1px solid red }\n"]] }
+    let(:combobot_404_response)   { [404, {'Content-Type' => 'text/html'}, ['File not found']] }
+
+    it 'should not respond to anything other than "/combobot"' do
+      @app.call({}).must_equal(dummy_app_response)
+    end
+
+    it "combines javascript" do
+      @app.call(combobot_js_request).must_equal(combobot_js_response)
+    end
+
+    it "combines css" do
+      @app.call(combobot_css_request).must_equal(combobot_css_response)
+    end
+
+    it "returns 404 when it can't find files" do
+      @app.call(combobot_404_request).must_equal(combobot_404_response)
+    end
+
+    it 'returns 404 when trying to move up from the root dir' do
+      @app.call(combobot_hack_request).must_equal(combobot_404_response)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-combobot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154066720 !ruby/object:Gem::Requirement
+  requirement: &2153707180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154066720
+  version_requirements: *2153707180
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2154066280 !ruby/object:Gem::Requirement
+  requirement: &2153706740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154066280
+  version_requirements: *2153706740
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2154065860 !ruby/object:Gem::Requirement
+  requirement: &2153706320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154065860
+  version_requirements: *2153706320
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2154065440 !ruby/object:Gem::Requirement
+  requirement: &2153705900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154065440
+  version_requirements: *2153705900
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2154065020 !ruby/object:Gem::Requirement
+  requirement: &2153705480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154065020
+  version_requirements: *2153705480
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2154064600 !ruby/object:Gem::Requirement
+  requirement: &2153705060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154064600
+  version_requirements: *2153705060
 description: combines assets to server 1 file
 email:
 - r.hackr@gmail.com
@@ -94,15 +94,18 @@ files:
 - Guardfile
 - README.md
 - Rakefile
+- config.ru
 - lib/rack-combobot.rb
 - lib/rack/combobot.rb
+- lib/rack/combobot/combination.rb
 - lib/rack/combobot/config.rb
 - rack-combobot.gemspec
+- spec/lib/rack/combobot/combination_spec.rb
+- spec/lib/rack/combobot_spec.rb
 - spec/public/css1.css
 - spec/public/css2.css
 - spec/public/js1.js
 - spec/public/js2.js
-- spec/rack_combobot_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hojberg/rack-combobot
 licenses: []
@@ -129,9 +132,10 @@ signing_key:
 specification_version: 3
 summary: asset combinator
 test_files:
+- spec/lib/rack/combobot/combination_spec.rb
+- spec/lib/rack/combobot_spec.rb
 - spec/public/css1.css
 - spec/public/css2.css
 - spec/public/js1.js
 - spec/public/js2.js
-- spec/rack_combobot_spec.rb
 - spec/spec_helper.rb

data/spec/rack_combobot_spec.rb

@@ -1,50 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "combing assets from query string" do
-  include Rack::Test::Methods
-
-  before(:each) do
-    @app = Rack::Combobot.configure(:root => File.dirname(__FILE__) + '/public')
-  end
-
-  it "combines javascript" do
-    @app.call({
-      "QUERY_STRING" => "js1.js&js2.js"
-    }).must_equal([
-      200,
-      {"Content-Type" => "text/javascript"},
-      ["function lorem() { return \"a\"; }\nfunction ipsum() { return \"b\"; }\n"]
-    ])
-  end
-
-  it "combines css" do
-    @app.call({
-      "QUERY_STRING" => "css1.css&css2.css"
-    }).must_equal([
-      200,
-      {"Content-Type" => "text/css"},
-      [".lorem { background: blue; }\n#lipsum { border: 1px solid red }\n"]
-    ])
-  end
-
-  it "returns 404 when it can't find files" do
-    @app.call({
-      "QUERY_STRING" => "js3.js&js4.js"
-    }).must_equal([
-      404,
-      {'Content-Type' => 'text/html'},
-      ['File not found']
-    ])
-  end
-
-  it 'returns 404 when trying to move up from the root dir' do
-    @app.call({
-      "QUERY_STRING" => "js3.js&../../js4.js"
-    }).must_equal([
-      404,
-      {'Content-Type' => 'text/html'},
-      ['File not found']
-    ])
-  end
-
-end