rack-zippy 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.1 / 2014-07-09
+- Use absolute (not relative) path for default asset_root ([#11](https://github.com/eliotsykes/rack-zippy/issues/11))
+
 ## 1.2.0 / 2014-07-09
 - Add handling of font files with extensions: woff, woff2, ttf, eot, otf
   ([#9](https://github.com/eliotsykes/rack-zippy/issues/9))

data/lib/rack-zippy.rb

@@ -4,7 +4,7 @@ module Rack
   module Zippy
     class AssetServer
 
-      def initialize(app, asset_root='public')
+      def initialize(app, asset_root=Rails.public_path)
         @app = app
         @asset_root = asset_root
       end

data/lib/rack-zippy/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Zippy
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/test/asset_server_test.rb

@@ -5,6 +5,7 @@ class Rack::Zippy::AssetServerTest < Test::Unit::TestCase
 
   def setup
     ensure_correct_working_directory
+    ::Rails.public_path = Pathname.new("#{Dir.pwd}/public")
     ::Rails.configuration.assets.compile = false
   end
 
@@ -13,11 +14,7 @@ class Rack::Zippy::AssetServerTest < Test::Unit::TestCase
   end
 
   def app
-    response = 'Up above the streets and houses'
-    headers = {}
-    status = 200
-    rack_app = lambda { |env| [status, headers, response] }
-    Rack::Zippy::AssetServer.new(rack_app)
+    Rack::Zippy::AssetServer.new(create_rack_app)
   end
 
   def test_request_for_non_asset_path_beginning_with_assets_dir_name_bypasses_middleware
@@ -282,10 +279,28 @@ class Rack::Zippy::AssetServerTest < Test::Unit::TestCase
     assert_underlying_app_responded
   end
 
+  def test_asset_root_constructor_arg_accepts_string
+    asset_server = Rack::Zippy::AssetServer.new(create_rack_app, '/custom/asset/root')
+    assert_equal '/custom/asset/root', asset_server.instance_variable_get('@asset_root')
+  end
+
+  def test_default_asset_root_is_rails_public_path
+    Rails.public_path = '/unexpected/absolute/path/to/public'
+    asset_server = Rack::Zippy::AssetServer.new(create_rack_app)
+    assert_equal '/unexpected/absolute/path/to/public', asset_server.instance_variable_get('@asset_root')
+  end
+
   private
 
   DURATIONS_IN_SECS = {:year => 31536000, :month => 2678400, :day => 86400}.freeze
 
+  def create_rack_app
+    status = 200
+    headers = {}
+    response = 'Up above the streets and houses'
+    lambda { |env| [status, headers, response] }
+  end
+
   def assert_last_modified(expected)
     assert_equal expected, last_response.headers['last-modified']
   end

data/test/test_helper.rb

@@ -8,11 +8,21 @@ require 'rack/test'
 
 module Rails
 
-  @configuration = Struct.new(:assets).new
-  @configuration.assets = Struct.new(:compile).new
+  @@public_path = '/default/path/to/public/set/in/test_helper'
+
+  @@configuration = Struct.new(:assets).new
+  @@configuration.assets = Struct.new(:compile).new
 
   def self.configuration
-    @configuration
+    @@configuration
+  end
+
+  def self.public_path
+    @@public_path
+  end
+
+  def self.public_path=(path)
+    @@public_path = path
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-zippy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -56,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2186381762254847347
+      hash: 1496083500993811016
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2186381762254847347
+      hash: 1496083500993811016
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2