minit 0.0.1 → 0.0.2

data/.rvmrc

@@ -1,2 +1,2 @@
-rvm 1.9.2@minit
+rvm use 1.9.2@minit --create
 

data/.watchr

@@ -0,0 +1,7 @@
+def rspec spec
+  system("clear && ruby #{spec}")
+end
+
+watch( 'lib/(.*)\.rb' ) {|match| rspec("spec/#{match[1]}_spec.rb") }
+watch( 'spec/.*_spec\.rb' ) {|match| rspec(match[0]) }
+

data/Gemfile.lock

@@ -0,0 +1,22 @@
+PATH
+  remote: .
+  specs:
+    minit (0.0.1)
+      cssmin
+      jsmin
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    cssmin (1.0.2)
+    fakefs (0.3.1)
+    jsmin (1.0.1)
+    watchr (0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs
+  minit!
+  watchr

data/README.md

@@ -1,7 +1,8 @@
 Minit!
 ====================================
 
-Minify JS and CSS in all environments except development and test for Ruby on Rails 3 apps.
+Minify JS and CSS in all environments except development and test for Ruby on Rails apps.
+(so far tested on Rails 3 but will be testing on Rails 2 in the coming days)
 
 No frills, no configuration, opinionated packager. Use it, fork it or use something else.
 
@@ -10,11 +11,11 @@ This gem aims to fix two shortcomings in the main two asset packaging libraries,
 1. Jammit requires Java to package CSS
 2. asset_packager requires a configuration file to specify every single CSS or JS file
 
-It use CSSMin and JSMin gems from rgrove. Thanks!
+It uses CSSMin and JSMin gems from rgrove. Thanks!
 
 It will ignore files that don't exist. It will only include files once.
 
-It's less than 50 lines of code (and no, it's not forced)
+It's about 50 lines of code.
 
 Usage
 ====================================
@@ -40,6 +41,7 @@ Then ensure this folder structure to get the correct load order:
       stylesheets/
         reset.css
         default.css
+        application.css
         lib/
           *
         *
@@ -47,11 +49,16 @@ Then ensure this folder structure to get the correct load order:
 Status / Todo
 ====================================
 
-First alpha release
+First release
 
 This was hacked together one afternoon as I was fed up seeing the error message that
-Jammit couldn't compress because Java wasn't installed on our CentOS server. I wanted
+Jammit couldn't compress because Java wasn't installed on our server. I wanted
 to see if it was easy enough to put together a simpler solution.
 
-So it needs some tests which will follow shortly.
+Feel free to report bugs in Issues.
+
+Development
+====================================
+
+Minit uses MiniSpec, FakeFS, Watchr, RVM.
 

data/lib/minit.rb

@@ -1,48 +1,52 @@
 require 'cssmin'
 require 'jsmin'
 
-def package type, globs, create = true
-  compressor = {:javascripts => JSMin, :stylesheets => CSSMin}[type]
-  extension = {:javascripts => 'js', :stylesheets => 'css'}[type]
-  include_method = {:javascripts => 'javascript_include_tag', :stylesheets => 'stylesheet_link_tag'}[type]
-  raise "package type unknown. Only :javascripts or :stylesheets supported." unless compressor && extension && include_method
-  package_name = "packaged.#{extension}"
-  files = []
-  includes = (compress? && !create) ? File.join('/assets', package_name) : []
-  asset_path = File.join(Rails.root, 'public', type.to_s, '/')
-
-  file = File.open(File.join(Rails.root, 'public', 'assets', package_name), 'w') if (compress? && create)
-  globs.each do |glob|
-    Dir.glob(File.join(asset_path, glob)).each do |path|
-      next if files.include?(path)
-      files << path
-      if compress? && create
-        file.puts compressor.minify(File.open(path))
-      elsif !create
-        includes << path.gsub(asset_path, '')
+class Minit
+  def package type, globs, create
+    compressor = {:javascripts => JSMin, :stylesheets => CSSMin}[type]
+    extension = {:javascripts => 'js', :stylesheets => 'css'}[type]
+    include_method = {:javascripts => 'javascript_include_tag', :stylesheets => 'stylesheet_link_tag'}[type]
+    raise "package type unknown. Only :javascripts or :stylesheets supported." unless compressor && extension && include_method
+    package_name = "packaged.#{extension}"
+    return send(include_method, File.join('/assets', package_name)) if compress? && !create
+
+    files = []
+    includes = []
+    asset_path = File.join(Rails.root, 'public', type.to_s, '/')
+
+    file = File.open(File.join(Rails.root, 'public', 'assets', package_name), 'w') if (compress? && create)
+    globs.each do |glob|
+      Dir.glob(File.join(asset_path, glob)).each do |path|
+        next if files.include?(path)
+        files << path
+        if compress? && create
+          file.puts compressor.minify(File.read(path))
+        elsif !create
+          includes << path.gsub(asset_path, '')
+        end
       end
     end
+    file.close if file
   end
-  file.close if file
-  send(include_method, includes)
-end
 
-def compress?
-  !%w(development test).include?(Rails.env)
-end
+  def compress?
+    !%w(development test).include?(Rails.env)
+  end
 
-def include_stylesheets create = false
-  package :stylesheets, %w(reset.css default.css lib/**/*.css **/*.css), create
-end
+  def include_stylesheets create = false
+    package :stylesheets, %w(reset.css default.css application.css lib/**/*.css **/*.css), create
+  end
 
-def include_javascripts create = false
-  package :javascripts, %w(lib/**/*.js plugins/**/*.js **/*.js), create
+  def include_javascripts create = false
+    package :javascripts, %w(lib/**/*.js plugins/**/*.js **/*.js), create
+  end
 end
 
-if compress?
+minit = Minit.new
+if minit.compress?
   puts 'Compressing assets...'
-  include_stylesheets true
-  include_javascripts true
+  minit.include_stylesheets true
+  minit.include_javascripts true
   puts 'Finished compressing assets.'
 end
 

data/minit.gemspec

@@ -2,7 +2,7 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'minit'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.author      = 'Phil Thompson'
   s.email       = Base64.decode64("cGhpbEBlbGVjdHJpY3Zpc2lvbnMuY29t\n")
   s.homepage    = 'http://github.com/PhilT/minit'
@@ -14,6 +14,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'jsmin'
   s.add_dependency 'cssmin'
 
+  s.add_development_dependency 'fakefs'
+  s.add_development_dependency 'watchr'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_path  = 'lib'

data/spec/minit_spec.rb

@@ -0,0 +1,117 @@
+$LOAD_PATH << 'lib'
+require 'minitest/autorun'
+
+class Rails
+  @@env = 'development'
+  def self.env; @@env; end
+  def self.env= env; @@env = env; end
+  def self.root; '/root'; end
+end
+
+class Outputs
+  attr_accessor :output, :stylesheets, :javascripts
+  def reset
+    self.output = []
+    self.stylesheets = []
+    self.javascripts = []
+  end
+end
+$outputs = Outputs.new
+
+def puts str
+  $outputs.output << str
+end
+
+def stylesheet_link_tag *args
+  $outputs.stylesheets + args
+end
+
+def javascript_include_tag *args
+  $outputs.javascripts + args
+end
+
+require 'jsmin'
+require 'cssmin'
+require 'fakefs'
+require 'minit'
+def create path, content
+  path = File.join(Rails.root, 'public', path)
+  FileUtils.mkdir_p File.dirname(path)
+  File.open path, 'w' do |f|
+    f.puts content
+  end
+end
+FileUtils.mkdir_p File.join(Rails.root, 'public/assets')
+create 'stylesheets/reset.css', 'body {padding: 0}'
+create 'stylesheets/default.css', 'img {border: none}'
+create 'stylesheets/some.css', 'p {margin-bottom: 20px}'
+create 'stylesheets/application.css', 'body {margin: 20px auto}'
+create 'stylesheets/lib/jquery.ui.css', '.some_ui {}'
+create 'javascripts/lib/jquery.js', 'var jquery;'
+create 'javascripts/plugins/jquery_ui/jquery.menu.js', 'var menu;'
+create 'javascripts/application.js', '$(function(){});'
+
+describe 'Minit' do
+  before(:each) do
+    $outputs.reset
+    @subject = Minit.new
+  end
+
+  describe 'initialization' do
+    it 'packs CSS and JS into single files' do
+      Rails.env = 'production'
+      load 'minit.rb'
+      $outputs.output.must_equal ['Compressing assets...', 'Finished compressing assets.']
+      $outputs.stylesheets.must_equal []
+      $outputs.javascripts.must_equal []
+      File.read('/root/public/assets/packaged.css').must_equal "body{padding:0;}\nimg{border:none;}\nbody{margin:20px auto;}\n.some_ui{;}\np{margin-bottom:20px;}\n"
+      File.read('/root/public/assets/packaged.js').must_equal "\nvar jquery;\n\nvar menu;\n\n$(function(){});\n"
+    end
+
+    it 'does not do anything when no compression required' do
+      Rails.env = 'development'
+      load 'minit.rb'
+      $outputs.output.must_equal []
+      $outputs.stylesheets.must_equal []
+      $outputs.javascripts.must_equal []
+    end
+  end
+
+  describe 'compress?' do
+    it 'returns false for development environment' do
+      Rails.env = 'development'
+      @subject.compress?.must_equal false
+    end
+
+    it 'returns false for test environment' do
+      Rails.env = 'test'
+      @subject.compress?.must_equal false
+    end
+
+    it 'returns true for production environment' do
+      Rails.env = 'production'
+      @subject.compress?.must_equal true
+    end
+
+    it 'returns true for any other environment' do
+      Rails.env = 'other'
+      @subject.compress?.must_equal true
+    end
+  end
+
+  describe 'include_stylesheets' do
+    it 'defaults to not create' do
+      Rails.env = 'development'
+      @subject.include_stylesheets
+      $outputs.stylesheets.must_equal []
+    end
+  end
+
+  describe 'package' do
+    it 'raises when type is not javascripts or stylesheets' do
+      lambda { @subject.package :something, nil, nil }.must_raise RuntimeError
+    end
+  end
+
+end
+

metadata

@@ -2,7 +2,7 @@
 name: minit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Phil Thompson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 +01:00
+date: 2011-05-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,28 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: fakefs
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: watchr
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: phil@electricvisions.com
 executables: []
@@ -45,11 +67,14 @@ extra_rdoc_files: []
 
 files: 
 - .rvmrc
+- .watchr
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/minit.rb
 - minit.gemspec
+- spec/minit_spec.rb
 has_rdoc: true
 homepage: http://github.com/PhilT/minit
 licenses: []
@@ -78,5 +103,5 @@ rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Minify CSS and JS without requiring Java nor specifying individual files
-test_files: []
-
+test_files: 
+- spec/minit_spec.rb