sinatra-assets_linker 2.0.2 → 3.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODhiOTM1MGU1NWY4ZmM2MGFhZjU4YzNiZWMzNDkxZjBlOGU0NWY4OQ==
-  data.tar.gz: !binary |-
-    YzA0NmJmOGYwZTg3YmRjODNkZWVmNWE5OGQ5Zjg3YTJjYzhjNzZlNA==
+SHA1:
+  metadata.gz: 68e7f5a193a1fcb2121ca09bc5cc503a4b7ac0df
+  data.tar.gz: fa86d5cb4a923074eddafde6391723311eba6b90
 SHA512:
-  metadata.gz: !binary |-
-    YzY1MzZhODRkODQ4MzIxY2Y1OGVkZWIxOWJjMGRlZDdjMTMxNDk0YzQwMzEy
-    ZTQ4ZDJlYjE0NGU1NTA5ZWU3M2VhODAzMzFjMGUwM2Y0ZWRiMzlkYTc1NWE3
-    MzJlMWFlNGNhNmNkNTNiZTMzODVmYzE0YWY4OTcyOTQ4MGM3MjA=
-  data.tar.gz: !binary |-
-    NzI5ZTMzY2YxOWY5YmE0YjEzYzI1MDJmYjcwZDMxOThjMzAwODMwOGYwN2Iw
-    YmIxZDkxZGZkMjgxMDZkZmRmZjM0NmE3NTdiYjlmMmFkNmVlN2VhODA1N2Y5
-    NDBlODk5OTk2ZTM2YmQzNGE1NjJlNDhmMmRiNGQzZjg3YThjM2I=
+  metadata.gz: 69089ac7a508f5872de83feb987544645fbc3a9c121efaa27b718613671b8ef56ede977059e0152c4bbe55968b662649609da2fc0cdc8b8dd90f099bcfe5122f
+  data.tar.gz: e7d94a630c774cbcfbfc38925dfb0e21843abff11ca94f7eeac61228a9ca519c256ed33b6bd4a61251ee587d5e8212f18d65df5293f1b870b8744aff06f9aab6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 3.0.0 (2016.10.06)
+
+* use minitest instead of rspec
+* add additional class for configuration
+* refactoring and cleanup
+
 === 2.0.2 (2015.07.17)
 
 * docker ref

data/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
+# Specify your gem's dependencies in mayaml.gemspec
 gemspec

data/README.md

@@ -25,8 +25,25 @@ Or install it yourself as:
 
     $ gem install sinatra-assets_linker
 
+## Configuration
+
+Through `SinatraAssetsLinker::Config` class:
+
+```ruby
+config = SinatraAssetsLinker::Config.new(
+  "project_css_dir" => "css_dir"                    # default: "stylesheets"
+  "project_javascripts_dir" => "js_dir"             # default: "javascripts"
+  "project_js_compressed_dir" => "cjs_dir"          # default: "js"
+  "project_images_dir" => "img_dir"                 # default: "images"
+  "project_assets_verbose" => true                  # default: false
+  "project_cdn_url" => "http://cdn.net"             # default: nil
+)
+```
+
 ## Usage
 
+Above methods look for configuration under: `settings.assets_linker_config`, so:
+
 ```ruby
 require 'sinatra/base'
 require 'sinatra/assets_linker'
@@ -35,16 +52,8 @@ class MyApp < Sinatra::Base
   helpers Sinatra::AssetsLinker
 
   configure do
-    # define assets dirs
-    set :project_css_dir, 'css_dir'
-    set :project_js_dir, 'js_dir'
-    set :project_img_dir, 'img_dir'
-
-    # optionally
-    set :project_cdn_url, 'http://cdn.net'
-    set :project_assets_verbose, true
+    set :assets_linker_config, SinatraAssetsLinker::Config.new(ENV.to_h)
   end
-
 end
 ```
 
@@ -56,7 +65,7 @@ js_uri('file.js')         # -> /js_dir/file.js
 img_uri('file.jpg')       # -> /img_dir/file.jpg
 ```
 
-if you set `:cdn_url` before, you get:
+if you set `"project_cdn_url"` before, you get:
 
 ```ruby
 css_uri('file.css')       # -> http://cdn.net/css_dir/file.css
@@ -64,19 +73,10 @@ 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 [javastripts]
-* :project_rjs_dir [js]
-* :project_cdn_url [nil]
-* :project_assets_verbose [false]
-
-## Requirejs integration
+## Assets verbose
 
-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`.
+If you set `"project_assets_verbose"` to `true`, then the `js_uri` method will
+use `project_javascripts_dir` instead of `project_js_compressed_dir`
 
 ## Versioning
 

data/lib/sinatra/assets_linker.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2015 Szymon Kopciewski
+# Copyright (C) 2015,2016 Szymon Kopciewski
 #
 # This file is part of SinatraAssetsLinker.
 #
@@ -22,26 +22,26 @@ require "sinatra/base"
 module Sinatra
   module AssetsLinker
     def css_uri(file_name, add_script_name = true)
-      css_dir = get_settings(:project_css_dir, "stylesheets")
+      css_dir = get_settings(:project_css_dir)
       generate_uri(css_dir, file_name, add_script_name)
     end
 
     def js_uri(file_name, add_script_name = true)
-      js_dir = get_settings(:project_js_dir, "javascripts")
-      rjs_dir = get_settings(:project_rjs_dir, "js")
-      choosen_dir = get_settings(:project_assets_verbose, false) ? js_dir : rjs_dir
+      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)
     end
 
     def img_uri(file_name, add_script_name = true)
-      img_dir = get_settings(:project_img_dir, "images")
+      img_dir = get_settings(:project_images_dir)
       generate_uri(img_dir, file_name, add_script_name)
     end
 
     private
 
-    def get_settings(key, default = nil)
-      settings.respond_to?(key) ? settings.send(key) : default
+    def get_settings(key)
+      settings.assets_linker_config.fetch(key.to_s)
     end
 
     def generate_uri(assets_dir, file_name, add_script_name)

data/lib/sinatra-assets_linker/config.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+# Copyright (C) 2015,2016 Szymon Kopciewski
+#
+# This file is part of SinatraAssetsLinker.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 "piko_model"
+
+module SinatraAssetsLinker
+  class Config < PikoModel::Model
+    field "project_css_dir", default: "stylesheets"
+    field "project_javascripts_dir", default: "javascripts"
+    field "project_js_compressed_dir", default: "js"
+    field "project_images_dir", default: "images"
+    field "project_assets_verbose", default: false
+    field "project_cdn_url", default: nil
+  end
+end

data/lib/sinatra-assets_linker/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2015 Szymon Kopciewski
+# Copyright (C) 2015,2016 Szymon Kopciewski
 #
 # This file is part of SinatraAssetsLinker.
 #
@@ -18,5 +18,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module SinatraAssetsLinker
-  VERSION = "2.0.2"
+  VERSION = "3.0.0".freeze
 end

data/lib/sinatra-assets_linker.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2015 Szymon Kopciewski
+# Copyright (C) 2015,2016 Szymon Kopciewski
 #
 # This file is part of SinatraAssetsLinker.
 #
@@ -18,3 +18,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require "sinatra/assets_linker"
+require "sinatra-assets_linker/config"

metadata

@@ -1,87 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assets_linker
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: piko_model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-given
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides the methods for generating the assets urls.
-email: s.kopciewski@gmail.com
+description: Provides methods for generating assets urls.
+email:
+- s.kopciewski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,6 +134,7 @@ files:
 - LICENSE
 - README.md
 - lib/sinatra-assets_linker.rb
+- lib/sinatra-assets_linker/config.rb
 - lib/sinatra-assets_linker/version.rb
 - lib/sinatra/assets_linker.rb
 homepage: https://github.com/skopciewski/sinatra-assets_linker
@@ -103,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The Sinatra helper for the assets links.