web_resource_bundler 0.0.20 → 0.0.21

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) 
     @filter = Filters::CdnFilter::Filter.new(@cdn_settings, @file_manager)
   end
 
@@ -15,21 +15,29 @@ describe WebResourceBundler::Filters::CdnFilter do
     it "returns host for image using its hash" do
      @cdn_settings[:http_hosts] << 'http://froogle.com'
      url = '/images/1.gif'
-     @filter.host_for_image(url).should == @cdn_settings[:http_hosts][url.hash % @cdn_settings[:http_hosts].size]
+     @filter.send(:host_for_image, url).should == @cdn_settings[:http_hosts][url.hash % @cdn_settings[:http_hosts].size]
     end
 
     it "returns https host if request was https" do
       @cdn_settings[:protocol] = 'https'
       @filter = Filters::CdnFilter::Filter.new(@cdn_settings, @file_manager)
       url = '/images/1.gif'
-      @filter.host_for_image(url).should == @cdn_settings[:https_hosts][url.hash % @cdn_settings[:https_hosts].size]
+      @filter.send(:host_for_image, url).should == @cdn_settings[:https_hosts][url.hash % @cdn_settings[:https_hosts].size]
+    end
+  end
+
+  describe "#url_css_tag" do
+    it "should return css url tag with absolute url" do
+      host = 'http://google.com'
+      url  = '/styles/1.css'
+      @filter.send(:url_css_tag, host, url).should == "url('" + host + url + "')"
     end
   end
 
   describe "#new_filename" do
     it "adds cdn_ prefix to original file name" do
       path = 'styles/1.css'
-      @filter.new_filepath(path).should == 'cache/cdn_1.css'
+      @filter.send(:new_filepath, path).should == 'cache/cdn_1.css'
     end
   end
 
@@ -40,14 +48,14 @@ describe WebResourceBundler::Filters::CdnFilter do
 
     it "adds hosts to image urls" do
       content = "background: url('../images/1.png');"
-      @filter.rewrite_content_urls!(@file_path, content)
+      @filter.send(:rewrite_content_urls!, @file_path, content)
       content.should == "background: url('http://boogle.com/styles/images/1.png');"
     end
 
     it "doesn't add hosts for images encoded in base64" do
       content = "background:url('data:image/png;base64,iVBORw0KGg); *background:url(mhtml:http://domain.com/cache/base64_ie_style_9648c01be7e50284958eb07877c70e03.en.css!rails5804) no-repeat 0 100%;"
       clon = content.dup
-      @filter.rewrite_content_urls!(@file_path, content.dup)
+      @filter.send(:rewrite_content_urls!, @file_path, content.dup)
       content.should == clon 
     end
 
@@ -57,7 +65,7 @@ describe WebResourceBundler::Filters::CdnFilter do
       content = "background: url('../images/1.png');background-image: url('../images/1.png');" 
       host = @cdn_settings[:http_hosts]['/styles/images/1.png'.hash % @cdn_settings[:http_hosts].size]
       url = "#{host}/styles/images/1.png"
-      @filter.rewrite_content_urls!(@file_path, content)
+      @filter.send(:rewrite_content_urls!, @file_path, content)
       content.should == "background: url('#{url}');background-image: url('#{url}');"
     end
   end

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

@@ -3,7 +3,7 @@ module WebResourceBundler::Filters::ImageEncodeFilter
   describe CssGenerator do
     before(:each) do
       @settings = base64_settings
-      @generator = CssGenerator.new(@settings, FileManager.new(@settings[:resource_dir], @settings[:cache_dir]))
+      @generator = CssGenerator.new(@settings, FileManager.new(@settings))
     end
     
     describe "#pattern" do
@@ -24,12 +24,43 @@ module WebResourceBundler::Filters::ImageEncodeFilter
         end
       end
     end
+
+    describe "#set_settings" do
+      it "should set new settings" do
+        sets = {:key => 'value'}
+        @generator.set_settings(sets)
+        @generator.instance_variable_get("@settings").should == sets
+      end
+    end
+
+    describe "#image_size_limit" do
+      it "should return 32kb @settings[:max_image_size] is not setted" do
+        settings = base64_settings
+        settings[:max_image_size] = nil
+        @generator.set_settings(settings)
+        @generator.send(:image_size_limit).should == CssGenerator::MAX_IMAGE_SIZE
+      end
+
+      it "should return settings[:max_image_size] if it's less then 32 kb" do
+        settings = base64_settings
+        settings[:max_image_size] = 10 
+        @generator.set_settings(settings)
+        @generator.send(:image_size_limit).should == 10
+      end
+
+      it "should return 32kb if settings[:max_image_size] bigger than 32" do
+        settings = base64_settings
+        settings[:max_image_size] = 100
+        @generator.set_settings(settings)
+        @generator.send(:image_size_limit).should == CssGenerator::MAX_IMAGE_SIZE 
+      end
+    end
     
     describe "#encode_images_basic" do
 
       before(:each) do
         @content = "background-image: url('images/ligo.jpg'); background: url('images/logo.jpg');"
-        @images = @generator.encode_images_basic!(@content) do |image_data, tag|
+        @images = @generator.send(:encode_images_basic!, @content) do |image_data, tag|
           tag + image_data.extension
         end
       end
@@ -88,15 +119,24 @@ module WebResourceBundler::Filters::ImageEncodeFilter
         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?("background: #eeeeee url(mhtml:").should be_true
           @content.include?("repeat-x 0 100%").should be_true
         end
       end
     end
     
+    describe "#construct_mhtml_content" do
+      it "returns mhtml block for ie" do
+        images = [ImageData.new('images/logo.jpg', @settings[:resource_dir])]
+        result = @generator.construct_mhtml_content(images)
+        result.include?(CssGenerator::MHTML_CONTENT_TYPE).should be_true
+        result.include?(CssGenerator::SEPARATOR).should be_true
+      end
+    end
+
     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.send(: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

@@ -2,42 +2,47 @@ require File.expand_path(File.join(File.dirname(__FILE__), "../../../spec_helper
 describe WebResourceBundler::Filters::ImageEncodeFilter::Filter do
 
   before(:each) do
-    @settings = settings
+    @settings        = settings
     @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])
-    @filter = Filters::ImageEncodeFilter::Filter.new(@base64_settings, @file_manager)
+    @file_prefix     = Filters::ImageEncodeFilter::Filter::FILE_PREFIX
+    @ie_file_prefix  = Filters::ImageEncodeFilter::Filter::IE_FILE_PREFIX
+    @mhtml_prefix    = Filters::ImageEncodeFilter::Filter::MHTML_FILE_PREFIX 
+    @file_manager    = FileManager.new(@settings)
+    @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.send(:css_filepath, filename).should == File.join(@settings[:cache_dir], @file_prefix + filename)
     end
   end
 
-  describe "#new_filepath_for_ie" do
+  describe "#mhtml_css_filepath" 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.send(:mhtml_css_filepath, filename).should == File.join(@settings[:cache_dir], @ie_file_prefix + filename)
     end
   end
 
   describe "#mhtml_filepath" do
-    it "returns mhtml file path" do
-      @filter.mhtml_filepath('styles/1.css').should == 'cache/mhtml_1.mhtml'
+    it "should return new filename for mhtml file for IE" do
+      filename = "2.css"
+      @filter.send(:mhtml_filepath, filename).should == File.join(@settings[:cache_dir], @mhtml_prefix + '2.mhtml')
     end
   end
 
+
   describe "#apply" do
     context "block was bundled" do
+
       before(:each) do
         @bundler_filter = Filters::BundleFilter::Filter.new(@base64_settings, @file_manager)
-              end
+      end
+
       it "encodes images in css and change filename" do
         block_data = @sample_block_helper.sample_block_data
-        bundle_filepath = @bundler_filter.bundle_filepath(WebResourceBundler::ResourceFileType::CSS, block_data.styles)
+        bundle_filepath = @bundler_filter.send(:bundle_filepath, WebResourceBundler::ResourceFileType::CSS, block_data.styles)
         @bundler_filter.apply!(block_data)
         @filter.apply!(block_data)
         generated_files = block_data.files.map {|f| f.path}      
@@ -47,15 +52,15 @@ describe WebResourceBundler::Filters::ImageEncodeFilter::Filter do
 
       it "changes type of styles files to CSS only" do
         block_data = @sample_block_helper.sample_block_data
-        resource_file = WebResourceBundler::ResourceFile.new_style_file(styles.first)
+        resource_file = WebResourceBundler::ResourceFile.new_css_file(styles.first)
         block_data.files = [resource_file]
         block_data.child_blocks = []
         @bundler_filter.apply!(block_data)
         @filter.apply!(block_data)
         block_data.files.size.should == 3
-        %w{CSS IE_CSS MHTML}.each do |type_name|
+        %w{BASE64_CSS MHTML_CSS MHTML}.each do |type_name|
           type = eval("WebResourceBundler::ResourceFileType::" + type_name)
-          block_data.files.select {|f| f.types == [type]}.size.should == 1
+          block_data.files.select {|f| f.type == type}.size.should == 1
         end
       end
     end

data/spec/web_resource_bundler/settings_spec.rb

@@ -0,0 +1,77 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "../spec_helper"))
+describe WebResourceBundler::Settings do
+
+  before(:each) do
+    @s = settings
+    Settings.set(@s)
+  end
+
+  describe "#defaults" do
+    it "returns default required settings for bundler" do
+      root = '/root' 
+      settings = Settings.send(:defaults, root)
+      settings[:resource_dir].should == File.join(root, Settings::DEFAULT_RESOURCE_DIR)
+      settings[:log_path].should == File.join(root, Settings::DEFAULT_LOG_PATH)
+      settings[:cache_dir].should == Settings::DEFAULT_CACHE_DIR
+      settings[:bundle_filter][:use].should == true
+      settings[:cdn_filter][:use].should == false
+      settings[:base64_filter][:use].should == true
+    end
+  end
+	
+  describe "#commons" do
+    it "returns settings common to all filters" do
+      settings = Settings.send(:commons, @s)
+      settings.keys.size.should == 2
+      settings[:resource_dir].should == @s[:resource_dir]
+      settings[:cache_dir].should == @s[:cache_dir]
+    end
+  end
+
+  describe "#read_from_file" do
+    it "loads settings from yaml file" do
+      rails_root = root_dir 
+      content = File.read(File.join(root_dir, 'config/web_resource_bundler.yml'))
+      rails_env = 'development'
+      original = YAML::load(content)[rails_env]
+      settings = Settings.send(:read_from_file, rails_root, rails_env) 
+      original.each_key do |key|
+        settings[key].should == original[key]
+      end
+      settings[:resource_dir].should == File.join(root_dir, Settings::DEFAULT_RESOURCE_DIR)
+    end
+    it "returns empty hash if file isn't exist" do
+      Settings.send(:read_from_file, '', '').should == {}
+    end
+  end
+
+  describe "#correct?" do
+    it "should return true if all required keys present" do
+      Settings.correct?.should be_true
+    end
+    it "returns false if one of the keys isn't present" do
+      Settings.settings.delete(:resource_dir)
+      Settings.correct?.should be_false
+    end
+  end
+
+  describe "filter_settings" do
+    it "returns filter settings merged with common settings" do
+      cdn_sets = Settings.filter_settings(:cdn_filter)
+      cdn_sets[:resource_dir].should == Settings.settings[:resource_dir]
+      cdn_sets[:cache_dir].should == Settings.settings[:cache_dir]
+      cdn_sets[:max_image_size].should be_nil
+    end
+  end
+
+  describe "#set_request_specific_data!" do
+    it "sets domain and protocol for settings" do
+      s = {}
+      Settings.set_request_specific_data!(s, 'google.com', 'http')
+      s[:domain].should == 'google.com'
+      s[:protocol].should == 'http'
+    end
+  end
+
+end
+

data/spec/web_resource_bundler/web_resource_bundler_spec.rb

@@ -4,14 +4,12 @@ module WebResourceBundler
 
     before(:each) do
       @s = settings
-      @bundler = WebResourceBundler::Bundler.instance
+      @bundler = WebResourceBundler::Bundler
     end
 
     describe "#initialize" do 
       it "sets instance state correctly" do
         @bundler.logger.should == nil
-        @bundler.settings.should == nil
-        @bundler.settings_correct.should == false
       end
     end
 
@@ -20,25 +18,17 @@ module WebResourceBundler
         @bundler.setup(root_dir, 'development')
       end
 
-      #describe "#set_settings" do
-      #  it "changes settings for all filters" do
-      #    settings = @bundler.settings.dup
-      #    settings[:base64_filter][:use] = false
-      #    @bundler.set_settings(settings)
-      #  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 = @bundler.send("filters_array", @bundler.filters)
           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 = @bundler.send("filters_array", @bundler.filters)
             filters.size.should == i
             @bundler.filters.size.should == 3
             i -= 1
@@ -48,20 +38,23 @@ module WebResourceBundler
 
       describe "#set_filters" do
         before(:each) do
-          @file_manager = FileManager.new(@s[:resource_dir], @s[:cache_dir])
+          @file_manager = FileManager.new(@s)
           @bundler.instance_eval "@filters={}"
         end
         it "inits filters if no filters were initialized before" do
           @bundler.filters.should == {}
-          @bundler.send("set_filters", @s, @file_manager)
+          @bundler.send("set_filters", @bundler.filters, @bundler.instance_variable_get("@file_manager"))
           @bundler.filters.size.should == 3
         end
         it "sets filters settings if filters already inited" do
-          @bundler.send("set_filters", @s, @file_manager)
+          @bundler.send("set_filters", @bundler.filters, @bundler.instance_variable_get("@file_manager"))
           @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 
+          Settings.set({:base64_filter => {
+                          :use => true, 
+                          :max_image_size => 18
+                        }})
+          @bundler.send("set_filters", @bundler.filters, @bundler.instance_variable_get("@file_manager"))
+          @bundler.filters[:base64_filter].settings[:max_image_size].should == 18 
         end
       end
       
@@ -69,15 +62,15 @@ module WebResourceBundler
       describe "#create_logger" do
 
         it "creates log directory if it's unexistent" do
-          log_dir_path = File.dirname(@bundler.settings[:log_path])
+          log_dir_path = File.dirname(Settings.settings[:log_path])
           FileUtils.rm_rf(log_dir_path)
-          @bundler.send("create_logger", @bundler.settings[:log_path])
+          @bundler.send("create_logger", Settings.settings[:log_path])
           File.exist?(log_dir_path).should be_true
           FileUtils.rm_rf(log_dir_path)
         end
 
         it "sets log_path in settings if it isn't specified" do
-          path = @bundler.settings[:log_path] 
+          path = Settings.settings[:log_path] 
           @bundler.send("create_logger", path)
           File.exist?(path).should be_true
           File.delete(path)
@@ -104,10 +97,10 @@ module WebResourceBundler
           @bundler.set_settings(settings)
           clean_cache_dir
           block_text = @sample_block_helper.sample_block
-          block_data = BlockParser.new.parse(block_text.dup)
-          @bundler.send("bundle_upto_date?", block_data).should == false
+          block_data = BlockParser.parse(block_text.dup)
+          @bundler.send("bundle_upto_date?", block_data, @bundler.filters).should == false
           @bundler.process(block_text, 'localhost:3000', 'http')
-          @bundler.send("bundle_upto_date?", block_data).should == true
+          @bundler.send("bundle_upto_date?", block_data, @bundler.filters).should == true
         end
       end
 
@@ -117,7 +110,7 @@ module WebResourceBundler
           @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 = block_data.all_files
           all_files.each do |file|
             CssUrlRewriter::rewrite_content_urls!(file.path, File.read(File.join(@s[:resource_dir], file.path))).should == file.content
           end

data/web_resource_bundler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{web_resource_bundler}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gregolsen"]
@@ -34,7 +34,7 @@ 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_manager.rb",
+    "lib/web_resource_bundler/settings.rb",
     "lib/web_resource_bundler/web_resource_bundler_init.rb",
     "spec/sample_block_helper.rb",
     "spec/spec_helper.rb",
@@ -64,7 +64,7 @@ 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_manager_spec.rb",
+    "spec/web_resource_bundler/settings_spec.rb",
     "spec/web_resource_bundler/web_resource_bundler_spec.rb",
     "web_resource_bundler.gemspec"
   ]
@@ -86,7 +86,7 @@ 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_manager_spec.rb",
+    "spec/web_resource_bundler/settings_spec.rb",
     "spec/web_resource_bundler/web_resource_bundler_spec.rb"
   ]
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - gregolsen
@@ -62,7 +62,7 @@ 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_manager.rb
+- lib/web_resource_bundler/settings.rb
 - lib/web_resource_bundler/web_resource_bundler_init.rb
 - spec/sample_block_helper.rb
 - spec/spec_helper.rb
@@ -92,7 +92,7 @@ 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_manager_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
@@ -141,5 +141,5 @@ test_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_manager_spec.rb
+- spec/web_resource_bundler/settings_spec.rb
 - spec/web_resource_bundler/web_resource_bundler_spec.rb

data/lib/web_resource_bundler/settings_manager.rb

@@ -1,91 +0,0 @@
-require 'yaml'
-class WebResourceBundler::SettingsManager
-
-  DEFAULT_LOG_PATH = 'log/web_resource_bundler.log'
-  DEFAULT_RESOURCE_DIR = 'public'
-  DEFAULT_SETTINGS_PATH = 'config/web_resource_bundler.yml'
-  DEFAULT_CACHE_DIR = 'cache'
-
-  class << self
-
-    #creates settings from config file or from defaults
-    #if config file doesn't exists
-    def create_settings(rails_root, rails_env)
-      settings = {}
-      if File.exist?(rails_root)
-        #reading settings from file in config dir
-        settings = settings_from_file(rails_root, rails_env) 
-        #building required defaults
-        defaults = create_default_settings(rails_root)
-        #merging required with read from file settings
-        #if there's no file settings will contain just required defaults
-        settings = defaults.merge(settings)
-      end
-      settings
-    end
-
-    #creates defaults settings
-    def create_default_settings(rails_root)
-      settings = {}
-      settings[:resource_dir] = File.join(rails_root, DEFAULT_RESOURCE_DIR)
-      settings[:log_path] = File.join(rails_root, DEFAULT_LOG_PATH)
-      settings[:cache_dir] = DEFAULT_CACHE_DIR
-      settings[:bundle_filter] = {
-        :use => true
-      }
-      settings[:cdn_filter] = {
-        :use => false
-      }
-      settings[:base64_filter] = {
-        :use => true,
-        :max_image_size => 20
-      }
-      settings
-    end
-
-    #settings common for all filters
-    def common_settings(settings)
-      {
-        :resource_dir => settings[:resource_dir],
-        :cache_dir => settings[:cache_dir],
-      }
-    end
-
-    #load settings from yaml file depending on environment
-    def settings_from_file(rails_root, rails_env)
-      settings = {} 
-      settings_file_path = File.join(rails_root, DEFAULT_SETTINGS_PATH)
-      if File.exist?(settings_file_path)
-        settings_file = File.open(settings_file_path)
-        all_settings = YAML::load(settings_file)
-        if all_settings[rails_env]
-          settings = all_settings[rails_env]
-          settings[:resource_dir] = File.join(rails_root, DEFAULT_RESOURCE_DIR)
-        end
-      end
-      settings
-    end
-
-    #ensures that settings has obligatory keys present
-    def settings_correct?(settings)
-      %w{resource_dir log_path cache_dir}.each do |key|
-        return false unless settings.has_key?(key.to_sym)
-      end
-      return true
-    end
-
-    #dynamically created methods for each filter have its own settings method
-    %w{base64_filter cdn_filter bundle_filter}.each do |filter_name|
-      define_method "#{filter_name}_settings" do |settings|
-        self.common_settings(settings).merge(settings[filter_name.to_sym])
-      end
-    end 
-
-    #setting request specific settings like domain and protocol
-    def set_request_specific_settings!(settings, domain, protocol)
-      settings[:domain] = domain
-      settings[:protocol] = protocol
-      settings
-    end
-  end
-end

data/spec/web_resource_bundler/settings_manager_spec.rb

@@ -1,88 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "../spec_helper"))
-describe WebResourceBundler::SettingsManager do
-
-  before(:each) do
-    @s = settings
-  end
-
-  describe "#create_default_settings" do
-    it "returns default required settings for bundler" do
-      root = '/root' 
-      settings = SettingsManager.create_default_settings(root)
-      settings[:resource_dir].should == File.join(root, SettingsManager::DEFAULT_RESOURCE_DIR)
-      settings[:log_path].should == File.join(root, SettingsManager::DEFAULT_LOG_PATH)
-      settings[:cache_dir].should == SettingsManager::DEFAULT_CACHE_DIR
-      settings[:bundle_filter][:use].should == true
-      settings[:cdn_filter][:use].should == false
-      settings[:base64_filter][:use].should == true
-    end
-  end
-
-  describe "#common_settings" do
-    it "returns settings common to all filters" do
-      settings = SettingsManager.common_settings(@s)
-      settings.keys.size.should == 2
-      settings[:resource_dir].should == @s[:resource_dir]
-      settings[:cache_dir].should == @s[:cache_dir]
-    end
-  end
-
-  describe "#settings_from_file" do
-    it "loads settings from yaml file" do
-      rails_root = root_dir 
-      content = File.read(File.join(root_dir, 'config/web_resource_bundler.yml'))
-      rails_env = 'development'
-      original = YAML::load(content)[rails_env]
-      settings = SettingsManager.settings_from_file(rails_root, rails_env) 
-      original.each_key do |key|
-        settings[key].should == original[key]
-      end
-      settings[:resource_dir].should == File.join(root_dir, SettingsManager::DEFAULT_RESOURCE_DIR)
-    end
-    it "returns empty hash if file isn't exist" do
-      SettingsManager.settings_from_file('', '').should == {}
-    end
-  end
-
-  describe "#settings_correct?" do
-    it "should return true if all required keys present" do
-      SettingsManager.settings_correct?(@s).should be_true
-    end
-    it "returns false if one of the keys isn't present" do
-      @s.delete(:resource_dir)
-      SettingsManager.settings_correct?(@s).should be_false
-    end
-  end
-
-  context "dynamically created filter settings methods" do
-    it "properly creates methods for each filter settings" do
-      %w{cdn_filter_settings base64_filter_settings bundle_filter_settings}.each do |method|
-        if RUBY_VERSION > '1.9.0'
-          key = method.to_sym 
-        else
-          key = method
-        end
-        SettingsManager.public_methods.include?(key).should be_true
-      end
-    end
-    describe "#cdn_filter_settings" do
-      it "returns cdn settings merged with commons" do
-        cdn = SettingsManager.cdn_filter_settings(@s)
-        cdn[:resource_dir].should == @s[:resource_dir]
-        cdn[:cache_dir].should == @s[:cache_dir]
-        cdn[:use].should == @s[:cdn_filter][:use]
-      end
-    end
-  end
-
-  describe "#set_request_specific_settings!" do
-    it "sets domain and protocol for settings" do
-      s = {}
-      SettingsManager.set_request_specific_settings!(s, 'google.com', 'http')
-      s[:domain].should == 'google.com'
-      s[:protocol].should == 'http'
-    end
-  end
-
-end
-