tension 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9cf71e35efaa0ea2e7eb78d0052a2df8b45b632
-  data.tar.gz: b24c477ef7dc0caee9c6822876b94d9dfcf131ce
+  metadata.gz: 69774653d546060ae567082eed766dec21e960e1
+  data.tar.gz: b2010ae61c8cac4764b644747df83ec5424f2c4f
 SHA512:
-  metadata.gz: 3bd97a878212cc03faa6ea81a407f8dbb1b454070680e23f881b734bb5450fadf5a78008e1b6da00211d2621cd4d8004fbac8f890b9d23a33e844bc05196e096
-  data.tar.gz: 0fbcadf94b6608f3ea34b189995224c3fe24a29158a6f1b178cb3d611214b761154f2b83a7f642c93dd712f9b6f6455f23d86f3bd399f46f3cfa048520decf2b
+  metadata.gz: 54f20566dabb047d69083bad4f754cccffd35daddecfdf5ac6f0b7447d85063e2a65ec60dbb0851dfc1049035ba6b08468c9c913a57b021a3cf38af104d51de0
+  data.tar.gz: 815605457bed700c1edaa25abba43fc10abd2415d653ede03515557b3cf0d553726315ba784fa3ea6e81f9018b8e8338b7d336da2947b90441eabe71ce016373

data/lib/tension/environment.rb

@@ -49,9 +49,11 @@ module Tension
       #   }
       #
       def asset_map
-        if @asset_map.nil?
-          @asset_map = Hash.new
-          globals    = Hash.new
+        @asset_map = nil if Rails.env.development?
+
+        @asset_map ||= begin
+          map      = Hash.new
+          globals  = Hash.new
 
           ASSET_TYPES.each do |type|
             # Find and store the global asset for this type.
@@ -61,9 +63,7 @@ module Tension
 
           # TODO: add support for looking up the tree...
           search_paths.each_pair do |controller_path, actions|
-            next unless local_controller?( controller_path )
-
-            @asset_map.store( controller_path, Hash.new )
+            map.store( controller_path, Hash.new )
 
             ASSET_TYPES.each do |type|
               # Attempt to locate a common asset for this controller.
@@ -71,22 +71,21 @@ module Tension
               common_asset = valid_asset( common_path ) || globals.fetch( type[:extension] )
 
               actions.each do |action|
-                if @asset_map[ controller_path ][ action ].nil?
-                  @asset_map.fetch( controller_path )
-                            .store( action, Hash.new )
+                unless map[ controller_path ].has_key?( action )
+                  map.fetch( controller_path ).store( action, Hash.new )
                 end
 
                 action_asset = valid_asset( "#{ [ controller_path, action ].join("/") }.#{ type[:extension] }" )
-                @asset_map.fetch( controller_path )
-                          .fetch( action )
-                          .store( type[:extension], action_asset || common_asset )
+                map.fetch( controller_path )
+                   .fetch( action )
+                   .store( type[:extension], action_asset || common_asset )
               end
             end
 
           end
-        end
 
-        @asset_map
+          map
+        end
       end
 
       # All unique, existing asset paths.
@@ -131,7 +130,7 @@ module Tension
       # configured GET routes.
       #
       def configured_route_defaults
-        if @configured_route_defaults.nil?
+        @configured_route_defaults ||= begin
           get_routes = Rails.application.routes.routes.find_all do |route|
             route.verb.match("GET")
           end
@@ -142,8 +141,6 @@ module Tension
 
           @configured_route_defaults.compact!
         end
-
-        @configured_route_defaults
       end
 
       # Returns: a real BundledAsset present in the Sprockets index, or nil
@@ -152,15 +149,6 @@ module Tension
       def valid_asset asset_path
         Rails.application.assets.find_asset( asset_path )
       end
-
-      # Returns: true if the controller targeted in the routes is present in this
-      # app's local code rather than in a gem. Gems are responsible for ensuring
-      # availability of their own assets.
-      #
-      def local_controller? controller_path
-        File.exists?("#{ Rails.root }/app/controllers/#{ controller_path }_controller.rb")
-      end
-
     end
 
   end

data/lib/tension/railtie.rb

@@ -1,16 +1,16 @@
-require "tension"
+require 'tension'
 
 module Tension
-  require "rails"
+  require 'rails'
 
   class Railtie < Rails::Railtie
     initializer "tension.add_assets_to_precompile_list" do |app|
       ActiveSupport.on_load :after_initialize do
 
         Rails.application.reload_routes!
-        Tension.load_assets!
+        Tension.load_assets! unless Rails.env.development? or Rails.env.test?
 
-        ApplicationHelper.send(:include, Tension::TensionHelper)
+        ActionView::Base.send(:include, Tension::TensionHelper)
 
         Rails.application.config.assets.precompile << lambda do |path, filename|
           Tension::Environment.asset_paths.include?( filename )

data/lib/tension/tension_helper.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module Tension
 
   # Tagger is included in ActionView::Helpers so it can be called from
@@ -5,12 +7,11 @@ module Tension
   module TensionHelper
     extend ActiveSupport::Concern
 
-    # Just call 
     def asset_for type, *args
-      asset = Tension::Environment.asset_map
-                                  .fetch( request.params[:controller] )
-                                  .fetch( request.params[:action] )
-                                  .fetch( type.to_s )
+      controller = request.params[:controller]
+      action     = request.params[:action]
+
+      asset = Tension::Environment.asset_map[ controller ][ action ][ type.to_s ]
 
       include_method = case type
       when :js
@@ -19,7 +20,7 @@ module Tension
         :stylesheet_link_tag
       end
 
-      send( include_method, asset.logical_path, *args )
+      send( include_method, asset.logical_path, *args ) unless asset.nil?
     end
   end
 

data/lib/tension/version.rb

@@ -0,0 +1,3 @@
+module Tension
+  VERSION = "0.9.3".freeze
+end

data/lib/tension.rb

@@ -1,5 +1,3 @@
-require 'active_support/ordered_options'
-
 require 'tension/environment'
 require 'tension/railtie' if defined?(Rails)
 require 'tension/tension_helper'
@@ -8,14 +6,4 @@ module Tension
   def self.load_assets!
     !!Tension::Environment.asset_map
   end
-
-  # def self.config
-  #   @config ||= begin
-  #     config = ActiveSupport::OrderedOptions.new
-
-  #     config.enabled = !Rails.env.development? && !Rails.env.test?
-
-  #     config
-  #   end
-  # end
 end

data/tension.gemspec

@@ -1,8 +1,11 @@
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require 'tension/version'
+
 Gem::Specification.new do |s|
   s.name = "tension"
 
-  s.version = "0.9.1"
-  s.date    = "2013-03-21"
+  s.version = Tension::VERSION
+  s.date    = "2013-04-10"
   s.license = "MIT"
 
   s.summary     = "Tighten up Rails's asset pipeline for CSS & JS."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tension
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Piers Mainwaring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,6 +37,7 @@ files:
 - lib/tension/environment.rb
 - lib/tension/railtie.rb
 - lib/tension/tension_helper.rb
+- lib/tension/version.rb
 - tension.gemspec
 homepage: https://github.com/piersadrian/tension
 licenses: