happo 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97302068d4c34f670c8ce49747ca263a1f5f6c36
-  data.tar.gz: 03bb8213cfac918a790c72d392b86ee9d96429e5
+  metadata.gz: bfa1d5f7b53de566a64a6710794a4deea0a756db
+  data.tar.gz: db582e13b81de2322f8da87531e37230eea83800
 SHA512:
-  metadata.gz: 5ddc0e81b2412b3f604ae335a7ad1e712d52e364ebd832684c8ad3a0493b20beb345b15981ef89a89dfe9a169cd296307adb4f11bef98df752775e35f9220553
-  data.tar.gz: 9e530f6b12ddc037be582ea0536eaab077438ba601a03fe30dedf301f99ee27c1baec84bf29162e06a585fb80a31f0213755b249d3ce425e38442789569d525c
+  metadata.gz: 762fc9435e4b284e6c2d3c5bb475d1b0e7d8bd23215acb9404b767311fa6328440c328450ce2f1f14ebd0cbb60fa13624c06c3bedf78ea0831f8b9f8ecb5f795
+  data.tar.gz: cb059925a90d2398b09bb5a0aac0297911a8e221d4bdd73fff1920e722baefc715f0922caf653e14cef95de6540e8e3a3ba6f453cbdf8996d08cf96e4d98034d

data/lib/happo/server.rb

@@ -39,18 +39,22 @@ module Happo
     end
 
     get '/*' do
-      config = Happo::Utils.config
+      # If this file is part of Happo itself (e.g. some bit of JavaScript), we
+      # want to give that precedence so that Happo can work properly.
       file = params[:splat].first
-      if File.exist?(file)
-        send_file file
-      else
-        config['public_directories'].each do |pub_dir|
-          filepath = File.join(Dir.pwd, pub_dir, file)
-          if File.exist?(filepath)
-            send_file filepath
-          end
-        end
+      return send_file(file) if File.exist?(file)
+
+      # The requested file is not part of Happo, so let's look in the configured
+      # public directories. This is useful for serving up e.g. custom font files
+      # that your components depend on to be rendered correctly.
+      config = Happo::Utils.config
+      config['public_directories'].each do |pub_dir|
+        filepath = File.join(Dir.pwd, pub_dir, file)
+        return send_file(filepath) if File.exist?(filepath)
       end
+
+      status 404 # not found
+      body '404 error: not found'
     end
 
     run!

data/lib/happo/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Happo
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happo
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Henric Trotzig
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png