requirejs-rails 0.9.5 → 0.9.6

data/lib/requirejs-rails.rb

@@ -1 +1 @@
-require 'requirejs/rails'
+require "requirejs/rails"

data/lib/requirejs/rails.rb

@@ -1,5 +1,5 @@
 module Requirejs
   module Rails
-    require 'requirejs/rails/engine'
+    require "requirejs/rails/engine"
   end
 end

data/lib/requirejs/rails/builder.rb

@@ -1,32 +1,24 @@
-require 'requirejs/rails'
+require "ostruct"
+require "pathname"
 
-require 'pathname'
-require 'ostruct'
+require "requirejs/rails"
 
-module Requirejs::Rails
-  class Builder
-    # config should be an instance of Requirejs::Rails::Config
-    
-    def initialize(config)
-      @config = config
-    end
-    
-    def build      
-      @config.tmp_dir
-    end
+module Requirejs
+  module Rails
+    class Builder
+      def initialize(config)
+        @config = config
+      end
 
-    def digest_for(path)
-      if !Rails.application.assets.file_digest(path).nil?
-        Rails.application.assets.file_digest(path).hexdigest
-      else
-        raise Requirejs::BuildError, "Cannot compute digest for missing asset: #{path}"
+      def build
+        @config.tmp_dir
       end
-    end
 
-    def generate_rjs_driver
-      templ = Erubis::Eruby.new(@config.driver_template_path.read)
-      @config.driver_path.open('w') do |f|
-        f.write(templ.result(@config.get_binding))
+      def generate_rjs_driver
+        templ = Erubis::Eruby.new(@config.driver_template_path.read)
+        @config.driver_path.open('w') do |f|
+          f.write(templ.result(@config.get_binding))
+        end
       end
     end
   end

data/lib/requirejs/rails/config.rb

@@ -1,35 +1,47 @@
-require 'requirejs/rails'
-require 'requirejs/error'
+require "pathname"
 
-require 'active_support/ordered_options'
-require 'erubis'
-require 'pathname'
+require "active_support/ordered_options"
+require "erubis"
 
-module Requirejs::Rails
-  class Config < ::ActiveSupport::OrderedOptions
-    LOADERS = [ :requirejs, :almond ]
+require "requirejs/error"
+require "requirejs/rails"
 
-    def initialize(application)
-      super
-      self.manifest = nil
+module Requirejs
+  module Rails
+    class Config < ::ActiveSupport::OrderedOptions
+      LOADERS = [:requirejs, :almond]
 
-      self.logical_asset_filter = [/\.js$/,/\.html$/,/\.txt$/]
-      self.tmp_dir = application.root + 'tmp'
-      self.bin_dir = Pathname.new(__FILE__+'/../../../../bin').cleanpath
+      BOWER_PATH_PATTERN = Regexp.new("\\A(.*)/(?:\\.bower|bower|component)\\.json\\z")
 
-      self.source_dir = self.tmp_dir.join("requirejs/src")
-      self.build_dir = self.tmp_dir.join("requirejs/dst")
-      self.target_dir = application.root + 'public/assets'
-      self.rjs_path   = self.bin_dir+'r.js'
+      LOGICAL_PATH_PATTERNS = [
+          Regexp.new("\\.html\\z"),
+          Regexp.new("\\.js\\z"),
+          Regexp.new("\\.txt\\z"),
+          BOWER_PATH_PATTERN
+      ]
 
-      self.loader = :requirejs
+      def initialize(application)
+        super
 
-      self.driver_template_path = Pathname.new(__FILE__+'/../rjs_driver.js.erb').cleanpath
-      self.driver_path = self.tmp_dir.join("requirejs/rjs_driver.js")
+        self.manifest = nil
+        self.logical_path_patterns = LOGICAL_PATH_PATTERNS
 
-      self.user_config = {}
+        self.tmp_dir = application.root + 'tmp'
+        self.bin_dir = Pathname.new(__FILE__+'/../../../../bin').cleanpath
 
-      self.run_config_whitelist = %w{
+        self.source_dir = self.tmp_dir.join("requirejs/src")
+        self.build_dir = self.tmp_dir.join("requirejs/dst")
+        self.target_dir = application.root + 'public/assets'
+        self.rjs_path = self.bin_dir+'r.js'
+
+        self.loader = :requirejs
+
+        self.driver_template_path = Pathname.new(__FILE__+'/../rjs_driver.js.erb').cleanpath
+        self.driver_path = self.tmp_dir.join("requirejs/rjs_driver.js")
+
+        self.user_config = {}
+
+        self.run_config_whitelist = %w{
         baseUrl
         callback
         catchError
@@ -49,7 +61,7 @@ module Requirejs::Rails
         xhtml
       }
 
-      self.build_config_whitelist = %w{
+        self.build_config_whitelist = %w{
         appDir
         baseUrl
         closure
@@ -88,69 +100,70 @@ module Requirejs::Rails
         useStrict
         wrap
       }
-    end
+      end
 
-    def loader=(sym)
-      unless LOADERS.include?(sym)
-        raise Requirejs::ConfigError, "Attempt to set unknown loader: #{sym}"
+      def loader=(sym)
+        unless LOADERS.include?(sym)
+          raise Requirejs::ConfigError, "Attempt to set unknown loader: #{sym}"
+        end
+        self[:loader] = sym
       end
-      self[:loader] = sym
-    end
 
-    def build_config
-      unless self.has_key?(:build_config)
-        self[:build_config] = self.run_config.merge "baseUrl" => source_dir.to_s,
-                                                    "modules" => [ { 'name' => 'application' } ]
-        self[:build_config].merge!(self.user_config).slice!(*self.build_config_whitelist)
-        case self.loader
-        when :requirejs
-          # nothing to do
-        when :almond
-          mods = self[:build_config]['modules']
-          unless mods.length == 1
-            raise Requirejs::ConfigError, "Almond build requires exactly one module, config has #{mods.length}."
+      def build_config
+        unless self.has_key?(:build_config)
+          self[:build_config] = self.run_config.merge "baseUrl" => source_dir.to_s,
+                                                      "modules" => [{'name' => 'application'}]
+          self[:build_config].merge!(self.user_config).slice!(*self.build_config_whitelist)
+          case self.loader
+            when :requirejs
+              # nothing to do
+            when :almond
+              mods = self[:build_config]['modules']
+              unless mods.length == 1
+                raise Requirejs::ConfigError, "Almond build requires exactly one module, config has #{mods.length}."
+              end
+              mod = mods[0]
+              name = mod['name']
+              mod['name'] = 'almond'
+              mod['include'] = name
           end
-          mod = mods[0]
-          name = mod['name']
-          mod['name'] = 'almond'
-          mod['include'] = name
         end
+        self[:build_config]
       end
-      self[:build_config]
-    end
 
-    def run_config
-      unless self.has_key?(:run_config)
-        self[:run_config] = { "baseUrl" => "/assets" }
-        self[:run_config].merge!(self.user_config).slice!(*self.run_config_whitelist)
+      def run_config
+        unless self.has_key?(:run_config)
+          self[:run_config] = {"baseUrl" => "/assets"}
+          self[:run_config].merge!(self.user_config).slice!(*self.run_config_whitelist)
+        end
+        self[:run_config]
       end
-      self[:run_config]
-    end
 
-    def user_config=(cfg)
-      if url = cfg.delete('baseUrl')
-        raise Requirejs::ConfigError, "baseUrl is not needed or permitted in the configuration"
+      def user_config=(cfg)
+        if url = cfg.delete('baseUrl')
+          raise Requirejs::ConfigError, "baseUrl is not needed or permitted in the configuration"
+        end
+        self[:user_config] = cfg
       end
-      self[:user_config] = cfg
-    end
 
-    def module_name_for(mod)
-      case self.loader
-      when :almond
-        return mod['include']
-      when :requirejs
-        return mod['name']
+      def module_name_for(mod)
+        case self.loader
+          when :almond
+            return mod['include']
+          when :requirejs
+            return mod['name']
+        end
       end
-    end
 
-    def get_binding
-      return binding()
-    end
+      def get_binding
+        return binding()
+      end
 
-    def asset_allowed?(asset)
-      self.logical_asset_filter.reduce(false) do |accum, matcher|
-        accum || (matcher =~ asset)
-      end ? true : false
+      def asset_allowed?(logical_path)
+        logical_path_patterns.reduce(false) do |accum, pattern|
+          accum || !!(pattern.match(logical_path))
+        end
+      end
     end
   end
 end

data/lib/requirejs/rails/engine.rb

@@ -1,6 +1,6 @@
-require 'requirejs/rails/config'
+require "pathname"
 
-require 'pathname'
+require "requirejs/rails/config"
 
 module Requirejs
   module Rails
@@ -54,7 +54,7 @@ module Requirejs
         config.after_initialize do |app|
           config = app.config
           rails_manifest_path = File.join(app.root, 'public', config.assets.prefix)
-          rails_manifest = Sprockets::Manifest.new(app.assets, rails_manifest_path)
+          rails_manifest = ::Sprockets::Manifest.new(app.assets, rails_manifest_path)
           if config.requirejs.manifest_path.exist? && rails_manifest
             rjs_digests = YAML.load(ERB.new(File.new(config.requirejs.manifest_path).read).result)
             rails_manifest.assets.merge!(rjs_digests)

data/lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.9.5"
-    LibVersion = "2.1.15"
+    Version = "0.9.6"
+    LibVersion = "2.1.17"
   end
 end

data/lib/requirejs/rails/view_proxy.rb

@@ -0,0 +1,9 @@
+module Requirejs
+  module Rails
+    class ViewProxy
+      include ActionView::Context
+      include ActionView::Helpers::AssetUrlHelper
+      include ActionView::Helpers::TagHelper
+    end
+  end
+end

data/lib/tasks/requirejs-rails_tasks.rake

@@ -1,13 +1,12 @@
-require 'requirejs/rails/builder'
-require 'requirejs/rails/config'
+require "fileutils"
+require "pathname"
+require "tempfile"
 
-require 'fileutils'
-require 'pathname'
+require "active_support/ordered_options"
+require "sprockets"
 
-require 'sprockets'
-require 'tempfile'
-
-require 'active_support/ordered_options'
+require "requirejs/rails/builder"
+require "requirejs/rails/config"
 
 namespace :requirejs do
   # This method was backported from an earlier version of Sprockets.
@@ -40,7 +39,7 @@ namespace :requirejs do
   end
 
   task setup: ["assets:environment"] do
-    unless defined?(Sprockets)
+    unless defined?(::Sprockets)
       warn "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
       exit
     end
@@ -89,9 +88,6 @@ OS X Homebrew users can use 'brew install node'.
     # Copy all assets to the temporary staging directory.
     task prepare_source: ["requirejs:setup",
                           "requirejs:clean"] do
-      bower_json_pattern = Regexp.new("\\A(.*)/bower\\.json\\z")
-      js_ext = requirejs.env.extension_for_mime_type("application/javascript")
-
       requirejs.config.source_dir.mkpath
 
       # Save the original JS compressor and cache, which will be restored later.
@@ -102,20 +98,31 @@ OS X Homebrew users can use 'brew install node'.
       original_cache = requirejs.env.cache
       requirejs.env.cache = nil
 
-      requirejs.env.each_logical_path do |logical_path|
-        m = bower_json_pattern.match(logical_path)
-        bower_logical_path = m && "#{m[1]}#{js_ext}"
+      js_ext = requirejs.env.mime_types["application/javascript"][:extensions].first
 
+      requirejs.env.logical_paths do |logical_path, physical_path|
         next \
-          if !(requirejs.config.asset_allowed?(logical_path) || bower_logical_path)
-
-        asset = requirejs.env.find_asset(logical_path)
-
-        if asset
-          # If a `bower.json` was found, then substitute the logical path with the parsed module name.
-          filename = requirejs.config.source_dir.join(bower_logical_path || asset.logical_path)
-          filename.dirname.mkpath
-          asset.write_to(filename)
+          if !requirejs.config.asset_allowed?(logical_path)
+
+        m = ::Requirejs::Rails::Config::BOWER_PATH_PATTERN.match(logical_path)
+
+        if !m
+          asset = requirejs.env.find_asset(logical_path)
+
+          if asset
+            file = requirejs.config.source_dir.join(asset.logical_path)
+            file.dirname.mkpath
+            asset.write_to(file)
+          end
+        else
+          bower_logical_path = Pathname.new(logical_path).dirname.sub_ext(js_ext).to_s
+          asset = requirejs.env.find_asset(bower_logical_path)
+
+          if asset
+            file = requirejs.config.source_dir.join(bower_logical_path)
+            file.dirname.mkpath
+            asset.write_to(file)
+          end
         end
       end
 
@@ -145,8 +152,10 @@ OS X Homebrew users can use 'brew install node'.
     task digestify_and_compress: ["requirejs:setup"] do
       requirejs.config.build_config['modules'].each do |m|
         asset_name = "#{requirejs.config.module_name_for(m)}.js"
+        asset = requirejs.env.find_asset(asset_name)
+
         built_asset_path = requirejs.config.build_dir.join(asset_name)
-        digest_name = asset_name.sub(/\.(\w+)$/) { |ext| "-#{requirejs.builder.digest_for(built_asset_path)}#{ext}" }
+        digest_name = asset.digest_path
         digest_asset_path = requirejs.config.target_dir + digest_name
 
         # Ensure that the parent directory `a/b` for modules with names like `a/b/c` exist.

data/test/requirejs-rails_test.rb

@@ -17,7 +17,7 @@ class RequirejsRailsTest < ActiveSupport::TestCase
   end
 
   test "CHANGELOG up to date" do
-    changelog_match = (/^# v#{Requirejs::Rails::Version}/ =~ Pathname.new(__FILE__+'/../../CHANGELOG.md').cleanpath.read)
+    changelog_match = (/^### v#{Requirejs::Rails::Version}/ =~ Pathname.new(__FILE__+'/../../CHANGELOG.md').cleanpath.read)
     assert changelog_match, "CHANGELOG has no section for v#{Requirejs::Rails::Version}"
   end
 end
@@ -41,7 +41,7 @@ class RequirejsRailsConfigTest < ActiveSupport::TestCase
   test "matches configured logical assets" do
     assert_equal true, @cfg.asset_allowed?('foo.js')
     assert_equal false, @cfg.asset_allowed?('bar.frobnitz')
-    @cfg.logical_asset_filter += [/\.frobnitz$/]
+    @cfg.logical_path_patterns += [/\.frobnitz$/]
     assert_equal true, @cfg.asset_allowed?('bar.frobnitz')
   end
 
@@ -136,9 +136,13 @@ class RequirejsHelperTest < ActionView::TestCase
   end
 
   test "requirejs_include_tag_with_block" do
-    render text: wrap(requirejs_include_tag("application") do
-      {"class" => controller.class.name.demodulize}
-    end)
+    result = wrap(
+        requirejs_include_tag("application") do
+          {"class" => controller.class.name.demodulize}
+        end
+    )
+
+    render text: result
 
     assert_select "script:first-of-type[src=\"/javascripts/require.js\"]" \
       "[data-class=\"TestController\"]", count: 1

data/vendor/assets/javascripts/almond.js

@@ -1,5 +1,5 @@
 /**
- * @license almond 0.3.0 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
+ * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
  */
@@ -44,12 +44,6 @@ var requirejs, require, define;
             //otherwise, assume it is a top-level require that will
             //be relative to baseUrl in the end.
             if (baseName) {
-                //Convert baseName to array, and lop off the last part,
-                //so that . matches that "directory" and not name of the baseName's
-                //module. For instance, baseName of "one/two/three", maps to
-                //"one/two/three.js", but we want the directory, "one/two" for
-                //this normalization.
-                baseParts = baseParts.slice(0, baseParts.length - 1);
                 name = name.split('/');
                 lastIndex = name.length - 1;
 
@@ -58,7 +52,11 @@ var requirejs, require, define;
                     name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
                 }
 
-                name = baseParts.concat(name);
+                //Lop off the last part of baseParts, so that . matches the
+                //"directory" and not name of the baseName's module. For instance,
+                //baseName of "one/two/three", maps to "one/two/three.js", but we
+                //want the directory, "one/two" for this normalization.
+                name = baseParts.slice(0, baseParts.length - 1).concat(name);
 
                 //start trimDots
                 for (i = 0; i < name.length; i += 1) {
@@ -408,6 +406,9 @@ var requirejs, require, define;
     requirejs._defined = defined;
 
     define = function (name, deps, callback) {
+        if (typeof name !== 'string') {
+            throw new Error('See almond README: incorrect module build, no module name');
+        }
 
         //This module may not have dependencies
         if (!deps.splice) {