sinatra-assets_linker 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjdlNWEzNmYxMjk3OTI0ZmY5NDFjZDZhNDgzNjY0YjMwYjUyNGE2YQ==
+    MzljZmNhZTM1OTFjMGZjMGJlMTMzNWZlYjRmYjZlZjc3NGQyZDA4MQ==
   data.tar.gz: !binary |-
-    NDA4ZjgwNzQ4ODc2OGE4NDM4MzcxZjlmOGNhMTk4YzFhZGMwZmNjMQ==
+    YTI4MDJjZDc2YWMwZGJjYTA0NjI1NTZkZjI5OTljYzQxN2YzNTY1MQ==
 SHA512:
   metadata.gz: !binary |-
-    MDg0NjcxMzMyNDcyOWVmNTY5ZmE1ODdiZmI1Y2JhMjIyMjNlNWE0MWEzN2Vi
-    NDFjMzRmZWNiNjQ1Y2FiMDU4MDE5NGEyZTFiMzE1NGY0NWMwMzg2OGM4YjI3
-    ODFjZmM0ZjMwNjIyODIzZDBmY2Y4ZjFkZTA3NTc3ODI1NWZhYjM=
+    ZWQ4ZTJlZjA5ZmI3YTQ5YWQ2NDY1ZTg3YTVjNGE2NjNiMDRlNWUzZjZmYzI3
+    NzljNGIyMTI5NmZiNDRkYjYwYjQ4ZTcwYmQwNDVhNjA0YmQxN2EyNWUyZjU2
+    OGQxNjVkZDE5YmJmNjc1MGI3YjA0MTAwNzZmMzBkMGNlOGJhZTQ=
   data.tar.gz: !binary |-
-    YzUxODcwMzYyZDg1ZGEyMzAzOTA0OGFhNDkwZjg4NjdkNTllMDVjZTVkYjZl
-    ZjE2MDQwMTA5NWVkYmFhZmRlYzVmYjIxMzk3YjA2MzkxNWRlNWVkMTYwZDc3
-    NTgwMzBiZjdhMzNhOWNiMzNkNGU2ZTliYmRjMTE4YjE1MzljM2U=
+    NmIwODM3YWMwYTI3ZjU4M2NhN2U5MWNhZTA4ZTZlNjI0Mzg4YTMwMTRiNTgw
+    MjFkZjY0MTdiYTNjZDdkNDMyODYyNDBkZWNmOTE2NGRjMDMzMmI4YzFhNzY4
+    MWQ3NjlhNjVmMjcxN2MxZWIwMTdlYzRiYjRjOWUxZWEyOTg0MDY=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 1.0.5 (2015.07.01)
+
+* refactor
+
 === 1.0.4 (2015.06.23)
 
 * update dockerfiles

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 = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/sinatra/assets_linker.rb

@@ -23,21 +23,18 @@ module Sinatra
   module AssetsLinker
 
     def css_uri(file_name, add_script_name = true)
-      cdn_url = get_settings(:cdn_url)
       css_dir = get_settings(:css_dir, 'stylesheets')
-      generate_uri(cdn_url, css_dir, file_name, add_script_name)
+      generate_uri(css_dir, file_name, add_script_name)
     end
 
     def js_uri(file_name, add_script_name = true)
-      cdn_url = get_settings(:cdn_url)
       js_dir = get_settings(:js_dir, 'javascripts')
-      generate_uri(cdn_url, js_dir, file_name, add_script_name)
+      generate_uri(js_dir, file_name, add_script_name)
     end
 
     def img_uri(file_name, add_script_name = true)
-      cdn_url = get_settings(:cdn_url)
       img_dir = get_settings(:img_dir, 'images')
-      generate_uri(cdn_url, img_dir, file_name, add_script_name)
+      generate_uri(img_dir, file_name, add_script_name)
     end
 
     private
@@ -46,9 +43,10 @@ module Sinatra
       settings.respond_to?(key) ? settings.send(key) : default
     end
 
-    def generate_uri(cdn_url, assets_dir, file_name, add_script_name)
+    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)
+      cdn_url = get_settings(:cdn_url)
       return File.join(cdn_url, relative_url) unless cdn_url.nil?
       relative_url
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assets_linker
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: The Sinatra helper for the assets links.