tension 0.9.16.pre → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24de161fcb938eff0187dbd00f57303069e91f30
-  data.tar.gz: 3c80a48d9e2a993b674a8a013a683844c5c8d8e3
+  metadata.gz: b8550a2d08689d7631777f9df17d8b943d40ad1f
+  data.tar.gz: bc26def24af87a4eb52366de7ad1cae8148e1f0c
 SHA512:
-  metadata.gz: c7ca25fdaec1bfb1662ae15cf76695db9941ab8a3ff34dced421abfd1d4f8b67bc7179385cc121030ad6f113bacbab274575a5b236c02ffe98e311a220267488
-  data.tar.gz: 7987f999f4ca991e21692d3c27a06578a24b16fd6e8a6ecc7d32bdcf3ec841458859dee13a72243f9c9c464e5346cdf531e4dd9da9415497d99abc8beecf7b79
+  metadata.gz: 7dab945b47b1e7e3baeb3a6095c1f7ab950a86308fb4329481bf8745d5a07823544a967606423d66713d561bade8977bd3399a3db967752f177cddc2c601e9d7
+  data.tar.gz: ba6b2135adbb65584a0012a56438f54f4c106111da2616522f59525dbc5963bc861b3317b5e610520ac0eece25a3ed50de08ca0695e09bb2539697ab6627e90d

data/lib/tension/context.rb

@@ -48,7 +48,16 @@ module Tension
     end
 
     def shared_assets
-      controller._tension_assets
+      klass = controller
+
+      while true
+        break {} if klass == ActionController::Base
+
+        assets = Tension.environment.controllers[ klass.name.underscore ]
+        break assets if assets.present?
+
+        klass = klass.superclass
+      end
     end
 
 

data/lib/tension/controller.rb

@@ -7,16 +7,15 @@ module Tension
     included do
       # Make these methods available in helpers too.
       helper_method :asset_context, :action_javascript, :action_stylesheet
-
-      class_attribute :_tension_assets, instance_accessor: false
-      self._tension_assets = {}
     end
 
 
     module ClassMethods
       def include_assets(options)
-        self._tension_assets[ Tension::CSS ] = options[:css]
-        self._tension_assets[ Tension::JS ]  = options[:js]
+        Tension.environment.controllers[ self.name.underscore ] = {
+          Tension::CSS => options[:css],
+          Tension::JS  => options[:js]
+        }
       end
     end
 

data/lib/tension/environment.rb

@@ -5,7 +5,7 @@ module Tension
   #
   class Environment
 
-    attr_reader :assets
+    attr_reader :assets, :controllers
 
     def initialize(assets_path)
       if assets_cached?
@@ -37,6 +37,10 @@ module Tension
       @contexts ||= Hash.new
     end
 
+    def controllers
+      @controllers ||= Hash.new
+    end
+
     # Determines whether or not a given path refers to an asset that requires
     # precompilation.
     #

data/lib/tension/version.rb

@@ -1,3 +1,3 @@
 module Tension
-  VERSION = "0.9.16.pre".freeze
+  VERSION = "0.10.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tension
 version: !ruby/object:Gem::Version
-  version: 0.9.16.pre
+  version: 0.10.0
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -57,9 +57,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3