githubbish_assets 0.1.1 → 0.1.2

data/VERSION

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

data/githubbish_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{githubbish_assets}
-  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 = ["Oleg Dashevskii"]
-  s.date = %q{2011-01-06}
+  s.date = %q{2011-01-07}
   s.description = %q{Github style assets bundling in a Rails 3 engine}
   s.email = %q{olegdashevski@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "githubbish_assets.gemspec",
     "lib/githubbish_assets.rb",
     "lib/githubbish_assets/helper.rb",
+    "lib/githubbish_assets/lister.rb",
     "lib/githubbish_assets/packer.rb",
     "lib/vendor/js_minimizer.rb",
     "test/helper.rb",

data/lib/githubbish_assets.rb

@@ -1,5 +1,6 @@
 require 'rails'
 require 'active_support'
+require 'githubbish_assets/lister'
 require 'githubbish_assets/packer'
 require 'githubbish_assets/helper'
 

data/lib/githubbish_assets/helper.rb

@@ -28,15 +28,7 @@ module GithubbishAssets
     end
 
     def javascript_include_files(bundles)
-      output = ""
-      bundles.each do |bundle|
-        files = GithubbishAssets::Packer.recursive_file_list("public/javascripts/#{bundle}", ".js")
-        files.each do |file|
-          file = file.gsub('public/javascripts/', '')
-          output << javascript_src_tag(file, {}) + "\n"
-        end
-      end
-      output.html_safe
+      _gh_include_files("public/javascripts", ".js", bundles) { |file| javascript_src_tag(file) }
     end
 
     def javascript_dev(*sources)
@@ -60,14 +52,22 @@ module GithubbishAssets
     end
 
     def stylesheet_include_files(bundles)
+      _gh_include_files("public/stylesheets", ".css", bundles) { |file| stylesheet_link_tag(file) }
+    end
+
+    private
+
+    def _gh_include_files(asset_root, ext, bundles)
+      p_asset_root = Rails.root + asset_root
       output = ""
+
       bundles.each do |bundle|
-        files = GithubbishAssets::Packer.recursive_file_list("public/stylesheets/#{bundle}", ".css")
+        files = RecursiveLister[p_asset_root + bundle.to_s, ext]
         files.each do |file|
-          file = file.gsub('public/stylesheets/', '')
-          output << stylesheet_link_tag(file) + "\n"
+          output << yield(file.relative_path_from(p_asset_root).to_s) << "\n"
         end
       end
+
       output.html_safe
     end
   end

data/lib/githubbish_assets/lister.rb

@@ -0,0 +1,13 @@
+module GithubbishAssets
+  class RecursiveLister
+    def self.[](root, ext)
+      files = []
+
+      root.find do |path|
+        files << path if path.file? && path.extname == ext
+      end
+
+      files.sort
+    end
+  end
+end

data/lib/githubbish_assets/packer.rb

@@ -1,5 +1,4 @@
 require 'yui/compressor'
-require 'find'
 
 module GithubbishAssets
   class Packer
@@ -11,7 +10,7 @@ module GithubbishAssets
         require 'closure-compiler'
       end
 
-      pack('public/javascripts', '.js') do |target, files|
+      pack(Rails.root + 'public/javascripts', '.js') do |target, files|
         case GithubbishAssets.js_compressor
         when :closure
           opts = [ [:js_output_file, target] ]
@@ -36,38 +35,23 @@ module GithubbishAssets
     end
 
     def self.css
-      pack('public/stylesheets', '.css') do |target, files|
+      pack(Rails.root + 'public/stylesheets', '.css') do |target, files|
         compress_with_yui(YUI::CssCompressor.new(:line_break => 0), files, target)
       end
     end
 
-    def self.recursive_file_list(basedir, ext)
-      files = []
-      Find.find(basedir) do |path|
-        if FileTest.directory?(path)
-          if File.basename(path)[0] == ?. # Skip dot directories
-            Find.prune
-          else
-            next
-          end
-        end
-        files << path if File.extname(path) == ext
-      end
-      files.sort
-    end
-
-
     private
 
-    def self.pack(relpath, ext)
+    def self.pack(path, ext)
       targets = []
-      get_top_level_directories(relpath).each do |bundle_directory|
+      get_top_level_directories(path).each do |bundle_directory|
         bundle_name = bundle_directory.basename
+        next if bundle_name.to_s == 'dev'
 
-        files = recursive_file_list(bundle_directory, ext)
-        next if files.empty? || bundle_name == 'dev'
+        files = RecursiveLister[bundle_directory, ext]
+        next if files.empty?
 
-        target = Rails.root + relpath + "bundle_#{bundle_name}#{ext}"
+        target = path + "bundle_#{bundle_name}#{ext}"
 
         yield target, files
 
@@ -77,12 +61,8 @@ module GithubbishAssets
       targets
     end
 
-    def self.get_top_level_directories(base_path)
-      Dir.entries(Rails.root + base_path).collect do |path|
-        if path[0] != ?. && (Rails.root + base_path + path).directory?
-          path
-        end
-      end.compact
+    def self.get_top_level_directories(root_path)
+      root_path.children.select { |path| path.directory? }
     end
 
     def self.compress_with_yui(compressor, files, target)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: githubbish_assets
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Oleg Dashevskii
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +06:00
+date: 2011-01-07 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,6 +128,7 @@ files:
 - githubbish_assets.gemspec
 - lib/githubbish_assets.rb
 - lib/githubbish_assets/helper.rb
+- lib/githubbish_assets/lister.rb
 - lib/githubbish_assets/packer.rb
 - lib/vendor/js_minimizer.rb
 - test/helper.rb