spar 1.0.7 → 1.0.8

data/lib/spar.rb

@@ -144,3 +144,9 @@ module Spar
     end
 
 end
+
+module Sprockets
+  class Context
+    include Spar::Helpers
+  end
+end

data/lib/spar/directive_processor.rb

@@ -2,6 +2,8 @@ module Spar
 
   class DirectiveProcessor < Sprockets::Processor
 
+    include Spar::Helpers
+
     def evaluate(context, locals, &block)
       @result = data
       
@@ -13,21 +15,21 @@ module Spar
     protected
       
       def process_methods
-        @result.gsub!(/\[\{(.*?)\}\]/) do
+        Spar.settings['interpolator_regex'] ||= '\[\{(.*?)\}\]' 
+        @result.gsub!(/#{Spar.settings['interpolator_regex']}/) do
           command = $1.strip
           case command
           when /^path_to\((?<file_name>.*)\)$/
-            Spar::Helpers.path_to($~[:file_name])
+            path_to($~[:file_name])
           when /^javascript_include_tag\((?<file_names>.*)\)$/
-            Spar::Helpers.javascript_include_tag(*($~[:file_names]).split(',').map(&:strip))
+            javascript_include_tag(*($~[:file_names]).split(',').map(&:strip))
           when /^stylesheet_link_tag\((?<file_names>.*)\)$/
-            Spar::Helpers.stylesheet_link_tag(*($~[:file_names]).split(',').map(&:strip))
-          else 
-            if variable = Spar.settings[command]
-              variable
-            else
-              raise "Could not find a value for: '#{command}'"
-            end
+            stylesheet_link_tag(*($~[:file_names]).split(',').map(&:strip))
+          else
+            variable = Spar.settings
+            command.split('.').each { |key| variable = variable[key] }
+            raise "Could not find a value for: '#{command}'" unless variable
+            variable
           end
         end
       end

data/lib/spar/helpers.rb

@@ -3,19 +3,34 @@ require 'sprockets'
 module Spar
   module Helpers
 
-    def self.paths
-      @paths ||= Spar::Helpers::Paths.new()
+    class << self
+
+      def paths
+        @paths ||= Spar::Helpers::Paths.new()
+      end
+      
+      def append_features(context) # :nodoc:
+        context.class_eval do
+          context_methods = context.instance_methods(false)
+          Helpers.public_instance_methods.each do |method|
+            remove_method(method) if context_methods.include?(method)
+          end
+        end
+
+        super(context)
+      end
+
     end
 
-    def self.path_to(asset_name, options={})
+    def path_to(asset_name, options={})
       asset_name = asset_name.logical_path if asset_name.respond_to?(:logical_path)
-      path = paths.compute_public_path(asset_name, options.merge(:body => true))
+      path = Helpers.paths.compute_public_path(asset_name, options.merge(:body => true))
       options[:body] ? "#{path}?body=1" : path
     end
 
-    def self.javascript_include_tag(*sources)
+    def javascript_include_tag(*sources)
       sources.collect do |source|
-        if Spar.settings['debug'] && asset = paths.asset_for(source, 'js')
+        if Spar.settings['debug'] && asset = Helpers.paths.asset_for(source, 'js')
           asset.to_a.map { |dep|
             javascript_tag(path_to(dep, :ext => 'js', :body => true))
           }
@@ -25,13 +40,13 @@ module Spar
       end.join("\n")
     end
 
-    def self.javascript_tag(src)
+    def javascript_tag(src)
       "<script src='#{src}' charset='utf-8'></script>"
     end
 
-    def self.stylesheet_link_tag(*sources)
+    def stylesheet_link_tag(*sources)
       sources.collect do |source|
-        if Spar.settings['debug'] && asset = paths.asset_for(source, 'css')
+        if Spar.settings['debug'] && asset = Helpers.paths.asset_for(source, 'css')
           asset.to_a.map { |dep|
             stylesheet_tag(path_to(dep, :ext => 'css', :body => true, :protocol => :request))
           }
@@ -41,10 +56,41 @@ module Spar
       end.join("\n")
     end
 
-    def self.stylesheet_tag(src)
+    def stylesheet_tag(src)
       "<link href='#{src}' rel='stylesheet'>"
     end
 
+    ## Helper methods for the spar context
+    def audio_path(source, options = {})
+      path_to source, { :dir => 'audios' }.merge(options)
+    end
+    alias_method :path_to_audio, :audio_path
+
+    def font_path(source, options = {})
+      path_to source, { :dir => 'fonts' }.merge(options)
+    end
+    alias_method :path_to_font, :font_path
+
+    def image_path(source, options = {})
+      path_to source, { :dir => 'images' }.merge(options)
+    end
+    alias_method :path_to_image, :image_path
+
+    def javascript_path(source, options = {})
+      path_to source, { :dir => 'javascripts', :ext => 'js' }.merge(options)
+    end
+    alias_method :path_to_javascript, :javascript_path
+
+    def stylesheet_path(source, options = {})
+      path_to source, { :dir => 'stylesheets', :ext => 'css' }.merge(options)
+    end
+    alias_method :path_to_stylesheet, :stylesheet_path
+
+    def video_path(source, options = {})
+      path_to source, { :dir => 'videos' }.merge(options)
+    end
+    alias_method :path_to_video, :video_path
+
     class Paths
       URI_REGEXP = %r{^[-a-z]+://|^cid:|^//}
 

data/lib/spar/version.rb

@@ -1,3 +1,3 @@
 module Spar
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spar
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -482,4 +482,3 @@ specification_version: 3
 summary: A simple framework for developing single page web apps with support for haml,
   sass, coffeescript, and pretty much anything else.
 test_files: []
-has_rdoc: