tension 0.9.15 → 0.9.16.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eaa058ee2622eb39b664cc7ba46ec0764421d94
-  data.tar.gz: 552a3bff4bbae5383b983151b881729bab24acaf
+  metadata.gz: 24de161fcb938eff0187dbd00f57303069e91f30
+  data.tar.gz: 3c80a48d9e2a993b674a8a013a683844c5c8d8e3
 SHA512:
-  metadata.gz: a711ab02daf23f6f578a2a006864ebf422668317e5f09d11b63104403bdf587041ec4779985efcd4fe6714b0f4e1e0ab1a363dcf8e05b010a3822106a11c270d
-  data.tar.gz: 03efbcd1cdd7f00fc53c8da818c2ff9a0942a348463414b361a5d56d61d23836eb0ca0d5f902131e84e3fae589b58e44bbaef4cb3da8bf16a5073bd863638c0d
+  metadata.gz: c7ca25fdaec1bfb1662ae15cf76695db9941ab8a3ff34dced421abfd1d4f8b67bc7179385cc121030ad6f113bacbab274575a5b236c02ffe98e311a220267488
+  data.tar.gz: 7987f999f4ca991e21692d3c27a06578a24b16fd6e8a6ecc7d32bdcf3ec841458859dee13a72243f9c9c464e5346cdf531e4dd9da9415497d99abc8beecf7b79

data/lib/tension/context.rb

@@ -1,9 +1,13 @@
 module Tension
   class Context
-    attr_reader :controller, :action
+    attr_reader :controller_name, :action
 
     def initialize(controller_path)
-      @controller = "#{ controller_path }_controller".classify.constantize
+      @controller_name = "#{ controller_path }_controller".classify
+    end
+
+    def controller
+      controller_name.constantize
     end
 
     # Locates the best stylesheet for the given action name. Aliased as,
@@ -43,13 +47,17 @@ module Tension
       controller.action_methods.include?(action_name)
     end
 
+    def shared_assets
+      controller._tension_assets
+    end
+
 
     private
 
     # Locates the best asset for the given action name and type.
     #
     def best_asset(action, type)
-      action_asset(action, type) || controller_asset(type) || global_asset(type)
+      action_asset(action, type) || controller_asset(type)
     end
 
     def method_missing(method_sym, *args)

data/lib/tension/controller.rb

@@ -7,14 +7,20 @@ 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
 
-    # Returns the Context for the current controller.
-    #
-    def asset_context
-      find_asset_context( request.symbolized_path_parameters[:controller] )
+
+    module ClassMethods
+      def include_assets(options)
+        self._tension_assets[ Tension::CSS ] = options[:css]
+        self._tension_assets[ Tension::JS ]  = options[:js]
+      end
     end
 
+
     # Returns the Sprockets Asset for the current action's JavaScript
     # to be written into the template.
     #
@@ -29,6 +35,13 @@ module Tension
       asset_context.css( request.symbolized_path_parameters[:action] )
     end
 
+
+    # Returns the Context for the current controller.
+    #
+    def asset_context
+      find_asset_context( request.symbolized_path_parameters[:controller] )
+    end
+
     # Proxy to Tension::Environment.find.
     #
     def find_asset_context(*args)

data/lib/tension/helper.rb

@@ -7,30 +7,52 @@ module Tension
   module Helper
     extend ActiveSupport::Concern
 
-    # Determines the best stylesheet to be included in a template based
+    # Determines the best stylesheets to be included in a template based
     # on the current controller and action.
     #
-    def best_stylesheet(*args)
-      asset_for( Tension::CSS, *args )
+    def best_stylesheets(*args)
+      build_tags( Tension::CSS, *args )
     end
 
-    # Determines the best JavaScript to be included in a template based
+    # Determines the best JavaScripts to be included in a template based
     # on the current controller and action.
     #
-    def best_javascript(*args)
-      asset_for( Tension::JS, *args )
+    def best_javascripts(*args)
+      build_tags( Tension::JS, *args )
     end
 
     private
 
-    def asset_for(type, *args)
+    def build_tags(type, *args)
+      options = args.extract_options!
+      shared_path = options.delete(:shared) || asset_context.shared_assets[type].presence
+
+      html = asset_for( type, "application", *args, options )
+
+      if shared_path
+        html << asset_for( type, shared_path, *args )
+      end
+
+      # action_asset = case type
+      #   when Tension::CSS
+      #     action_stylesheet
+      #   when Tension::JS
+      #     action_javascript
+      # end
+
+      # html << asset_for( type, action_asset.logical_path, *args, options )
+
+      html.html_safe
+    end
+
+    def asset_for(type, path, *args)
       return nil if asset_context.nil?
 
-      case type.to_sym
-      when :js
-        javascript_include_tag( action_javascript.logical_path, *args )
-      when :css
-        stylesheet_link_tag( action_stylesheet.logical_path, *args )
+      case type
+        when Tension::CSS
+          stylesheet_link_tag( path, *args )
+        when Tension::JS
+          javascript_include_tag( path, *args )
       end
     end
   end

data/lib/tension/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tension
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16.pre
 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3