compressible 0.0.2.4 → 0.0.2.6

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 # http://docs.rubygems.org/read/chapter/20
 spec = Gem::Specification.new do |s|
   s.name              = "compressible"
-  s.version           = "0.0.2.4"
+  s.version           = "0.0.2.6"
   s.author            = "Lance Pollard"
   s.summary           = "Compressible: Quick asset compression for Ruby - Perfect for Heroku"
   s.homepage          = "http://github.com/viatropos/compressible"
@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.files             = %w(README.markdown Rakefile init.rb MIT-LICENSE) + Dir["{lib,rails,test}/**/*"] - Dir["test/tmp"]
   s.require_path      = "lib"
-  s.add_dependency("activesupport", ">= 2.1.2")
+  s.add_dependency("activesupport", ">= 2.3.5")
   s.add_dependency("yui-compressor")
 end
 

data/lib/compressible.rb

@@ -1,11 +1,7 @@
 require 'rubygems'
 require 'yaml'
-begin
-  gem "activesupport", "= 2.3.5"
-  require 'active_support'
-rescue Gem::LoadError => e
-  puts e.inspect
-end
+require 'active_support'
+
 this = File.dirname(__FILE__)
 require File.join(this, "ext.rb")
 
@@ -26,3 +22,7 @@ Compressible.send(:include, Compressible::Configurable)
 Compressible.send(:include, Compressible::Assetable)
 Compressible.send(:include, Compressible::Readable)
 Compressible.send(:include, Compressible::Writable)
+
+def Compressible(*args, &block)
+  Compressible.define!(*args, &block)
+end

data/lib/compressible/assetable.rb

@@ -27,8 +27,9 @@ module Compressible
         paths = args.dup
         options = paths.extract_options!
         to = asset_name(options[:to])
-        add_to_config(:js, to, paths)
+        add_to_config(:js, to, paths.flatten)
         write_javascript(*args) unless config[:read_only] == true
+        to
       end
       alias_method :add_javascript, :javascript
       alias_method :js, :javascript
@@ -37,8 +38,9 @@ module Compressible
         paths = args.dup
         options = paths.extract_options!
         to = asset_name(options[:to])
-        add_to_config(:css, to, paths)
+        add_to_config(:css, to, paths.flatten)
         write_stylesheet(*args) unless config[:read_only] == true
+        to
       end
       alias_method :add_stylesheet, :stylesheet
       alias_method :css, :stylesheet

data/lib/compressible/builder.rb

@@ -0,0 +1,37 @@
+module Compressible
+  class Builder
+    class << self
+      def define!(*args, &block)
+        new(*args, &block)
+      end
+    end
+    
+    def initialize(*args, &block)
+      instance_eval(&block) if block_given?
+    end
+    
+    def read_only(value = true)
+      Compressible.configure(:read_only => value)
+    end
+    
+    def stylesheets(&block)
+      @context = "stylesheet"
+      instance_eval(&block) if block_given?
+      @context = nil
+    end
+    
+    def javascripts(&block)
+      @context = "javascript"
+      instance_eval(&block) if block_given?
+      @context = nil
+    end
+    
+    def method_missing(meth, *args, &block)
+      if @context
+        Compressible.send(@context, args, :to => [meth])
+      else
+        super(meth, *args, &block)
+      end
+    end
+  end
+end

data/lib/compressible/configurable.rb

@@ -20,6 +20,10 @@ module Compressible
         
         self
       end
+      
+      def define!(*args, &block)
+        Compressible::Builder.define!(*args, &block)
+      end
 
       def defaults
         {
@@ -38,7 +42,7 @@ module Compressible
       def add_to_config(type, key, value)
         raise "Please define a name for the cached #{type.to_s} using ':to => :my_name'" unless key
         item = find_or_create(type, key)
-        item[:paths] = value.collect {|i| asset_name(i)}
+        item[:paths] = value.flatten.collect {|i| asset_name(i)}
         item
       end
       

data/test/test_compressible.rb

@@ -130,6 +130,34 @@ class CompressibleTest < Test::Unit::TestCase
       
     end
     
+    context "dsl" do
+      setup do
+        Compressible.reset
+        Compressible do
+          read_only
+          
+          javascripts do
+            result "test-a", "test-b"
+          end
+          
+          stylesheets do
+            result "test-a", "test-b"
+          end
+        end
+      end
+      
+      should "have defined the right js and css" do
+        result = {:js => [{:paths=>["test-a", "test-b"], :to=>"result"}],
+          :stylesheet_path=>nil,
+          :javascript_path=>nil,
+          :read_only=>true,
+          :css => [{:paths=>["test-a", "test-b"], :to=>"result"}]
+        }
+        assert_equal result, Compressible.config
+      end
+      
+      
+    end
     
   end
   

data/test/test_helper.rb

@@ -1,7 +1,6 @@
 require "test/unit"
 require "rubygems"
 require "ruby-debug"
-gem "activesupport", "= 2.3.5"
 require 'active_support'
 require 'shoulda'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: compressible
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 75
   prerelease: false
   segments: 
   - 0
   - 0
   - 2
-  - 4
-  version: 0.0.2.4
+  - 6
+  version: 0.0.2.6
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -07:00
+date: 2010-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 9
         segments: 
         - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 3
+        - 5
+        version: 2.3.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - init.rb
 - MIT-LICENSE
 - lib/compressible/assetable.rb
+- lib/compressible/builder.rb
 - lib/compressible/configurable.rb
 - lib/compressible/readable.rb
 - lib/compressible/view_helpers.rb