tension 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b25b44ab03279d7f615039ff68af05f90938db
-  data.tar.gz: 1cc11db047e788ec6e2588bfded8038e8845eb63
+  metadata.gz: a75cab3b3ef65c9590305e2ae0743398a5326968
+  data.tar.gz: 9ff656abe44e288d6ee0e8ea2a8c3bfbcf0725f6
 SHA512:
-  metadata.gz: b1222f9a47a84c9ec680514d44bf980247b47893af75ff1a79a326c0da18512b7c3f0eea2e0f80c3839ee716503630d59d2bd25771f75fd2fd24f85afc0df277
-  data.tar.gz: 53cc3417937484fc3c18d71af10226e9f1b6e831544ab8911bd21a6e4f038f39c5517607333ce0d732a7046bfbc5d98e6a8b4b7e1209f046db2b40c5ddfa0971
+  metadata.gz: 94bfedf19b85e67862a66b352e9cc2b439a357d3389a031993ba6236b0e213f7f7d97d3089f441c6a826d31a2f849a78ca88b418942cee37115b2afaeddad31a
+  data.tar.gz: fc08ff6e486a0c43564c7ee934617bde46a33cc58d99926dfcbd77622052737e799cc9838cab327d39391a1eff0d38a6d49f8f1e9834041ce0c68087959cce81

data/lib/tension/controller.rb

@@ -32,7 +32,7 @@ module Tension
     # Proxy to Tension::Environment.find.
     #
     def find_asset_context(*args)
-      Tension::Environment.find(*args)
+      Tension.environment.find_context(*args)
     end
   end
 end

data/lib/tension/environment.rb

@@ -4,67 +4,81 @@ module Tension
   # the assets to be included in templates.
   #
   class Environment
-    class << self
 
-      # Loads a Context for the specified controller path.
-      #
-      def find(key)
-        fetch( Tension::Utils.controller_path(key) )
-      end
-      alias_method :[], :find
+    attr_reader :assets
 
-      # A Hash mapping controller paths to Contexts.
-      #
-      def contexts
-        @contexts ||= Hash.new
-      end
+    def initialize(assets_path)
+      @manifest = Sprockets::Manifest.new(assets_path)
+      process_assets!
+    end
 
-      # Preloads all Contexts. Useful in environments where assets and controller
-      # actions don't change without an app reboot (production, staging).
-      #
-      def eager_load!
-        configured_get_defaults.each do |default|
-          find(default[:controller])
-        end
+    # Loads a Context for the specified controller path.
+    #
+    def find_context(key)
+      fetch( Tension::Utils.controller_path(key) )
+    end
+    alias_method :[], :find_context
 
-        true
-      end
+    # A Hash mapping controller paths to Contexts.
+    #
+    def contexts
+      @contexts ||= Hash.new
+    end
 
-      # Determines whether or not a given path refers to an asset that requires
-      # precompilation.
-      #
-      def precompilation_needed?(path)
-        if cxt = find(path)
-          Tension::Utils.shared_asset?(path) || cxt.has_action?( Tension::Utils.action_name(path) )
-        end
+    # Determines whether or not a given path refers to an asset that requires
+    # precompilation.
+    #
+    def precompilation_needed?(path)
+      if cxt = find_context(path)
+        Tension::Utils.shared_asset?(path) || cxt.has_action?( Tension::Utils.action_name(path) )
       end
+    end
 
 
-      private
+    private
 
-      def fetch(path)
-        contexts[path] || store(path) unless path.nil?
-      end
+    def fetch(path)
+      contexts[path] || store(path) unless path.nil?
+    end
 
-      def store(path)
-        contexts[path] ||= Context.new(path) if valid_route?(path)
-      end
+    def store(path)
+      contexts[path] ||= Context.new(path) if valid_route?(path)
+    end
 
-      def valid_route?(controller)
-        configured_get_defaults.find do |default|
-          default[:controller] == controller
-        end
+    def valid_route?(controller)
+      configured_get_defaults.find do |default|
+        default[:controller] == controller
       end
+    end
+
+    def process_assets!
+      @assets = Hash.new
+      @manifest.files.each do |full_path, info|
+        next unless full_path.match(/\.css|\.js\z/)
 
-      # Routing defaults (including controller path and action name) for all
-      # configured GET routes.
-      #
-      def configured_get_defaults
-        @configured_get_defaults ||= Rails.application.routes.routes.map do |route|
-          route.defaults if route.verb.match("GET") && !route.defaults.empty?
-        end.compact
+        info = info.merge(full_path: full_path).with_indifferent_access
+        @assets[ info[:logical_path] ] = Asset.new(info)
       end
+    end
+
+    # Routing defaults (including controller path and action name) for all
+    # configured GET routes.
+    #
+    def configured_get_defaults
+      @configured_get_defaults ||= Rails.application.routes.routes.map do |route|
+        route.defaults if route.verb.match("GET") && !route.defaults.empty?
+      end.compact
+    end
+
+  end
+
+  class Asset
+    def initialize(attributes)
+      @attributes = attributes
+    end
 
+    def logical_path
+      @attributes[:logical_path]
     end
   end
 end

data/lib/tension/railtie.rb

@@ -9,10 +9,12 @@ module Tension
       ActionView::Base.send(:include, Tension::Helper)
       ActionController::Base.send(:include, Tension::Controller)
 
+      Tension.environment = Tension::Environment.new('public/assets')
+
       Rails.application.config.assets.precompile << lambda do |path, filename|
-        Tension::Environment.precompilation_needed?(path)
+        Tension.environment.precompilation_needed?(path)
       end
     end
-    
+
   end
 end

data/lib/tension/utils.rb

@@ -18,9 +18,6 @@ module Tension
 
         elsif matches = path.split("#").first.match(CONTROLLER_REGEX)
           return matches[0]
-
-        else
-          return nil
         end
       end
 
@@ -45,14 +42,14 @@ module Tension
       #     type: Tension::CSS
       #
       def find_asset(options)
-        assets[ logical_asset_path(options) ]
+        Tension.environment.assets[ logical_asset_path(options) ]
       end
 
       # Returns the application-wide Sprockets Asset for the given type.
       #   ARGS: type: Tension::JS or Tension::CSS
       #
       def global_asset(type)
-        assets[ "application.#{type}" ]
+        Tension.environment.assets[ "application.#{type}" ]
       end
 
       private
@@ -71,12 +68,6 @@ module Tension
         end
       end
 
-      # Alias for Sprockets' asset index.
-      #
-      def assets
-        Rails.application.assets
-      end
-
       # Takes an asset path like "comments/base/index.js" and determines
       # the controller ("comments/base") that should serve that asset.
       #   ARGS: path: a String path like "admin/blog_common.css"

data/lib/tension/version.rb

@@ -1,3 +1,3 @@
 module Tension
-  VERSION = "0.9.13".freeze
+  VERSION = "0.9.14".freeze
 end

data/lib/tension.rb

@@ -3,9 +3,18 @@ require 'tension/context'
 require 'tension/controller'
 require 'tension/helper'
 require 'tension/environment'
+require 'tension/version'
 require 'tension/railtie' if defined?(Rails)
 
 module Tension
   CSS = "css".freeze
   JS  = "js".freeze
+
+  def self.environment
+    @@environment
+  end
+
+  def self.environment=(env)
+    @@environment = env
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tension
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -14,14 +14,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Tension brings some sanity to Rails's CSS & JS organization for modern
@@ -52,17 +52,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Tighten up Rails's asset pipeline for CSS & JS.