sinatra-assets_linker 1.0.5 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzljZmNhZTM1OTFjMGZjMGJlMTMzNWZlYjRmYjZlZjc3NGQyZDA4MQ==
+    YjY4YjZhYTZmY2NmYTlmNGQwNWU4OTZkZTQwNDI1N2MyNzkyMmFhMw==
   data.tar.gz: !binary |-
-    YTI4MDJjZDc2YWMwZGJjYTA0NjI1NTZkZjI5OTljYzQxN2YzNTY1MQ==
+    N2JlNzMwMWU3NWJjNmUyMTdjODVmOWE1N2JjZDdmZDdlY2UxZTk2Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZWQ4ZTJlZjA5ZmI3YTQ5YWQ2NDY1ZTg3YTVjNGE2NjNiMDRlNWUzZjZmYzI3
-    NzljNGIyMTI5NmZiNDRkYjYwYjQ4ZTcwYmQwNDVhNjA0YmQxN2EyNWUyZjU2
-    OGQxNjVkZDE5YmJmNjc1MGI3YjA0MTAwNzZmMzBkMGNlOGJhZTQ=
+    NGI0YWE3NDA4Njk2NmIyZTQ4ZjU1OTc5OTA3OGE1NDhkMjVmMjhlY2Y5MDJj
+    YWRiYmUwNmEzMmY5OWY2NTk2MjE5YjY0NzNhYWM2Y2Y2MzQzNWY3ZTE3NjY0
+    MzRmM2NiZmNmNjIxYTIzZDFhMDA3NWI2NmJmNjVkN2U3NmRlN2M=
   data.tar.gz: !binary |-
-    NmIwODM3YWMwYTI3ZjU4M2NhN2U5MWNhZTA4ZTZlNjI0Mzg4YTMwMTRiNTgw
-    MjFkZjY0MTdiYTNjZDdkNDMyODYyNDBkZWNmOTE2NGRjMDMzMmI4YzFhNzY4
-    MWQ3NjlhNjVmMjcxN2MxZWIwMTdlYzRiYjRjOWUxZWEyOTg0MDY=
+    ZGZkNTRhYjIzMGU4ZTI0YzA0MDQ0MmZiYjExZjY0NDlmM2EwYWIyYTMzMjUz
+    ZWIwMzRlNDc0ZjQ1YmYwMzYzNGU1MjBkNWZmYWI1YzY1ZDg2MmM5NDZjY2Fm
+    OWE5YzY3NDA0ZWMwOWE5NDg5MmFjMWU5OWE5NjgzZTMwYWI0NzA=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 2.0.0 (2015.07.04)
+
+* rename settings variables
+* add configs to integrate r.js outputs into js_uri
+
 === 1.0.5 (2015.07.01)
 
 * refactor

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -8,8 +8,8 @@ Provided methods:
 * `js_uri(file_name, add_script_name = true)`
 * `img_uri(file_name, add_script_name = true)`
 
-They extend the [`uri`][uri] method from the Sinatra. 
-Always returns relative paths, unless you set `:cdn_url`.
+They extend the [`uri`][uri] method from the Sinatra.
+Always returns relative paths, unless you set `:project_cdn_url`.
 
 ## Installation
 
@@ -36,12 +36,13 @@ class MyApp < Sinatra::Base
 
   configure do
     # define assets dirs
-    set :css_dir, 'css_dir'
-    set :js_dir, 'js_dir'
-    set :img_dir, 'img_dir'
+    set :project_css_dir, 'css_dir'
+    set :project_js_dir, 'js_dir'
+    set :project_img_dir, 'img_dir'
 
     # optionally
-    set :cdn_url, 'http://cdn.net'
+    set :project_cdn_url, 'http://cdn.net'
+    set :project_assets_verbose, true
   end
 
 end
@@ -62,6 +63,21 @@ css_uri('file.css')       # -> http://cdn.net/css_dir/file.css
 js_uri('file.js')         # -> http://cdn.net/js_dir/file.js
 img_uri('file.jpg')       # -> http://cdn.net/img_dir/file.jpg
 ```
+
+## Configuration and defaults
+
+* :project_css_dir [stylesheets]
+* :project_js_dir [javascripts]
+* :project_rjs_dir [js]
+* :project_cdn_url [nil]
+* :project_assets_env [development]
+
+## Requirejs integration
+
+If you compile your javastripts into the other directory, you can set it by
+editing the `:project_rjs_dir` option, and switch loading assets from that
+dir by setting: `project_assets_verbose` to `true`.
+
 ## Versioning
 
 See [semver.org][semver]

data/lib/sinatra/assets_linker.rb

@@ -17,23 +17,24 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'sinatra/base'
+require "sinatra/base"
 
 module Sinatra
   module AssetsLinker
-
     def css_uri(file_name, add_script_name = true)
-      css_dir = get_settings(:css_dir, 'stylesheets')
+      css_dir = get_settings(:project_css_dir, "stylesheets")
       generate_uri(css_dir, file_name, add_script_name)
     end
 
     def js_uri(file_name, add_script_name = true)
-      js_dir = get_settings(:js_dir, 'javascripts')
-      generate_uri(js_dir, file_name, add_script_name)
+      js_dir = get_settings(:project_js_dir, "javascripts")
+      rjs_dir = get_settings(:project_rjs_dir, "js")
+      choosen_dir = get_settings(:project_assets_verbose, false) ? rjs_dir : js_dir
+      generate_uri(choosen_dir, file_name, add_script_name)
     end
 
     def img_uri(file_name, add_script_name = true)
-      img_dir = get_settings(:img_dir, 'images')
+      img_dir = get_settings(:project_img_dir, "images")
       generate_uri(img_dir, file_name, add_script_name)
     end
 
@@ -46,10 +47,9 @@ module Sinatra
     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)
+      cdn_url = get_settings(:project_cdn_url)
       return File.join(cdn_url, relative_url) unless cdn_url.nil?
       relative_url
     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 = '1.0.5'
+  VERSION = "2.0.0"
 end

data/lib/sinatra-assets_linker.rb

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'sinatra/assets_linker'
+require "sinatra/assets_linker"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assets_linker
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra