stylus 0.1.2 → 0.2.0

data/CHANGELOG.md

@@ -1,11 +1,16 @@
 ## Changelog
 
-### 0.1.2 (2001-07-08)
+### 0.2.0 (211-07-14)
+[Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.1.2...v0.2.0)
+
+* Replaced `stylus:install` with proper generators for Rails 3.1 - now all hooks for the `stylesheet_engine` will generate `.styl` files.
+
+### 0.1.2 (2011-07-08)
 [Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.1.1...v0.1.2)
 
 * Fixes missing `require` for Rails apps.
 
-### 0.1.1 (2001-07-07)
+### 0.1.1 (2011-07-07)
 [Compare view](https://github.com/lucasmazza/ruby-stylus/compare/v0.1.0...v0.1.1)
 
 * Requiring `stylus/tilt` outside the `Railtie`, by [DAddYE](https://github.com/DAddYE).

data/README.md

@@ -38,10 +38,6 @@ Just add the `stylus` gem to your Gemfile and the gem will hook itself into Spro
 
 If you just want to merge the generated css in another file, you can use only the `require` directive from Sprockets.
 
-### Rails Generators
-
-`stylus` ships with a `stylus:install` generator that copy 2 `.styl` files to your `lib/` folder, so when you run rails generators like `rails g assets products` or `rails g scaffold post` it will create `.styl` files instead of plain `.css` ones.
-
 ## Changelog
 [here.](https://github.com/lucasmazza/ruby-stylus/blob/master/CHANGELOG.md)
 

data/lib/rails/generators/stylus/assets/assets_generator.rb

@@ -0,0 +1,13 @@
+require "rails/generators/named_base"
+
+module Stylus
+  module Generators
+    class AssetsGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_stylus
+        template "stylesheet.css.styl", File.join('app/assets/stylesheets', class_path, "#{file_name}.css.styl")
+      end
+    end
+  end
+end

data/lib/{generators/stylus → rails/generators/stylus/assets}/templates/stylesheet.css.styl

@@ -1,3 +1,3 @@
 // Place all the styles related to the matching controller here.
 // They will automatically be included in application.css.
-// You can use Sass here: http://learnboost.github.com/stylus
+// You can use Stylus syntax here: http://learnboost.github.com/stylus

data/lib/rails/generators/stylus/scaffold/scaffold_generator.rb

@@ -0,0 +1,11 @@
+require 'rails/generators/css/scaffold/scaffold_generator'
+
+module Stylus
+  module Generators
+    # Just inherit from the original Generator from Rails
+    # because `scaffold.css` it's just to help people to start up
+    # their Rails applications.
+    class ScaffoldGenerator < Css::Generators::ScaffoldGenerator
+    end
+  end
+end

data/lib/stylus/railtie.rb

@@ -1,23 +1,19 @@
-### Stylus Railtie
-# `Railtie` responsible for injecting `stylus` inside the
-# Rails application and the `Sprockets` Asset Pipeline.
+require 'stylus/tilt'
+require 'sprockets'
 module Stylus
+  ### Stylus Railtie
+  #
+  # `Railtie` responsible for injecting `stylus` inside the
+  # Rails application and the `Sprockets` Asset Pipeline.
   class Railtie < ::Rails::Railtie
 
-    initializer :setup_stylus do |app|
-      config.app_generators.stylesheet_engine :styl
-      next unless app.config.assets.enabled
+    config.app_generators.stylesheet_engine :stylus
 
-      # Loading `Sprockets` before Rails so we can register our own Engine.
-      require 'sprockets'
-      require 'sprockets/engines'
-      require 'stylus/tilt'
-
-      Sprockets.register_engine '.styl', Tilt::StylusTemplate
-    end
+    Sprockets::Engines #autoloading
+    Sprockets.register_engine '.styl', Tilt::StylusTemplate
 
     # Includes the `Rails` asset load path into `stylus` so any
-    # `.styl` file inside it can be imported.
+    # `.styl` file inside it can be imported by the `stylus` API.
     config.after_initialize do |app|
       Stylus.paths.concat app.assets.paths
     end

data/lib/stylus/tilt.rb

@@ -1,13 +1,18 @@
-### Stylus template implementation for `Tilt`.
-# It can be used by the `Rails` Asset Pipeline or `Sinatra` Applications.
 require 'tilt'
-require 'tilt/template'
 
 module Tilt
+  ### Stylus template implementation for `Tilt`.
+  #
+  # It can be used by the `Rails` Asset Pipeline or `Sinatra` applications.
   class StylusTemplate < Template
     self.default_mime_type = 'text/css'
 
+    def self.engine_initialized?
+      defined? ::Stylus
+    end
+
     def prepare
+      require_template_library 'stylus'
     end
 
     def evaluate(scope, locals, &block)

data/lib/stylus/version.rb

@@ -1,3 +1,3 @@
 module Stylus
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/stylus.rb

@@ -1,11 +1,18 @@
-## Stylus
+require 'execjs'
+require 'stylus/version'
+require 'stylus/tilt' if defined?(::Tilt)
+require 'stylus/railtie' if defined?(::Rails)
 
+## Stylus
+#
 # `stylus` is a bridge between your Ruby code and the [Stylus](https://github.com/LearnBoost/stylus)
 # library that runs on Node.js. It's aims to be a replacement for the
 # [stylus_rails](https://github.com/lucasmazza/stylus_rails) gem and to support the Rails 3.1 asset pipeline
 # (via [Tilt](https://github.com/rtomayko/tilt)) and other scenarios,
-# backed by the [ExecJS](https://github.com/sstephenson/execjs) gem.module Stylus
+# backed by the [ExecJS](https://github.com/sstephenson/execjs) gem.
+#
 ### Usage
+#
 # To compile a `.styl` file or an arbitrary String to .CSS using stylus, just use the `compile` method.
 #
 # `Stylus.compile(File.new('application.styl'))`
@@ -14,11 +21,6 @@
 #
 # `Stylus.compile(File.read('application.styl'), :compress => true)`
 #
-
-require 'execjs'
-require 'stylus/version'
-require 'stylus/tilt' if defined?(::Tilt)
-require 'stylus/railtie' if defined?(::Rails)
 module Stylus
   class << self
     @@compress = false
@@ -26,7 +28,6 @@ module Stylus
     @@plugins = {}
 
     # Stores a list of plugins to import inside `Stylus`, with an optional hash.
-
     def use(*options)
       arguments = options.last.is_a?(Hash) ? options.pop : {}
       options.each do |plugin|
@@ -35,7 +36,7 @@ module Stylus
     end
     alias :plugin :use
 
-    # Retrieves the plugins registered by `use`.
+    # Retrieves all the registered plugins registered.
     def plugins
       @@plugins
     end

data/spec/generators/assets_generator_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'rails/generators/stylus/assets/assets_generator'
+
+describe Stylus::Generators::AssetsGenerator do
+  include Generators::TestCase
+  arguments  %w(posts)
+
+  it 'generates a .styl file' do
+    file('app/assets/stylesheets/posts.css.styl').should exist
+  end
+end

data/spec/generators/controller_generator_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'rails/generators/rails/controller/controller_generator'
+require 'rails/generators/stylus/assets/assets_generator'
+
+describe Rails::Generators::ControllerGenerator do
+  include Generators::TestCase
+  arguments  %w(posts --stylesheet-engine=stylus)
+
+  it 'generates a .styl file' do
+    file('app/assets/stylesheets/posts.css.styl').should exist
+  end
+end

data/spec/generators/scaffold_generator_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'rails/generators/rails/scaffold/scaffold_generator'
+require 'rails/generators/stylus/assets/assets_generator'
+require 'rails/generators/stylus/scaffold/scaffold_generator'
+
+describe Rails::Generators::ScaffoldGenerator do
+  include Generators::TestCase
+  arguments  %w(posts --stylesheet-engine=stylus --orm=false)
+
+  it 'generates the default scaffold stylesheet' do
+    file('app/assets/stylesheets/scaffold.css').should exist
+  end
+
+  it 'generates a named .styl file' do
+    file('app/assets/stylesheets/posts.css.styl').should exist
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
-require 'stylus'
+require 'support/helpers'
+require 'support/matchers'
+require 'support/generators/test_case'
 
 RSpec.configure do |config|
+  config.include Helpers
 
   config.after :each do
     Stylus.compress = false
@@ -8,14 +11,3 @@ RSpec.configure do |config|
     Stylus.plugins.clear
   end
 end
-
-def fixture_root
-  File.expand_path('../fixtures', __FILE__)
-end
-
-def fixture(name)
-  stylus = File.read(File.join(fixture_root, "#{name}.styl"))
-  css    = File.read(File.join(fixture_root, "#{name}.css"))
-  [stylus, css]
-end
-

data/spec/stylus_spec.rb

@@ -1,3 +1,4 @@
+require 'stylus'
 require 'spec_helper'
 
 describe Stylus do

data/spec/support/generators/test_case.rb

@@ -0,0 +1,68 @@
+# Extracted from generator_spec https://github.com/stevehodgkiss/generator_spec
+# But `RSpec::Rails::RailsExampleGroup` loads a truckload of things from rails and rspec-rails
+# That we don't need.
+
+ENV["RAILS_ENV"] = 'test'
+require 'rails'
+require 'rails/test_help'
+require 'rails/generators/test_case'
+require 'active_support/core_ext/class/attribute_accessors'
+
+module Generators
+  module TestCase
+    extend ActiveSupport::Concern
+    include FileUtils
+
+    included do
+      cattr_accessor :test_case, :test_case_instance
+
+      self.test_case = Class.new(Rails::Generators::TestCase) do
+        def fake_test_case; end
+        def add_assertion; end
+      end
+      self.test_case_instance = self.test_case.new(:fake_test_case)
+      self.test_case.tests described_class
+
+      before do
+        prepare_destination
+        create_routes
+        run_generator
+      end
+
+      destination File.expand_path("../tmp", __FILE__)
+    end
+
+    module ClassMethods
+      def tests(klass)
+        self.test_case.generator_class = klass
+      end
+
+      def arguments(array)
+        self.test_case.default_arguments = array
+      end
+
+      def destination(path)
+        self.test_case.destination_root = path
+      end
+    end
+
+    module InstanceMethods
+
+      def file(relative)
+         File.expand_path(relative, destination_root)
+       end
+
+      def method_missing(method_sym, *arguments, &block)
+        self.test_case_instance.send(method_sym, *arguments, &block)
+      end
+
+      def respond_to?(method_sym, include_private = false)
+        if self.test_case_instance.respond_to?(method_sym)
+          true
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -0,0 +1,18 @@
+module Helpers
+  def create_routes
+    destination = File.join(destination_root, "config")
+
+    FileUtils.mkdir_p(destination)
+    FileUtils.touch File.join(destination, 'routes.rb')
+  end
+
+  def fixture_root
+    File.expand_path('../../fixtures', __FILE__)
+  end
+
+  def fixture(name)
+    stylus = File.read(File.join(fixture_root, "#{name}.styl"))
+    css    = File.read(File.join(fixture_root, "#{name}.css"))
+    [stylus, css]
+  end
+end

data/spec/support/matchers.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :exist do
+  match do |file_path|
+    File.exists?(file_path)
+  end
+end

data/stylus.gemspec

@@ -13,8 +13,10 @@ Gem::Specification.new do |s|
   s.description = %q{Bridge library to compile .styl stylesheets from ruby code.}
 
   s.add_dependency 'execjs'
-  s.add_development_dependency 'rspec', '~>2.0'
-  s.add_development_dependency 'tilt'
+  s.add_development_dependency 'rspec',       '~> 2.0'
+  s.add_development_dependency 'railties',    '~> 3.1.0.rc1'
+  s.add_development_dependency 'actionpack',  '~> 3.1.0.rc1'
+  s.add_development_dependency 'sprockets',   '2.0.0.beta.10'
   s.add_development_dependency 'yajl-ruby'
   s.add_development_dependency 'rocco'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stylus
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Lucas Mazza
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 -03:00
+date: 2011-07-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,23 +48,63 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: tilt
+  name: railties
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15424103
         segments: 
+        - 3
+        - 1
         - 0
-        version: "0"
+        - rc
+        - 1
+        version: 3.1.0.rc1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: actionpack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15424103
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 1
+        version: 3.1.0.rc1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sprockets
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 62196471
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 10
+        version: 2.0.0.beta.10
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,11 +114,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,7 +128,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 description: Bridge library to compile .styl stylesheets from ruby code.
 email: 
 - luc4smazza@gmail.com
@@ -105,10 +145,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/generators/stylus/USAGE
-- lib/generators/stylus/install_generator.rb
-- lib/generators/stylus/templates/scaffold.css.styl
-- lib/generators/stylus/templates/stylesheet.css.styl
+- lib/rails/generators/stylus/assets/assets_generator.rb
+- lib/rails/generators/stylus/assets/templates/stylesheet.css.styl
+- lib/rails/generators/stylus/scaffold/scaffold_generator.rb
 - lib/stylus.rb
 - lib/stylus/compiler.js
 - lib/stylus/railtie.rb
@@ -125,8 +164,14 @@ files:
 - spec/fixtures/simple.styl
 - spec/fixtures/stylesheet.css
 - spec/fixtures/stylesheet.styl
+- spec/generators/assets_generator_spec.rb
+- spec/generators/controller_generator_spec.rb
+- spec/generators/scaffold_generator_spec.rb
 - spec/spec_helper.rb
 - spec/stylus_spec.rb
+- spec/support/generators/test_case.rb
+- spec/support/helpers.rb
+- spec/support/matchers.rb
 - spec/tilt_spec.rb
 - stylus.gemspec
 has_rdoc: true
@@ -175,6 +220,12 @@ test_files:
 - spec/fixtures/simple.styl
 - spec/fixtures/stylesheet.css
 - spec/fixtures/stylesheet.styl
+- spec/generators/assets_generator_spec.rb
+- spec/generators/controller_generator_spec.rb
+- spec/generators/scaffold_generator_spec.rb
 - spec/spec_helper.rb
 - spec/stylus_spec.rb
+- spec/support/generators/test_case.rb
+- spec/support/helpers.rb
+- spec/support/matchers.rb
 - spec/tilt_spec.rb

data/lib/generators/stylus/USAGE

@@ -1,3 +0,0 @@
-Copy the Stylus templates to your Rails app to replace the .css files generated by Rails, just do:
-
-    rails generate stylus:install

data/lib/generators/stylus/install_generator.rb

@@ -1,16 +0,0 @@
-module Stylus
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-      desc 'copy Stylus assets templates'
-      source_root File.expand_path('../templates', __FILE__)
-
-      def copy_asset_template
-        copy_file 'stylesheet.css.styl', 'lib/templates/rails/assets/stylesheet.css.styl'
-      end
-
-      def copy_scaffold_template
-        copy_file 'scaffold.css.styl', 'lib/templates/rails/resource/scaffold.css.styl'
-      end
-    end
-  end
-end

data/lib/generators/stylus/templates/scaffold.css.styl

@@ -1,58 +0,0 @@
-body
-  background-color #fff
-  color #333
-
-body, p, ol, ul, td
-  font-family verdana, arial, helvetica, sans-serif
-  font-size 13px
-  line-height 18px
-
-pre
-  background-color #eee
-  padding 10px
-  font-size 11px
-
-a
-  color #000
-
-  &:visited
-    color #666
-
-  &:hover
-    color #fff
-    background-color #000
-
-div.field, div.actions
-  margin-bottom 10px
-
-#notice
-  color green
-
-.field_with_errors
-  padding 2px
-  background-color red
-  display table
-
-#error_explanation
-  width 450px
-  border 2px solid red
-  padding 7px
-  padding-bottom 0
-  margin-bottom 20px
-  background-color #f0f0f0
-
-  h2
-    text-align left
-    font-weight bold
-    padding 5px 5px 5px 15px
-    font-size 12px
-    margin -7px
-    margin-bottom 0px
-    background-color #c00
-    color #fff
-  ul
-    li
-      font-size 12px
-      list-style square
-
-