ramaze-asset 0.2.2 → 0.2.3

data/lib/ramaze/asset/environment.rb

@@ -162,28 +162,6 @@ module Ramaze
         @files              = {}
         @added_files        = {}
         @asset_groups       = {}
-        @file_group_options = {
-          :paths      => [],
-          :cache_path => @options[:cache_path]
-        }
-
-        # Get all the public directories to serve files from.
-        Ramaze.options.roots.each do |root|
-          Ramaze.options.publics.each do |pub|
-            pub = File.join(root, pub)
-
-            if File.directory?(pub)
-              @file_group_options[:paths].push(pub)
-            end
-          end
-        end
-
-        if @file_group_options[:paths].empty?
-          raise(
-            Ramaze::Asset::AssetError,
-            'No existing public directories were found'
-          )
-        end
       end
 
       ##
@@ -278,13 +256,16 @@ module Ramaze
       #  controller set in :controller. When setting these methods the files
       #  will only be served when those methods are executed. This option is
       #  completely ignored if :controller is set to :global.
+      # @option options :force When set to true the files will be minified
+      #  regardless of the (global) :minify option. This is useful for files such
+      #  as Coffeescript or Less files.
       #
       def serve(type, files, options = {})
         type = type.to_sym
 
         if !Types.key?(type)
           raise(
-            Zen::Asset::AssetError,
+            Ramaze::Asset::AssetError,
             "The type \"#{type}\" doesn't exist"
           )
         end
@@ -464,10 +445,32 @@ module Ramaze
           options[:minify] = false
         end
 
-        controller = options.delete(:controller) || :global
-        methods    = options.delete(:methods)    || [:__all]
-        options    = options.merge(@file_group_options)
+        if options.key?(:force) and options[:force] === true
+          options[:minify] = true
+        end
+
+        controller           = options[:controller] || :global
+        methods              = options[:methods]    || [:__all]
+        options[:cache_path] = @options[:cache_path]
+        options[:paths]      = []
 
+        # Get all the public directories to serve files from.
+        Ramaze.options.roots.each do |root|
+          Ramaze.options.publics.each do |pub|
+            pub = File.join(root, pub)
+
+            if File.directory?(pub)
+              options[:paths].push(pub)
+            end
+          end
+        end
+
+        if options[:paths].empty?
+          raise(
+            Ramaze::Asset::AssetError,
+            'No existing public directories were found'
+          )
+        end
 
         if !controller.is_a?(Symbol)
           controller = controller.to_s.to_sym

data/lib/ramaze/asset/version.rb

@@ -1,5 +1,5 @@
 module Ramaze
   module Asset
-    Version = '0.2.2'
+    Version = '0.2.3'
   end # Asset
 end # Ramaze

data/ramaze-asset.gemspec

@@ -5,7 +5,7 @@ path = File.expand_path('../', __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'ramaze-asset'
   s.version     = Ramaze::Asset::Version
-  s.date        = '2011-09-14'
+  s.date        = '2011-09-16'
   s.authors     = ['Yorick Peterse']
   s.email       = 'yorickpeterse@gmail.com'
   s.summary     = 'A simple yet powerful asset manager for Ramaze.'

data/spec/ramaze_asset/environment.rb

@@ -45,19 +45,13 @@ describe('Ramaze::Asset::Environment') do
       env = Ramaze::Asset::Environment.new(
         :cache_path => __DIR__('../fixtures/public')
       )
+
+      env.serve(:javascript, ['js/mootools_core'])
     end
 
     Ramaze.options.publics = old_publics
   end
 
-  it('Generate the possible paths') do
-    path = __DIR__('../fixtures/public')
-    env  = Ramaze::Asset::Environment.new(:cache_path => path)
-
-    env.instance_variable_get(:@file_group_options)[:paths].include?(path) \
-      .should === true
-  end
-
   it('Register a new type') do
     Ramaze::Asset::Environment.register_type(:struct, Struct)
 
@@ -84,6 +78,17 @@ describe('Ramaze::Asset::Environment') do
     env.files[:css][:global][:__all][0].options[:minify].should        === false
   end
 
+  it('Force minifying a file') do
+    env = Ramaze::Asset::Environment.new(
+      :cache_path => __DIR__('../fixtures/public/minified'),
+      :minify     => false
+    )
+
+    env.serve(:javascript, ['js/mootools_core'], :force => true)
+
+    env.files[:javascript][:global][:__all][0].options[:minify].should === true
+  end
+
   it('Serve a file globally') do
     SpecEnv.serve(:javascript, ['js/mootools_core'], :controller => :global)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ramaze-asset
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000 +02:00
+date: 2011-09-16 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2152570740 !ruby/object:Gem::Requirement
+  requirement: &2153718420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2011.07.25
   type: :runtime
   prerelease: false
-  version_requirements: *2152570740
+  version_requirements: *2153718420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152570220 !ruby/object:Gem::Requirement
+  requirement: &2153717900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2152570220
+  version_requirements: *2153717900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152569740 !ruby/object:Gem::Requirement
+  requirement: &2153717420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2152569740
+  version_requirements: *2153717420
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2152569260 !ruby/object:Gem::Requirement
+  requirement: &2153716940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152569260
+  version_requirements: *2153716940
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152568780 !ruby/object:Gem::Requirement
+  requirement: &2153716460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2152568780
+  version_requirements: *2153716460
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152599780 !ruby/object:Gem::Requirement
+  requirement: &2153715980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2152599780
+  version_requirements: *2153715980
 description: A simple yet powerful asset manager for Ramaze.
 email: yorickpeterse@gmail.com
 executables: []