lane_groove 0.0.5 → 0.1.0

data/bin/lane_groove

@@ -4,6 +4,7 @@ require 'forever'
 
 WORKING_DIR = Dir.getwd
 puts "Working directory is #{WORKING_DIR}"
+puts "You can stop the lane_groove server with\n  lane_groove stop"
 puts "WARNING: Working directory is empty!" if Dir.glob(File.join(WORKING_DIR, '*.yaml')).empty?
 
 Forever.run do

data/lib/lane_groove.rb

@@ -2,18 +2,15 @@ require 'yaml'
 require 'json'
 require 'xmlsimple'
 require 'sinatra/base'
+require 'sinatra/respond_with'
 require 'rack/contrib'
 
+if Dir.glob(File.join(WORKING_DIR, '*.yaml')).empty?
+  puts "No config file(s) found in #{WORKING_DIR}. Please put one or more YAML files in #{WORKING_DIR}."
+  exit
+end
+
 class Hash
-  def upcase_keys
-    inject({}){ |new_hash, key_value|
-      key, value = key_value
-      value = value.upcase_keys if value.is_a?(Hash)
-      new_hash[key.upcase] = value
-      new_hash
-    }
-  end
-  
   def recursive_values
     inject([]){ |new_array, key_value|
       key, value = key_value
@@ -37,35 +34,58 @@ class Hash
   end
 end
 
+class Rack::Static
+  def initialize(app, options={})
+    # don't default to 'index.html' as per https://github.com/lgierth/rack/blob/5ab871f2a86ca4f943a5b1d0a3d0f32a2f9f77ef/lib/rack/static.rb
+    @app = app
+    @urls = options[:urls]
+    root = options[:root]
+    @file_server = Rack::File.new(root)
+  end
+end
+
+# inspired by https://github.com/crohr/rack-accept-header-updater/blob/master/lib/rack/accept_header_updater.rb
+# turns file extensions into accept headers.
+module Rack
+  class AcceptHeaderUpdater
+    def initialize(app)
+      @app = app
+    end
+    
+    def call(env)
+      req = Rack::Request.new(env)
+      if ext = (req.path_info.match('\.') && ".#{req.path_info.split('.').last}")
+        if mime_type = Rack::Mime::MIME_TYPES[ext.downcase]
+          env['HTTP_ACCEPT'] = [mime_type, env['HTTP_ACCEPT']].join(",")
+          req.path_info.gsub!(/#{ext}$/, '')
+        end
+      end
+      @app.call(env)
+    end
+  end
+end
+
 class LaneGroove < Sinatra::Base
   use Rack::CommonLogger
   use Rack::Access, '/' => %w{ 127.0.0.1 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 }
   
-  set :config, nil
+  # We're using Rack::Static instead of Sinatra static so we can put it in the Middleware stack before AcceptHeaderUpdater
+  if File.exists?(static_dir = File.join(WORKING_DIR, 'static'))
+    puts "Serving static files from #{static_dir}: #{Dir.glob File.join(static_dir, '*')}"
+    use Rack::Static, :urls => ['/static'], :root => WORKING_DIR
+  end
   
-  static_dir = File.join(WORKING_DIR, 'static')
+  use Rack::AcceptHeaderUpdater
+  register Sinatra::RespondWith
   
-  if File.exists? static_dir
-    puts "Serving static files from #{static_dir}"
-    set :static, true
-    set :public_folder, static_dir
-  end
+  disable :protection
+  set :config, nil
   
   helpers do
     def config_files
       Dir.glob File.join(WORKING_DIR, '*.yaml')
     end
     
-    def content_type_for(format)
-      {
-        :json => {'Content-Type' => 'application/json; charset=utf-8'},
-        :xml  => {'Content-Type' => 'application/xml; charset=utf-8'},
-        :yaml => {'Content-Type' => 'application/x-yaml; charset=utf-8'},
-        :rb   => {'Content-Type' => 'application/x-ruby; charset=utf-8'},
-        :line => {'Content-Type' => 'application/x-line; charset=utf-8'}
-      }[format]
-    end
-    
     def reload_yaml
       self.class.config = {}
       
@@ -80,8 +100,7 @@ class LaneGroove < Sinatra::Base
       cfg = self.class.config
       
       path.each do |node|
-        cfg = cfg[node]
-        break if cfg.nil?
+        break if (cfg = cfg[node]).nil?
       end
       
       return cfg
@@ -100,20 +119,17 @@ class LaneGroove < Sinatra::Base
   end
   
   get /^(.*)\.line$/ do |paths|
-    [200, content_type_for(:line), paths.split(',').map{ |path| extract_values config(*parse_path(path)) }.flatten.join(params['F'] || ' ')]
+    content_type 'application/x-line; charset=utf-8'
+    paths.split(',').map{ |path| extract_values config(*parse_path(path)) }.flatten.join(params['F'] || ' ')
   end
   
-  get /^(.*)\.([\w\d]{2,4})$/ do |path, ext|
-    ext = ext.to_sym
-    conf = config *parse_path(path)
+  get /^(.*)$/, :provides => [:json, :yaml, :xml] do |path|
+    halt 404 unless (conf = config *parse_path(path))
     
-    case ext
-      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}"]
+    respond_to do |format|
+      format.json { conf.to_json }
+      format.yaml { conf.to_yaml }
+      format.xml  { conf.remove_nil_values.to_xml }
     end
   end
   

data/test/lane_groove_test.rb

@@ -1,6 +1,6 @@
-WORKING_DIR = File.join(Dir.getwd, 'config_files')
+WORKING_DIR = File.join(File.dirname(__FILE__), 'config_files')
 
-require '../lib/lane_groove.rb'
+require_relative '../lib/lane_groove.rb'
 require 'test/unit'
 require 'rack/test'
 require 'fileutils'
@@ -41,99 +41,59 @@ class LaneGrooveTest < Test::Unit::TestCase
     EOX
   end
   
-  def config_all_XML
-    <<-EOX
-  <TEST>
-    <DB>
-      <HOST>my-db-server</HOST>
-      <USER>root</USER>
-      <PASS>none</PASS>
-      <BAR>1</BAR>
-    </DB>
-    <REDIS>
-      <HOST>my-redis-server</HOST>
-    </REDIS>
-  </TEST>
-    EOX
-  end
-  
-  def config_db_XML
-    <<-EOX
-  <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
-  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 'text/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 'text/yaml;charset=utf-8', last_response.content_type
     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 '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 'application/json;charset=utf-8', last_response.content_type
     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 '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 'application/xml;charset=utf-8', last_response.content_type
     assert_equal config_db_xml, last_response.body
   end
   
-  def test_all_XML
-    get '/.XML'
+  def test_line
+    get '/test/db/host,/test/db/user.line'
     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
+    assert_equal 'my-db-server root', last_response.body
   end
-  def test_db_XML
-    get '/test/db.XML'
+  def test_line_with_separator
+    get '/test/db/host,/test/db/user.line?F=,'
     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
+    assert_equal 'my-db-server,root', last_response.body
   end
   
   def reset_assets
-    FileUtils.mv('config_files/more_test.yaml', 'config_files/test.yaml') if File.exists?('config_files/more_test.yaml')
-    FileUtils.mv('config_files/no_static', 'config_files/static') if File.exists?('config_files/no_static')
+    FileUtils.mv(File.join(WORKING_DIR, 'more_test.yaml'), File.join(WORKING_DIR, 'test.yaml')) if File.exists?(File.join(WORKING_DIR, 'more_test.yaml'))
+    FileUtils.mv(File.join(WORKING_DIR, 'no_static'), File.join(WORKING_DIR, 'static')) if File.exists?(File.join(WORKING_DIR, 'no_static'))
   end
   
   def setup
@@ -145,16 +105,16 @@ class LaneGrooveTest < Test::Unit::TestCase
   end
   
   def test_reloading
-    get '/test/db.rb'
-    assert_equal config["test"]["db"].inspect, last_response.body
+    get '/test/db.json'
+    assert_equal config["test"]["db"].to_json, last_response.body
     
-    FileUtils.mv('config_files/test.yaml', 'config_files/more_test.yaml')
+    FileUtils.mv(File.join(WORKING_DIR, 'test.yaml'), File.join(WORKING_DIR, 'more_test.yaml'))
     
-    get '/test/db.rb'
-    assert_equal config["test"]["db"].inspect, last_response.body
+    get '/test/db.json'
+    assert_equal config["test"]["db"].to_json, last_response.body
     
-    get '/more_test/db.rb?reload=true'
-    assert_equal config["test"]["db"].inspect, last_response.body
+    get '/more_test/db.json?reload=true'
+    assert_equal config["test"]["db"].to_json, last_response.body
   end
   
   def test_network_restrictions
@@ -164,14 +124,13 @@ class LaneGrooveTest < Test::Unit::TestCase
   end
   
   def test_static_files
-    get '/some.txt'
+    get '/static/some.txt'
     assert_equal 'some text', last_response.body
   end
   def test_static_files_no_dir
-    FileUtils.mv('config_files/static', 'config_files/no_static')
-    get '/some.txt'
+    FileUtils.mv(File.join(WORKING_DIR, 'static'), File.join(WORKING_DIR, 'no_static'))
+    get '/static/some.txt'
     assert_equal 404, last_response.status
-    assert_equal 'unknown format txt', last_response.body
   end
   
 end

metadata

@@ -1,113 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lane_groove
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Niko
 - Dittmann
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: xml-simple
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70196359133860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70196359133860
+- !ruby/object:Gem::Dependency
   name: sinatra
+  requirement: &70196359133420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70196359133420
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: &70196359132940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-contrib
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70196359132940
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: &70196359132300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: foreverb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70196359132300
+- !ruby/object:Gem::Dependency
+  name: foreverb
+  requirement: &70196359131780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70196359131780
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70196359131360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: A small HTTP configuration server. Eats YAML, returns JSON, XML, YAML and rb. Restricts requests to local subnet.
+  prerelease: false
+  version_requirements: *70196359131360
+description: A small HTTP configuration server. Eats YAML, returns JSON, XML, YAML
+  and rb. Restricts requests to local subnet.
 email: mail@niko-dittmann.com
-executables: 
+executables:
 - lane_groove
 - lane_groove_test
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/lane_groove.rb
 - test/lane_groove_test.rb
 - bin/lane_groove
 - bin/lane_groove_test
 homepage: http://github.com/niko/lane_groove
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nowarning
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A small HTTP configuration server. Eats YAML, returns JSON, XML, YAML and rb. Restricts requests to local subnet.
-test_files: 
+summary: A small HTTP configuration server. Eats YAML, returns JSON, XML, YAML and
+  rb. Restricts requests to local subnet.
+test_files:
 - test/lane_groove_test.rb