roda-cj 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3718202aa5175a67126539e0d6f4ff22eff2a194
-  data.tar.gz: d2aa31f52413970c3c9442ca77c75cba0ec9f9f2
+  metadata.gz: af3da6c6a5dbecc79ec993e9393115ae8862e8b6
+  data.tar.gz: 4238915430382a9d43ccfba59f890229c3388d6a
 SHA512:
-  metadata.gz: bde6d4389d7c8c98626512de3e497f9df24d185ecea0c26e6cb3d49934758296730254461fb473b2e795415d119fc31c6d9cf44a6efc136da1151f72b29cf176
-  data.tar.gz: e45591c85df7a82cb5a6ad487bbf75fce44f124e423b2a301f7a9ff9796e8eeb67085261829e5983be5e6e491858ec8a76be28ff016ec31e5faec6f250538fbd
+  metadata.gz: 0a259997417cb792ac317890812d0d549bb6e4003eed49385b420de352a77c182854db078929d3dd2968c2179af289ab32625f56afd9e136445a5f45f6b0b5e7
+  data.tar.gz: 158e74929dd3bfbe8ef333b01f7e16567724222cb613c34351105ef8667178f7dd948aa03190edbde3e9b6c1a6a937deff8537723e4f660be61e232768e1d000

data/lib/roda/plugins/assets.rb

@@ -1,5 +1,6 @@
 require "tilt"
-require 'open-uri'
+require 'net/http'
+require 'uri'
 
 class Roda
   module RodaPlugins
@@ -53,7 +54,7 @@ class Roda
 
         # Generates a unique id, this is used to keep concat/compiled files
         # from caching in the browser when they are generated
-        def assets_unique_id type
+        def assets_unique_id(type)
           if unique_id = instance_variable_get("@#{type}")
             unique_id
           else
@@ -83,11 +84,13 @@ class Roda
 
         private
 
-        def compile_process_files files, type, folder
+        def compile_process_files(files, type, folder)
           require 'yuicompressor'
 
-          r = new
+          # start app instance
+          app = new
 
+          # content to render to file
           content = ''
 
           files.each do |file|
@@ -95,7 +98,7 @@ class Roda
               file = "#{folder}/#{file}"
             end
 
-            content += r.read_asset_file file, type
+            content += app.read_asset_file file, type
           end
 
           path = assets_opts[:compiled_path] \
@@ -150,6 +153,7 @@ class Roda
         end
 
         def render_asset(file, type)
+          # convert back url safe to period
           file.gsub!(/(\$2E|%242E)/, '.')
 
           if !assets_opts[:compiled] && !assets_opts[:concat]
@@ -177,7 +181,7 @@ class Roda
           end
         end
 
-        def read_asset_file file, type
+        def read_asset_file(file, type)
           folder = assets_opts[:"#{type}_folder"]
 
           # If there is no file it must be a remote file request.
@@ -187,31 +191,29 @@ class Roda
             file  = env['SCRIPT_NAME'].gsub(/^\/#{route}\/#{folder}\//, '')
           end
 
+          # If it's not a url or parent direct append the full path
           if !file[/^\.\//] && !file[/^http/]
-            path = assets_opts[:path] + '/' + folder + "/#{file}"
-          else
-            path = file
+            file = assets_opts[:path] + '/' + folder + "/#{file}"
           end
 
+          # set the current engine
           engine = assets_opts[:"#{type}_engine"]
 
-          # render via tilt
-          if File.exists? "#{path}.#{engine}"
-            render path: "#{path}.#{engine}"
-          # read file directly
-          elsif File.exists? "#{path}.#{type}"
-            File.read "#{path}.#{type}"
-          # grab remote file content
+          if File.exists? "#{file}.#{engine}"
+            # render via tilt
+            render path: "#{file}.#{engine}"
+          elsif File.exists? "#{file}.#{type}"
+            # read file directly
+            File.read "#{file}.#{type}"
           elsif file[/^http/]
-            open(file).read
-          # as a last attempt lets see if the file can be rendered by tilt
-          # otherwise load the file directly
-          elsif File.exists? path
-            begin
-              render path: path
-            rescue
-              File.read path
-            end
+            # grab remote file content
+            Net::HTTP.get(URI.parse(file))
+          elsif File.exists?(file) && !file[/\.#{type}$/]
+            # Render via tilt if the type isn't css or js
+            render path: file
+          else
+            # if it is css/js read the file directly
+            File.read file
           end
         end
 
@@ -229,13 +231,13 @@ class Roda
 
         # CSS tag template
         # <link rel="stylesheet" href="theme.css">
-        def css_assets_tag attrs
+        def css_assets_tag(attrs)
           "<link rel=\"stylesheet\" #{attrs} />"
         end
 
         # JS tag template
         # <script src="scriptfile.js"></script>
-        def js_assets_tag attrs
+        def js_assets_tag(attrs)
           "<script type=\"text/javascript\" #{attrs}></script>"
         end
       end

data/lib/roda/version.rb

@@ -1,3 +1,3 @@
 class Roda
-  RodaVersion = '1.0.4'.freeze
+  RodaVersion = '1.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-cj
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack