railz_lite 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f212021508124c75b30ec2d598c39939597f7263f8a08d8909efedc5d13220e7
-  data.tar.gz: 2b45fc4a2b46f7aa168a48d1fc0c222cbeca5007c1c1df7400bbd591363388a7
+  metadata.gz: e77147f68729fb2f1b68f730aa31e1e50ca822df8990e6fb35ba9eb2e02cbf5d
+  data.tar.gz: e96ec7817513298e3899cde8d3e9d3f43cbc97589302443db38c4ec8a993258b
 SHA512:
-  metadata.gz: d9a20d00eeab48b8738ee9f136468f97081a2b14c1819c9473277374a169cc8dbe85a45ee4ed48bfcc4df24856791019cf994df791d062c4a339d5d0ea83bc03
-  data.tar.gz: 0646d6b6f01ac5c7998e9bf3c0431a34777cf22f7ac46e34756b2fc197832c9794949d2de2398c2ccbdaa5f2c8d59497a3dacaca62d9c2e5ace82fa1eae261bf
+  metadata.gz: 5968f44535f416c2524445365be98cacfe92894e1ed1079268cb8261ea0c44bd8101ad9f7fb62d84677fb0f2e5f57937f955144046bb1c399659b61c0065acb2
+  data.tar.gz: 958a09155c32bd8707908f4a820a2cc5e8f4116e0d90fa91c44ca24855827df3e4819ab31a410beffeb866615013418012890bab1237d105e0e9111bba4664ac

data/lib/railz_lite/controllers/static.rb

@@ -13,17 +13,21 @@ class Static
     req = Rack::Request.new(env)
     path = req.path
 
-    if can_match?(path)
-      file_server.call(env)
-    else
+    asset_dir = get_asset_dir(path)
+
+    if asset_dir.nil?
       app.call(env)
+    else
+      file_server.call(env, asset_dir)
     end
   end
 
   private
 
-  def can_match?(path)
-    root_paths.any? { |root| path.index("/#{root}") }
+  # return the root directory of asset request ex => 'films/assets/app.css' would return 'assets'
+  def get_asset_dir(path)
+    root_paths.each { |root| return root if path.include?(root) }
+    nil
   end
 end
 
@@ -37,9 +41,9 @@ class FileServer
     '.js' => 'text/javascript'
   }
 
-  def call(env)
+  def call(env, asset_dir)
     res = Rack::Response.new
-    file_name = requested_file_name(env)
+    file_name = requested_file_name(env, asset_dir)
 
     if File.exist?(file_name)
       serve_file(file_name, res)
@@ -60,10 +64,11 @@ class FileServer
     res.write(file)
   end
 
-  def requested_file_name(env)
+  def requested_file_name(env, asset_dir)
     req = Rack::Request.new(env)
-    path = req.path
     dir = Dir.pwd
-    File.join(dir, path)
+    path = req.path
+    filename = File.basename(path)
+    File.join(dir, asset_dir, filename)
   end
 end

data/lib/railz_lite/generators/templates/server.rb

@@ -24,7 +24,7 @@ end
 
 app = Rack::Builder.new do
   use ShowExceptions # generates helpful error messages
-  use Static # serves static assets from /public
+  use Static # serves static assets from /public and /assets
   run app
 end.to_app
 

data/lib/railz_lite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailzLite
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railz_lite
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - bryan lynch