ramaze-asset 0.2.1 → 0.2.2

data/lib/ramaze/asset/environment.rb

@@ -290,7 +290,7 @@ module Ramaze
         end
 
         @files[type]       ||= {:global => {:__all => []}}
-        @added_files[type] ||= []
+        @added_files[type] ||= {}
 
         options, controller, methods = prepare_options(options)
         file_group                   = Types[type].new(files, options)
@@ -376,7 +376,7 @@ module Ramaze
         end
 
         @added_files.each do |type, files|
-          @added_files[type] = []
+          @added_files[type] = {}
         end
       end
 
@@ -397,8 +397,11 @@ module Ramaze
       def store_group(key, file_group, controller, methods)
         # Remove all files from the group that have already been loaded.
         file_group.files.each_with_index do |file, index|
-          if @added_files.key?(key) and @added_files[key].include?(file)
-            file_group.files.delete_at(index)
+          if @added_files.key?(key)
+            if @added_files[key].key?(controller) \
+            and @added_files[key][controller].include?(file)
+              file_group.files.delete_at(index)
+            end
           end
         end
 
@@ -412,7 +415,9 @@ module Ramaze
           @files[key][controller][m].push(file_group)
         end
 
-        @added_files[key] += file_group.files
+        @added_files[key]             ||= {}
+        @added_files[key][controller] ||= []
+        @added_files[key][controller]  += file_group.files
       end
 
       ##

data/lib/ramaze/asset/version.rb

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

data/spec/ramaze_asset/environment.rb

@@ -147,4 +147,52 @@ describe('Ramaze::Asset::Environment') do
     files.include?('/css/github.css').should === true
     files.include?('/css/reset.css').should  === true
   end
+
+  it('Load multiple files for the same controller') do
+    SpecEnv.serve(
+      :javascript,
+      ['js/mootools_core'],
+      :controller => SpecEnvironment
+    )
+
+    SpecEnv.serve(
+      :javascript,
+      ['js/mootools_more'],
+      :controller => SpecEnvironment
+    )
+
+    SpecEnv.serve(
+      :javascript,
+      ['js/mootools_core'],
+      :controller => SpecEnvironment2
+    )
+
+    SpecEnv.files[:javascript].keys.include?(:SpecEnvironment).should  === true
+    SpecEnv.files[:javascript].keys.include?(:SpecEnvironment2).should === true
+
+    SpecEnv.files[:javascript][:SpecEnvironment][:__all].length.should  === 2
+    SpecEnv.files[:javascript][:SpecEnvironment2][:__all].length.should === 1
+
+    body1 = get('/').body
+    body2 = get('/2').body
+
+    body1.should != body2
+
+    body1.include?('js/mootools_core').should === true
+    body1.include?('js/mootools_more').should === true
+    body2.include?('js/mootools_core').should === true
+    body2.include?('js/mootools_more').should === false
+  end
+
+  it('Files should only be loaded once for the same controller') do
+    3.times do
+      SpecEnv.serve(
+        :javascript,
+        ['js/mootools_core'],
+        :controller => SpecEnvironment
+      )
+    end
+
+    SpecEnv.files[:javascript][:SpecEnvironment][:__all].length.should === 1
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ramaze-asset
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2156392100 !ruby/object:Gem::Requirement
+  requirement: &2152570740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2011.07.25
   type: :runtime
   prerelease: false
-  version_requirements: *2156392100
+  version_requirements: *2152570740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156391580 !ruby/object:Gem::Requirement
+  requirement: &2152570220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2156391580
+  version_requirements: *2152570220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156391100 !ruby/object:Gem::Requirement
+  requirement: &2152569740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156391100
+  version_requirements: *2152569740
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2156390620 !ruby/object:Gem::Requirement
+  requirement: &2152569260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2156390620
+  version_requirements: *2152569260
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156390140 !ruby/object:Gem::Requirement
+  requirement: &2152568780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2156390140
+  version_requirements: *2152568780
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156389660 !ruby/object:Gem::Requirement
+  requirement: &2152599780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2156389660
+  version_requirements: *2152599780
 description: A simple yet powerful asset manager for Ramaze.
 email: yorickpeterse@gmail.com
 executables: []