baron 1.0.8 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/baron.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "baron"
-  s.version = "1.0.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Buggia"]
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
     "spec/sample_data/resources/feed.rss",
     "spec/sample_data/resources/redirects.txt",
     "spec/sample_data/resources/robots.txt",
+    "spec/sample_data/supplemental-files/theme_config.yml",
     "spec/sample_data/themes/typography/css/app.css",
     "spec/sample_data/themes/typography/css/bootstrap-responsive.css",
     "spec/sample_data/themes/typography/css/bootstrap-responsive.min.css",

data/lib/baron.rb

@@ -102,6 +102,7 @@ module Baron
       params = {:page_name => route.first, :rss_feed => get_feed_path}
       params[:page_title] = (route.first == @config[:root] ? '' : "#{route.first.capitalize} #{@config[:title_delimiter]} ") + "#{@config[:title]}"          
       theme = Theme.new(@config)
+      theme.load_config
     
       begin
 
@@ -232,20 +233,10 @@ module Baron
       get_all_categories.each { |h| return true if h[:node_name] == path_node }
       return false
     end
-    
-    def load_theme_config filename_and_path
-      bar = {}
-      metadata = File.read(filename_and_path)
-      YAML.load(metadata).each_pair { |key, value| bar[key.downcase.to_sym] = value }
-      bar
-    rescue Errno::ENOENT => e
-      return {}
-    end
 
     def get_pages_path()          "#{@config[:sample_data_path]}pages/"                                             end
     def get_articles_path()       "#{@config[:sample_data_path]}articles"                                           end
     def get_page_template(name)   "#{@config[:sample_data_path]}pages/#{name}.rhtml"                                end
-    def get_theme_template(name)  "#{@config[:sample_data_path]}themes/#{@config[:theme]}/templates/#{name}.rhtml"  end
     def get_system_resource(name) "#{@config[:sample_data_path]}resources/#{name}"                                  end
     def get_feed_path()           "#{@config[:url]}/feed.rss"                                                       end 
   end
@@ -256,12 +247,13 @@ module Baron
       self[:root] = "/themes/#{config[:theme]}"
       self[:name] = config[:theme]
       self[:file_root] = "#{@config[:sample_data_path]}themes/#{@config[:theme]}".squeeze('/')
-      load_config("#{self[:file_root]}/theme_config.yml")
+      self[:theme_config] = "#{self[:file_root]}/theme_config.yml".squeeze('/')
     end
 
-    def load_config filename_and_path
-      metadata = File.read(filename_and_path)
-      YAML.load(metadata).each_pair { |key, value| self[key.downcase.to_sym] = value }
+    def load_config filename_and_path = ''
+      filename_and_path = filename_and_path.empty? ? self[:theme_config] : filename_and_path
+      params = YAML.load(File.read(filename_and_path))
+      params.each_pair { |key, value| self[key.downcase.to_sym] = value } unless !params
     rescue Errno::ENOENT => e
       puts "Warning: unable to load config file : " + filename_and_path
     end

data/spec/baron_theme_spec.rb

@@ -9,6 +9,7 @@ describe "Baron::Theme" do
   before :all do
     @config = load_config()
     @theme = Baron::Theme.new(@config)
+    @theme.load_config()
   end
 
   it "finds all parameters in theme_config.yml" do
@@ -26,4 +27,12 @@ describe "Baron::Theme" do
     @theme.get_template('home').should == SAMPLE_DATA_PATH + 'themes/typography/templates/home.rhtml'
     @theme.get_template('layout').should == SAMPLE_DATA_PATH + 'themes/typography/templates/layout.rhtml'
   end
+  
+  it "doesn't crash with a bad or empty config file" do
+    theme = Baron::Theme.new({})
+    theme.load_config("#{SAMPLE_DATA_PATH}supplemental-files/theme_config.yml")
+    theme.length.should == 4
+    theme.load_config("FOOBAR-FAKE-URL-FAKE-FAKE")
+    theme.length.should == 4
+  end
 end

data/spec/sample_data/supplemental-files/theme_config.yml

@@ -0,0 +1,5 @@
+###
+# Theme Config File
+#
+# sample config file with no variables. Need to make sure this doesn't crash the app
+#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baron
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -81,6 +81,7 @@ files:
 - spec/sample_data/resources/feed.rss
 - spec/sample_data/resources/redirects.txt
 - spec/sample_data/resources/robots.txt
+- spec/sample_data/supplemental-files/theme_config.yml
 - spec/sample_data/themes/typography/css/app.css
 - spec/sample_data/themes/typography/css/bootstrap-responsive.css
 - spec/sample_data/themes/typography/css/bootstrap-responsive.min.css