stylus 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1566bf07cbd7a850d8d71b919559eb5a2fb9b017
-  data.tar.gz: 5125d3def706e75fd455a298b5bf9fb4885ad472
+  metadata.gz: a60b09a5dc38e150643c2c4d99b9f5c2108a3edc
+  data.tar.gz: 365863ee6e4bf807677fe6854edb132490c6306f
 SHA512:
-  metadata.gz: 7049f9b42626a132a83daa1db13721e31fbc248410a5f844b5e626b322419eea3e828c746ab613b55a8f8ae3633184b13c88eae33a897cc22762f162685f1eba
-  data.tar.gz: 17e72872fbbf27f0b64d2dfe3b5f5dbf7130398897a7f1965193b6a64256f632f56aacea71d5de5ad016f3d2f69f2de21edbbeba8987134c6caede12f326be54
+  metadata.gz: bccc161871310118e15ac03a5185b76e2f5368fb3d62f8f7f961d144623a4e0756360ddec5bef778ee432f5e75993cf91522c76438028cdab04d1065736e82f5
+  data.tar.gz: 1217da2209684e7433d57d142c870afb086f41da108d5d15077ac55eba633b11c3c08046098ebfef26ed7d23be54ea789a7631265a88d0b003709dbf3561db38

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2012 Lucas Mazza <luc4smazza@gmail.com>
+Copyright (c) 2012-2015 Lucas Mazza; 2015 Forge Software, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,8 +1,10 @@
 # Ruby Stylus
 
-[![Build Status](https://secure.travis-ci.org/lucasmazza/ruby-stylus.png)](http://travis-ci.org/lucasmazza/ruby-stylus)
+[![Gem Version](https://badge.fury.io/rb/stylus.svg)](http://badge.fury.io/rb/stylus)
+[![Build Status](https://travis-ci.org/forgecrafted/ruby-stylus.svg?branch=master)](https://travis-ci.org/forgecrafted/ruby-stylus)
+[![Coverage Status](https://coveralls.io/repos/forgecrafted/ruby-stylus/badge.svg)](https://coveralls.io/r/forgecrafted/ruby-stylus)
 
-`stylus` is a bridge between your Ruby code and the [Stylus](https://github.com/LearnBoost/stylus) library that runs on [node.js](http://nodejs.org). It has support for Rails 4 applications. (if you are working with Rails 3, check the [0-7-stable](https://github.com/lucasmazza/ruby-stylus/tree/0-7-stable) branch.)
+`stylus` is a bridge between Ruby and the [Stylus](https://github.com/stylus/stylus) library that runs on [node.js](http://nodejs.org). It has support for Rails 4 applications. (if you are working with Rails 3, check the [0-7-stable](https://github.com/forgecrafted/ruby-stylus/tree/0-7-stable) branch.)
 
 ## Installation
 
@@ -12,17 +14,17 @@ If you have a `Gemfile`:
 gem 'stylus'
 ```
 
-or if you don't have a Gemfile, install it in your system:
+or install it on your system:
 
 ```
 gem install stylus
 ```
 
-Since version 0.3.0, the [stylus-source](https://github.com/railsjedi/ruby-stylus-source) packages the Stylus source into a Rubygem, so it will be available after installing this gem. The `ruby-source` version will follow the Stylus releases and their versions.
+The [ruby-stylus-source](https://github.com/forgecrafted/ruby-stylus-source) packages the Stylus source into a gem, and is installed as a dependency of this gem.  Versions of `ruby-stylus-source` follow Stylus releases and their versions.
 
-You can replace the Stylus code by placing another version of Stylus on `./node_modules/stylus`, and it will be used instead of the version bundled inside the gem.
+You can manually replace the Stylus code by placing another version of Stylus on `./node_modules/stylus`, and it will be used instead of the version bundled inside the gem.
 
-**But remember**, you still need the `node` command available on your runtime for this gem to work. `stylus` is also compatible with the Heroku Cedar stack, enabling asset compilation during the deployment of your apps. You can check the [Node.js wiki](https://github.com/joyent/node/wiki/Quick-and-easy-installation) for more info.
+**REMEMBER**, you still need the `node` command available on your runtime for this gem to work. This gem is also compatible with the Heroku Cedar stack, enabling asset compilation during the deployment of your apps. You can check the [Node.js wiki](https://github.com/joyent/node/wiki/Quick-and-easy-installation) for more info.
 
 ## Usage
 
@@ -52,16 +54,31 @@ Stylus.use :nib
 # a `:filename` option so Stylus can locate your stylesheet for proper inspection.
 Stylus.debug = true
 ```
+
 ### With Rails and the Asset Pipeline.
 
 Adding `stylus` to your Gemfile should let you work with `.styl` files with the Rails 3.1 Pipeline. Any asset generated with `rails generate` will be created with a `.css.styl` extension.
 
 Any `@import` directive will add the stylesheet as a sprockets dependency, so you can update external libraries and it will reflect on your assets fingerprints. Also, the Sprockets load path (usually `app/assets`, `lib/assets`, `vendor/assets` and the `assets` folder inside any other gem) will be available to your stylesheets.
 
-If the `config.assets.debug` is turned on, Stylus will emit extra comments on your stylesheets to help debugging and inspection using the `linenos` and `firebug` options. Check the [FireStylus extension for Firebug](https://github.com/LearnBoost/stylus/blob/master/docs/firebug.md) for more info.
+If the `config.assets.debug` is turned on, Stylus will emit extra comments on your stylesheets to help debugging and inspection using the `linenos` and `firebug` options. Check the [FireStylus extension for Firebug](https://github.com/stylus/stylus/blob/master/docs/firebug.md) for more info.
 
-### `@import` and file extensions.
+It should be noted that in a default rails project you should also remove the sass-rails gem. This gem includes the tilt gem required by the asset pipeline so you should also add that gem back on its own.
+
+```
+# gem 'sass-rails'
+gem 'tilt'
+```
+
+For compilation of assets during deployment (e.g. for heroku) you'll also need to enable/add the rubyracer gem.
 
+```
+# See https://github.com/rails/execjs#readme for more supported runtimes
+gem 'therubyracer', platforms: :ruby
+```
+
+### `@import` and file extensions.
+  
 Stylus and Sprockets file lookups differ on the subject of handling file extensions, and that may hurt a bit.
 
 If you use Stylus `@import` to expose variables, mixins or just to concatenate code, you should use only the `.styl` extension on your imported files. If you use the `.css.styl` form (a convention from Sprockets), Stylus will treat it as a plain CSS file since it has `.css` on its name.
@@ -73,34 +90,31 @@ If you use Stylus `@import` to expose variables, mixins or just to concatenate c
 
 ### `@import` dependency resolution
 
-Because of how sprockets handles dependency resolution for computing
-file changes and expiring caches, it is necessary to specify the full import path in your import statements.
+Because of how sprockets handles dependency resolution for computing file changes and expiring caches, it is necessary to specify the full import path in your import statements.
 
 That is, given:
 
-    app/assets/stylesheets/
-    app/assets/stylesheets/file.styl
-    app/assets/stylesheets/some_directory/other_file.styl
-    app/assets/stylesheets/some_directory/another_file.styl
-
-Imports should be specified with the full path relative to
-`app/assets/stylesheets` regardless of where the file calling the import is. In this example we use the `app/assets` directory, but this also applies to `vendor/assets` and `lib/assets`.
-
-`app/assets/stylesheets/file.styl`
+```
+app/assets/stylesheets/
+app/assets/stylesheets/file.styl
+app/assets/stylesheets/some_directory/other_file.styl
+app/assets/stylesheets/some_directory/another_file.styl
+```
 
-    @import "some_directory/other_file.styl"
-    ...
+Imports should be specified with the full path relative to `app/assets/stylesheets` regardless of where the file calling the import is. In this example we use the `app/assets` directory, but this also applies to `vendor/assets` and `lib/assets`.
 
-`app/assets/stylesheets/some_directory/other_file.styl`
+```ruby
+# app/assets/stylesheets/file.styl
+@import "some_directory/other_file.styl"
 
-    @import "some_directory/another_file.styl"
-    ...
+# app/assets/stylesheets/some_directory/other_file.styl
+@import "some_directory/another_file.styl"
+```
 
 This will ensure that all changes get reflected when any of the imported
 files change. If you don't do this, sprockets will not accurately be
 able to keep track of your dependencies.
 
-
 ### Standalone Sprockets usage
 
 If you're using Sprockets outside Rails, on Sinatra or on a plain Rack app, you can wire up Stylus inside a instance of `Sprockets::Environment` with the `Stylus.setup` method.
@@ -123,7 +137,7 @@ map('/assets') { run assets.index }
 
 ## Plugins
 
-[Stylus](https://github.com/LearnBoost/stylus) exposes a nice API to create plugins written on [node.js](http://nodejs.org), like [nib](https://github.com/visionmedia/nib). The installation process should be the same as described above for [Stylus](https://github.com/LearnBoost/stylus) (since they're all npm packages after all). You can hook them up on your Ruby code with `Stylus.use`:
+[Stylus](https://github.com/stylus/stylus) exposes a nice API to create plugins written on [node.js](http://nodejs.org), like [nib](https://github.com/visionmedia/nib). The installation process should be the same as described above for [Stylus](https://github.com/stylus/stylus) (since they're all npm packages after all). You can hook them up on your Ruby code with `Stylus.use`:
 
 ```ruby
 Stylus.use :fingerprint, literal: 'caa8c262e23268d2a7062c6217202343b84f472b'
@@ -137,34 +151,18 @@ stylus(file).use(fingerprint({literal:'caa8c262e23268d2a7062c6217202343b84f472b'
 
 ## Questions, Bugs or Support
 
-You can [submit an issue](https://github.com/lucasmazza/ruby-stylus/issues) or ping me on [GitHub](http://github.com/lucasmazza) or [Twitter](http://twitter.com/lucasmazza).
+[Drop us a line in the issues section](https://github.com/forgecrafted/ruby-stylus/issues).
 
-For more info about the [Stylus](https://github.com/LearnBoost/stylus) syntax and its features you can check the [project repository](https://github.com/learnboost/stylus) and the docs on the [GitHub page](http://learnboost.github.com/stylus).
+**Be sure to include sample code that reproduces the problem.**
 
-## Changelog
-[It's available here.](https://github.com/lucasmazza/ruby-stylus/blob/master/CHANGELOG.md)
-
-## License
+For more info about Stylus syntax and its features, you can check the [project repository](https://github.com/stylus/stylus), and the docs on the [GitHub page](http://stylus.github.io/stylus/).
 
-(The MIT License)
+## Changelog
 
-Copyright (c) 2012-2013 Lucas Mazza <luc4smazza@gmail.com>
+[Available here.](https://github.com/forgecrafted/ruby-stylus/blob/master/CHANGELOG.md)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+## License
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Copyright (c) 2012-2015 Lucas Mazza; 2015 Forge Software, LLC.
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+This is free software, and may be redistributed under the terms specified in the LICENSE file.

data/lib/stylus.rb

@@ -23,11 +23,12 @@ require 'stylus/railtie' if defined?(::Rails)
 module Stylus
   extend Runtime
   class << self
-    @@compress = false
-    @@debug    = false
-    @@paths    = []
-    @@imports  = []
-    @@plugins  = {}
+    @@compress  = false
+    @@debug     = false
+    @@paths     = []
+    @@imports   = []
+    @@definitions = {}
+    @@plugins   = {}
 
     # Stores a list of plugins to import inside `Stylus`, with an optional hash.
     def use(*options)
@@ -47,11 +48,23 @@ module Stylus
     end
     alias :imports :import
 
+
+    # Stores a list of defined variables to create on every compile process.
+    def define(variable, value, options = {})
+      literal = true if options[:literal]
+      @@definitions[variable] = { value: value, literal: literal }
+    end
+
     # Retrieves all the registered plugins.
     def plugins
       @@plugins
     end
 
+    # Retrieves all the registered variables.
+    def definitions
+      @@definitions
+    end
+
     # Returns the global load path `Array` for your stylesheets.
     def paths
       @@paths
@@ -103,7 +116,7 @@ module Stylus
       end
       source  = source.read if source.respond_to?(:read)
       options = merge_options(options)
-      exec('compile', source, options, plugins, imports)
+      exec('compile', source, options, plugins, imports, definitions)
     end
 
     # Converts back an input of plain CSS to the `Stylus` syntax. The source object can be

data/lib/stylus/runtime/compiler.js

@@ -1,6 +1,6 @@
 var stylus = require('stylus');
 
-function compile(str, options, plugins, imports) {
+function compile(str, options, plugins, imports, definitions) {
   var style = stylus(str, options);
   var output = '';
 
@@ -8,10 +8,22 @@ function compile(str, options, plugins, imports) {
     var fn = require(name);
     style.use(fn(plugins[name]));
   }
+
   imports.forEach(function(path) {
     style.import(path);
   })
 
+  for(var definition in definitions) {
+    obj = definitions[definition];
+    value = obj.value
+
+    if(obj.literal) {
+      value = new stylus.nodes.Literal(value);
+    }
+
+    style.define(definition, value);
+  }
+
   style.render(function(error, css) {
     if(error) throw error;
     output = css;

data/lib/stylus/tilt/rails.rb

@@ -3,6 +3,7 @@ require 'stylus/tilt/stylus'
 module Stylus
   module Rails
     class StylusTemplate < ::Tilt::StylusTemplate
+      EXCLUDED_EXTENSIONS = %w{ css js gzip json md html }
 
       # Public: The default mime type for stylesheets.
       self.default_mime_type = 'text/css'
@@ -36,7 +37,8 @@ asset-path(key)
       # Returns string representations of hash in Stylus syntax
       def assets_hash(scope)
         @assets_hash ||= scope.environment.each_logical_path.each_with_object({ :url => '', :path => '' }) do |logical_path, assets_hash|
-          unless File.extname(logical_path) =~ /^(\.(css|js)|)$/
+          extensions = EXCLUDED_EXTENSIONS.join('|')
+          unless File.extname(logical_path) =~ Regexp.new("^(\.(#{extensions})|)$")
             path_to_asset = scope.path_to_asset(logical_path)
             assets_hash[:url] << "('#{logical_path}' url(\"#{path_to_asset}\")) "
             assets_hash[:path] << "('#{logical_path}' \"#{path_to_asset}\") "

data/lib/stylus/version.rb

@@ -1,3 +1,3 @@
 module Stylus
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'rails'
 require 'rails/generators/test_case'
 
@@ -21,6 +24,7 @@ RSpec.configure do |config|
     Stylus.debug = false
     Stylus.paths = []
     Stylus.plugins.clear
+    Stylus.definitions.clear
     Stylus.imports.clear
   end
 end

data/spec/stylus_spec.rb

@@ -62,6 +62,23 @@ describe Stylus do
     expect(Stylus.compile(input)).to eq(output)
   end
 
+  it 'stores the define calls' do
+    Stylus.define "mystring", "test"
+    expect(Stylus).to have(1).definitions
+  end
+
+  it 'defines a global variable string' do
+    Stylus.define "mystring", "test"
+    input, output = fixture(:definition)
+    expect(Stylus.compile(input)).to match(/content: 'test'/)
+  end
+
+  it 'defines a global variable literal' do
+    Stylus.define "mystring", "red", :literal => true
+    input, output = fixture(:definition)
+    expect(Stylus.compile(input)).to match(/content: red/)
+  end
+
   it 'includes and imports "nib" automatically' do
     Stylus.nib = true
     input, output = fixture(:nib)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stylus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Lucas Mazza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: Bridge library to compile .styl stylesheets from ruby code.
 email:
 - luc4smazza@gmail.com
@@ -99,25 +113,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Stylus Compiler
 test_files:
-- spec/generators/assets_generator_spec.rb
-- spec/generators/controller_generator_spec.rb
-- spec/generators/scaffold_generator_spec.rb
-- spec/import_processor_spec.rb
-- spec/rails_spec.rb
-- spec/runtime_spec.rb
-- spec/spec_helper.rb
-- spec/sprockets_spec.rb
-- spec/stylus_spec.rb
+- spec/support/helpers.rb
+- spec/support/matchers.rb
 - spec/support/generators/test_case.rb
-- spec/support/generators/tmp/app/controllers/posts_controller.rb
 - spec/support/generators/tmp/app/helpers/posts_helper.rb
+- spec/support/generators/tmp/app/controllers/posts_controller.rb
 - spec/support/generators/tmp/config/routes.rb
-- spec/support/helpers.rb
-- spec/support/matchers.rb
 - spec/tilt/rails_spec.rb
 - spec/tilt/stylus_spec.rb
+- spec/runtime_spec.rb
+- spec/rails_spec.rb
+- spec/spec_helper.rb
+- spec/stylus_spec.rb
+- spec/sprockets_spec.rb
+- spec/generators/assets_generator_spec.rb
+- spec/generators/scaffold_generator_spec.rb
+- spec/generators/controller_generator_spec.rb
+- spec/import_processor_spec.rb