jammit_lite 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/jammit_lite.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jammit_lite}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jordan Glasner"]
-  s.date = %q{2010-03-22}
+  s.date = %q{2010-03-29}
   s.description = %q{Use Jammit on Heroku without slug bloat. Jammit::Lite loads Jammit in development, but replaces it in production saving over 9MB.}
   s.email = %q{jordan@digitalignition.com}
   s.extra_rdoc_files = [

data/lib/jammit/lite/bundle.rb

@@ -6,16 +6,20 @@ module Jammit
       
       # takes array of files from yaml hash and expands any wilcards
       def self.expand(files)
-        files.map! do |file|
-          if file.match(/\*/).nil?
-            # return single file name
-            return file
-          else
-            # expand wildcard into all matching filenames
-            return Dir[Rails.root + file].map { |path| path.gsub("#{Rails.root}/",'') }
-          end          
+        files.inject([]) do |expanded,file| 
+          wildcard?(file) ? expanded.concat(expand_wildcard_path(file)) : expanded.push(file)
+          expanded
         end
-        files.flatten!
+      end
+      
+      # returns true if given path includes "*"
+      def self.wildcard?(path)
+        not path.match(/\*/).nil?
+      end
+      
+      # expands paths with wildcards into Array of matching filenames
+      def self.expand_wildcard_path(path)
+        Dir[Rails.root + path].map { |path| path.gsub("#{Rails.root}/",'') }
       end
 
       attr_accessor :path

data/lib/jammit_lite.rb

@@ -4,23 +4,33 @@ module Jammit
     
     # returns hash of bundle file arrays keyed by bundle name
     def self.assets(type)
-      hash = asset_hash[type].symbolize_keys
-      assets = hash.inject({}) do |out,array|   
+      hash = asset_hash(type)
+      hash_to_assets(hash)
+    end
+    
+    # typecasts paths in given Hash into Assets
+    def self.hash_to_assets(hash)
+      hash.inject({}) do |out,array|   
         key,paths = array
         out[key] = paths.map { |path| Jammit::Lite::Asset.new(path) }
         out
       end
-    end
+    end    
     
+    # returns hash from yaml with given type, e.g. :javascripts
+    # expands all wildcard paths
+    def self.asset_hash(type)
+      yaml[type].symbolize_keys.inject({}) do |out,pair|
+        bundle,files = pair
+        out[bundle] = Jammit::Lite::Bundle.expand(files)
+        out
+      end
+    end
     
     # returns hash from config/assets.yml
-    # expands all wildcard paths
-    def self.asset_hash
+    def self.yaml
       yaml = File.open("#{Rails.root}/config/assets.yml")
-      hash = YAML::load(yaml).symbolize_keys
-      hash.each do |key,bundles|
-        bundles.each { |name,files| bundles[name] = Jammit::Lite::Bundle.expand(files) }
-      end
+      YAML::load(yaml).symbolize_keys
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit_lite
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jordan Glasner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -04:00
+date: 2010-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency