rack-zippy 3.0.1 → 4.0.0

data/test/configuration_test.rb

@@ -1,4 +1,5 @@
 require_relative 'test_helper'
+require 'rack-zippy/configuration'
 
 module Rack
   module Zippy

data/test/public/report.csv

@@ -0,0 +1 @@
+this,is,report,csv

data/test/railtie_test.rb

@@ -0,0 +1,60 @@
+require_relative 'test_helper'
+
+module Rails
+  class Railtie
+    def self.config
+      OpenStruct.new(after_initialize: true)
+    end
+  end
+
+  def self.version
+    raise 'Stub Rails.version'
+  end
+end
+
+require 'rack-zippy/railtie'
+
+module Rack
+  module Zippy
+    class RailtieTest <  TestCase
+
+      def teardown
+        Rack::Zippy::Railtie.skip_version_check = false
+      end
+
+      def test_upgrade_rails_or_downgrade_zippy_recommendation_for_rails_versions_below_4_2
+        with_rails_version('4.1.99') do
+          assert_output("[rack-zippy] This version of rack-zippy does not support Rails. Your choices include: 1) [RECOMMENDED] Upgrade to Rails 4.2 or above and use Rails' built-in ActionDispatch::Static middleware to serve gzipped files. or 2) Specify an earlier version of rack-zippy (~> '3.0.1') in your Gemfile that does support Rails\n") { Rack::Zippy::Railtie.version_check }
+        end
+      end
+
+      versions = ['4.2.0', '5.0.0', '10.0.0']
+      versions.each do |version|
+        test "remove zippy recommendation printed for Rails versions #{version}" do
+            with_rails_version(version) do
+              assert_output("[rack-zippy] rack-zippy is not supported for this version of Rails. Rails now supports serving gzipped files using its own ActionDispatch::Static middleware. It is strongly recommended you remove rack-zippy from your app and use ActionDispatch::Static in its place.\n") { Rack::Zippy::Railtie.version_check }
+            end
+        end
+      end
+
+      def test_config_silences_remove_zippy_recommendation_for_rails_versions_4_2_and_above
+        versions = ['4.2.0', '5.0.0', '10.0.0']
+        versions.each do |version|
+          with_rails_version(version) do
+            Rack::Zippy::Railtie.skip_version_check = true
+            assert_silent { Rack::Zippy::Railtie.version_check }
+          end
+        end
+      end
+
+      private
+
+      def with_rails_version(version)
+        Rails.stub :version, version do
+          yield
+        end
+      end
+
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,35 +3,13 @@ require 'bundler/setup'
 
 Bundler.require :default, :development
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rack/test'
+require 'active_support/testing/declarative'
 
-module RailsEnvironmentStub
 
-  @@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
-  end
-
-  def self.public_path
-    @@public_path
-  end
-
-  def self.public_path=(path)
-    @@public_path = path
-  end
-
-  def self.version
-    return 'Rails.version stub'
-  end
-
-end
-
-class TestCase < ::Test::Unit::TestCase
+class TestCase < ::Minitest::Test
+  extend ActiveSupport::Testing::Declarative
 
   DURATIONS_IN_SECS = {:year => 31536000, :month => 2678400, :day => 86400}.freeze
 
@@ -51,16 +29,5 @@ class TestCase < ::Test::Unit::TestCase
     "#{Dir.pwd}/public"
   end
 
-  def enter_rails_env
-    Object.send(:const_set, :Rails, ::RailsEnvironmentStub) unless defined?(::Rails)
-  end
-
-  def exit_rails_env
-    Object.send(:remove_const, :Rails)
-  end
-
-  def in_rails_env?
-    return defined?(::Rails)
-  end
 
 end

metadata

@@ -1,16 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rack-zippy
 version: !ruby/object:Gem::Version
-  version: 3.0.1
-  prerelease: 
+  version: 4.0.0
 platform: ruby
 authors:
 - Eliot Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
-dependencies: []
+date: 2015-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.1
+- !ruby/object:Gem::Dependency
+  name: guard-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rack middleware for serving static gzipped assets generated by the Rails
   asset pipeline
 email:
@@ -19,7 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -27,74 +96,71 @@ files:
 - README.md
 - Rakefile
 - lib/rack-zippy.rb
-- lib/rack-zippy/asset_compiler.rb
 - lib/rack-zippy/configuration.rb
-- lib/rack-zippy/serveable_file.rb
+- lib/rack-zippy/railtie.rb
 - lib/rack-zippy/version.rb
 - rack-zippy.gemspec
 - test/asset_server_test.rb
 - test/configuration_test.rb
-- test/null_asset_compiler_test.rb
 - test/public/assets/application.css
 - test/public/assets/application.css.gz
 - test/public/assets/application.js
 - test/public/assets/application.js.gz
 - test/public/assets/blog/logos/logo1.png
 - test/public/assets/favicon.ico
+- test/public/assets/loading.GiF
 - test/public/assets/rails.png
 - test/public/favicon.ico
 - test/public/foo/bar.html
 - test/public/foo/index.html
 - test/public/index.html
+- test/public/report.csv
 - test/public/robots.txt
 - test/public/thanks.html
-- test/rails_asset_compiler_test.rb
-- test/serveable_file_test.rb
+- test/railtie_test.rb
 - test/test_helper.rb
-- video-player.png
 homepage: https://github.com/eliotsykes/rack-zippy
 licenses:
 - MIT
+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: 1.8.23.2
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack middleware for serving static gzipped assets generated by the Rails
   asset pipeline
 test_files:
 - test/asset_server_test.rb
 - test/configuration_test.rb
-- test/null_asset_compiler_test.rb
 - test/public/assets/application.css
 - test/public/assets/application.css.gz
 - test/public/assets/application.js
 - test/public/assets/application.js.gz
 - test/public/assets/blog/logos/logo1.png
 - test/public/assets/favicon.ico
+- test/public/assets/loading.GiF
 - test/public/assets/rails.png
 - test/public/favicon.ico
 - test/public/foo/bar.html
 - test/public/foo/index.html
 - test/public/index.html
+- test/public/report.csv
 - test/public/robots.txt
 - test/public/thanks.html
-- test/rails_asset_compiler_test.rb
-- test/serveable_file_test.rb
+- test/railtie_test.rb
 - test/test_helper.rb

data/lib/rack-zippy/asset_compiler.rb

@@ -1,39 +0,0 @@
-module Rack
-  module Zippy
-
-    class NullAssetCompiler
-      def compiles?(path_info)
-        return false
-      end
-    end
-
-    class RailsAssetCompiler
-
-      def initialize
-        # config.assets.compile is normally false in production, and true in dev+test envs.
-        # compile == true => active pipeline
-        # compile == false => disabled pipeline
-        @active = ::Rails.configuration.assets.compile
-      end
-
-      def compiles?(path_info)
-        return active? && on_pipeline_path?(path_info)
-      end
-
-      private
-
-      def on_pipeline_path?(path_info)
-        path_info =~ PRECOMPILED_ASSETS_SUBDIR_REGEX
-      end
-
-      def active?
-        return @active
-      end
-
-      def self.rails_env?
-        return defined?(::Rails.version)
-      end
-    end
-
-  end
-end

data/lib/rack-zippy/serveable_file.rb

@@ -1,138 +0,0 @@
-module Rack
-  module Zippy
-    class ServeableFile
-
-      attr_reader :path, :full_path_info
-
-      def initialize(options)
-        raise ArgumentError.new(':has_encoding_variants option must be given') unless options.has_key?(:has_encoding_variants)
-
-        @path = options[:path]
-        @full_path_info = options[:full_path_info]
-        @has_encoding_variants = options[:has_encoding_variants]
-        @is_gzipped = options[:is_gzipped]
-        @max_age_fallback = options[:max_age_fallback] || SECONDS_IN[:day]
-      end
-
-      def headers
-        headers = { 'Content-Type'  => Rack::Mime.mime_type(::File.extname(full_path_info)) }
-        headers.merge! cache_headers
-
-        headers['Vary'] = 'Accept-Encoding' if encoding_variants?
-        headers['Content-Encoding'] = 'gzip' if gzipped?
-
-        headers['Content-Length'] = ::File.size(path).to_s
-        return headers
-      end
-
-      def cache_headers
-        case full_path_info
-        when PRECOMPILED_ASSETS_SUBDIR_REGEX
-          lifetime_in_secs = SECONDS_IN[:year]
-          last_modified = CACHE_FRIENDLY_LAST_MODIFIED
-        when '/favicon.ico'
-          lifetime_in_secs = SECONDS_IN[:month]
-          last_modified = CACHE_FRIENDLY_LAST_MODIFIED
-        else
-          lifetime_in_secs = @max_age_fallback
-        end
-
-        headers = { 'Cache-Control' => "public, max-age=#{lifetime_in_secs}" }
-        headers['Last-Modified'] = last_modified if last_modified
-
-        return headers
-      end
-
-      def response_body
-        [::File.read(path)]
-      end
-
-      def self.find_first(options)
-        asset_compiler = options[:asset_compiler]
-        path_info = options[:path_info].chomp('/')
-
-        return nil if asset_compiler.compiles?(path_info)
-
-        asset_root = options[:asset_root]
-
-        candidate_path_infos = []
-        if !path_info.empty?
-          candidate_path_infos << path_info
-          candidate_path_infos << "#{path_info}#{DEFAULT_STATIC_EXTENSION}"
-        end
-        candidate_path_infos << "#{path_info}/index#{DEFAULT_STATIC_EXTENSION}"
-
-        file_path = nil
-
-        full_path_info = candidate_path_infos.find do |candidate_path_info|
-          file_path = ::File.join(asset_root, candidate_path_info)
-          readable_file?(file_path)
-        end
-
-        return nil if full_path_info.nil? || !has_static_extension?(full_path_info)
-
-        include_gzipped = options[:include_gzipped]
-
-        gzipped_file_path = "#{file_path}.gz"
-        gzipped_file_present = readable_file?(gzipped_file_path)
-
-        has_encoding_variants = gzipped_file_present
-
-        init_options = {
-          :path => file_path,
-          :full_path_info => full_path_info,
-          :has_encoding_variants => has_encoding_variants,
-          :max_age_fallback => options[:max_age_fallback]
-        }
-
-        if include_gzipped && gzipped_file_present
-          init_options[:path] = gzipped_file_path
-          init_options[:is_gzipped] = true
-        end
-
-        return ServeableFile.new(init_options)
-      end
-
-      def self.has_static_extension?(path)
-        Rack::Zippy.static_extensions.include? ::File.extname(path).slice(1..-1).to_s.downcase
-      end
-
-      def encoding_variants?
-        return @has_encoding_variants
-      end
-
-      def gzipped?
-        return @is_gzipped
-      end
-
-      def ==(other)
-        return false if other.nil?
-        return true if self.equal?(other)
-        return self.class == other.class &&
-          self.gzipped? == other.gzipped? &&
-          self.encoding_variants? == other.encoding_variants? &&
-          self.path == other.path &&
-          self.full_path_info == other.full_path_info
-      end
-      alias_method :eql?, :==
-
-        private
-
-      # Old last-modified headers encourage caching via browser heuristics. Use it for year-long cached assets.
-      CACHE_FRIENDLY_LAST_MODIFIED = 'Mon, 10 Jan 2005 10:00:00 GMT'
-
-      SECONDS_IN = {
-        :day => 24*60*60,
-        :month => 31*(24*60*60),
-        :year => 365*(24*60*60)
-      }.freeze
-
-      DEFAULT_STATIC_EXTENSION = '.html'.freeze
-
-      def self.readable_file?(file_path)
-        return ::File.file?(file_path) && ::File.readable?(file_path)
-      end
-
-    end
-  end
-end