scharfie-bones 0.2.6.1 → 0.2.7

data/lib/bones/bones.rb

@@ -64,7 +64,7 @@ class Bones
   def self.reset
     @pages_path = @layouts_path = @root = @base = nil
   end
-  
+
   # Process incoming request (for real this time!)
   def call(env)
     # Grab the request
@@ -72,7 +72,8 @@ class Bones
     
     # Create a new template for the given path
     # and compile it
-    template = Template.new(request.path_info)
+    
+    template = Template.new(Template.template_for_request(request))
     template.request = request
     output   = template.compile
 

data/lib/bones/cache.rb

@@ -141,8 +141,9 @@ class Bones
     end
     
     def process_page(page)
-      template = Bones::Template.new(page)
-      template.request = generate_mock_request(:path_info => page)
+      request = generate_mock_request(page)
+      template = Bones::Template.new(Bones::Template.template_for_request(request))
+      template.request = request
       process_template(template.compile)
     end
     
@@ -184,8 +185,8 @@ class Bones
       end    
     end    
 
-    def generate_mock_request(options={})
-      OpenStruct.new(options)
+    def generate_mock_request(path, options={})
+      Rack::Request.new(Rack::MockRequest.env_for(path, options))
     end
   end
 end

data/lib/bones/proxy.rb

@@ -16,4 +16,4 @@ class Bones
       force_load 'Bones' => File.join(File.dirname(__FILE__), '..', 'bones.rb')
     end
   end  
-end
+end

data/lib/bones/template.rb

@@ -25,7 +25,11 @@ class Bones
         include klass.constantize
       end
     end
-    
+
+    def self.template_for_request(request)
+      request.path_info
+    end
+
     # Load the helpers
     include_helpers if Bones.booted?
     
@@ -73,19 +77,22 @@ class Bones
       @layout
     end
     
-    # Compiles the template (along with the layout
-    # if necessary)
-    def compile
-      # go away, favicon requests
-      return String.new if File.basename(filename) =~ /^favicon.ico/
-      
+    def source
       unless File.exist?(filename)
         raise "Template missing\n#{filename}"
       end
       
       src = ERB.new(File.read(filename)).src
       src = (local_assigns_source || '') + (src || '')
-      @content_for_layout = eval(src)
+    end
+
+    # Compiles the template (along with the layout
+    # if necessary)
+    def compile
+      # go away, favicon requests
+      return String.new if File.basename(filename) =~ /^favicon.ico/
+      
+      @content_for_layout = eval(source)
       
       if layout && File.file?(layout_filename)
         erb = ERB.new(File.read(layout_filename))
@@ -126,4 +133,4 @@ class Bones
       template.compile
     end
   end  
-end
+end

data/lib/tasks/bones.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), '../bones.rb')
-
+# require File.join(File.dirname(__FILE__), '../bones.rb')
 task :default => :server
 
 desc "Start bones server"

data/pushables/boot.rb

@@ -4,6 +4,7 @@ if File.file?(vendor_bones)
   require vendor_bones
 else
   require 'rubygems'
+  gem      'scharfie-bones', '0.2.7'
   require 'bones'
 end
   

data/pushables/config.ru

@@ -2,4 +2,4 @@ require File.join(File.dirname(__FILE__), 'boot.rb')
 use Rack::CommonLogger
 use Rack::ShowExceptions
 use Bones::Static
-run Bones::Proxy.new
+run Bones.new

data/scharfie-bones.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = "scharfie-bones"
-  s.version     = "0.2.6.1"
-  s.date        = "2011-02-15"
+  s.version     = "0.2.7"
+  s.date        = "2011-02-21"
   s.authors     = ["Chris Scharf", "Ryan Heath"]
   s.email       = "scharfie@gmail.com"
 

data/test/test_template.rb

@@ -3,10 +3,22 @@ require File.dirname(__FILE__) + '/test_helper'
 context "Bones Template" do
   uses_example_site
   
+  def mock_request_for(path, options={})
+    Rack::Request.new(Rack::MockRequest.env_for(path, options))
+  end
+
   setup do
     @template = Bones::Template.new('')
   end
 
+  test ".template_for_request" do
+    @request = mock_request_for("/about-something")
+    assert_include Bones::Template.template_for_request(@request), 'about-something'
+
+    @request = mock_request_for('/things/whatever')
+    assert_include Bones::Template.template_for_request(@request), 'things/whatever'
+  end
+
   test "should return proper filename for top-level files" do
     @template.path = 'about'
     assert_include @template.filename, '/about.html.erb'
@@ -71,4 +83,4 @@ context "Bones template 'about'" do
     
     assert 'Chris', @template.instance_variable_get(:@content_for_name)
   end
-end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scharfie-bones
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  - 1
-  version: 0.2.6.1
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Chris Scharf
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-02-21 00:00:00 -05:00
 default_executable: bones
 dependencies: 
 - !ruby/object:Gem::Dependency