@@ -4,6 +4,9 @@ module Holly CSS_DIR = "stylesheets" DEFAULT_TYPE = "js" + REQUIRE = /^\s*(?:\/\/|\/\*)\s*@require\s+(\S+)/ + LOAD = /^\s*(?:\/\/|\/\*)\s*@load\s+(\S+)/ + def self.public_dir @public_dir || RAILS_ROOT.gsub(/\/$/, "") + "/public" end @@ -40,6 +43,13 @@ module Holly return context end + def self.parse(string, pattern, asset_type = DEFAULT_TYPE) + string.split(/[\r\n]/). + map { |l| l.match(pattern).to_a[1] }. + delete_if { |s| s.to_s == "" }. + map { |s| resolve_source(s, asset_type) } + end + def self.get_symbol(source) asset = Asset.new(source) return " " if asset.exists? lib/holly.rb @@ -3,9 +3,6 @@ require 'find' module Holly class Asset - REQUIRE = /^\s*(?:\/\/|\/\*)\s*@require\s+(\S+)/ - LOAD = /^\s*(?:\/\/|\/\*)\s*@load\s+(\S+)/ - class << self def find_all files, dir = [], Holly.public_dir @@ -51,12 +48,12 @@ module Holly end def requires - @requires ||= parse(REQUIRE) + @requires ||= Holly.parse(read, REQUIRE, asset_type) @requires.dup end def loads - @loads ||= parse(LOAD) + @loads ||= Holly.parse(read, LOAD, asset_type) @loads.dup end @@ -76,14 +73,5 @@ module Holly end end - private - - def parse(pattern) - lines. - map { |l| l.match(pattern).to_a[1] }. - delete_if { |s| s.to_s == "" }. - map { |s| Holly.resolve_source(s, asset_type) } - end - end end lib/holly/asset.rb 1f319d4fc38613a6c99ccb7f94025a8fc1848108 James Coglan jcoglan@googlemail.com http://github.com/jcoglan/holly/commit/066b3c60f0ffe179a0d5043c4764e07786b7f11b 066b3c60f0ffe179a0d5043c4764e07786b7f11b 2008-01-06T19:40:39-08:00 2008-01-06T19:40:39-08:00 Restructuring file parsing routine. 06e14710b65cc25faff6f23cd40eae55fa9e3ce0 James Coglan jcoglan@googlemail.com