butler_static 0.0.6 → 0.0.7

data/lib/butler/static.rb

@@ -75,18 +75,13 @@ module Butler
   #        general global HTTP header settings
   #
   class Static
-    def initialize(app, options={})
+    def initialize(app, path=nil, options={})
       @app = app
-      path = options[:path] || ''
-      # CLEAN THIS MESS UP
       path ||= Rails.application.config.paths['public'].first if defined? Rails
-      @header_rules = {}
-      if defined? Rails
-         header_rules = Rails.application.config.assets.header_rules
-         @header_rules.merge(header_rules) if header_rules
-      end
-      @header_rules = @header_rules.merge(options[:header_rules]) if options[:header_rules]
-      @file_handler = Butler::Handler.new(path, header_rules: @header_rules)
+      header_rules = {}
+      header_rules = Rails.application.config.assets.header_rules if defined? Rails
+      header_rules = options[:header_rules] if options[:header_rules]
+      @file_handler = Butler::Handler.new(path, header_rules: header_rules)
     end
 
     def call(env)

data/lib/butler/version.rb

@@ -1,3 +1,3 @@
 module Butler
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/butler/static_test.rb

@@ -185,7 +185,7 @@ class StaticTest < MiniTest::Unit::TestCase
     /\.(css|erb)\z/ => {'Cache-Control' => 'public, max-age=600'},
   }
 
-  App = Butler::Static.new(DummyApp, path: "#{FIXTURE_LOAD_PATH}/public", header_rules: header_rules)
+  App = Butler::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public", header_rules: header_rules)
 
   def setup
     @app = App

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: butler_static
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: