hyperloop 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dfb955d1503bb9133c9c4f83c7813a1a65a1f41
-  data.tar.gz: 9321f9d51755fbeef6ef2bd694c3a129d273cbe4
+  metadata.gz: 29a3801566158ad7b51ebbdaf45cb6ca6e67ae84
+  data.tar.gz: 38ec4004a3ed61d574f1e66e6183c6079e0e9272
 SHA512:
-  metadata.gz: 9c03dd0d3a042535c644e6db73be972d79783f92ed9a1231889050f3e086693aadb59d0b25716289646ba982737c2d0684c9dd1549993ca27edf4c42c10e9e94
-  data.tar.gz: f97317e18c1b3aa65243650b00d18fd235252799d6b740c5af0f409168e7f12e0bc98683f7424f9cd73bf76f2d0abb02dcb0081bc0b3cea2af64a26cf1e53d5c
+  metadata.gz: 3e1539c80d4e01aedd6b6a41cd0feb1def272cff39d8635225b0230b03b5f93373986d4063ec2390c2746e9c884541a7cd968cb7671e054189f794aa315f9885
+  data.tar.gz: 283808d56433d7a843af9de630a15752ca8c14613e957306aa346cb0d8aa550755b1c45ee678857b7413fbea7f4c3aaedb2b781addb7b9b3934321299728ed38

data/lib/hyperloop/application.rb

@@ -7,8 +7,7 @@ module Hyperloop
     include Rack::Utils
 
     def initialize(root=nil)
-      @root          = root
-      @view_registry = View::Registry.new(@root)
+      @root = root
     end
 
     # Rack call interface.
@@ -21,7 +20,7 @@ module Hyperloop
         # as the response body.
         response["Content-Type"] = asset.content_type
         response.write(asset.source)
-      elsif view = @view_registry.find_template_view(normalized_request_path(request.path))
+      elsif view = view_registry.find_template_view(normalized_request_path(request.path))
         # If there's a view at the path, use its data as the response body.
         data = view.render(request)
         response.write(data)
@@ -48,12 +47,16 @@ module Hyperloop
     #
     # Returns a Sprockets::Environment.
     def assets
-      @assets ||= Sprockets::Environment.new do |env|
-        env.append_path(File.join(@root, "app", "assets"))
-        env.append_path(File.join(@root, "vendor", "assets"))
+      @assets = nil unless production?
+
+      @assets ||= Sprockets::Environment.new(@root) do |env|
+        env.version = ENV["RACK_ENV"]
+
+        env.append_path(File.join("app", "assets"))
+        env.append_path(File.join("vendor", "assets"))
 
         # compress everything in production
-        if ENV["RACK_ENV"] == "production"
+        if production?
           env.js_compressor  = YUI::JavaScriptCompressor.new(:munge => true)
           env.css_compressor = YUI::CssCompressor.new
         end
@@ -81,5 +84,20 @@ module Hyperloop
         path.chomp("/")
       end
     end
+
+    # Internal: Are we running in production mode?
+    #
+    # Returns a boolean.
+    def production?
+      ENV["RACK_ENV"] == "production"
+    end
+
+    # Internal: The view registry to use for the app.
+    #
+    # Returns a Hyperloop::View::Registry
+    def view_registry
+      @view_registry = nil unless production?
+      @view_registry ||= View::Registry.new(@root)
+    end
   end
 end

data/lib/hyperloop/version.rb

@@ -1,3 +1,3 @@
 module Hyperloop
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/application_spec.rb

@@ -3,12 +3,11 @@ require File.expand_path("../spec_helper", __FILE__)
 describe Hyperloop::Application do
   describe "with a flat views directory" do
     before :each do
-      @app     = Hyperloop::Application.new("spec/fixtures/simple/")
-      @request = Rack::MockRequest.new(@app)
+      @app = Hyperloop::Application.new(prepare_fixture(:simple))
     end
 
     it "responds successfully to a request for root" do
-      response = @request.get("/")
+      response = mock_request(@app).get("/")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("text/html")
@@ -16,21 +15,21 @@ describe Hyperloop::Application do
     end
 
     it "responds successfully to a request for a different page" do
-      response = @request.get("/about")
+      response = mock_request(@app).get("/about")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("About")
     end
 
     it "responds successfully to a request with a trailing slash" do
-      response = @request.get("/about/")
+      response = mock_request(@app).get("/about/")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("About")
     end
 
     it "404s on a request for a nonexistent page" do
-      response = @request.get("/nonexistent")
+      response = mock_request(@app).get("/nonexistent")
 
       expect(response).to be_not_found
     end
@@ -38,19 +37,18 @@ describe Hyperloop::Application do
 
   describe "with subdirectories" do
     before :each do
-      @app     = Hyperloop::Application.new("spec/fixtures/subdirectories/")
-      @request = Rack::MockRequest.new(@app)
+      @app = Hyperloop::Application.new(prepare_fixture(:subdirectories))
     end
 
     it "responds successfully to a request for the subdirectory root" do
-      response = @request.get("/subdir1")
+      response = mock_request(@app).get("/subdir1")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("Subdirectory Index")
     end
 
     it "responds successfully to a request for a different page in the subdirectory" do
-      response = @request.get("/subdir1/kanye")
+      response = mock_request(@app).get("/subdir1/kanye")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("Hurry up with my damn croissant")
@@ -59,12 +57,11 @@ describe Hyperloop::Application do
 
   describe "with ERB" do
     before :each do
-      @app     = Hyperloop::Application.new("spec/fixtures/erb/")
-      @request = Rack::MockRequest.new(@app)
+      @app = Hyperloop::Application.new(prepare_fixture(:erb))
     end
 
     it "renders embedded Ruby in the root page" do
-      response = @request.get("/")
+      response = mock_request(@app).get("/")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("WE ARE USING ERB")
@@ -73,12 +70,11 @@ describe Hyperloop::Application do
 
   describe "with a layout" do
     before :each do
-      @app     = Hyperloop::Application.new("spec/fixtures/layouts/")
-      @request = Rack::MockRequest.new(@app)
+      @app = Hyperloop::Application.new(prepare_fixture(:layouts))
     end
 
     it "renders the root view within the layout" do
-      response = @request.get("/")
+      response = mock_request(@app).get("/")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("Layout Header")
@@ -86,7 +82,7 @@ describe Hyperloop::Application do
     end
 
     it "renders subdirectory views within the layout" do
-      response = @request.get("/subdir")
+      response = mock_request(@app).get("/subdir")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("Layout Header")
@@ -96,19 +92,18 @@ describe Hyperloop::Application do
 
   describe "with assets" do
     before :each do
-      @app     = Hyperloop::Application.new("spec/fixtures/assets/")
-      @request = Rack::MockRequest.new(@app)
+      @app = Hyperloop::Application.new(prepare_fixture(:assets))
     end
 
     it "responds successfully to a request for root" do
-      response = @request.get("/")
+      response = mock_request(@app).get("/")
 
       expect(response).to be_ok
       expect(text_in(response.body, "h1")).to eql("This app has so many assets")
     end
 
     it "responds successfully to a request for the css app bundle" do
-      response = @request.get("/assets/stylesheets/app.css")
+      response = mock_request(@app).get("/assets/stylesheets/app.css")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("text/css")
@@ -116,7 +111,7 @@ describe Hyperloop::Application do
     end
 
     it "responds successfully to a request for the javascript app bundle" do
-      response = @request.get("/assets/javascripts/app.js")
+      response = mock_request(@app).get("/assets/javascripts/app.js")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("application/javascript")
@@ -124,7 +119,7 @@ describe Hyperloop::Application do
     end
 
     it "responds successfully to a request for a vendored css file" do
-      response = @request.get("/assets/stylesheets/vendored.css")
+      response = mock_request(@app).get("/assets/stylesheets/vendored.css")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("text/css")
@@ -132,7 +127,7 @@ describe Hyperloop::Application do
     end
 
     it "responds successfully to a request for a vendored javascript bundle" do
-      response = @request.get("/assets/javascripts/vendored.js")
+      response = mock_request(@app).get("/assets/javascripts/vendored.js")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("application/javascript")
@@ -140,7 +135,7 @@ describe Hyperloop::Application do
     end
 
     it "responds successfully to a request for a gif" do
-      response = @request.get("/assets/images/my-gif.gif")
+      response = mock_request(@app).get("/assets/images/my-gif.gif")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("image/gif")
@@ -148,7 +143,7 @@ describe Hyperloop::Application do
     end
 
     it "responds successfully to a request for a jpg" do
-      response = @request.get("/assets/images/my-jpg.jpg")
+      response = mock_request(@app).get("/assets/images/my-jpg.jpg")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("image/jpeg")
@@ -156,7 +151,7 @@ describe Hyperloop::Application do
     end
 
     it "responds successfully to a request for a png" do
-      response = @request.get("/assets/images/my-png.png")
+      response = mock_request(@app).get("/assets/images/my-png.png")
 
       expect(response).to be_ok
       expect(response.content_type).to eql("image/png")
@@ -164,24 +159,142 @@ describe Hyperloop::Application do
     end
 
     it "404s on a request for an asset without namespacing by type" do
-      response = @request.get("/assets/app.js")
+      response = mock_request(@app).get("/assets/app.js")
       expect(response).to be_not_found
     end
 
     it "404s on a request for an asset namespaced by the wrong type" do
-      response = @request.get("/assets/stylesheets/app.js")
+      response = mock_request(@app).get("/assets/stylesheets/app.js")
       expect(response).to be_not_found
     end
 
     it "404s on a request for an asset namespaced by an unknown type" do
-      response = @request.get("/assets/shouldfail/shouldfail.css")
+      response = mock_request(@app).get("/assets/shouldfail/shouldfail.css")
       expect(response).to be_not_found
     end
 
     it "404s on a request for a nonexistent asset" do
-      response = @request.get("/assets/javascripts/nonexistent.js")
+      response = mock_request(@app).get("/assets/javascripts/nonexistent.js")
 
       expect(response).to be_not_found
     end
   end
+
+  describe "live reloading" do
+    context "with assets" do
+      before :each do
+        @root = prepare_fixture(:assets)
+        @app  = Hyperloop::Application.new(@root)
+      end
+
+      it "reloads changed assets" do
+        # On the first request, stylesheet should have `display: block` and not
+        # `display: inline`.
+        response = mock_request(@app).get("/assets/stylesheets/app.css")
+        expect(response).to be_ok
+        expect(response.body).to match(/display: ?block/)
+        expect(response.body).not_to match(/display: ?inline/)
+
+        change_fixture(@root, "app/assets/stylesheets/my-styles.scss",
+          :pattern     => "display: block",
+          :replacement => "display: inline"
+        )
+
+        # On the second request, stylesheet should have `display: inline` and not
+        # `display: block`.
+        response = mock_request(@app).get("/assets/stylesheets/app.css")
+        expect(response).to be_ok
+        expect(response.body).to match(/display: ?inline/)
+        expect(response.body).not_to match(/display: ?block/)
+      end
+    end
+
+    context "with views" do
+      before :each do
+        @root = prepare_fixture(:partials)
+        @app  = Hyperloop::Application.new(@root)
+      end
+
+      it "reloads changed layouts" do
+        # On the first request, <title> text should not be "Changed"
+        response = mock_request(@app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "title")).not_to eql("Changed")
+
+        change_fixture(@root, "app/views/layouts/application.html.erb",
+          :pattern     => /<title>[^<]*<\/title>/,
+          :replacement => "<title>Changed</title>"
+        )
+
+        # On the second request, <title> text should be "Changed"
+        response = mock_request(@app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "title")).to eql("Changed")
+      end
+
+      it "reloads changed partials" do
+        # On the first request, <p> text should not be "Changed"
+        response = mock_request(@app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "p.spec-in-partial")).not_to eql("Changed")
+
+        change_fixture(@root, "app/views/subdir/_partial.html.erb",
+          :pattern     => /<p class="spec-in-partial">[^<]*<\/p>/,
+          :replacement => "<p class=\"spec-in-partial\">Changed</p>"
+        )
+
+        # On the second request, <p> text should be "Changed"
+        response = mock_request(@app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "p.spec-in-partial")).to eql("Changed")
+      end
+
+      it "reloads changed views" do
+        # On the first request, <h2> text should not be "Changed"
+        response = mock_request(@app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "h2")).not_to eql("Changed")
+
+        change_fixture(@root, "app/views/index.html.erb",
+          :pattern     => /<h2>[^<]*<\/h2>/,
+          :replacement => "<h2>Changed</h2>"
+        )
+
+        # On the second request, <h2> text should be "Changed"
+        response = mock_request(@app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "h2")).to eql("Changed")
+      end
+    end
+
+    context "in production" do
+      before :each do
+        set_rack_env :production
+      end
+
+      after :each do
+        reset_rack_env
+      end
+
+      it "doesn't reload changed views" do
+        root = prepare_fixture(:erb)
+        app  = Hyperloop::Application.new(root)
+
+        # On the first request, <title> text should be "ERB"
+        response = mock_request(app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "title")).to eql("ERB")
+
+        change_fixture(root, "app/views/index.html.erb",
+          :pattern     => "<title>ERB</title>",
+          :replacement => "<title>Changed</title>"
+        )
+
+        # On the second request, <title> text should still be "ERB"
+        response = mock_request(app).get("/")
+        expect(response).to be_ok
+        expect(text_in(response.body, "title")).to eql("ERB")
+      end
+    end
+  end
 end

data/spec/fixtures/partials/app/views/subdir/_partial.html.erb

@@ -1 +1 @@
-<p>This is coming from a partial.</p>
+<p class="spec-in-partial">This is coming from a partial.</p>

data/spec/spec_helper.rb

@@ -4,6 +4,53 @@ require "pry"
 require "hyperloop"
 
 module Helpers
+  # Public: Clean up all prepared fixtures.
+  #
+  # Returns nothing.
+  def cleanup_fixtures
+    tmp_fixtures_dir = File.join("tmp", "spec", "fixtures")
+    FileUtils.rm_rf(tmp_fixtures_dir)
+  end
+
+  # Public: Change the contents of a file in a fixture.
+  #
+  # fixture_path - Path to the fixture containing the file we want to change.
+  # file_path    - Path (relative to fixture_path) of the file we want to
+  #                change.
+  # options      - Hash containing the following keys:
+  #                :pattern     - (Required) Regexp or String to find in the
+  #                               file. Only the first occurrence will be
+  #                               matched.
+  #                :replacement - (Required) String to replace the found pattern
+  #                               with.
+  #
+  # Examples:
+  #
+  #   change_fixture("tmp/spec/fixtures/erb", "app/views/index.html.erb",
+  #     :pattern     => "<title>ERB</title>",
+  #     :replacement => "<title>Changed</title>"
+  #   )
+  #
+  #   change_fixture("tmp/spec/fixtures/erb", "app/views/index.html.erb",
+  #     :pattern     => /<title>[^<]*<\/title>/,
+  #     :replacement => "<title>Changed</title>"
+  #   )
+  #
+  # Returns nothing.
+  def change_fixture(fixture_path, file_path, options = {})
+    pattern     = options[:pattern]
+    replacement = options[:replacement]
+
+    raise ArgumentError, "change_fixture must include a :pattern option" unless pattern
+    raise ArgumentError, "change_fixture must include a :replacement option" unless replacement
+
+    File.open(File.join(fixture_path, file_path), "r+") do |f|
+      data = f.read.sub(pattern, replacement)
+      f.rewind
+      f.write(data)
+    end
+  end
+
   def html(str)
     Nokogiri::HTML(str)
   end
@@ -15,6 +62,58 @@ module Helpers
     )
   end
 
+  # Public: Prepare a fixture with the specified name.
+  #
+  # name - Symbol name of the fixture to prepare. The name passed here will be
+  #        looked up in the spec/fixtures directory.
+  #
+  # Note:
+  #
+  #   This method exists along with change_fixture and cleanup_fixtures. If
+  #   these get used a lot more or more fixture-related functionality is added,
+  #   it may make sense to extract a Fixture class and move these methods into
+  #   it.
+  #
+  # Returns a string filepath representing the new location of the prepared
+  # fixture.
+  def prepare_fixture(name)
+    root     = File.join("spec", "fixtures", name.to_s)
+    contents = File.join(root, ".")
+    tmp_root = File.join("tmp", root)
+
+    # Delete and recreate the tmp/spec/fixtures/:name directory, then copy the
+    # fixture into it.
+    FileUtils.rm_rf(tmp_root)
+    FileUtils.mkdir_p(tmp_root)
+    FileUtils.cp_r(contents, tmp_root)
+
+    tmp_root
+  end
+
+  # Public: Set the RACK_ENV environment variable back to whatever it was when
+  # the spec started running. If RACK_ENV wasn't set before the spec started
+  # running, it will be deleted.
+  #
+  # Returns nothing.
+  def reset_rack_env
+    if defined?(@old_rack_env)
+      ENV["RACK_ENV"] = @old_rack_env
+    else
+      ENV.delete("RACK_ENV")
+    end
+  end
+
+  # Public: Set the RACK_ENV environment variable to the specified value.
+  #
+  # name - Symbol environment name to set RACK_ENV to. Should be :development,
+  #        :test, or :production.
+  #
+  # Returns nothing.
+  def set_rack_env(name)
+    @old_rack_env = ENV["RACK_ENV"] if ENV.key?("RACK_ENV")
+    ENV["RACK_ENV"] = name.to_s
+  end
+
   def text_in(html_str, selector)
     node = html(html_str).at_css(selector)
     node && node.text
@@ -24,11 +123,17 @@ module Helpers
     @mock_app ||= double("rack app", :call => Hyperloop::Response.new.finish )
   end
 
-  def mock_request
-    Rack::MockRequest.new(mock_app)
+  def mock_request(app = nil)
+    Rack::MockRequest.new(app || mock_app)
   end
 end
 
+ENV["RACK_ENV"] ||= "test"
+
 RSpec.configure do |c|
   c.include(Helpers)
+
+  c.after :all do
+    cleanup_fixtures
+  end
 end

data/spec/view/scope_spec.rb

@@ -1,7 +1,7 @@
 describe Hyperloop::View::Scope do
   before :each do
     view_registry = Hyperloop::View::Registry.new("spec/fixtures/partials/")
-    @request      = Rack::MockRequest.new(mock_app)
+    @request      = mock_request
     @scope        = Hyperloop::View::Scope.new(@request, view_registry)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperloop
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jake Boxer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script