scharfie-bones 0.2.3 → 0.2.4

data/bin/bones

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '../lib/boot')
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bones/boot.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bones/initializer.rb'))
 path = ARGV.shift
 
 if path.nil?

data/lib/bones.rb

@@ -1,74 +1 @@
-# Bones - the _real_ request handler,
-# which BonesProxy loads and calls upon to
-# do the dirty work.
-class Bones
-  class << self
-    attr_accessor :base, :root
-    attr_accessor :system_path, :pages_path, :layouts_path
-    attr_accessor :booted
-    
-    def base
-      @base || ''
-    end
-    
-    # Path to the root of the bones project
-    # Defaults to current directory
-    def root
-      @root ||= File.expand_path(File.dirname(__FILE__) + '/../../')
-    end
-    
-    # Path to the bones system files
-    # Defaults to the directory containing this file
-    def system_path
-      @system_path ||= File.expand_path(File.dirname(__FILE__))
-    end
-    
-    # Path to the directory containing the page templates
-    #   [root]/pages
-    def pages_path
-      @pages_path || root / 'pages'
-    end
-    
-    # Path to the directory containing the layout templates
-    #   [root]/layouts
-    def layouts_path
-      @layouts_path || root / 'layouts'
-    end
-    
-    def booted?
-      @booted
-    end
-  end
-  
-  # Resets root, pages, and layouts paths and the base setting
-  def self.reset
-    @pages_path = @layouts_path = @root = @base = nil
-  end
-  
-  # Process incoming request (for real this time!)
-  def call(env)
-    # Grab the request
-    request  = Rack::Request.new(env) 
-    
-    # Create a new template for the given path
-    # and compile it
-    template = Template.new(request.path_info)
-    template.request = request
-    output   = template.compile
-
-    # Build a rack response
-    # Rack::Response.new.finish do |response|
-    #   response.write output
-    # end    
-    [200, { 'Content-Type' => 'text/html'}, output]
-  end
-  
-  # Returns array of all pages (excluding partials)
-  def self.pages
-    Dir.chdir(Bones.pages_path) do
-      Dir.glob('**/*.html.erb').map do |f|
-        f.starts_with?('_') ? nil : f.gsub('.html.erb', '')
-      end.compact
-    end
-  end  
-end
+require File.join(File.dirname(__FILE__), "bones/bones.rb")

data/lib/bones/bones.rb

@@ -0,0 +1,73 @@
+# Bones - the _real_ request handler,
+# which BonesProxy loads and calls upon to
+# do the dirty work.
+class Bones
+  class << self
+    attr_accessor :base, :root
+    attr_accessor :system_path, :pages_path, :layouts_path
+    attr_accessor :booted
+    
+    def base
+      @base || ''
+    end
+    
+    # Path to the root of the bones project
+    def root
+      @root ||= Pathname.new(__FILE__).dirname.dirname.expand_path.to_s
+    end
+    
+    # Path to the bones system files
+    # Defaults to the lib
+    def system_path
+      @system_path ||= Pathname.new(__FILE__).dirname.dirname.expand_path.to_s
+    end
+    
+    # Path to the directory containing the page templates
+    #   [root]/pages
+    def pages_path
+      @pages_path || root / 'pages'
+    end
+    
+    # Path to the directory containing the layout templates
+    #   [root]/layouts
+    def layouts_path
+      @layouts_path || root / 'layouts'
+    end
+    
+    def booted?
+      @booted
+    end
+  end
+  
+  # Resets root, pages, and layouts paths and the base setting
+  def self.reset
+    @pages_path = @layouts_path = @root = @base = nil
+  end
+  
+  # Process incoming request (for real this time!)
+  def call(env)
+    # Grab the request
+    request  = Rack::Request.new(env) 
+    
+    # Create a new template for the given path
+    # and compile it
+    template = Template.new(request.path_info)
+    template.request = request
+    output   = template.compile
+
+    # Build a rack response
+    # Rack::Response.new.finish do |response|
+    #   response.write output
+    # end    
+    [200, { 'Content-Type' => 'text/html'}, output]
+  end
+  
+  # Returns array of all pages (excluding partials)
+  def self.pages
+    Dir.chdir(Bones.pages_path) do
+      Dir.glob('**/*.html.erb').map do |f|
+        f.starts_with?('_') ? nil : f.gsub('.html.erb', '')
+      end.compact
+    end
+  end  
+end

data/lib/{boot.rb → bones/boot.rb}

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'activesupport'
 require 'rack'
-require File.join(File.dirname(__FILE__), 'bones.rb')
-require File.join(File.dirname(__FILE__), 'extensions.rb')
+require 'pathname'
+require Pathname.new(__FILE__).dirname.join('bones.rb')
+require Pathname.new(__FILE__).dirname.join('extensions.rb')
 
 ActiveSupport::Dependencies.load_paths.push Bones.system_path
 $:.push Bones.system_path

data/lib/bones/template.rb

@@ -85,7 +85,7 @@ class Bones
       
       src = ERB.new(File.read(filename)).src
       src = (local_assigns_source || '') + (src || '')
-      @content_for_layout = eval(src) # erb.result(binding)
+      @content_for_layout = eval(src)
       
       if layout && File.file?(layout_filename)
         erb = ERB.new(File.read(layout_filename))
@@ -118,7 +118,7 @@ class Bones
     # the '_footer.html.erb' template.
     def partial(name, options={})
       path = name.to_s.split('/')
-      path[-1] = '_' + path.last unless path.last.starts_with?('_')
+      path.last.gsub!(/^([^_])/, '_\1')
       name = path.join('/')
       template = Template.new(name, false, options)
       template.request = request

data/lib/tasks/bones.rb

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

data/pushables/boot.rb

@@ -1,11 +1,11 @@
-bones_boot = File.join(File.dirname(__FILE__), 'bones', 'lib', 'boot.rb')
+bones_boot = File.join(File.dirname(__FILE__), 'vendor/bones/lib/bones/boot.rb')
 
 if File.file?(bones_boot)
   require bones_boot
 else
   require 'rubygems'
   require 'bones'
-  require 'boot'
+  require 'bones/boot'
 end
   
 Bones.root = File.expand_path(File.dirname(__FILE__))

data/scharfie-bones.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = "scharfie-bones"
-  s.version     = "0.2.3"
-  s.date        = "2009-04-20"
+  s.version     = "0.2.4"
+  s.date        = "2009-10-24"
   s.authors     = ["Chris Scharf", "Ryan Heath"]
   s.email       = "scharfie@gmail.com"
 
@@ -28,9 +28,10 @@ Gem::Specification.new do |s|
     'lib/bones/static.rb',
     'lib/bones/template.rb',
     'lib/bones/versioned_release.rb',
+    'lib/bones/bones.rb',
+    'lib/bones/boot.rb',
+    'lib/bones/extensions.rb',
     'lib/bones.rb',
-    'lib/boot.rb',
-    'lib/extensions.rb',
     'lib/helpers',
     'lib/helpers/application_helper.rb',
     'lib/helpers/core_helper.rb',
@@ -52,7 +53,8 @@ Gem::Specification.new do |s|
     'test/example_site/pages/about.html.erb',
     'test/example_site/pages/index.html.erb',
     'test/example_site/pages/partials',
-    'test/example_site/pages/partials/_footer.html.erb',
+    'test/example_site/pages/partials/common',
+    'test/example_site/pages/partials/common/_footer.html.erb',
     'test/example_site/pages/things',
     'test/example_site/pages/things/a.html.erb',
     'test/example_site/public',

data/test/example_site/layouts/example_layout.html.erb

@@ -1,3 +1,4 @@
 Example Layout
 <%= yield %>
 <%= yield :name %>
+<%= partial 'partials/common/footer' %>

data/test/example_site/pages/index.html.erb

@@ -4,6 +4,6 @@
 </head>
 <body>  
   <a href="/things/a">Thing A</a>
-  <form action="/comment"></form> 
+  <form action="/comment"></form>
 </body>
 </html>

data/test/test_bones.rb

@@ -2,10 +2,10 @@ require File.dirname(__FILE__) + '/test_helper'
 
 context 'Bones' do
   test "should have proper paths" do
-    assert_equal relative_path('../..'),         Bones.root
-    assert_equal relative_path('../lib'),        Bones.system_path
-    assert_equal relative_path('../../pages'),   Bones.pages_path
-    assert_equal relative_path('../../layouts'), Bones.layouts_path
+    assert_equal relative_path('../lib'),         Bones.root
+    assert_equal relative_path('../lib'),         Bones.system_path
+    assert_equal relative_path('../lib/pages'),   Bones.pages_path
+    assert_equal relative_path('../lib/layouts'), Bones.layouts_path
   end
   
   test "should allow getting/setting Bones.base" do

data/test/test_cache.rb

@@ -14,6 +14,23 @@ context "Bones::Cache with default options" do
     assert_include @page, 'href="/things/a.html"'
   end
 end
+
+context 'Bones::Cache with default options, layout' do
+  uses_example_site
+  
+  setup do
+    @cache = Bones::Cache.new
+    @page = @cache.process_page('about')
+  end
+  
+  test "should have layout" do
+    assert_include @page, 'Example Layout'
+  end
+
+  test "should have footer" do
+    assert_include @page, 'Footer text'
+  end
+end
   
 context "Bones::Cache with custom base" do
   uses_example_site

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 $:.unshift(File.dirname(__FILE__) + '/../')
-require 'lib/boot'
+require 'lib/bones/boot'
 require 'test/unit'
 
 class String
@@ -18,8 +18,7 @@ end
 
 def context(name, &block)
   Object.const_set(name.to_s.to_test_class_name, Class.new(Test::Unit::TestCase, &block))
-end 
-
+end
 
 class Test::Unit::TestCase
   class << self; attr_accessor :bones_root; end
@@ -38,7 +37,7 @@ class Test::Unit::TestCase
   # end
   
   def self.uses_example_site
-    self.bones_root = File.expand_path(File.dirname(__FILE__) / 'example_site')
+    self.bones_root = Pathname.new(__FILE__).dirname.join('example_site').expand_path.to_s
   end
 
   def run_with_bones_root(*args, &block)
@@ -56,10 +55,11 @@ class Test::Unit::TestCase
   end
   
   def relative_path(path)
-    File.expand_path(File.dirname(__FILE__) / path)
+    Pathname.new(__FILE__).dirname.join(path).expand_path.to_s
   end
   
   def assert_include(collection, obj, message=nil)
+    message ||= "expected #{collection.inspect} to include #{obj.inspect}"
     assert collection.include?(obj), message
   end
 end

data/test/test_template.rb

@@ -31,8 +31,9 @@ context "Bones Template" do
     assert_include @template.some_custom_helper, 'Some custom helper'
   end
   
-  test "should render partial partials/footer" do
-    assert_include @template.partial('partials/footer'), 'Footer text'
+  test "should render partial partials/common/footer" do
+    # @template.layout = 'example_layout'
+    assert_include @template.partial('partials/common/footer'), 'Footer text'
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scharfie-bones
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Chris Scharf
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -04:00
+date: 2009-10-24 00:00:00 -04:00
 default_executable: bones
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,10 @@ files:
 - lib/bones/static.rb
 - lib/bones/template.rb
 - lib/bones/versioned_release.rb
+- lib/bones/bones.rb
+- lib/bones/boot.rb
+- lib/bones/extensions.rb
 - lib/bones.rb
-- lib/boot.rb
-- lib/extensions.rb
 - lib/helpers/application_helper.rb
 - lib/helpers/core_helper.rb
 - lib/layouts/application.html.erb
@@ -67,7 +68,7 @@ files:
 - test/example_site/layouts/example_layout.html.erb
 - test/example_site/pages/about.html.erb
 - test/example_site/pages/index.html.erb
-- test/example_site/pages/partials/_footer.html.erb
+- test/example_site/pages/partials/common/_footer.html.erb
 - test/example_site/pages/things/a.html.erb
 - test/example_site/public/images/.gitignore
 - test/example_site/public/javascripts/.gitignore