rapper 0.0.3 → 0.1.0

data/README.markdown

@@ -64,8 +64,8 @@ The following defaults are applied if not defined in your configuration:
 The `definition_root` setting in the rapper config is a path to a folder containing more YAML files that define the various types of bundles you want to build (eg. `stylesheets.yml`, `javascripts.yml`) Example definition file:
 
     --- 
-    - source_root: public/javascripts
-    - destination_root: public/assets/javascripts
+    - root: public/javascripts
+    - tag_root: /javascripts
     - suffix: js
     - assets: 
       - base: 
@@ -85,8 +85,8 @@ The above definition will create two asset files: `public/assets/javascripts/bas
 If versioning is turned on in your config, version strings will be used to enforce better browser caching of assets. (Version numbers are always used in definition files.)
 
     --- 
-    - source_root: public/javascripts
-    - destination_root: public/assets/javascripts
+    - root: public/javascripts
+    - tag_root: /javascripts
     - suffix: js
     - assets: 
       - base: 
@@ -111,6 +111,13 @@ When the contents of the asset change, the version will change in the query stri
 
 Browsers will automatically re-download and cache the new asset.
 
+# Development
+
+Rapper's got a Gemfile. You know what to do.
+
+    bundle install --path vendor
+    bundle exec rake spec
+
 ## To do soon
 
 * Merb view helpers

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/lib/rapper.rb

@@ -12,11 +12,15 @@ module Rapper
   # The main Rapper class. Handles, well, everything.
   class Engine
     
+    # Base
     include Rapper::Config
     include Rapper::Logging
     include Rapper::Utils
     include Rapper::Compressors
     include Rapper::Versioning
+    # View helpers
+    include Rapper::HtmlTags
+    include Rapper::HelperSetup
     
     # Load the configuration YAML file and set the current environment.
     # 
@@ -29,6 +33,7 @@ module Rapper
       @config = {}
       @definitions = {}
       load_config( config_path )
+      setup_helpers
       log :verbose, "Loaded rappper with #{environment} environment from #{config_path}"
     end
     
@@ -42,14 +47,14 @@ module Rapper
       
       types.each do |type|
         definition = @definitions[type]
-        source = File.expand_path( definition.source_root )
+        source = File.expand_path( definition.root )
         destination = definition.destination_root
         suffix = definition.suffix
         
         definition.assets.each do |name, spec|
           next unless needs_packaging?( type, name )
           
-          source_files = definition.asset_component_paths( name )
+          source_files = definition.component_paths( name )
           destination_file = definition.asset_path( name )
           
           log :verbose, "Joining #{source_files.size} files to #{name}"

data/lib/rapper/compressors.rb

@@ -23,10 +23,12 @@ module Rapper
     class Compressor
       class << self
         
-        # Get the compressor for a given file.
+        # Compress a file. Raises UnknownFileExtension if it doesn't know how
+        # to compress a file with the given file's file extension.
         # 
-        # @param [String] file Path to the file to fetch the Compressor for
-        # @return [Types] Description
+        # @param [String] file_path Path to the file to compress.
+        # 
+        # @param [Hash] opts Options to be passed to the compressor (optional).
         def compress( file_path, opts={} )
           unless compressor = @extensions[File.extname( file_path )]
             raise Rapper::Errors::UnknownFileExtension,
@@ -49,22 +51,24 @@ module Rapper
         end
         
         # Compress a file.
+        # 
+        # @param [String] file_path Path to the file to compress.
         def do_compress( file_path )
           raise NotImplementedError
         end
         
-        # @param [String] path Path to a file.
+        # @param [String] file_path Path to a file.
         # 
         # @return [String] The contents of the file.
-        def read_file( path )
-          File.new( path, 'r' ).read
+        def read_file( file_path )
+          File.new( file_path, 'r' ).read
         end
         
-        # @param [String] path Path to the desired file.
+        # @param [String] file_path Path to the desired file.
         # 
         # @return [File] Writable file instance with 0644 permissions.
-        def writable_file( path )
-          File.new( path, 'w', 0644 )
+        def writable_file( file_path )
+          File.new( file_path, 'w', 0644 )
         end
       end
     end

data/lib/rapper/config.rb

@@ -38,8 +38,8 @@ module Rapper
     # @param [String] key Configuration key.
     # 
     # @return [String,Hash] If the current environment's config defines this
-    #   setting, return that value. If not, return the default setting. If the
-    #   default setting is a hash, return the default merged with the
+    #   setting, returns that value. If not, returns the default setting. If
+    #   the default setting is a hash, returns the default merged with the
     #   environment's setting.
     def get_config( key )
       if default_config[key].is_a?( Hash )
@@ -53,7 +53,8 @@ module Rapper
     # versions.)
     # 
     # @param [<String>] types Asset types to update the definition files for.
-    #   Defaults to all types.
+    #   Defaults to all types (i.e. every type with a definition file in
+    #   `definition_root`).
     def update_definitions( *types )
       types = types.empty? ? asset_types : types
       log :info, "Updating definitions for #{types.join( ', ' )}"

data/lib/rapper/definition.rb

@@ -7,22 +7,37 @@ module Rapper
       @path = path
       @type = File.basename( path, ".yml" )
       @definition = YAML.load_file( @path )
+      # Create asset destination folder, if needed
+      Dir.mkdir( destination_root ) unless File.directory?( destination_root )
     end
     
     # =======================
     # = Definition settings =
     # =======================
     
-    def source_root
-      first_key_value( "source_root", @definition ) || ""
+    # @return [String] The root for asset component files.
+    def root
+      definition_value( "root" )
     end
     
     def destination_root
-      first_key_value( "destination_root", @definition ) || ""
+      definition_value( "root" ).gsub( /\/$/, '' ) + "/assets"
     end
     
+    # @return [String] The public url root for the asset component files (used
+    # when bundling is off).
+    def component_tag_root
+      definition_value( "tag_root" )
+    end
+    
+    # @return [String] The public url root for packaged asset files.
+    def asset_tag_root
+      definition_value( "tag_root" ).gsub( /\/$/, '' ) + "/assets"
+    end
+    
+    # @return [String] The suffix of files used in this definition.
     def suffix
-      first_key_value( "suffix", @definition )
+      definition_value( "suffix" )
     end
     
     # ==========
@@ -33,7 +48,7 @@ module Rapper
     def assets
       assets = {}
       
-      first_key_value( "assets", @definition ).each do |spec|
+      definition_value( "assets" ).each do |spec|
         assets[spec.keys.first] = spec.values.first.inject({}) do |memo, item|
           memo.merge( item )
         end
@@ -48,13 +63,27 @@ module Rapper
     # 
     # @param [String] version New version string for the asset.
     def set_version( name, version )
-      first_key_value( "assets", @definition ).each do |spec|
+      name = name.to_s
+      definition_value( "assets" ).each do |spec|
         next unless spec[name]
         spec[name].each do |setting|
           next unless setting["version"]
           setting["version"] = version
         end
       end
+    end 
+    
+    def get_version( name )
+      name = name.to_s
+      definition_value( "assets" ).each do |spec|
+        next unless spec[name]
+        spec[name].each do |setting|
+          next unless setting["version"]
+          return setting["version"]
+        end
+      end
+      
+      false
     end
     
     # ==========
@@ -75,17 +104,19 @@ module Rapper
     # @param [String] name The asset's name.
     # 
     # @return [String] Path to the packaged asset file.
-    def asset_path( name )
+    def asset_path( name, root=nil )
+      root ||= self.destination_root
       file_name = "#{name}.#{self.suffix}"
-      File.join( self.destination_root, file_name )
+      File.join( root, file_name )
     end
     
     # @param [String] name Name of the asset.
     # 
     # @return [Array<String>] Ordered list of the files that comprise the given
     #   asset.
-    def asset_component_paths( name )
-      spec = self.assets[name]
+    def component_paths( name, root=nil )
+      root ||= self.root
+      spec = self.assets[name.to_s]
       
       if spec.nil?
         raise Rapper::Errors::InvalidAssetName,
@@ -94,7 +125,7 @@ module Rapper
       
       ( spec["files"] || [] ).map do |file|
         file_name = "#{file}.#{self.suffix}"
-        File.join( self.source_root, file_name )
+        File.join( root, file_name )
       end
     end
     
@@ -106,9 +137,9 @@ module Rapper
     # 
     # @return [Object,nil] The first value found for the key or nil of nothing
     #   was found.
-    def first_key_value( key, array )
-      hash = array.find { |h| h.keys.include? key }
-      hash ? hash[key] : nil
+    def definition_value( key )
+      hash = @definition.find { |h| h.keys.include? key }
+      hash ? hash[key] : ""
     end
   end
 end

data/lib/rapper/helpers.rb

@@ -0,0 +1,45 @@
+module Rapper
+  # Set up view helpers for various web frameworks. Currently supported:
+  #   * Merb
+  # To do:
+  #   * Sinatra
+  module HelperSetup
+    
+    # Loads view helpers for any/all available web frameworks available.
+    # TODO: Refactor.
+    def setup_helpers
+      if Rapper::ViewHelpers.const_defined?( :RAPPER )
+        Rapper::ViewHelpers.send( :remove_const, :RAPPER )
+      end
+      Rapper::ViewHelpers.const_set( :RAPPER, self )
+      
+      # Merb
+      begin
+        Merb::Controller.send( :include, Rapper::ViewHelpers )
+      rescue NameError; end
+    end
+    
+    private
+  end
+  
+  module ViewHelpers
+    
+    RAPPER = nil
+    
+    def self.included( klass )
+      klass.class_eval do
+        # Define a "rapper_FOO_tag" method for each definition type. For
+        # example, if you have "stylesheets" and "javascripts" definitions,
+        # you'll have "rapper_stylesheets_tag( name )" and
+        # "rapper_javascripts_tag( name )" methods.
+        RAPPER.definitions.each do |type, definition|
+          tag_method = RAPPER.tag_method_for_type( type )
+          define_method "rapper_#{type}_tag".to_sym do |name|
+            RAPPER.send( tag_method, type, name )
+          end
+        end
+      end
+    end
+  end
+  
+end

data/lib/rapper/html_tags.rb

@@ -0,0 +1,90 @@
+require 'erb'
+
+module Rapper
+  module HtmlTags
+    
+    def tag_method_for_type( type )
+      if @definitions[type].suffix =~ /css/
+        :css_tag
+      else
+        :js_tag
+      end
+    end
+    
+    def js_tag( type, name )
+      self.get_tag( JsTag, type, name )
+    end
+    
+    def css_tag( type, name )
+      self.get_tag( CssTag, type, name )
+    end
+    
+    protected
+    
+    def get_tag( klass, type, name )
+      definition = @definitions[type]
+      style = self.get_config( 'tag_style' ).to_sym
+      version = nil
+      if self.get_config( 'version' )
+        version = definition.get_version( name )
+      end
+      
+      if self.get_config( "bundle" )
+        path = definition.asset_path( name, definition.asset_tag_root )
+        klass.send( :for, path, version, style )
+      else
+        paths = definition.component_paths( name, definition.component_tag_root )
+        paths.map do |path|
+          klass.send( :for, path, version, style )
+        end.join( "\n" )
+      end
+    end
+    
+    class Tag
+      class << self
+        def templates
+          {}
+        end
+        
+        def for( path, version, style )
+          @cache ||= {}
+          @cache[style] ||= {}
+          
+          if version
+            path << "?v=#{version}"
+          end
+          
+          unless @cache[style][path] && @cache[style][path]
+            @cache[style][path] = ERB.new( templates[style] ).result( binding )
+          end
+          
+          @cache[style][path]
+        end
+      end
+    end
+    
+    class JsTag < Tag
+      class << self
+        def templates
+          {
+            :html => '<script type="text/javascript" src="<%= path %>"></script>',
+            :html5 => "<script src=\"<%= path %>\"></script>",
+            :xhtml => '<script type="text/javascript" src="<%= path %>"></script>'
+          }
+        end
+      end
+    end
+    
+    class CssTag < Tag
+      class << self
+        def templates
+          {
+            :html => '<link type="text/css" rel="stylesheet" href="<%= path %>">',
+            :html5 => "<link rel=\"stylesheet\" href=\"<%= path %>\">",
+            :xhtml => '<link type="text/css" rel="stylesheet" href="<%= path %>" />'
+          }
+        end
+      end
+    end
+  end
+end

data/lib/rapper/logging.rb

@@ -4,6 +4,7 @@ module Rapper
     
     protected
     
+    # Guess if a string is a path.
     PATHY_STRING = /\.|\//
     
     # Outputs all arguments (joined with spaces) to:

data/lib/rapper/versioning.rb

@@ -44,7 +44,7 @@ module Rapper
     # 
     # @return [String] A four-character version hash for the given asset.
     def version( type, name )
-      source_files = @definitions[type].asset_component_paths( name )
+      source_files = @definitions[type].component_paths( name )
       destination_file = Tempfile.new( 'rapper' )
       join_files( source_files, destination_file.path )
       version = Digest::MD5.file( destination_file.path ).to_s[0,4]

data/rapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rapper}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyson Tate"]
-  s.date = %q{2011-02-19}
+  s.date = %q{2011-03-09}
   s.description = %q{Static asset packager and compressor with versioning and built-in view helpers. Easy to configure, easy to use, and easy to ignore when you want to. No crazy JavaScript comment DSLs, either.}
   s.email = %q{tyson@tysontate.com}
   s.extra_rdoc_files = [
@@ -30,14 +30,16 @@ Gem::Specification.new do |s|
     "lib/rapper/config.rb",
     "lib/rapper/definition.rb",
     "lib/rapper/errors.rb",
+    "lib/rapper/helpers.rb",
+    "lib/rapper/html_tags.rb",
     "lib/rapper/logging.rb",
     "lib/rapper/utils.rb",
     "lib/rapper/versioning.rb",
     "lib/yui/css_compressor.rb",
     "rapper.gemspec",
+    "spec/fixtures/config/asset_definitions/base/javascripts.yml",
+    "spec/fixtures/config/asset_definitions/base/stylesheets.yml",
     "spec/fixtures/config/assets.yml",
-    "spec/fixtures/config/assets/base/javascripts.yml",
-    "spec/fixtures/config/assets/base/stylesheets.yml",
     "spec/fixtures/javascripts/simple_1.js",
     "spec/fixtures/javascripts/simple_2.js",
     "spec/fixtures/stylesheets/simple_1.css",
@@ -45,17 +47,17 @@ Gem::Specification.new do |s|
     "spec/fixtures/test_cases/compression/assets.yml",
     "spec/fixtures/test_cases/compression/definitions/css.yml",
     "spec/fixtures/test_cases/compression/definitions/js.yml",
-    "spec/fixtures/test_cases/compression/expected/base.css",
-    "spec/fixtures/test_cases/compression/expected/base.js",
-    "spec/fixtures/test_cases/compression/expected/base_reversed.css",
-    "spec/fixtures/test_cases/compression/expected/base_reversed.js",
+    "spec/fixtures/test_cases/compression/expected/javascripts/base.js",
+    "spec/fixtures/test_cases/compression/expected/javascripts/base_reversed.js",
+    "spec/fixtures/test_cases/compression/expected/stylesheets/base.css",
+    "spec/fixtures/test_cases/compression/expected/stylesheets/base_reversed.css",
     "spec/fixtures/test_cases/concatenation/assets.yml",
     "spec/fixtures/test_cases/concatenation/definitions/css.yml",
     "spec/fixtures/test_cases/concatenation/definitions/js.yml",
-    "spec/fixtures/test_cases/concatenation/expected/base.css",
-    "spec/fixtures/test_cases/concatenation/expected/base.js",
-    "spec/fixtures/test_cases/concatenation/expected/base_reversed.css",
-    "spec/fixtures/test_cases/concatenation/expected/base_reversed.js",
+    "spec/fixtures/test_cases/concatenation/expected/javascripts/base.js",
+    "spec/fixtures/test_cases/concatenation/expected/javascripts/base_reversed.js",
+    "spec/fixtures/test_cases/concatenation/expected/stylesheets/base.css",
+    "spec/fixtures/test_cases/concatenation/expected/stylesheets/base_reversed.css",
     "spec/fixtures/yui_css/background-position.css",
     "spec/fixtures/yui_css/background-position.css.min",
     "spec/fixtures/yui_css/box-model-hack.css",

data/spec/fixtures/config/{assets → asset_definitions}/base/javascripts.yml

@@ -1,14 +1,14 @@
 --- 
-- source_root: spec/fixtures/javascripts
-- destination_root: tmp
+- root: spec/fixtures/javascripts
+- tag_root: /javascripts
 - suffix: js
 - assets: 
   - single_file: 
     - files: 
       - simple_1
-    - version: 0
+    - version: abcd
   - multiple_files: 
     - files: 
       - simple_1
       - simple_2
-    - version: 0
+    - version: efgh

data/spec/fixtures/config/{assets → asset_definitions}/base/stylesheets.yml

@@ -1,14 +1,14 @@
 --- 
-- source_root: spec/fixtures/stylesheets
-- destination_root: tmp
+- root: spec/fixtures/stylesheets
+- tag_root: /stylesheets
 - suffix: css
 - assets: 
   - single_file: 
     - files: 
       - simple_1
-    - version: 0
+    - version: abcd
   - multiple_files: 
     - files: 
       - simple_1
       - simple_2
-    - version: 0
+    - version: efgh

data/spec/fixtures/config/assets.yml

@@ -1,5 +1,5 @@
 base: &base
-  definition_root: spec/fixtures/config/assets/base
+  definition_root: spec/fixtures/config/asset_definitions/base
 test:
   <<: *base
   bundle: true
@@ -23,3 +23,19 @@ test_logging_verbose:
 test_logging_file:
   <<: *base
   log: tmp/test_logging_file.log
+test_no_bundle:
+  <<: *base
+  version: false
+  bundle: false
+xhtml_tags:
+  <<: *base
+  version: false
+  tag_style: xhtml
+html5_tags:
+  <<: *base
+  version: false
+  tag_style: html5
+versions:
+  <<: *base
+  version: true
+  

data/spec/fixtures/test_cases/compression/definitions/css.yml

@@ -1,6 +1,6 @@
 --- 
-- source_root: spec/fixtures/stylesheets
-- destination_root: tmp
+- root: spec/fixtures/stylesheets
+- tag_root: /stylesheets
 - suffix: css
 - assets: 
   - base: 

data/spec/fixtures/test_cases/compression/definitions/js.yml

@@ -1,6 +1,6 @@
 --- 
-- source_root: spec/fixtures/javascripts
-- destination_root: tmp
+- root: spec/fixtures/javascripts
+- tag_root: /javascripts
 - suffix: js
 - assets: 
   - base: 

data/spec/fixtures/test_cases/concatenation/definitions/css.yml

@@ -1,6 +1,6 @@
 --- 
-- source_root: spec/fixtures/stylesheets
-- destination_root: tmp
+- root: spec/fixtures/stylesheets
+- tag_root: /stylesheets
 - suffix: css
 - assets: 
   - base: 

data/spec/fixtures/test_cases/concatenation/definitions/js.yml

@@ -1,6 +1,6 @@
 --- 
-- source_root: spec/fixtures/javascripts
-- destination_root: tmp
+- root: spec/fixtures/javascripts
+- tag_root: /javascripts
 - suffix: js
 - assets: 
   - base: 

data/spec/rapper_spec.rb

@@ -51,17 +51,18 @@ describe Rapper do
       rapper.send( :asset_types ).sort.should == ["javascripts", "stylesheets"]
       rapper.definitions["javascripts"].should be_a( Rapper::Definition )
       rapper.definitions["stylesheets"].should be_a( Rapper::Definition )
-      rapper.definitions["javascripts"].source_root.should == "spec/fixtures/javascripts"
-      rapper.definitions["javascripts"].destination_root.should == "tmp"
+      rapper.definitions["javascripts"].root.should == "spec/fixtures/javascripts"
+      rapper.definitions["javascripts"].component_tag_root.should == "/javascripts"
+      rapper.definitions["javascripts"].asset_tag_root.should == "/javascripts/assets"
       rapper.definitions["javascripts"].suffix.should == "js"
       rapper.definitions["javascripts"].assets.should == {
         "single_file"=>{
           "files"=>["simple_1"],
-          "version"=>0
+          "version"=>"abcd"
         },
         "multiple_files"=>{
           "files"=>["simple_1", "simple_2"],
-          "version"=>0
+          "version"=>"efgh"
         }
       }
     end
@@ -130,22 +131,34 @@ describe Rapper do
     Dir["spec/fixtures/test_cases/*"].each do |folder|
       next unless File.directory?( folder )
       name = folder.split( "/" ).last
-      results_path = "tmp/*.*"
-      expecteds_path = "#{folder}/expected/*.*"
+      
+      paths = [
+        {
+          :results => "spec/fixtures/javascripts/assets/*.*",
+          :expecteds => "#{folder}/expected/javascripts/*.*",
+        },
+        {
+          :results => "spec/fixtures/stylesheets/assets/*.*",
+          :expecteds => "#{folder}/expected/stylesheets/*.*",
+        }
+      ]
       
       it "passes the \"#{name}\" test case" do
         rapper = Rapper::Engine.new( "#{folder}/assets.yml", "test" )
         rapper.package
         
-        # Produces the same exact individual files
-        file_names( results_path ).should == file_names( expecteds_path )
-        # Contents are all the same
-        results = Dir[results_path]
-        expecteds = Dir[expecteds_path]
+        paths.each do |path|
         
-        results.each_index do |i|
-          unless File.read( results[i] ) == File.read( expecteds[i] )
-            raise "#{results[i]} did not match #{expecteds[i]}"
+          # Produces the same exact individual files
+          file_names( path[:results] ).should == file_names( path[:expecteds] )
+          # Contents are all the same
+          results = Dir[ path[:results] ]
+          expecteds = Dir[ path[:expecteds] ]
+          
+          results.each_index do |i|
+            unless File.read( results[i] ) == File.read( expecteds[i] )
+              raise "#{results[i]} did not match #{expecteds[i]}"
+            end
           end
         end
       end
@@ -157,12 +170,49 @@ describe Rapper do
   end
   
   describe "view helpers" do
-    it "returns tags for component files when bundling is off"
-    it "returns tabs for asset when bundling is on"
-    it "can return html"
-    it "can return xhtml"
-    it "can return html5"
-    it "adds a version number if versioning is on"
-    it "doesn't add a version number if versioning is off"
+    
+    module Merb; class Controller; end; end
+    
+    before :each do
+      @controller = Merb::Controller.new
+    end
+    
+    it "returns tags for component files when bundling is off" do
+      Rapper::Engine.new( "spec/fixtures/config/assets.yml", "test_no_bundle" )
+      @controller.rapper_stylesheets_tag( :single_file ).should == "<link rel=\"stylesheet\" href=\"/stylesheets/simple_1.css\">"
+      @controller.rapper_stylesheets_tag( :multiple_files ).should == "<link rel=\"stylesheet\" href=\"/stylesheets/simple_1.css\">\n<link rel=\"stylesheet\" href=\"/stylesheets/simple_2.css\">"
+      @controller.rapper_javascripts_tag( :single_file ).should == "<script src=\"/javascripts/simple_1.js\"></script>"
+      @controller.rapper_javascripts_tag( :multiple_files ).should == "<script src=\"/javascripts/simple_1.js\"></script>\n<script src=\"/javascripts/simple_2.js\"></script>"
+    end
+    
+    it "returns tags for asset when bundling is on" do
+      Rapper::Engine.new( "spec/fixtures/config/assets.yml", "test" )
+      @controller.rapper_stylesheets_tag( :single_file ).should == "<link type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/assets/single_file.css\">"
+      @controller.rapper_stylesheets_tag( :multiple_files ).should == "<link type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/assets/multiple_files.css\">"
+      @controller.rapper_javascripts_tag( :single_file ).should == "<script type=\"text/javascript\" src=\"/javascripts/assets/single_file.js\"></script>"
+      @controller.rapper_javascripts_tag( :multiple_files ).should == "<script type=\"text/javascript\" src=\"/javascripts/assets/multiple_files.js\"></script>"
+    end
+    
+    it "can return xhtml tags" do
+      Rapper::Engine.new( "spec/fixtures/config/assets.yml", "xhtml_tags" )
+      @controller.rapper_stylesheets_tag( :single_file ).should == "<link type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/assets/single_file.css\" />"
+      @controller.rapper_stylesheets_tag( :multiple_files ).should == "<link type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/assets/multiple_files.css\" />"
+      @controller.rapper_javascripts_tag( :single_file ).should == "<script type=\"text/javascript\" src=\"/javascripts/assets/single_file.js\"></script>"
+      @controller.rapper_javascripts_tag( :multiple_files ).should == "<script type=\"text/javascript\" src=\"/javascripts/assets/multiple_files.js\"></script>"
+    end
+    
+    it "can return html5 tags" do
+      Rapper::Engine.new( "spec/fixtures/config/assets.yml", "html5_tags" )
+      @controller.rapper_stylesheets_tag( :single_file ).should == "<link rel=\"stylesheet\" href=\"/stylesheets/assets/single_file.css\">"
+      @controller.rapper_stylesheets_tag( :multiple_files ).should == "<link rel=\"stylesheet\" href=\"/stylesheets/assets/multiple_files.css\">"
+      @controller.rapper_javascripts_tag( :single_file ).should == "<script src=\"/javascripts/assets/single_file.js\"></script>"
+      @controller.rapper_javascripts_tag( :multiple_files ).should == "<script src=\"/javascripts/assets/multiple_files.js\"></script>"
+    end
+    
+    it "adds a version number if versioning is on" do
+      Rapper::Engine.new( "spec/fixtures/config/assets.yml", "versions" )
+      @controller.rapper_stylesheets_tag( :single_file ).should == "<link rel=\"stylesheet\" href=\"/stylesheets/assets/single_file.css?v=abcd\">"
+      @controller.rapper_javascripts_tag( :single_file ).should == "<script src=\"/javascripts/assets/single_file.js?v=abcd\"></script>"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -6,14 +6,10 @@ require 'fileutils'
 
 Spec::Runner.configure do |config|
   
-  # Setup and tear down tmp files.
-  
-  config.before :all do
-    Dir::mkdir( "tmp" ) unless FileTest::directory?( "tmp" )
-  end
-  
+  # Tear down test case assets folders
   config.after :each do
-    Dir[ "tmp/*" ].each { |f| FileUtils.rm( f ) }
+    FileUtils.rm_r( Dir[ "tmp/*" ] )
+    FileUtils.rm_r( Dir[ "spec/fixtures/*/assets" ] )
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rapper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Tyson Tate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 -08:00
+date: 2011-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -233,14 +233,16 @@ files:
 - lib/rapper/config.rb
 - lib/rapper/definition.rb
 - lib/rapper/errors.rb
+- lib/rapper/helpers.rb
+- lib/rapper/html_tags.rb
 - lib/rapper/logging.rb
 - lib/rapper/utils.rb
 - lib/rapper/versioning.rb
 - lib/yui/css_compressor.rb
 - rapper.gemspec
+- spec/fixtures/config/asset_definitions/base/javascripts.yml
+- spec/fixtures/config/asset_definitions/base/stylesheets.yml
 - spec/fixtures/config/assets.yml
-- spec/fixtures/config/assets/base/javascripts.yml
-- spec/fixtures/config/assets/base/stylesheets.yml
 - spec/fixtures/javascripts/simple_1.js
 - spec/fixtures/javascripts/simple_2.js
 - spec/fixtures/stylesheets/simple_1.css
@@ -248,17 +250,17 @@ files:
 - spec/fixtures/test_cases/compression/assets.yml
 - spec/fixtures/test_cases/compression/definitions/css.yml
 - spec/fixtures/test_cases/compression/definitions/js.yml
-- spec/fixtures/test_cases/compression/expected/base.css
-- spec/fixtures/test_cases/compression/expected/base.js
-- spec/fixtures/test_cases/compression/expected/base_reversed.css
-- spec/fixtures/test_cases/compression/expected/base_reversed.js
+- spec/fixtures/test_cases/compression/expected/javascripts/base.js
+- spec/fixtures/test_cases/compression/expected/javascripts/base_reversed.js
+- spec/fixtures/test_cases/compression/expected/stylesheets/base.css
+- spec/fixtures/test_cases/compression/expected/stylesheets/base_reversed.css
 - spec/fixtures/test_cases/concatenation/assets.yml
 - spec/fixtures/test_cases/concatenation/definitions/css.yml
 - spec/fixtures/test_cases/concatenation/definitions/js.yml
-- spec/fixtures/test_cases/concatenation/expected/base.css
-- spec/fixtures/test_cases/concatenation/expected/base.js
-- spec/fixtures/test_cases/concatenation/expected/base_reversed.css
-- spec/fixtures/test_cases/concatenation/expected/base_reversed.js
+- spec/fixtures/test_cases/concatenation/expected/javascripts/base.js
+- spec/fixtures/test_cases/concatenation/expected/javascripts/base_reversed.js
+- spec/fixtures/test_cases/concatenation/expected/stylesheets/base.css
+- spec/fixtures/test_cases/concatenation/expected/stylesheets/base_reversed.css
 - spec/fixtures/yui_css/background-position.css
 - spec/fixtures/yui_css/background-position.css.min
 - spec/fixtures/yui_css/box-model-hack.css