sinatra-assets_linker 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e7f5a193a1fcb2121ca09bc5cc503a4b7ac0df
-  data.tar.gz: fa86d5cb4a923074eddafde6391723311eba6b90
+  metadata.gz: 47b4c96824eb32e59653dcaf81badc57fa20321b
+  data.tar.gz: a8bea6b8f297b6118a5dd5ff6197f0e7d464ef68
 SHA512:
-  metadata.gz: 69089ac7a508f5872de83feb987544645fbc3a9c121efaa27b718613671b8ef56ede977059e0152c4bbe55968b662649609da2fc0cdc8b8dd90f099bcfe5122f
-  data.tar.gz: e7d94a630c774cbcfbfc38925dfb0e21843abff11ca94f7eeac61228a9ca519c256ed33b6bd4a61251ee587d5e8212f18d65df5293f1b870b8744aff06f9aab6
+  metadata.gz: 9c4c0f9e558e28aae71de62b3822e11e6b29a17828fa78979952ffa3a8131233f0f232ddb2da271652d70b98fc14f2bfb1a6036e793fe34430375ae49990a644
+  data.tar.gz: 3dd66effb9cf75a5477113a21a6cba16d1978452d41954863e0e25a769ec975fdf20e449efe95c42c93bf4c6bf1bc1d17f06082c3c7e461c84df85d144a9efb2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 3.0.1 (2016.10.24)
+
+* helper functions now have `absolute` attribute to be compatible with `Sinatra::uri` function
+
 === 3.0.0 (2016.10.06)
 
 * use minitest instead of rspec

data/lib/sinatra/assets_linker.rb

@@ -21,21 +21,21 @@ require "sinatra/base"
 
 module Sinatra
   module AssetsLinker
-    def css_uri(file_name, add_script_name = true)
+    def css_uri(file_name, absolute = true, add_script_name = true)
       css_dir = get_settings(:project_css_dir)
-      generate_uri(css_dir, file_name, add_script_name)
+      generate_uri(css_dir, file_name, absolute, add_script_name)
     end
 
-    def js_uri(file_name, add_script_name = true)
+    def js_uri(file_name, absolute = true, add_script_name = true)
       javascript_dir = get_settings(:project_javascripts_dir)
       js_dir = get_settings(:project_js_compressed_dir)
       choosen_dir = get_settings(:project_assets_verbose) ? javascript_dir : js_dir
-      generate_uri(choosen_dir, file_name, add_script_name)
+      generate_uri(choosen_dir, file_name, absolute, add_script_name)
     end
 
-    def img_uri(file_name, add_script_name = true)
+    def img_uri(file_name, absolute = true, add_script_name = true)
       img_dir = get_settings(:project_images_dir)
-      generate_uri(img_dir, file_name, add_script_name)
+      generate_uri(img_dir, file_name, absolute, add_script_name)
     end
 
     private
@@ -44,12 +44,15 @@ module Sinatra
       settings.assets_linker_config.fetch(key.to_s)
     end
 
-    def generate_uri(assets_dir, file_name, add_script_name)
-      absolute_path = false
-      relative_url = uri(File.join(assets_dir, file_name), absolute_path, add_script_name)
+    def generate_uri(assets_dir, file_name, absolute, add_script_name)
       cdn_url = get_settings(:project_cdn_url)
-      return File.join(cdn_url, relative_url) unless cdn_url.nil?
-      relative_url
+      relative_url = File.join(assets_dir, file_name)
+      if cdn_url.nil? || cdn_url == ""
+        uri(relative_url, absolute, add_script_name)
+      else
+        uri(relative_url, false, add_script_name)
+        File.join(cdn_url, relative_url)
+      end
     end
   end
 end

data/lib/sinatra-assets_linker/version.rb

@@ -18,5 +18,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module SinatraAssetsLinker
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assets_linker
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra