web_resource_bundler 0.0.13 → 0.0.14

data/README

@@ -5,6 +5,7 @@ Content:
 2. Functional description
 3. Installation
 4. Usage
+5. Recommendations 
 
 =================== 1. Purpose ===============================================
 
@@ -98,7 +99,6 @@ use <%= web_resource_bundler_process do %>
 
 And as result you'll have
 
-
 <link href="/cache/base64_style_d880a502addaa493b889c0970616430b.css?1290594873" media="screen" rel="stylesheet" type="text/css" />
 <script src="/cache/script_275d311037da40e9c9b8c919a8c08b55.js?1290594873" type="text/javascript"></script>
 
@@ -107,7 +107,7 @@ And as result you'll have
 <![endif]-->
 
 <!--[if lte IE 7]>
-   <link type="text/css" rel="stylesheet" href="/cache/base64_style_ad801w02addaa493b889c0970616430b"/>
+   <link type="text/css" rel="stylesheet" href="/cache/base64_style_ad801w02addaa493b889c0970616430b.css?1290594873"/>
 <![endif]-->
 
 !!!
@@ -116,3 +116,28 @@ Don't forget to clean your cache directory after deploy to clean old bundles
 
 To disable bundling and see raw results add no_bundler param
 mysite.com/?no_bundler=1
+================= 5. Recommendations ===================================
+
+1. Be mindful while organazing and linking your resource files 
+WebResourceBundler combines all resource file in one. This resulted file could be huge.
+  a. Don't link all resources in layouts!
+    Be sure to link resources (css\js) only for pages that using them, in other case your users will be forced
+    to download huge css\js files with unused content.
+  b. One css for one page.
+    Try to slice you css files - separate file for each particular page.
+  c. Separate bundle block for crucial resources
+    To make crucial resources (basic styles\scripts for user can see basic page layout ASAP) load first - just bundle them in separate web_resource_bundler_process block and put this block at the top of your head block. 
+
+2. Don't set max_image_size to big values. 
+The main reason of using Base64 filter is to avoid unnecessary server requests and minimize load time,
+but when encoded image is very big, traffic overhead time (encoded image base64 code is bigger for apprx. 30% than source image size) could be bigger than request time. In this case your site could be even slower than without a WebResourceBundler.
+Recommended max_image_size value is 1..20kbytes
+
+3. Be careful with third party scripts.
+Some third party javascript libs can load another script file on the fly, relative path for this file computed
+on the client side. But your scripts are bundled and their relative path changed (cache folder), that's why such script
+won't be able to compute loaded file path correctly. You should avoid bundling such tricky javascripts.
+
+4. Unexistent resources handling 
+  a. Be sure to link in html only existent resource files, otherwise bundler won't work.
+  b. If you have unexistent images in css, bundler will work but you've got info messages in log.

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/web_resource_bundler/filters/base_filter.rb

@@ -5,24 +5,18 @@ module WebResourceBundler
       attr_reader :settings
 
       def initialize(settings, file_manager)
-        @settings = Settings.new(settings)
+        @settings = settings
         @file_manager = file_manager
       end
 
       def set_settings(settings)
-        @settings.set(settings)
+        @settings = settings
       end
 
       def apply(block_data = nil)
         #applies filter to block_data
       end
 
-      #resource is hash {:css => ResourceBundle::Data, :js => ResourceBundle::Data}
-      def change_resulted_files!(resource = nil)
-        #this method changes resource file names to resulted files paths
-        #used to determine if resulted files exist on disk
-      end
-
     end
   end
 end

data/lib/web_resource_bundler/filters/bundle_filter.rb

@@ -30,16 +30,16 @@ module WebResourceBundler::Filters::BundleFilter
 
     def get_md5(files)
       items = [(files.map {|f| f.path }).sort]
-      items += @settings.md5_additional_data if @settings.md5_additional_data
+      items += @settings[:md5_additional_data] if @settings[:md5_additional_data]
       Digest::MD5.hexdigest(items.flatten.join('|'))
     end
 
     def bundle_filepath(type, files)
       unless files.empty?
         items = [type[:name] + '_' + get_md5(files)]
-        items += @settings.filename_additional_data if @settings.filename_additional_data
+        items += @settings[:filename_additional_data] if @settings[:filename_additional_data]
         items << type[:ext]
-        return File.join(@settings.cache_dir, items.join('.'))
+        return File.join(@settings[:cache_dir], items.join('.'))
       else
         return nil
       end

data/lib/web_resource_bundler/filters/cdn_filter.rb

@@ -13,16 +13,16 @@ module WebResourceBundler::Filters::CdnFilter
     end
 
     def new_filepath(path)
-      File.join(@settings.cache_dir, 'cdn_' + File.basename(path))
+      File.join(@settings[:cache_dir], 'cdn_' + File.basename(path))
     end
 
     #insures that image linked to one particular host  
     def host_for_image(image_url)
       #hosts are different depending on protocol 
-      if @settings.protocol == 'https' 
-        hosts = @settings.https_hosts
+      if @settings[:protocol] == 'https' 
+        hosts = @settings[:https_hosts]
       else
-        hosts = @settings.http_hosts
+        hosts = @settings[:http_hosts]
       end
       #getting host based on image url hash
       host_index = image_url.hash % hosts.size

data/lib/web_resource_bundler/filters/image_encode_filter/css_generator.rb

@@ -13,7 +13,7 @@ module WebResourceBundler
         end
 
         def set_settings(settings)
-          @settings.set(settings)
+          @settings = settings
         end
 
         #construct mhtml head of css file with definition of image data in base64
@@ -24,7 +24,7 @@ module WebResourceBundler
             result << 'Content-Type: multipart/related; boundary="' << SEPARATOR << '"' << "\n\n"
             #each image found in css should be defined in header with base64 encoded content
             images.each_key do |key|
-              result += images[key].construct_mhtml_image_data('--' + SEPARATOR)
+              result << images[key].construct_mhtml_image_data('--' + SEPARATOR)
             end
             result << "\n" << '--' << SEPARATOR << '--' << "\n"
             result << "*/"
@@ -34,7 +34,7 @@ module WebResourceBundler
 
         #creates mhtml link to use in css tags instead of image url
         def construct_mhtml_link(filepath)
-          "#{@settings.protocol}://#{File.join(@settings.domain, filepath)}"
+          "#{@settings[:protocol]}://#{File.join(@settings[:domain], filepath)}"
         end
         
         #iterates through all tags found in css
@@ -46,8 +46,8 @@ module WebResourceBundler
           new_content = content.gsub!(PATTERN) do |s|
             tag, url = $1, $3
             #this constructor will write in log if image doesn't exist
-            data = ImageData.new(url, @settings.resource_dir) 
-            if !url.empty? and data.exist and data.size <= @settings.max_image_size and block_given?
+            data = ImageData.new(url, @settings[:resource_dir]) 
+            if !url.empty? and data.exist and data.size <= @settings[:max_image_size] and block_given?
               #using image url as key to prevent one image be encoded many times
               images[data.url] = data unless images[data.path]
               #changing string using provided block

data/lib/web_resource_bundler/filters/image_encode_filter/image_data.rb

@@ -35,9 +35,9 @@ module WebResourceBundler
     		def construct_mhtml_image_data(separator)
     			if @exist
     				result = separator + "\n"
-    				result += "Content-Location:" + @id + "\n"
-    				result +=	"Content-Transfer-Encoding:base64" + "\n\n"
-    				result += encoded + "\n\n"
+    				result << 'Content-Location:' << @id << "\n"
+    				result <<	'Content-Transfer-Encoding:base64' << "\n\n"
+    				result << encoded << "\n\n"
     			end
     		end
 

data/lib/web_resource_bundler/filters/image_encode_filter.rb

@@ -39,17 +39,17 @@ module WebResourceBundler::Filters::ImageEncodeFilter
     
     #path of a new file with images encoded
     def encoded_filepath(base_file_path)
-      File.join(@settings.cache_dir, FILE_PREFIX + File.basename(base_file_path))
+      File.join(@settings[:cache_dir], FILE_PREFIX + File.basename(base_file_path))
     end
 
     #path of a new file for IE with images encoded
     def encoded_filepath_for_ie(base_file_path)
-      File.join(@settings.cache_dir, IE_FILE_PREFIX + File.basename(base_file_path))
+      File.join(@settings[:cache_dir], IE_FILE_PREFIX + File.basename(base_file_path))
     end
 
     #filepath of mhtml file for IE
     def mhtml_filepath(base_file_path)
-      File.join(@settings.cache_dir, MHTML_FILE_PREFIX + File.basename(base_file_path)) 
+      File.join(@settings[:cache_dir], MHTML_FILE_PREFIX + File.basename(base_file_path)) 
     end
 
   end

data/lib/web_resource_bundler.rb

@@ -4,7 +4,6 @@ require 'content_management/block_data'
 require 'content_management/css_url_rewriter'
 require 'content_management/resource_file'
 
-require 'settings'
 require 'file_manager'
 require 'logger'
 require 'filters'
@@ -26,7 +25,7 @@ module WebResourceBundler
     def initialize
       @filters = {} 
       @settings = nil
-      @file_manager = nil
+      @file_manager = FileManager.new('','') 
       @parser = BlockParser.new
       @@logger = nil 
       @settings_correct = false
@@ -36,22 +35,28 @@ module WebResourceBundler
     def set_settings(settings)
       #all methods user call from rails should not raise any exception
       begin
-        @settings = Settings.new settings
-        if @settings.resource_dir
-          @@logger = create_logger(@settings)
-          unless @settings.cache_dir
-            @settings.cache_dir = 'cache'
+        @settings = settings
+        if @settings[:resource_dir]
+
+          #creating default log file in rails log directory called web_resource_bundler.log
+          unless @settings[:log_path]
+            log_dir = File.expand_path('../log', @settings[:resource_dir])
+            log_name = 'web_resource_bundler.log'
+            @settings[:log_path] = File.join(log_dir, log_name)
+            Dir.mkdir(log_dir) unless File.exist?(log_dir)
           end
-          #if file manager is nil it should be created
-          unless @file_manager
-            @file_manager = FileManager.new(@settings.resource_dir, @settings.cache_dir)
-          else
-            #if manager already exist than its settings chaged
-            @file_manager.resource_dir, @file_manager.cache_dir = @settings.resource_dir, @settings.cache_dir
+          @@logger = create_logger(@settings[:log_path]) unless @@logger
+
+          unless @settings[:cache_dir]
+            @settings[:cache_dir] = 'cache'
           end
+
+          @file_manager.resource_dir, @file_manager.cache_dir = @settings[:resource_dir], @settings[:cache_dir]
           set_filters(@settings, @file_manager) 
           #used to determine if bundler in correct state and could be used
           @settings_correct = true
+        else
+          @settings_correct = false
         end
       rescue Exception => e
         @@logger.error("Incorrect settings initialization, #{settings}\n#{e.to_s}") if @@logger
@@ -61,30 +66,32 @@ module WebResourceBundler
 
     #main method to process html text block
     def process(block)
-      begin
-        filters = filters_array
-        #parsing html text block, creating BlockData instance
-        block_data = @parser.parse(block)
-        #if filters set and no bundle files exists we should process block data
-        unless filters.empty? or bundle_upto_date?(block_data)
-          #reading files content and populating block_data
-          read_resources!(block_data)
-          #applying filters to block_data
+      if @settings_correct
+        begin
+          filters = filters_array
+          #parsing html text block, creating BlockData instance
+          block_data = @parser.parse(block)
+          #if filters set and no bundle files exists we should process block data
+          unless filters.empty? or bundle_upto_date?(block_data)
+            #reading files content and populating block_data
+            read_resources!(block_data)
+            #applying filters to block_data
+            block_data.apply_filters(filters)
+            #writing resulted files with filtered content on disk
+            write_files_on_disk(block_data)
+            @@logger.info("files written on disk")
+            return block_data
+          end
+          #bundle up to date, returning existing block with modified file names 
           block_data.apply_filters(filters)
-          #writing resulted files with filtered content on disk
-          write_files_on_disk(block_data)
-          @@logger.info("files written on disk")
           return block_data
+        rescue Exceptions::WebResourceBundlerError => e
+          @@logger.error(e.to_s)
+          return nil
+        rescue Exception => e
+          @@logger.error(e.backtrace.join("\n") + "Unknown error occured: " + e.to_s)
+          return nil
         end
-        #bundle up to date, returning existing block with modified file names 
-        block_data.apply_filters(filters)
-        return block_data
-      rescue Exceptions::WebResourceBundlerError => e
-        @@logger.error(e.to_s)
-        return nil
-      rescue Exception => e
-        @@logger.error(e.backtrace.join("\n") + "Unknown error occured: " + e.to_s)
-        return nil
       end
     end
 
@@ -94,7 +101,7 @@ module WebResourceBundler
     def filters_array
       filters = []
       %w{bundle_filter base64_filter cdn_filter}.each do |key|
-        filters << @filters[key.to_sym] if @filters[key.to_sym]
+        filters << @filters[key.to_sym] if @settings[key.to_sym][:use] and @filters[key.to_sym] 
       end
       filters
     end
@@ -103,46 +110,36 @@ module WebResourceBundler
     def set_filters(settings, file_manager)
       #common settings same for all filters
       common_sets = { 
-        :resource_dir => settings.resource_dir,
-        :cache_dir => settings.cache_dir
+        :resource_dir => settings[:resource_dir],
+        :cache_dir => settings[:cache_dir]
       }
-      #used to craete filters
+      #used to create filters
       filters_data = {
         :bundle_filter => 'BundleFilter',
         :base64_filter => 'ImageEncodeFilter',
         :cdn_filter => 'CdnFilter'
       }
-      filters_data.each_pair do |key, filter_class|
-        if settings[key] and settings[key][:use]
-          filter_settings = settings[key].merge(common_sets)
-          if @filters[key]
+      filters_data.each_pair do |key, filter_class| 
+        if settings[key] and settings[key][:use] 
+          filter_settings = settings[key].merge(common_sets) 
+          if @filters[key] 
             @filters[key].set_settings(filter_settings)
           else
             #creating filter instance with settings
             @filters[key] = eval("Filters::" + filter_class + "::Filter").new(filter_settings, file_manager)
           end
-        else
-          #this filter turned off in settings so should be deleted
-          @filters.delete(key)
         end
       end
       @filters
     end
 
-    def create_logger(settings)
+    def create_logger(logfile_path)
       begin
-        #creating default log file in rails log directory called web_resource_bundler.log
-        unless settings.log_path
-          log_dir = File.expand_path('../log', settings.resource_dir)
-          log_name = 'web_resource_bundler.log'
-          settings[:log_path] = File.join(log_dir, log_name)
-          Dir.mkdir(log_dir) unless File.exist?(log_dir)
-        end
-        file = File.open(settings.log_path, File::WRONLY | File::APPEND | File::CREAT)
+        file = File.open(logfile_path, File::WRONLY | File::APPEND | File::CREAT)
         logger = Logger.new(file)
       rescue Exception => e
         logger = Logger.new(STDOUT)
-        logger.error("Can't create log file, check log path: #{settings.log_path}\n#{e.to_s}")
+        logger.error("Can't create log file, check log path: #{logfile_path}\n#{e.to_s}")
       end
       logger
     end
@@ -158,7 +155,7 @@ module WebResourceBundler
       block_data_copy.apply_filters(filters_array)
       #cheking if resulted files exist on disk in cache folder
       block_data_copy.files.each do |file|
-        return false unless File.exist?(File.join(@settings.resource_dir, file.path))
+        return false unless File.exist?(File.join(@settings[:resource_dir], file.path))
       end
       true
     end
@@ -182,7 +179,7 @@ module WebResourceBundler
     def write_files_on_disk(block_data)
       @file_manager.create_cache_dir
       block_data.files.each do |file|
-        File.open(File.join(@settings.resource_dir, file.path), "w") do |f|
+        File.open(File.join(@settings[:resource_dir], file.path), "w") do |f|
           f.print(file.content)
         end
       end

data/spec/sample_block_helper.rb

@@ -34,7 +34,7 @@ class SampleBlockHelper
     if content
       resource_file.content = content
     else
-      resource_file.content = File.read(File.join(@settings.resource_dir, file))
+      resource_file.content = File.read(File.join(@settings[:resource_dir], file))
     end
     resource_file
   end

data/spec/spec_helper.rb

@@ -20,10 +20,6 @@ def scripts
 end
 
 def settings
-  Settings.new(settings_hash)
-end
-
-def settings_hash
   {
     :resource_dir => File.join(File.dirname(__FILE__), '/public'),
     :cache_dir => 'cache',
@@ -48,19 +44,19 @@ def settings_hash
 end
 
 def bundle_settings
-  settings.bundle_filter.merge(common_settings)
+  settings[:bundle_filter].merge(common_settings)
 end
 
 def cdn_settings
-  settings.cdn_filter.merge(common_settings)
+  settings[:cdn_filter].merge(common_settings)
 end
 
 def base64_settings
-  settings.base64_filter.merge(common_settings)
+  settings[:base64_filter].merge(common_settings)
 end
 
 def common_settings
-  {:resource_dir => settings.resource_dir, :cache_dir => settings.cache_dir}
+  {:resource_dir => settings[:resource_dir], :cache_dir => settings[:cache_dir]}
 end
 
 
@@ -74,8 +70,8 @@ Spec::Runner.configure do |config|
   end
 
   config.after(:all) do
-    File.delete(settings.log_path) if File.exist?(settings.log_path)
-    log_path = File.expand_path('../log', settings.resource_dir)
+    File.delete(settings[:log_path]) if File.exist?(settings[:log_path])
+    log_path = File.expand_path('../log', settings[:resource_dir])
     FileUtils.rm_rf(log_path) if File.exist?(log_path)
     clean_cache_dir
   end

data/spec/web_resource_bundler/content_management/block_parser_spec.rb

@@ -3,7 +3,8 @@ module WebResourceBundler
   describe BlockParser do
 
     before(:each) do
-      @file_manager = FileManager.new(settings.resource_dir, settings.cache_dir)
+      @settings = settings
+      @file_manager = FileManager.new(@settings[:resource_dir], @settings[:cache_dir])
       @block_parser = BlockParser.new
     end
 

data/spec/web_resource_bundler/file_manager_spec.rb

@@ -5,27 +5,27 @@ describe WebResourceBundler::FileManager do
   end
 
   def create_stub_file(name)
-    File.open(File.join(@settings.resource_dir, name), "w") do |file|
+    File.open(File.join(@settings[:resource_dir], name), "w") do |file|
       file.print "hi there"
     end
   end
 
   before(:each) do
-    temp_dir = File.join(@settings.resource_dir, 'temp')
+    temp_dir = File.join(@settings[:resource_dir], 'temp')
     Dir.mkdir(temp_dir) unless File.exist?(temp_dir)
     @bundle_url = 'temp/bundle.dat'
-    @bundle_path = File.join(@settings.resource_dir, @bundle_url)
+    @bundle_path = File.join(@settings[:resource_dir], @bundle_url)
     create_stub_file(@bundle_url)
-    @manager = FileManager.new(@settings.resource_dir, @settings.cache_dir)
+    @manager = FileManager.new(@settings[:resource_dir], @settings[:cache_dir])
   end
 
   after(:each) do
-    FileUtils.rm_rf(File.join(@settings.resource_dir, 'temp'))
+    FileUtils.rm_rf(File.join(@settings[:resource_dir], 'temp'))
   end
 
   describe "#create_cache_dir" do
     it "creates cache dir if it doesn't exists" do
-      dir_path = File.join(@settings.resource_dir, @settings.cache_dir)
+      dir_path = File.join(@settings[:resource_dir], @settings[:cache_dir])
       FileUtils.rm_rf(dir_path)
       @manager.create_cache_dir
       File.exist?(dir_path).should == true

data/spec/web_resource_bundler/filters/bundle_filter/filter_spec.rb

@@ -4,16 +4,16 @@ describe WebResourceBundler::Filters::BundleFilter::Filter do
     clean_cache_dir
     @settings = settings
     @bundle_settings = bundle_settings
-    @filter = Filters::BundleFilter::Filter.new(@bundle_settings, FileManager.new(@settings.resource_dir, @settings.cache_dir))
+    @filter = Filters::BundleFilter::Filter.new(@bundle_settings, FileManager.new(@settings[:resource_dir], @settings[:cache_dir]))
     @block_data = @sample_block_helper.sample_block_data
     css_type = ResourceFileType::CSS
     js_type = ResourceFileType::JS
     items = [@block_data.styles.map {|f| f.path}.sort] + @bundle_settings[:md5_additional_data]
     @css_md5_value = Digest::MD5.hexdigest(items.flatten.join('|'))
-    @css_bundle_file = File.join(@settings.cache_dir, [css_type[:name] + '_' + @css_md5_value, 'en', css_type[:ext]].join('.'))
+    @css_bundle_file = File.join(@settings[:cache_dir], [css_type[:name] + '_' + @css_md5_value, 'en', css_type[:ext]].join('.'))
     items = [@block_data.scripts.map {|f| f.path}.sort]  + @bundle_settings[:md5_additional_data]
     js_md5_value = Digest::MD5.hexdigest(items.flatten.join('|'))
-    @js_bundle_file = File.join(@settings.cache_dir, [js_type[:name] + '_' + js_md5_value, 'en', js_type[:ext]].join('.'))
+    @js_bundle_file = File.join(@settings[:cache_dir], [js_type[:name] + '_' + js_md5_value, 'en', js_type[:ext]].join('.'))
   end
 
   describe "#apply" do

data/spec/web_resource_bundler/filters/bundle_filter/resource_packager_spec.rb

@@ -3,10 +3,10 @@ require 'digest/md5'
 describe WebResourceBundler::Filters::BundleFilter::ResourcePackager do
   before(:each) do
     @settings = settings
-    file_manager = FileManager.new(@settings.resource_dir, @settings.cache_dir)
+    file_manager = FileManager.new(@settings[:resource_dir], @settings[:cache_dir])
     @file_packager = Filters::BundleFilter::ResourcePackager.new(@settings, file_manager)
     @file_paths = styles.map do |url|
-      File.join(@settings.resource_dir, url)
+      File.join(@settings[:resource_dir], url)
     end
   end
 

data/spec/web_resource_bundler/filters/cdn_filter_spec.rb

@@ -7,7 +7,7 @@ describe WebResourceBundler::Filters::CdnFilter do
     @cdn_settings[:https_hosts] = ['http://froogle.com']
     @settings[:cdn_filter][:http_hosts] = @cdn_settings[:http_hosts] 
     @settings[:cdn_filter][:https_hosts] = @cdn_settings[:https_hosts]
-    @file_manager = FileManager.new(@settings.resource_dir, @settings.cache_dir) 
+    @file_manager = FileManager.new(@settings[:resource_dir], @settings[:cache_dir]) 
     @filter = Filters::CdnFilter::Filter.new(@cdn_settings, @file_manager)
   end
 
@@ -68,7 +68,7 @@ describe WebResourceBundler::Filters::CdnFilter do
       block_data = BlockData.new
       block_data.files = [file]
       @filter.apply!(block_data)
-      block_data.files.first.path.should == File.join(@settings.cache_dir, 'cdn_temp.css')
+      block_data.files.first.path.should == File.join(@settings[:cache_dir], 'cdn_temp.css')
       block_data.files.first.content.should == "background: url('http://boogle.com/images/1.png');background-image: url('http://boogle.com/images/1.png');"
     end
   end

data/spec/web_resource_bundler/filters/image_encode_filter/css_generator_spec.rb

@@ -2,8 +2,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), "../../../spec_helper
 module WebResourceBundler::Filters::ImageEncodeFilter
   describe CssGenerator do
     before(:each) do
-      @settings = Settings.new base64_settings
-      @generator = CssGenerator.new(@settings, FileManager.new(@settings.resource_dir, @settings.cache_dir))
+      @settings = base64_settings
+      @generator = CssGenerator.new(@settings, FileManager.new(@settings[:resource_dir], @settings[:cache_dir]))
     end
     
     describe "#pattern" do
@@ -28,14 +28,14 @@ module WebResourceBundler::Filters::ImageEncodeFilter
     describe "#encode_images_basic" do
 
       before(:each) do
-        @content = "background-image: url('images/logo.jpg'); background: url('images/logo.jpg');"
+        @content = "background-image: url('images/ligo.jpg'); background: url('images/logo.jpg');"
         @images = @generator.encode_images_basic!(@content) do |image_data, tag|
           tag + image_data.extension
         end
       end
 
       it "substitute each image tag (image should exist and has proper size) with result of a yield" do
-        @content.should == "background-image: jpg; background: jpg;"
+        @content.should == "background-image: url('images/ligo.jpg'); background: jpg;"
       end
 
       it "returns hash of images found and with proper size" do
@@ -87,8 +87,8 @@ module WebResourceBundler::Filters::ImageEncodeFilter
       describe "#encode_images_for_ie" do
         it "changes urls to mhtml link" do
           @generator.encode_images_for_ie!(@content, 'cache/1.mhtml')
-          @content.include?("mhtml:#{@settings.protocol}://#{@settings.domain}/cache/1.mhtml!").should be_true
-          @content.include?("background: #eeeeee url(mhtml:").should be_true
+          @content.include?("mhtml:#{@settings[:protocol]}://#{@settings[:domain]}/cache/1.mhtml!").should be_true
+          @content.include?("*background: #eeeeee url(mhtml:").should be_true
           @content.include?("repeat-x 0 100%").should be_true
         end
       end
@@ -96,7 +96,7 @@ module WebResourceBundler::Filters::ImageEncodeFilter
     
     describe "#construct_mhtml_link" do
       it "should create link without public folder" do
-        @generator.construct_mhtml_link("temp.css").should == "http://#{@settings.domain}/temp.css"
+        @generator.construct_mhtml_link("temp.css").should == "http://#{@settings[:domain]}/temp.css"
       end
     end
   end

data/spec/web_resource_bundler/filters/image_encode_filter/filter_spec.rb

@@ -6,21 +6,21 @@ describe WebResourceBundler::Filters::ImageEncodeFilter::Filter do
     @base64_settings = base64_settings
     @file_prefix = Filters::ImageEncodeFilter::Filter::FILE_PREFIX
     @ie_file_prefix = Filters::ImageEncodeFilter::Filter::IE_FILE_PREFIX
-    @file_manager = FileManager.new(@settings.resource_dir, @settings.cache_dir)
+    @file_manager = FileManager.new(@settings[:resource_dir], @settings[:cache_dir])
     @filter = Filters::ImageEncodeFilter::Filter.new(@base64_settings, @file_manager)
   end
 
   describe "#encoded_filepath" do
     it "should return new filename for css for all browsers except IE" do
       filename = "mycss.css"
-      @filter.encoded_filepath(filename).should == File.join(@settings.cache_dir, @file_prefix + filename)
+      @filter.encoded_filepath(filename).should == File.join(@settings[:cache_dir], @file_prefix + filename)
     end
   end
 
   describe "#new_filepath_for_ie" do
     it "should return new filename for css for IE" do
       filename = "2.css"
-      @filter.encoded_filepath_for_ie(filename).should == File.join(@settings.cache_dir, @ie_file_prefix + filename)
+      @filter.encoded_filepath_for_ie(filename).should == File.join(@settings[:cache_dir], @ie_file_prefix + filename)
     end
   end
 
@@ -41,8 +41,8 @@ describe WebResourceBundler::Filters::ImageEncodeFilter::Filter do
         @bundler_filter.apply!(block_data)
         @filter.apply!(block_data)
         generated_files = block_data.files.map {|f| f.path}
-        generated_files.include?(File.join(@settings.cache_dir, @file_prefix + File.basename(bundle_filepath))).should be_true
-        generated_files.include?(File.join(@settings.cache_dir, @ie_file_prefix + File.basename(bundle_filepath))).should be_true
+        generated_files.include?(File.join(@settings[:cache_dir], @file_prefix + File.basename(bundle_filepath))).should be_true
+        generated_files.include?(File.join(@settings[:cache_dir], @ie_file_prefix + File.basename(bundle_filepath))).should be_true
       end
 
     end
@@ -62,8 +62,8 @@ describe WebResourceBundler::Filters::ImageEncodeFilter::Filter do
         generated_files = @block_data.styles.map {|f| f.path}
         generated_files.size.should == 2*@files.size
         @files.each do |file|
-          generated_files.include?(File.join(@settings.cache_dir, @ie_file_prefix + File.basename(file))).should be_true
-          generated_files.include?(File.join(@settings.cache_dir, @file_prefix + File.basename(file))).should be_true
+          generated_files.include?(File.join(@settings[:cache_dir], @ie_file_prefix + File.basename(file))).should be_true
+          generated_files.include?(File.join(@settings[:cache_dir], @file_prefix + File.basename(file))).should be_true
         end
       end
 

data/spec/web_resource_bundler/filters/image_encode_filter/image_data_spec.rb

@@ -15,7 +15,7 @@ module WebResourceBundler::Filters::ImageEncodeFilter
 
 		context "with existent small enough file" do
 			before(:each) do
-				@data = ImageData.new(image_path("logo.jpg"), settings.resource_dir)
+				@data = ImageData.new(image_path("logo.jpg"), settings[:resource_dir])
 			end
 			
 			it "should exist" do
@@ -32,7 +32,7 @@ module WebResourceBundler::Filters::ImageEncodeFilter
 			end
 
 			it "should have unique id" do
-				new_data = ImageData.new(image_path("good.jpg"), settings.resource_dir)
+				new_data = ImageData.new(image_path("good.jpg"), settings[:resource_dir])
 				new_data.exist.should be_true
 				@data.id.should_not equal(new_data.id)
   		end

data/spec/web_resource_bundler/web_resource_bundler_spec.rb

@@ -3,13 +3,44 @@ module WebResourceBundler
   describe Bundler do
 
     before(:each) do
-      @s = Settings.new settings_hash
+      @s = settings
       @bundler = WebResourceBundler::Bundler.instance
     end
 
+    describe "#set_settings" do
+      it "sets settings_correct property to false if resource dir not specified" do
+        @bundler.set_settings({})
+        @bundler.settings_correct.should be_false
+      end
+      it "sets settings_correct property to true if resource dir specified" do
+        @bundler.set_settings({:resource_dir => @s[:resource_dir]})
+        @bundler.settings_correct.should be_true
+      end
+    end
+
+
+    describe "#filters_array" do
+      it "returns array of filters that has :use => true in settings" do
+        @bundler.set_settings(@s)
+        filters = @bundler.send("filters_array")
+        filters.size.should == 3
+        @bundler.filters.size.should == 3
+        i = 2
+        %w{cdn_filter bundle_filter base64_filter}.each do |s|
+          @s[s.to_sym][:use] = false
+          @bundler.set_settings(@s)
+          filters = @bundler.send("filters_array")
+          filters.size.should == i
+          @bundler.filters.size.should == 3
+          i -= 1
+        end
+      end
+    end
+
     describe "#set_filters" do
       before(:each) do
-        @file_manager = FileManager.new(@s.resource_dir, @s.cache_dir)
+        @file_manager = FileManager.new(@s[:resource_dir], @s[:cache_dir])
+        @bundler.instance_eval "@filters={}"
       end
       it "inits filters if no filters were initialized before" do
         @bundler.filters.should == {}
@@ -18,38 +49,44 @@ module WebResourceBundler
       end
       it "sets filters settings if filters already inited" do
         @bundler.send("set_filters", @s, @file_manager)
-        @bundler.filters[:base64_filter].settings.max_image_size.should == @s[:base64_filter][:max_image_size]
+        @bundler.filters[:base64_filter].settings[:max_image_size].should == @s[:base64_filter][:max_image_size]
         @s[:base64_filter][:max_image_size] = 90
         @bundler.send("set_filters", @s, @file_manager)
-        @bundler.filters[:base64_filter].settings.max_image_size.should == 90 
+        @bundler.filters[:base64_filter].settings[:max_image_size].should == 90 
       end
     end
-
-    describe "#initialize" do
-      it "set instance to nil if resource_dir ins't specified" do
+    describe "#initialize" do 
+      it "set instance to nil if resource_dir ins't specified" do 
         @bundler.set_settings({})
         @bundler.settings_correct.should be_false
       end
       it "correctly inits cache dir, and log path with defaults if resource_dir specified" do
-        res_dir = settings_hash[:resource_dir]
+        res_dir = settings[:resource_dir]
         @bundler.set_settings({:resource_dir => res_dir })
         @bundler.settings_correct.should be_true
-        @bundler.settings.cache_dir.should == 'cache'
-        @bundler.settings.log_path.should == File.expand_path('../log/web_resource_bundler.log', res_dir)
+        @bundler.settings[:cache_dir].should == 'cache'
+        @bundler.settings[:log_path].should == File.expand_path('../log/web_resource_bundler.log', res_dir)
+      end
+      it "creates log directory if it's unexistent" do
+        @bundler.set_settings({:resource_dir => @s[:resource_dir]})
+        log_dir_path = File.expand_path('../log', @s[:resource_dir])
+        File.exist?(log_dir_path).should be_true
+        Dir.delete(log_dir_path)
       end
     end
 
     describe "#create_logger" do
       it "sets log_path in settings if it isn't specified" do
-        sets = Settings.new({:resource_dir => @s.resource_dir })
-        @bundler.send("create_logger", sets)
-        @bundler.settings.log_path.should == File.expand_path('../log/web_resource_bundler.log', sets.resource_dir)
+        path = File.expand_path('../web_resource_bundler.log', @s[:resource_dir])
+        @bundler.send("create_logger", path)
+        File.exist?(path).should be_true
+        File.delete(path)
       end
     end
 
     describe "#process" do
       it "returns the same filenames when bundling or just computing resulted files" do
-        @bundler.set_settings(settings_hash)
+        @bundler.set_settings(settings)
         clean_cache_dir
         block_text = @sample_block_helper.sample_block
         block_data = @bundler.process(block_text)
@@ -63,7 +100,7 @@ module WebResourceBundler
 
     describe "#bundle_upto_date?" do
       it "returns true if block was already bundled and resulted files exist" do
-        @bundler.set_settings(settings_hash)
+        @bundler.set_settings(settings)
         clean_cache_dir
         block_text = @sample_block_helper.sample_block
         block_data = BlockParser.new.parse(block_text.dup)
@@ -76,12 +113,12 @@ module WebResourceBundler
 
     describe "#read_resources!" do
       it "populates block_data resource files structure with files content" do
-        @bundler.set_settings(settings_hash)
+        @bundler.set_settings(settings)
         block_data = @sample_block_helper.sample_block_data
         @bundler.send("read_resources!", block_data)
         all_files = block_data.styles + block_data.scripts + block_data.child_blocks[0].styles + block_data.child_blocks[0].scripts
         all_files.each do |file|
-          CssUrlRewriter::rewrite_content_urls!(file.path, File.read(File.join(@s.resource_dir, file.path))).should == file.content
+          CssUrlRewriter::rewrite_content_urls!(file.path, File.read(File.join(@s[:resource_dir], file.path))).should == file.content
         end
       end
     end

data/web_resource_bundler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{web_resource_bundler}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gregolsen"]
-  s.date = %q{2010-12-04}
+  s.date = %q{2010-12-13}
   s.description = %q{this lib could bundle you css/js files in single file, encode images in base64, rewrite images urls to your cdn hosts}
   s.email = %q{anotheroneman@yahoo.com}
   s.extra_rdoc_files = [
@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
      "lib/web_resource_bundler/filters/image_encode_filter/css_generator.rb",
      "lib/web_resource_bundler/filters/image_encode_filter/image_data.rb",
      "lib/web_resource_bundler/rails_app_helpers.rb",
-     "lib/web_resource_bundler/settings.rb",
      "lib/web_resource_bundler/web_resource_bundler_init.rb",
      "spec/public/foo.css",
      "spec/public/images/good.jpg",
@@ -68,7 +67,6 @@ Gem::Specification.new do |s|
      "spec/web_resource_bundler/filters/image_encode_filter/css_generator_spec.rb",
      "spec/web_resource_bundler/filters/image_encode_filter/filter_spec.rb",
      "spec/web_resource_bundler/filters/image_encode_filter/image_data_spec.rb",
-     "spec/web_resource_bundler/settings_spec.rb",
      "spec/web_resource_bundler/web_resource_bundler_spec.rb",
      "web_resource_bundler.gemspec"
   ]
@@ -86,7 +84,6 @@ Gem::Specification.new do |s|
      "spec/web_resource_bundler/filters/bundle_filter/resource_packager_spec.rb",
      "spec/web_resource_bundler/web_resource_bundler_spec.rb",
      "spec/web_resource_bundler/file_manager_spec.rb",
-     "spec/web_resource_bundler/settings_spec.rb",
      "spec/web_resource_bundler/content_management/css_url_rewriter_spec.rb",
      "spec/web_resource_bundler/content_management/block_data_spec.rb",
      "spec/web_resource_bundler/content_management/resource_file_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - gregolsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 +02:00
+date: 2010-12-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,6 @@ files:
 - lib/web_resource_bundler/filters/image_encode_filter/css_generator.rb
 - lib/web_resource_bundler/filters/image_encode_filter/image_data.rb
 - lib/web_resource_bundler/rails_app_helpers.rb
-- lib/web_resource_bundler/settings.rb
 - lib/web_resource_bundler/web_resource_bundler_init.rb
 - spec/public/foo.css
 - spec/public/images/good.jpg
@@ -93,7 +92,6 @@ files:
 - spec/web_resource_bundler/filters/image_encode_filter/css_generator_spec.rb
 - spec/web_resource_bundler/filters/image_encode_filter/filter_spec.rb
 - spec/web_resource_bundler/filters/image_encode_filter/image_data_spec.rb
-- spec/web_resource_bundler/settings_spec.rb
 - spec/web_resource_bundler/web_resource_bundler_spec.rb
 - web_resource_bundler.gemspec
 has_rdoc: true
@@ -137,7 +135,6 @@ test_files:
 - spec/web_resource_bundler/filters/bundle_filter/resource_packager_spec.rb
 - spec/web_resource_bundler/web_resource_bundler_spec.rb
 - spec/web_resource_bundler/file_manager_spec.rb
-- spec/web_resource_bundler/settings_spec.rb
 - spec/web_resource_bundler/content_management/css_url_rewriter_spec.rb
 - spec/web_resource_bundler/content_management/block_data_spec.rb
 - spec/web_resource_bundler/content_management/resource_file_spec.rb

data/lib/web_resource_bundler/settings.rb

@@ -1,46 +0,0 @@
-module WebResourceBundler
-  class Settings
-    @@defaults = {
-      :cache_dir => 'cache',
-      :base64_filter => {
-        :max_image_size => 23, #kbytes
-        :protocol => 'http',
-        :domain => 'localhost:3000'
-      },
-      :bundle_filter => {
-        :md5_additional_data => []
-      },
-      :cdn_filter => {
-        :http_hosts => ['http://localhost:3000'],
-        :https_hosts => ['https://localhost:3000']
-      }
-    }
-
-    def initialize(hash = {})
-      @settings = hash
-    end
-
-    def set(hash)
-      @settings.merge!(hash)
-    end
-
-    def [](i)
-      @settings[i]
-    end
-
-    def []=(i , v)
-      @settings[i] = v 
-    end
-
-    def method_missing(m, *args, &block)
-      m=m.to_s
-      if /.*=\z/.match(m)
-        @settings[m[0..-2].to_sym] = args[0] 
-      else
-        @settings[m.to_sym]
-      end
-    end
-
-
-  end
-end

data/spec/web_resource_bundler/settings_spec.rb

@@ -1,45 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "../spec_helper"))
-module WebResourceBundler
-  describe Settings do
-    
-    before(:each) do
-      @settings_hash = settings_hash
-      @s = Settings.new(@settings_hash)
-    end
-
-    it "should contain proper defaults after initialization" do
-      @settings_hash.each_key do |k|
-        @s[k].should == @settings_hash[k] 
-        @s.send(k).should == @settings_hash[k]
-      end
-    end
-
-    it "should set proper values using unexistent setters" do
-      @s.domain = "new_domain"
-      @s[:domain].should == "new_domain"
-    end
-
-    it "returns values while calling keys as methods" do
-      @settings_hash.each_key do |k|
-        @s.send(k).should == @settings_hash[k]
-      end
-    end
-
-    it "returns nil on unexistent key" do
-      @s.send("unexistent_key".to_sym).should be_nil
-      @s["unexistent_key".to_sym].should be_nil
-    end
-
-    describe "#set" do
-      it "merges current settings with passed hash" do
-        @settings_hash[:domain] = "new_value"
-        @s.set({:domain => "new_value"})
-        @settings_hash.each do |k, v|
-          @s.send(k).should == v 
-        end
-      end
-    end
-
-  end
-end
-