rack-server-pages 0.0.2 → 0.0.3

data/Gemfile

@@ -9,10 +9,11 @@ group :development do
   gem 'guard'
   gem 'guard-bundler'
   gem 'guard-rspec'
-  #gem 'rb-readline'
-  #gem 'rb-inotify', :require => false
-  #gem 'rb-fsevent', :require => false
-  #gem 'rb-fchange', :require => false
+  gem 'rb-readline'
+  gem 'rb-inotify', :require => false
+  gem 'rb-fsevent', :require => false
+  gem 'rb-fchange', :require => false
+  gem 'ruby_gntp'
 end
 
 group :test do

data/README.md

@@ -7,6 +7,7 @@ There are no controllers or models, just only views like a jsp, asp and php!
 <http://github.com/migrs/rack-server-pages>
 
 [![Build Status](https://secure.travis-ci.org/migrs/rack-server-pages.png)](http://travis-ci.org/migrs/rack-server-pages)
+[![Dependency Status](https://gemnasium.com/migrs/rack-server-pages.png?travis)](https://gemnasium.com/migrs/rack-server-pages)
 
 ## Features
 
@@ -16,12 +17,14 @@ There are no controllers or models, just only views like a jsp, asp and php!
 - Tilt support (optional)
 - Include a partial template
 - Layout template
+- Before/After filters
+- Include helpers
 - Integrate with any rack applications (Rails, Sinatra, etc...)
 - Extremely simple and easy to use!
 
 ## Requirements
 
-- [Ruby](http://ruby-lang.org/) 1.8.7 or 1.9.x
+- [Ruby](http://ruby-lang.org/) 1.8.7, 1.9.x, jruby 1.6.x
 - [Rack](http://github.com/rack/rack)
 
 ## Install
@@ -267,6 +270,7 @@ or put your `Gemfile`
 ### [CoffeeScript](http://jashkenas.github.com/coffee-script/)
 
 `views/script.js.coffee`
+
     number   = 42
     opposite = true
 
@@ -343,6 +347,8 @@ Create `sinatra_sample.rb`
     require 'sinatra'
     require 'rack-server-pages'
 
+    use Rack::ServerPages
+
     get '/' do
       '<p>Hello Sinatra!</p>'
     end
@@ -382,8 +388,7 @@ And create `public/info.php` :)
 ## ToDo
 
 ### Implements
-- Before/After filter
-- Support Helpers
+- Error handling
 - Static file generator (for designer)
 
 ### Tasks

data/config.ru

@@ -10,4 +10,32 @@ require 'slim'
 Rack::ServerPages::Template::ERBTemplate.extensions << 'php' # ERBTemplate
 Tilt.register Tilt::ERBTemplate, 'php' # TiltTemplate
 
-run Rack::ServerPages
+module SampleHelper
+  def before
+    @sample1 = 'sample1'
+  end
+
+  def sample5
+    'sample5'
+  end
+
+  def after
+  end
+end
+
+run Rack::ServerPages.new { |config|
+  config.helpers SampleHelper
+  config.helpers do
+    def sample4
+      'sample4'
+    end
+  end
+
+  config.before do
+    @sample2 = 'sample2'
+
+    def sample3
+      'sample3'
+    end
+  end
+}

data/lib/rack/server_pages.rb

@@ -8,7 +8,7 @@ require 'forwardable'
 
 module Rack
   class ServerPages
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
 
     def self.call(env)
       new.call(env)
@@ -22,6 +22,12 @@ module Rack
       @config = Config.new(*options)
       yield @config if block_given?
       @app = app || @config.failure_app || NotFound
+      @binding = Class.new(Binding)
+
+      require ::File.dirname(__FILE__) + "/server_pages/sample_helper"
+      @config.helpers Rack::ServerPages::SampleHelper
+
+      @binding.setup(@config.helpers, @config.filters)
     end
 
     def call(env)
@@ -37,15 +43,7 @@ module Rack
         file = select_template_file(files)
 
         if template = Template[file]
-          scope = Binding.new(env)
-          scope.response.tap do |res|
-            catch(:halt) do
-              res.write template.render_with_layout(scope)
-              res['Last-Modified'] ||= ::File.mtime(file).httpdate
-              res['Content-Type']  ||= template.mime_type_with_charset(@config.default_charset)
-              res['Cache-Control'] ||= @config.cache_control if @config.cache_control
-            end
-          end.finish
+          render(template, @binding.new(env))
         else
           StaticFile.new(file, @config.cache_control).call(env)
         end
@@ -54,8 +52,27 @@ module Rack
       end
     end
 
+    def render(template, scope)
+      scope.response.tap do |res|
+        catch(:halt) do
+          invoke_filter(:before, scope)
+          res.write template.render_with_layout(scope)
+          res['Last-Modified'] ||= ::File.mtime(template.file).httpdate
+          res['Content-Type']  ||= template.mime_type_with_charset(@config.default_charset)
+          res['Cache-Control'] ||= @config.cache_control if @config.cache_control
+          invoke_filter(:after, scope)
+        end
+      end.finish
+    end
+
+    def invoke_filter(type, scope)
+      @config.filters[type].each do |filter|
+        filter.respond_to?(:bind) ? filter.bind(scope).call : scope.instance_exec(&filter)
+      end
+    end
+
     def evalute_path_info(path)
-      if m = path.match(%r!^#{@config.effective_path}/((?:[\w-]+/)+)?([a-zA-Z0-9]\w*)?(\.\w+)?$!)
+      if m = path.match(%r!^#{@config.effective_path}/((?:[\w-]+/)+)?([A-z0-9]\w*)?(\.\w+)?(\.\w+)?$!)
         m[1,3] # dir, file, ext
       end
     end
@@ -84,16 +101,38 @@ module Rack
       end
 
       hash_accessor :view_path, :effective_path, :cache_control, :default_charset, :failure_app
+      attr_reader :filters
 
       def initialize
         super
         self[:default_charset] ||= 'utf-8'
         self[:view_path] ||= %w(views public)
+        @helpers = []
+        @filters = { :before => [], :after => [] }
       end
 
       def view_paths
         (v = self[:view_path]).kind_of?(Enumerable) ? v : [v.to_s]
       end
+
+      def before(*fn, &block)
+        add_filter(:before, *fn, &block)
+      end
+
+      def after(*fn, &block)
+        add_filter(:after, *fn, &block)
+      end
+
+      def add_filter(type, *args, &block)
+        @filters[type] << block if block_given?
+        @filters[type].concat args unless args.empty?
+      end
+
+      def helpers(*args, &block)
+        @helpers << block if block_given?
+        @helpers.concat args unless args.empty?
+        @helpers
+      end
     end
 
     class NotFound
@@ -103,18 +142,25 @@ module Rack
     end
 
     class Template
+
       def self.[] file
         engine.new(file).find_template
       end
 
       def self.engine
-        defined?(Tilt) ? TiltTemplate : ERBTemplate
+        tilt? ? TiltTemplate : ERBTemplate
       end
 
       def self.tilt?
-        engine == TiltTemplate
+        (@@use_tilt ||= defined?(Tilt)) and defined?(Tilt)
+      end
+
+      def self.tilt= bool
+        @@use_tilt = !!bool
       end
 
+      attr_reader :file
+
       def initialize(file)
         @file = file
       end
@@ -124,7 +170,7 @@ module Rack
         Mime.mime_type(ext, default_mime_type)
       end
 
-      def mime_type_with_charset(charset)
+      def mime_type_with_charset(charset = 'utf-8')
         if (m = mime_type) =~ %r!^(text/\w+|application/(?:javascript|(xhtml\+)?xml|json))$!
          "#{m}; charset=#{charset}"
         else
@@ -195,9 +241,9 @@ module Rack
         halt
       end
 
-      def partial(file)
+      def partial(file, &block)
         if tpl_file = Dir["#{file}{.*,}"].first and template = Template[tpl_file]
-          template.render(self)
+          template.render(self, &block)
         else
           IO.read(file)
         end
@@ -226,7 +272,7 @@ module Rack
       end
 
       def url(path = "")
-        env['SCRIPT_NAME'] + (path.to_s[0,1]!='/'?'/':'') + path.to_s
+        env['SCRIPT_NAME'] + (path.to_s[0,1]!= '/' ? '/' : '') + path.to_s
       end
     end
 
@@ -240,6 +286,22 @@ module Rack
       def_delegators :request, :env, :params, :session, :cookies, :logger
       def_delegators :response, :headers, :set_cookies, :delete_cookie
 
+      def self.setup(helpers, filters)
+        helpers.each do |helper|
+          if helper.kind_of? Proc
+            class_eval(&helper)
+          else
+            class_eval { include helper }
+            [:before, :after].each do |type|
+              if helper.method_defined?(type)
+                filters[type] << helper.instance_method(type)
+                class_eval { undef :"#{type}" }
+              end
+            end
+          end
+        end
+      end
+
       def initialize(env)
         @request  = Rack::Request.new(env)
         @response = Rack::Response.new
@@ -250,99 +312,5 @@ module Rack
         binding
       end
     end
-
-  end
-end
-
-module Rack::ServerPages::Binding::Extra
-  require 'erb'
-  def rubyinfo
-    ERB.new(<<-RUBYINFO).result(binding)
-    <html><head>
-    <style type="text/css"><!--
-    body {background-color: #ffffff; color: #000000;}
-    body, td, th, h1, h2 {font-family: sans-serif;}
-    pre {margin: 0px; font-family: monospace;}
-    a:link {color: #000099; text-decoration: none; background-color: #ffffff;}
-    a:hover {text-decoration: underline;}
-    table {border-collapse: collapse;}
-    .center {text-align: center;}
-    .center table { margin-left: auto; margin-right: auto; text-align: left;}
-    .center th { text-align: center !important; }
-    td, th { border: 1px solid #000000; font-size: 75%; vertical-align: baseline;}
-    h1 {font-size: 150%;}
-    h2 {font-size: 125%;}
-    .p {text-align: left;}
-    .e {background-color: #ccccff; font-weight: bold; color: #000000;}
-    .h {background-color: #9999cc; font-weight: bold; color: #000000;}
-    .v {background-color: #cccccc; color: #000000;}
-    i {color: #666666; background-color: #cccccc;}
-    img {float: right; border: 0px;}
-    hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;}
-    //--></style>
-    <title>rubyinfo()</title>
-    </head>
-    <body>
-      <div class="center">
-        <table border="0" cellpadding="3" width="600">
-          <tr class="h">
-            <td>
-            <h1 class="p">Rack Server Pages Version <%= Rack::ServerPages::VERSION%></h1>
-            </td>
-          </tr>
-        </table>
-        <br />
-        <h2>Rack Environment</h2>
-        <table border="0" cellpadding="3" width="600">
-          <tr class="h"><th>Variable</th><th>Value</th></tr>
-          <% for key, value in env do %>
-            <tr><td class="e"><%= key %></td><td class="v"><%= value %></td></tr>
-          <% end %>
-        </table>
-        <h2>Ruby</h2>
-        <table border="0" cellpadding="3" width="600">
-          <tr><td class="e">RUBY_VERSION</td><td class="v"><%= RUBY_VERSION %></td></tr>
-          <tr><td class="e">RUBY_PATCHLEVEL</td><td class="v"><%= RUBY_PATCHLEVEL %></td></tr>
-          <tr><td class="e">RUBY_RELEASE_DATE</td><td class="v"><%= RUBY_RELEASE_DATE %></td></tr>
-          <tr><td class="e">RUBY_PLATFORM</td><td class="v"><%= RUBY_PLATFORM %></td></tr>
-        </table>
-        <h2>Environment</h2>
-        <table border="0" cellpadding="3" width="600">
-          <tr class="h"><th>Variable</th><th>Value</th></tr>
-          <% for key, value in ENV do %>
-            <tr><td class="e"><%= key %></td><td class="v"><%= value %></td></tr>
-          <% end %>
-        </table>
-        <% if defined?(Tilt) %>
-        <h2>Tilt</h2>
-        <table border="0" cellpadding="3" width="600">
-          <% for key, value in Tilt.mappings do %>
-            <tr><td class="e"><%= key %></td><td class="v"><%= value %></td></tr>
-          <% end %>
-        </table>
-        <% else %>
-        <h2>ERB Template</h2>
-        <table border="0" cellpadding="3" width="600">
-          <tr><td class="e">extensions</td><td class="v"><%=Rack::ServerPages::Template::ERBTemplate.extensions.join(', ')%></td></tr>
-        </table>
-        <% end %>
-        <h2>Binding</h2>
-        <table border="0" cellpadding="3" width="600">
-          <tr><td class="e">methods</td><td class="v"><%= (methods - Object.methods).join(', ') %></td></tr>
-        </table>
-        <h2>License</h2>
-        <table border="0" cellpadding="3" width="600">
-        <tr class="v"><td>
-        <p>
-        MIT License
-        </p>
-        </td></tr>
-        </table><br />
-      </div>
-    </body>
-    </html>
-    RUBYINFO
   end
-  alias phpinfo rubyinfo # just a joke :)
 end
-Rack::ServerPages::Binding.send(:include, Rack::ServerPages::Binding::Extra)

data/lib/rack/server_pages/sample_helper.rb

@@ -0,0 +1,91 @@
+module Rack::ServerPages::SampleHelper
+  require 'erb'
+  def rubyinfo
+    ERB.new(<<-RUBYINFO).result(binding)
+    <html><head>
+    <style type="text/css"><!--
+    body {background-color: #ffffff; color: #000000;}
+    body, td, th, h1, h2 {font-family: sans-serif;}
+    pre {margin: 0px; font-family: monospace;}
+    a:link {color: #000099; text-decoration: none; background-color: #ffffff;}
+    a:hover {text-decoration: underline;}
+    table {border-collapse: collapse;}
+    .center {text-align: center;}
+    .center table { margin-left: auto; margin-right: auto; text-align: left;}
+    .center th { text-align: center !important; }
+    td, th { border: 1px solid #000000; font-size: 75%; vertical-align: baseline;}
+    h1 {font-size: 150%;}
+    h2 {font-size: 125%;}
+    .p {text-align: left;}
+    .e {background-color: #ccccff; font-weight: bold; color: #000000;}
+    .h {background-color: #9999cc; font-weight: bold; color: #000000;}
+    .v {background-color: #cccccc; color: #000000;}
+    i {color: #666666; background-color: #cccccc;}
+    img {float: right; border: 0px;}
+    hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;}
+    //--></style>
+    <title>rubyinfo()</title>
+    </head>
+    <body>
+      <div class="center">
+        <table border="0" cellpadding="3" width="600">
+          <tr class="h">
+            <td>
+            <h1 class="p">Rack Server Pages Version <%= Rack::ServerPages::VERSION%></h1>
+            </td>
+          </tr>
+        </table>
+        <br />
+        <h2>Rack Environment</h2>
+        <table border="0" cellpadding="3" width="600">
+          <tr class="h"><th>Variable</th><th>Value</th></tr>
+          <% for key, value in env do %>
+            <tr><td class="e"><%= key %></td><td class="v"><%= value %></td></tr>
+          <% end %>
+        </table>
+        <h2>Ruby</h2>
+        <table border="0" cellpadding="3" width="600">
+          <tr><td class="e">RUBY_VERSION</td><td class="v"><%= RUBY_VERSION %></td></tr>
+          <tr><td class="e">RUBY_PATCHLEVEL</td><td class="v"><%= RUBY_PATCHLEVEL %></td></tr>
+          <tr><td class="e">RUBY_RELEASE_DATE</td><td class="v"><%= RUBY_RELEASE_DATE %></td></tr>
+          <tr><td class="e">RUBY_PLATFORM</td><td class="v"><%= RUBY_PLATFORM %></td></tr>
+        </table>
+        <h2>Environment</h2>
+        <table border="0" cellpadding="3" width="600">
+          <tr class="h"><th>Variable</th><th>Value</th></tr>
+          <% for key, value in ENV do %>
+            <tr><td class="e"><%= key %></td><td class="v"><%= value %></td></tr>
+          <% end %>
+        </table>
+        <% if defined?(Tilt) %>
+        <h2>Tilt</h2>
+        <table border="0" cellpadding="3" width="600">
+          <% for key, value in Tilt.mappings do %>
+            <tr><td class="e"><%= key %></td><td class="v"><%= value %></td></tr>
+          <% end %>
+        </table>
+        <% else %>
+        <h2>ERB Template</h2>
+        <table border="0" cellpadding="3" width="600">
+          <tr><td class="e">extensions</td><td class="v"><%=Rack::ServerPages::Template::ERBTemplate.extensions.join(', ')%></td></tr>
+        </table>
+        <% end %>
+        <h2>Binding</h2>
+        <table border="0" cellpadding="3" width="600">
+          <tr><td class="e">methods</td><td class="v"><%= (methods - Object.methods).join(', ') %></td></tr>
+        </table>
+        <h2>License</h2>
+        <table border="0" cellpadding="3" width="600">
+        <tr class="v"><td>
+        <p>
+        MIT License
+        </p>
+        </td></tr>
+        </table><br />
+      </div>
+    </body>
+    </html>
+    RUBYINFO
+  end
+  alias phpinfo rubyinfo # just a joke :)
+end

data/public/README.erb

@@ -1,2 +1,3 @@
 <% Rack::ServerPages::Template.tilt? ? layout('public/_layout.html') : headers['Content-Type'] = 'text/plain' %>
+<% @title = 'README.md' %>
 <%= partial 'README.md' %>

data/public/_layout.html.erb

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>README.md</title>
+    <title><%=@title%><%=" - " if @title%>Rack Server Pages</title>
     <link href="<%=url("/style.css")%>" media="screen" rel="stylesheet" type="text/css" />
   </head>
   <body>

data/public/sample.erb

@@ -6,3 +6,8 @@ What's your name?:
   <input type="submit" />
 </form>
 
+<%= @sample1 %>
+<%= @sample2 %>
+<%= sample3 %>
+<%= sample4 %>
+<%= sample5 %>

data/public/style.css.sass

@@ -0,0 +1,99 @@
+body
+  margin: 0 auto
+  font-family: Georgia, Palatino, serif
+  color: #444444
+  line-height: 1
+  max-width: 960px
+  padding: 30px
+
+h1, h2, h3, h4
+  color: #111111
+  font-weight: 400
+
+h1, h2, h3, h4, h5, p
+  margin-bottom: 24px
+  padding: 0
+
+h1
+  font-size: 48px
+
+h2
+  font-size: 36px
+  margin: 24px 0 6px
+
+h3
+  font-size: 24px
+
+h4
+  font-size: 21px
+
+h5
+  font-size: 18px
+
+a
+  color: #0099ff
+  margin: 0
+  padding: 0
+  vertical-align: baseline
+  &:hover
+    text-decoration: none
+    color: #ff6600
+  &:visited
+    color: purple
+
+  //ul, ol {
+  //    padding: 0;
+  //    margin: 0;
+  //}
+
+li
+  line-height: 24px
+  ul
+    margin-left: 24px
+
+p, ul, ol
+  font-size: 16px
+  line-height: 24px
+  //max-width: 540px;
+
+pre
+  padding: 5px 10px
+  max-width: 800px
+  white-space: pre-wrap
+  background-color: #eee
+
+code
+  font-family: Consolas, Monaco, Andale Mono, monospace
+  line-height: 1.5
+  font-size: 13px
+  background-color: #eee
+
+p
+  padding: 2px
+  margin: 2px
+
+aside
+  display: block
+  float: right
+  width: 390px
+
+blockquote
+  border-left: .5em solid #eee
+  padding: 0 2em
+  margin-left: 0
+  max-width: 476px
+  cite
+    font-size: 14px
+    line-height: 20px
+    color: #bfbfbf
+  cite:before
+    content: '\2014 \00A0'
+  p
+    color: #666
+    max-width: 460px
+
+hr
+  width: 540px
+  text-align: left
+  margin: 0 auto 0 0
+  color: #999

data/spec/lib/rack/server_pages_spec.rb

@@ -1,9 +1,15 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+begin
+require 'ruby-debug'
+require 'tapp'
+rescue LoadError
+end
 
 describe 'Rack::ServerPages' do
   describe 'Basic requests' do
     before { get path_info }
     subject { last_response }
+    let(:content_type) { 'text/html' }
 
     should_be_ok        '/'
     should_be_not_found '/hoge'
@@ -24,6 +30,13 @@ describe 'Rack::ServerPages' do
     should_be_ok        '/examples/index.html'
     should_be_not_found '/examples/index.htm'
     should_be_not_found '/examples/.htaccess'
+
+    context 'content-type: text/css' do
+      let(:content_type) { 'text/css' }
+      should_be_ok        '/betty'
+      should_be_ok        '/betty.css'
+      should_be_ok        '/betty.css.sass'
+    end
   end
 
   describe 'Rack::ServerPages private methods' do

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ def should_be_ok(path)
   context "GET #{path}" do
     let(:path_info) { path }
     it { should be_ok }
-    its(:content_type) { should match %r{\btext/html\b} }
+    its(:content_type) { should match %r!\b#{content_type}\b! }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-server-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-31 00:00:00.000000000Z
+date: 2012-01-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70102886225200 !ruby/object:Gem::Requirement
+  requirement: &70252865364220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102886225200
+  version_requirements: *70252865364220
 description: ! "Rack middleware and appilcation for serving dynamic pages in very
   simple way.\n                     There are no controllers and no models, just only
   views like a asp, jsp and php!"
@@ -41,12 +41,13 @@ files:
 - config.ru
 - lib/rack-server-pages.rb
 - lib/rack/server_pages.rb
+- lib/rack/server_pages/sample_helper.rb
 - public/README.erb
 - public/_layout.html.erb
 - public/index.html
 - public/info.php
 - public/sample.erb
-- public/style.css
+- public/style.css.sass
 - rack-server-pages.gemspec
 - spec/lib/rack/server_pages_spec.rb
 - spec/spec_helper.rb

data/public/style.css

@@ -1,106 +0,0 @@
-body{
-    margin: 0 auto;
-    font-family: Georgia, Palatino, serif;
-    color: #444444;
-    line-height: 1;
-    max-width: 960px;
-    padding: 30px;
-}
-h1, h2, h3, h4 {
-    color: #111111;
-    font-weight: 400;
-}
-h1, h2, h3, h4, h5, p {
-    margin-bottom: 24px;
-    padding: 0;
-}
-h1 {
-    font-size: 48px;
-}
-h2 {
-    font-size: 36px;
-    margin: 24px 0 6px;
-}
-h3 {
-    font-size: 24px;
-}
-h4 {
-    font-size: 21px;
-}
-h5 {
-    font-size: 18px;
-}
-a {
-    color: #0099ff;
-    margin: 0;
-    padding: 0;
-    vertical-align: baseline;
-}
-a:hover {
-    text-decoration: none;
-    color: #ff6600;
-}
-a:visited {
-    color: purple;
-}
-/*ul, ol {
-    padding: 0;
-    margin: 0;
-}*/
-li {
-    line-height: 24px;
-}
-li ul, li ul {
-    margin-left: 24px;
-}
-p, ul, ol {
-    font-size: 16px;
-    line-height: 24px;
-    /*max-width: 540px;*/
-}
-pre {
-    padding: 5px 10px;
-    max-width: 800px;
-    white-space: pre-wrap;
-    background-color: #eee;
-}
-code {
-    font-family: Consolas, Monaco, Andale Mono, monospace;
-    line-height: 1.5;
-    font-size: 13px;
-    background-color: #eee;
-}
-p {
-    padding: 2px;
-    margin: 2px;
-}
-aside {
-    display: block;
-    float: right;
-    width: 390px;
-}
-blockquote {
-    border-left:.5em solid #eee;
-    padding: 0 2em;
-    margin-left:0;
-    max-width: 476px;
-}
-blockquote  cite {
-    font-size:14px;
-    line-height:20px;
-    color:#bfbfbf;
-}
-blockquote cite:before {
-    content: '\2014 \00A0';
-}
-
-blockquote p {  
-    color: #666;
-    max-width: 460px;
-}
-hr {
-    width: 540px;
-    text-align: left;
-    margin: 0 auto 0 0;
-    color: #999;
-}