jader 0.0.4 → 0.0.5

data/Gemfile

@@ -2,10 +2,10 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in jade.gemspec
 gemspec
+gem 'therubyracer', :platform => :ruby
 
 group :test do
   gem 'johnson',      :platform => :mri_18
-  gem 'therubyracer', :platform => :ruby
   gem 'therubyrhino', :platform => :jruby
   gem 'sqlite3'
 end

data/README.md

@@ -56,28 +56,16 @@ and the call to `=yield` will render your Jade template above.
 
 Since Rails doesn't expect server-side templates to live under `app/assets` we need to add our client-side views path to Rails views lookup path.
 
-Inside your `application_controller.rb` add the following:
+Assuming we have an initializer `app/config/initializers/jader.rb` we can add our client-side views directory like this:
 
 ```ruby
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-
-  before_filter :prepend_view_paths
-
-  # .... application controller code
-
-  private
-
-  # Adds Client-Side views to render path
-  def prepend_view_paths
-    prepend_view_path Rails.root.join('app', 'assets', 'javascripts', , 'views')
-  end
-
+Jader.configure do |config|
+  # make your client-side views directory discoverable to Rails
+  config.views_path = Rails.root.join('app','assets','javascripts','views')
 end
-
 ```
 
-This is a ad-hoc solution that should change in the near future.
+Internally, this adds a `before_filter` to `ApplicationController::Base` that prepends the provided path to `ActionView::Context` .
 
 ### Client-side code
 
@@ -276,7 +264,7 @@ Jader.configure do |config|
 end
 ```
 
-`Jader::Configuration.includes` is an array that accepts raw Javascript strings that are, in turn, passed to the server-side template evaluation context.
+`Jader.configuration.includes` is an array that accepts raw Javascript strings that are, in turn, passed to the server-side template evaluation context.
 
 To give a more pragmatic example of using Jader inclusions, lets try using `I18n.js` on both server and client.
 
@@ -314,6 +302,8 @@ Assuming we have an initializer `app/config/initializers/jader.rb` it should inc
 ```ruby
 Jader.configure do |config|
   config.mixins_path = Rails.root.join('app','assets','javascripts','mixins')
+  # make your client-side views directory discoverable to Rails
+  config.views_path = Rails.root.join('app','assets','javascripts','views')
   # Use some javascript from a file that's not available in the asset pipeline
   config.includes << IO.read(Rails.root.join('app','assets','javascripts','includes','util.js'))
   # wait for assets to be ready

data/lib/jader/configuration.rb

@@ -7,7 +7,8 @@ module Jader
   # @yield [config] Jader::Configuration instance
   # @example
   #     Jader.configure do |config|
-  #       config.mixins_path = Rails.root.join('app','assets','javascripts','helpers')
+  #       config.mixins_path = Rails.root.join('app','assets','javascripts','mixins')
+  #       config.views_path = Rails.root.join('app','assets','javascripts','views')
   #       config.includes << IO.read Rails.root.join('app','assets','javascripts','util.js')
   #     end
   def self.configure
@@ -17,11 +18,12 @@ module Jader
 
   # Jader configuration class
   class Configuration
-    attr_accessor :mixins_path, :includes
+    attr_accessor :mixins_path, :views_path, :includes
 
     # Initialize Jader::Configuration class with default values
     def initialize
       @mixins_path = nil
+      @views_path = nil
       @includes = []
     end
   end

data/lib/jader/engine.rb

@@ -7,5 +7,15 @@ module Jader
       next unless app.config.assets.enabled
       Sprockets.register_engine '.jade', ::Jader::Template
     end
+
+    initializer 'jader.prepend_views_path', :after => :add_view_paths do |app|
+      next if Jader::configuration.views_path.nil?
+      ActionController::Base.class_eval do
+        before_filter do |controller|
+          prepend_view_path Jader::configuration.views_path
+        end
+      end
+    end
+
   end
 end

data/lib/jader/version.rb

@@ -1,3 +1,3 @@
 module Jader
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -6,4 +6,4 @@
 //
 //= require 'jade/runtime'
 //= require ./sample
-//= require views/users/index
+//= require views/users/dummy

data/spec/dummy/config/initializers/jader.rb

@@ -1,4 +1,5 @@
 Jader.configure do |config|
   config.mixins_path = Rails.root.join('app','assets','javascripts','mixins')
+  config.views_path = Rails.root.join('app','assets','javascripts','views')
   config.includes << IO.read(Rails.root.join('app','assets','javascripts','includes','util.js'))
 end

data/spec/template_spec.rb

@@ -34,7 +34,7 @@ describe Jader::Compiler do
     context = V8::Context.new
     context.eval %{
       #{asset_for('application.js').to_s}
-      html = JST['views/users/index']({phrase: '#{phrase}'})
+      html = JST['views/users/dummy']({phrase: '#{phrase}'})
     }
     context.eval('html').should include(phrase.upcase)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libv8
@@ -171,7 +171,8 @@ files:
 - spec/dummy/app/assets/javascripts/mixins/application_mixins.jade
 - spec/dummy/app/assets/javascripts/mixins/users_mixins.jade
 - spec/dummy/app/assets/javascripts/sample.jst.jade
-- spec/dummy/app/assets/javascripts/views/users/index.jst.jade
+- spec/dummy/app/assets/javascripts/views/users/dummy.jst.jade
+- spec/dummy/app/assets/javascripts/views/users/index.jade
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
@@ -180,7 +181,6 @@ files:
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/users/index.jade
 - spec/dummy/app/views/users/show.jade
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -249,7 +249,8 @@ test_files:
 - spec/dummy/app/assets/javascripts/mixins/application_mixins.jade
 - spec/dummy/app/assets/javascripts/mixins/users_mixins.jade
 - spec/dummy/app/assets/javascripts/sample.jst.jade
-- spec/dummy/app/assets/javascripts/views/users/index.jst.jade
+- spec/dummy/app/assets/javascripts/views/users/dummy.jst.jade
+- spec/dummy/app/assets/javascripts/views/users/index.jade
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/users_controller.rb
@@ -258,7 +259,6 @@ test_files:
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/users/index.jade
 - spec/dummy/app/views/users/show.jade
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb