lane_groove 0.0.4 → 0.0.5

data/lib/lane_groove.rb

@@ -6,7 +6,7 @@ require 'rack/contrib'
 
 class Hash
   def upcase_keys
-    self.inject({}){ |new_hash, key_value|
+    inject({}){ |new_hash, key_value|
       key, value = key_value
       value = value.upcase_keys if value.is_a?(Hash)
       new_hash[key.upcase] = value
@@ -15,13 +15,26 @@ class Hash
   end
   
   def recursive_values
-    self.inject([]){ |new_array, key_value|
+    inject([]){ |new_array, key_value|
       key, value = key_value
       value = value.recursive_values if value.is_a?(Hash)
       new_array << value
       new_array.flatten
     }
   end
+  
+  def remove_nil_values
+    inject({}){ |new_hash, key_value|
+      key, value = key_value
+      value = value.remove_nil_values if value.is_a?(Hash)
+      new_hash[key] = value unless value.nil?
+      new_hash
+    }
+  end
+  
+  def to_xml(root=nil)
+    XmlSimple.xml_out(self, 'RootName' => root, 'NoAttr' => true)
+  end
 end
 
 class LaneGroove < Sinatra::Base
@@ -35,7 +48,7 @@ class LaneGroove < Sinatra::Base
   if File.exists? static_dir
     puts "Serving static files from #{static_dir}"
     set :static, true
-    set :public, static_dir
+    set :public_folder, static_dir
   end
   
   helpers do
@@ -58,10 +71,8 @@ class LaneGroove < Sinatra::Base
       
       config_files.each do |file|
         puts "Loading #{file}"
-        self.class.config[File.basename(file, '.yaml').to_sym] = YAML.load_file(file)
+        self.class.config[File.basename(file, '.yaml')] = YAML.load_file(file)
       end
-      
-      config.to_yaml
     end
     
     def config(*path)
@@ -77,7 +88,7 @@ class LaneGroove < Sinatra::Base
     end
     
     def parse_path(path)
-      path.split('/').delete_if{|n| n.empty?}.compact.map{|n| n.to_sym}
+      path.split('/').delete_if{|n| n.empty?}.compact.map{|n| n}
     end
     def extract_values(path)
       path.is_a?(Hash) ? path.recursive_values : path
@@ -94,14 +105,14 @@ class LaneGroove < Sinatra::Base
   
   get /^(.*)\.([\w\d]{2,4})$/ do |path, ext|
     ext = ext.to_sym
-    path = parse_path(path)
+    conf = config *parse_path(path)
     
     case ext
-      when :yaml then [200, content_type_for(:yaml), config(*path).to_yaml]
-      when :json then [200, content_type_for(:json), config(*path).to_json]
-      when :xml  then [200, content_type_for(:xml), XmlSimple.xml_out(config(*path), 'RootName' => nil, 'NoAttr' => true)]
-      when :XML  then [200, content_type_for(:xml), XmlSimple.xml_out(config(*path).upcase_keys, 'RootName' => nil, 'NoAttr' => true)]
-      when :rb   then [200, content_type_for(:rb), config(*path).inspect]
+      when :yaml then [200, content_type_for(:yaml), conf.to_yaml]
+      when :json then [200, content_type_for(:json), conf.to_json]
+      when :xml  then [200, content_type_for(:xml), conf.remove_nil_values.to_xml]
+      when :XML  then [200, content_type_for(:xml), conf.remove_nil_values.upcase_keys.to_xml]
+      when :rb   then [200, content_type_for(:rb), conf.inspect]
       else ; [404, {}, "unknown format #{ext}"]
     end
   end

data/test/lane_groove_test.rb

@@ -1,6 +1,6 @@
 WORKING_DIR = File.join(Dir.getwd, 'config_files')
 
-require '../lib/app.rb'
+require '../lib/lane_groove.rb'
 require 'test/unit'
 require 'rack/test'
 require 'fileutils'
@@ -13,7 +13,7 @@ class LaneGrooveTest < Test::Unit::TestCase
   end
   
   def config
-    {:test=>{:db=>{:host=>"my-db-server", :user=>"root", :pass=>"none"}, :redis=>{:host=>"my-redis-server"}}}
+    {"test"=>{"db"=>{"host"=>"my-db-server", "user"=>"root", "pass"=>"none", "foo" => nil, "bar" => 1}, "redis"=>{"host"=>"my-redis-server"}}}
   end
   
   def config_all_xml
@@ -23,6 +23,7 @@ class LaneGrooveTest < Test::Unit::TestCase
       <host>my-db-server</host>
       <user>root</user>
       <pass>none</pass>
+      <bar>1</bar>
     </db>
     <redis>
       <host>my-redis-server</host>
@@ -36,6 +37,7 @@ class LaneGrooveTest < Test::Unit::TestCase
   <host>my-db-server</host>
   <user>root</user>
   <pass>none</pass>
+  <bar>1</bar>
     EOX
   end
   
@@ -46,6 +48,7 @@ class LaneGrooveTest < Test::Unit::TestCase
       <HOST>my-db-server</HOST>
       <USER>root</USER>
       <PASS>none</PASS>
+      <BAR>1</BAR>
     </DB>
     <REDIS>
       <HOST>my-redis-server</HOST>
@@ -59,60 +62,71 @@ class LaneGrooveTest < Test::Unit::TestCase
   <HOST>my-db-server</HOST>
   <USER>root</USER>
   <PASS>none</PASS>
+  <BAR>1</BAR>
     EOX
   end
   
   def test_all_rb
     get '/.rb'
+    assert_equal 200, last_response.status
     assert_equal 'application/x-ruby; charset=utf-8', last_response.content_type
     assert_equal config.inspect, last_response.body
   end
   def test_db_rb
     get '/test/db.rb'
+    assert_equal 200, last_response.status
     assert_equal 'application/x-ruby; charset=utf-8', last_response.content_type
-    assert_equal config[:test][:db].inspect, last_response.body
+    assert_equal config["test"]["db"].inspect, last_response.body
   end
   
   def test_all_yaml
     get '/.yaml'
+    assert_equal 200, last_response.status
     assert_equal 'application/x-yaml; charset=utf-8', last_response.content_type
     assert_equal config.to_yaml, last_response.body
   end
   def test_db_yaml
     get '/test/db.yaml'
+    assert_equal 200, last_response.status
     assert_equal 'application/x-yaml; charset=utf-8', last_response.content_type
-    assert_equal config[:test][:db].to_yaml, last_response.body
+    assert_equal config["test"]["db"].to_yaml, last_response.body
   end
   
   def test_all_json
     get '/.json'
+    assert_equal 200, last_response.status
     assert_equal 'application/json; charset=utf-8', last_response.content_type
     assert_equal config.to_json, last_response.body
   end
   def test_db_json
     get '/test/db.json'
+    assert_equal 200, last_response.status
     assert_equal 'application/json; charset=utf-8', last_response.content_type
-    assert_equal config[:test][:db].to_json, last_response.body
+    assert_equal config['test']["db"].to_json, last_response.body
   end
   
   def test_all_xml
     get '/.xml'
+    assert_equal 200, last_response.status
     assert_equal 'application/xml; charset=utf-8', last_response.content_type
     assert_equal config_all_xml, last_response.body
   end
   def test_db_xml
     get '/test/db.xml'
+    assert_equal 200, last_response.status
     assert_equal 'application/xml; charset=utf-8', last_response.content_type
     assert_equal config_db_xml, last_response.body
   end
   
   def test_all_XML
     get '/.XML'
+    assert_equal 200, last_response.status
     assert_equal 'application/xml; charset=utf-8', last_response.content_type
     assert_equal config_all_XML, last_response.body
   end
   def test_db_XML
     get '/test/db.XML'
+    assert_equal 200, last_response.status
     assert_equal 'application/xml; charset=utf-8', last_response.content_type
     assert_equal config_db_XML, last_response.body
   end
@@ -132,15 +146,15 @@ class LaneGrooveTest < Test::Unit::TestCase
   
   def test_reloading
     get '/test/db.rb'
-    assert_equal config[:test][:db].inspect, last_response.body
+    assert_equal config["test"]["db"].inspect, last_response.body
     
     FileUtils.mv('config_files/test.yaml', 'config_files/more_test.yaml')
     
     get '/test/db.rb'
-    assert_equal config[:test][:db].inspect, last_response.body
+    assert_equal config["test"]["db"].inspect, last_response.body
     
     get '/more_test/db.rb?reload=true'
-    assert_equal config[:test][:db].inspect, last_response.body
+    assert_equal config["test"]["db"].inspect, last_response.body
   end
   
   def test_network_restrictions

metadata

@@ -2,7 +2,7 @@
 name: lane_groove
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Niko
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 Z
+date: 2011-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple