scharfie-bones 0.1.5 → 0.2.0

data/Rakefile

@@ -0,0 +1,11 @@
+require 'rake'
+require 'rake/testtask'
+
+task :default => :test
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end

data/bin/bones

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-# $:.unshift(File.dirname(__FILE__) + '/../')
-require 'fileutils'
-
+require File.join(File.dirname(__FILE__), '../lib/boot')
 path = ARGV.shift
 
 if path.nil?
@@ -13,10 +11,4 @@ end
 path = File.expand_path(path)
 FileUtils.mkdir(path) unless File.directory?(path)
 
-# Set the root to the path
-ROOT = path
-
-require 'boot.rb'
-require 'init.rb'
-
-BonesInitializer.run
+Bones::Initializer.run(path)

data/bones.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = "bones"
-  s.version     = "0.1.5"
-  s.date        = "2009-02-04"
+  s.version     = "0.2.0"
+  s.date        = "2009-02-05"
   s.authors     = ["Chris Scharf", "Ryan Heath"]
   s.email       = "scharfie@gmail.com"
 
@@ -12,26 +12,59 @@ Gem::Specification.new do |s|
   s.has_rdoc    = false
 	
   s.require_paths      = ['lib']	
-  s.default_executable = 'bones'
   s.executables        = ['bones']
+  s.default_executable = 'bones'
   
   s.files = [ 
-    'README',
-    'lib/Rakefile',
+    'bin',
     'bin/bones',
-    'lib/bones.rb',
+    'bones.gemspec',
+    'lib/bones',
+    'lib/bones/cache.rb',
+    'lib/bones/initializer.rb',
     'lib/bones/release.rb',
+    'lib/bones/template.rb',
+    'lib/bones/versioned_release.rb',
+    'lib/bones.rb',
     'lib/boot.rb',
-    'lib/cache.rb',
     'lib/extensions.rb',
     'lib/helpers',
     'lib/helpers/core_helper.rb',
-    'lib/init.rb',
     'lib/pages/directory.html.erb',
     'lib/pages/intro.html.erb',
+    'lib/Rakefile',
     'lib/server.rb',
+    'lib/tasks',
     'lib/tasks/bones.rb',
-    'bones.gemspec'
+    'Rakefile',
+    'README',
+    'test',
+    'test/example_site',
+    'test/example_site/helpers',
+    'test/example_site/helpers/custom_helper.rb',
+    'test/example_site/layouts',
+    'test/example_site/layouts/example_layout.html.erb',
+    'test/example_site/pages',
+    '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/things',
+    'test/example_site/pages/things/a.html.erb',
+    'test/example_site/public',
+    'test/example_site/public/images',
+    'test/example_site/public/images/.gitignore',
+    'test/example_site/public/javascripts',
+    'test/example_site/public/javascripts/.gitignore',
+    'test/example_site/public/stylesheets',
+    'test/example_site/public/stylesheets/.gitignore',
+    'test/example_site/public/videos',
+    'test/example_site/public/videos/.gitignore',
+    'test/test_bones.rb',
+    'test/test_cache.rb',
+    'test/test_template.rb',
+    'test/test_example_site.rb',
+    'test/test_helper.rb'
   ]
 
   # Dependencies

data/lib/Rakefile

@@ -1,3 +1,14 @@
-require 'rubygems'
-require 'bones'
+# Bones
+bones_boot = File.join(File.dirname(__FILE__), 'bones', 'boot.rb')
+
+if File.file?(bones_boot)
+  require bones_boot
+else
+  require 'rubygems'
+  require 'bones'
+end
+  
+Bones.root = File.expand_path('.')
+
+require 'rake'
 require 'tasks/bones'

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

@@ -1,9 +1,3 @@
-#!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'boot')
-require 'fileutils'
-require 'optparse'
-require 'ostruct'
-
 class Bones
   class Cache
     class Options
@@ -21,10 +15,13 @@ class Bones
           method = "#{k}=".to_sym
           send(method, v) if respond_to?(method)
         end
+        
+        self
       end
   
       # Process arguments
       def self.process(args)
+        args = [] if args.blank?
         options = new
     
         OptionParser.new do |o|
@@ -72,7 +69,7 @@ class Bones
       end
       
       def default_destination
-        File.expand_path(ROOT / 'public')
+        File.expand_path(Bones.root / 'public')
       end
   
       # Returns true if the versions enabled
@@ -94,7 +91,14 @@ class Bones
     attr_accessor :options
     
     def initialize(options=nil)
-      self.options = Options === options ? options : Options.process(options)
+      self.options = case options
+      when Hash
+        Options.new.merge(options)
+      when Options
+        options
+      else  
+        Options.process(options)
+      end  
     end
     
     def self.run(options=nil)
@@ -105,7 +109,7 @@ class Bones
       version = options.versioned? ? options.release.versioned_directory_name : nil
       
       # Process each page
-      Dir.chdir(ROOT) do
+      Dir.chdir(Bones.root) do
         puts "** Note: No files/directories will be modified (noop flag)" if options.noop        
         puts "** Writing to: #{options.destination}"
         puts "** Using base: #{options.base}" unless options.base.blank?
@@ -115,14 +119,9 @@ class Bones
         pages.each_with_index do |page, index|
           print  "\r     %-70s (%4d/%4d)" % [[version, page].compact.join('/') + '.html', index + 1, total]
           $stdout.flush
-          template = Bones::Template.new(page)
-          template.request = generate_mock_request(:path_info => page)
-          result = template.compile
-          result.gsub!(/(href|src|action|url)(="|\()([-A-Za-z0-9_\.\/]+)([^:]*?)("|\))/) do |match|
-            property, url, params = $1, normalize_url(original_url = $3, options.base), $4
-            property =~ /url/ ? 'url(%s%s)' % [url, params] : '%s="%s%s"' % [property, url, params]
-          end
-          path = options.destination / page + '.html'
+          
+          result = process_page(page)
+          path   = options.destination / page + '.html'
           
           unless options.noop
             FileUtils.mkdir_p(File.dirname(path))
@@ -136,15 +135,24 @@ class Bones
           puts "** Copying public files"
           options.release.copy_public_directories unless options.noop
         end
-  
-        # puts "** Cached to: #{options.destination}" 
-        # puts "** Using base: #{options.base}" unless options.base.blank?
-        # puts "** Note: No files/directories were modified (noop flag)" if options.noop
       end
 
       puts "** Done."      
     end
     
+    def process_page(page)
+      template = Bones::Template.new(page)
+      template.request = generate_mock_request(:path_info => page)
+      process_template(template.compile)
+    end
+    
+    def process_template(result)
+      result.gsub(/(href|src|action|url)(="|\()([-A-Za-z0-9_\.\/]+)([^:]*?)("|\))/) do |match|
+        property, url, params = $1, normalize_url(original_url = $3), $4
+        property =~ /url/ ? 'url(%s%s)' % [url, params] : '%s="%s%s"' % [property, url, params]
+      end      
+    end
+    
     # Fixes the given URL path to begin at given base.
     # In addition, the .html extension will be added if
     # the path is a page.
@@ -152,7 +160,7 @@ class Bones
     # For example, if the base is /some_folder,
     #   normalize_url('/page_path', '/some_folder')
     #   # => /some_folder/page_path.html
-    def normalize_url(path, base='')
+    def normalize_url(path)
       @known_pairs ||= {}
       @public_directories_regex ||= Regexp.new(public_directories.join('|'))
   
@@ -161,16 +169,18 @@ class Bones
       else
         value = case
         when path =~ /^(\w{3,}:\/\/|mailto)/
+          # don't do anything to this type of URL
           return path
         when path =~ @public_directories_regex
           path
         when File.directory?('pages' / path)
           path
         else
-          path + '.html'
+          # don't add .html if there's already an extension
+          path =~ /\..+/ ? path : path + '.html'
         end
-    
-        @known_pairs[path] = base / value
+        
+        @known_pairs[path] = options.base / value
       end    
     end    
 

data/lib/bones/initializer.rb

@@ -0,0 +1,74 @@
+class Bones
+  class Initializer
+    def self.relative_path(path)
+      path.gsub(Bones.root + '/', '')
+    end
+    
+    def self.ensure_file(path, &block)
+      return if File.exist?(path)
+      puts "** Writing #{relative_path(path)}"
+      File.open(path, 'w', &block)
+    end
+
+    def self.ensure_directory(path)
+      return nil if File.directory?(path)
+      puts "** Directory #{relative_path(path)}"
+      FileUtils.mkdir_p(path)  
+      return true
+    end
+
+    def self.run(root=nil)
+      Bones.root = root
+      
+      puts "** Initializing"
+      puts "** Directory: #{Bones.root}"
+
+      ensure_directory(Bones.root / 'public' / 'javascripts')
+      ensure_directory(Bones.root / 'public' / 'stylesheets')
+      pages_new = ensure_directory(Bones.root / 'pages')
+      ensure_directory(Bones.root / 'layouts')
+      ensure_directory(Bones.root / 'helpers')
+
+      if pages_new
+        ensure_file(Bones.root / 'pages' / 'index.html.erb') do |f|
+          f.write File.read(Bones.system_path / 'pages' / 'intro.html.erb')
+        end
+      end  
+
+      ensure_file(Bones.root / 'layouts' / 'application.html.erb') do |f|
+        f.write <<-HTML
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+      <html>
+      <head>
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+        <title>Welcome to bones</title>
+        <%= stylesheet_link_tag 'styles' %>
+        <%= javascript_include_tag %>
+      </head>  
+      <body>
+        <h1>Welcome to <strong>bones</strong></h1>
+        <%= @content_for_layout %>
+      </body>
+      </html>  
+        HTML
+      end
+
+      ensure_file(Bones.root / 'public' / 'stylesheets' / 'styles.css')
+
+      ensure_file(Bones.root / 'Rakefile') do |f|
+        puts "** Adding Rakefile to parent directory"
+        f.write File.read(Bones.system_path / 'Rakefile')
+      end
+
+      puts <<-HELP if __FILE__ == $0
+
+       All set! Now just run:
+         rake server
+ 
+       The app will run on port 3000
+ 
+      HELP
+    end
+  end
+end

data/lib/bones/release.rb

@@ -15,61 +15,14 @@ class Bones
     end
     
     def original_destination
-      @original_destination || (ROOT / 'public')
+      @original_destination || (Bones.root / 'public')
     end
   
     # Copies all public directories to the new release directory
     def copy_public_directories
       public_directories.each do |src|
-        FileUtils.copy_entry ROOT / 'public' / src, destination / src
+        FileUtils.copy_entry Bones.root / 'public' / src, destination / src
       end
     end  
   end
-
-  # Class used to encapsulate the logic needed to
-  # maintain mockup versions
-  class VersionedRelease < Release
-    # Pre-fix used for versioned directories
-    DIR_PREFIX = 'v'
-  
-    def initialize(original_destination, release_destination = nil)
-      super
-      @release_destination = get_versioned_destination
-    end
-    
-    # Returns the versioned directories within the 'public' folder
-    # $> Bones::Versioned.directories
-    # $> => ["/v1", "/v2", ... "/vN"]
-    def self.directories(base=nil)
-      base ||= ROOT / 'public'
-      FileUtils.mkdir_p(base) unless File.directory?(base)
-      Dir.chdir(base) do
-        Dir.glob("#{DIR_PREFIX}**").inject([]) do |dirs, dir|
-          dirs << '/' + File.basename(dir)
-        end  
-      end
-    end
-  
-    # Public accessor of version
-    def version
-      next_version
-    end
-  
-    # Returns directory name of versioned path
-    # For example, 'v1'
-    def versioned_directory_name
-      DIR_PREFIX + next_version
-    end
-
-  private
-    # increments to the next version based on existing versions
-    def next_version
-      (self.class.directories(original_destination).size + 1).to_s
-    end
-  
-    # constructs the next version path
-    def get_versioned_destination
-      original_destination / versioned_directory_name
-    end
-  end
 end

data/lib/bones/template.rb

@@ -0,0 +1,118 @@
+class Bones
+  # Template - loads template file based on
+  # request path information and compiles
+  # it using ERB
+  class Template
+    attr_accessor :path
+    attr_accessor :layout
+    attr_accessor :options
+    attr_accessor :request
+    
+    # Returns array of all helper files that should
+    # be included
+    def self.helpers_to_include
+      files = [
+        Dir.glob(Bones.system_path / 'helpers/*_helper.rb'),
+        Dir.glob(Bones.root / 'helpers/*_helper.rb')
+      ].flatten
+    end
+    
+    # Load all available helpers
+    def self.include_helpers
+      helpers_to_include.each do |filename|
+        klass = File.basename(filename, '.rb').camelize
+        force_load klass => filename
+        include klass.constantize
+      end
+    end
+    
+    # Load the helpers
+    include_helpers if Bones.booted?
+    
+    # Initialize template with path and optional layout
+    def initialize(path, layout=-1, options={})
+      @path    = path.gsub(/\.html|\.html\.erb/, '')
+      @layout  = layout == -1 ? 'application' : layout
+      @options = options
+      
+      self.class.include_helpers
+    end
+    
+    def inspect
+      '#<Bones::Template @path="%s" @layout="%s">' % [path, layout]
+    end
+    
+    # Full path to template file
+    def filename
+      if self.path =~ /raw$/
+        layout false
+        Bones.system_path / 'pages' / 'directory.html.erb'
+      else
+        path = Bones.pages_path / @path
+        path /= 'index' if File.directory?(path) or path.ends_with?('/')
+        path += '.html.erb'
+      end
+    end
+    
+    # Returns array of pages
+    def pages
+      Bones.pages
+    end
+    
+    # Full path to layout file
+    def layout_filename
+      Bones.layouts_path / layout.to_s + '.html.erb'
+    end
+    
+    # Gets/sets layout
+    # If no argument is passed, the layout is returned;
+    # otherwise, sets the layout 
+    # (use false or nil to turn off the layout)
+    def layout(arg=-1)
+      @layout = arg unless arg == -1
+      @layout
+    end
+    
+    # Compiles the template (along with the layout
+    # if necessary)
+    def compile
+      src = ERB.new(File.read(filename)).src
+      src = (local_assigns_source || '') + (src || '')
+      @content_for_layout = eval(src) # erb.result(binding)
+      
+      if layout && File.file?(layout_filename)
+        erb = ERB.new(File.read(layout_filename))
+        erb.result(binding)
+      else
+        @content_for_layout
+      end  
+    end
+    
+    # Generates source for local variable assignments
+    def local_assigns_source
+      src = []
+      (options[:locals] || {}).each do |key, value|
+        src << "#{key} = #{value.inspect};\n"
+      end
+      src.join
+    end
+    
+    # Short-hand for compiling a template
+    def self.compile(*args)
+      Template.new(*args).compile
+    end
+    
+    # Renders partial template - an underscore
+    # is automatically added to the passed name,
+    # so <%= partial 'footer' %> will render
+    # the '_footer.html.erb' template.
+    def partial(name, options={})
+      path = name.to_s.split('/')
+      path[-1] = '_' + path.last unless path.last.starts_with?('_')
+      name = path.join('/')
+      template = Template.new(name, false, options)
+      template.request = request
+      template.compile
+    end
+  end  
+end

data/lib/bones/versioned_release.rb

@@ -0,0 +1,49 @@
+class Bones
+  # Class used to encapsulate the logic needed to
+  # maintain mockup versions
+  class VersionedRelease < Release
+    # Pre-fix used for versioned directories
+    DIR_PREFIX = 'v'
+  
+    def initialize(original_destination, release_destination = nil)
+      super
+      @release_destination = get_versioned_destination
+    end
+    
+    # Returns the versioned directories within the 'public' folder
+    # $> Bones::Versioned.directories
+    # $> => ["/v1", "/v2", ... "/vN"]
+    def self.directories(base=nil)
+      base ||= Bones.root / 'public'
+      FileUtils.mkdir_p(base) unless File.directory?(base)
+      Dir.chdir(base) do
+        Dir.glob("#{DIR_PREFIX}**").inject([]) do |dirs, dir|
+          dirs << '/' + File.basename(dir) if dir =~ /^#{DIR_PREFIX}\d+$/
+          dirs
+        end.compact
+      end
+    end
+  
+    # Public accessor of version
+    def version
+      next_version
+    end
+  
+    # Returns directory name of versioned path
+    # For example, 'v1'
+    def versioned_directory_name
+      DIR_PREFIX + next_version
+    end
+
+  private
+    # increments to the next version based on existing versions
+    def next_version
+      (self.class.directories(original_destination).size + 1).to_s
+    end
+  
+    # constructs the next version path
+    def get_versioned_destination
+      original_destination / versioned_directory_name
+    end
+  end  
+end

data/lib/bones.rb

@@ -3,11 +3,46 @@
 # do the dirty work.
 class Bones
   class << self
-    attr_accessor :base
+    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!)
@@ -29,124 +64,10 @@ class Bones
   
   # Returns array of all pages (excluding partials)
   def self.pages
-    Dir.chdir(PAGES) do
+    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  
-  
-  # Template - loads template file based on
-  # request path information and compiles
-  # it using ERB
-  class Template
-    attr_accessor :path
-    attr_accessor :layout
-    attr_accessor :options
-    attr_accessor :request
-    
-    # Load all available helpers
-    def self.include_helpers
-      files = [
-        Dir.glob(SYSTEM / 'helpers/*_helper.rb'),
-        Dir.glob(ROOT / 'helpers/*_helper.rb')
-      ].flatten
-      
-      # Include each helper
-      files.each do |filename|
-        klass = File.basename(filename, '.rb').camelize
-        force_load klass => filename
-        include klass.constantize
-      end
-    end
-    
-    # Load the helpers
-    include_helpers if Object.const_defined?(:SYSTEM)
-    
-    # Initialize template with path and optional layout
-    def initialize(path, layout=-1, options={})
-      @path    = path.gsub(/\.html|\.html\.erb/, '')
-      @layout  = layout == -1 ? 'application' : layout
-      @options = options
-      
-      self.class.include_helpers
-    end
-    
-    def inspect
-      '#<Bones::Template @path="%s" @layout="%s">' % [path, layout]
-    end
-    
-    # Full path to template file
-    def filename
-      if @path =~ /raw$/
-        layout false
-        path = SYSTEM / 'pages' / 'directory.html.erb'
-      else
-        path = PAGES / @path
-        path /= 'index' if File.directory?(path) or path.ends_with?('/')
-        path += '.html.erb'
-      end
-    end
-    
-    # Returns array of pages
-    def pages
-      Bones.pages
-    end
-    
-    # Full path to layout file
-    def layout_filename
-      path = LAYOUTS / layout.to_s + '.html.erb'
-    end
-    
-    # Gets/sets layout
-    # If no argument is passed, the layout is returned;
-    # otherwise, sets the layout 
-    # (use false or nil to turn off the layout)
-    def layout(arg=-1)
-      @layout = arg unless arg == -1
-      @layout
-    end
-    
-    # Compiles the template (along with the layout
-    # if necessary)
-    def compile
-      src = ERB.new(File.read(filename)).src
-      src = (local_assigns_source || '') + (src || '')
-      @content_for_layout = eval(src) # erb.result(binding)
-      
-      if layout
-        erb = ERB.new(File.read(layout_filename))
-        erb.result(binding)
-      else
-        @content_for_layout
-      end  
-    end
-    
-    # Generates source for local variable assignments
-    def local_assigns_source
-      src = []
-      (options[:locals] || {}).each do |key, value|
-        src << "#{key} = #{value.inspect};\n"
-      end
-      src.join
-    end
-    
-    # Short-hand for compiling a template
-    def self.compile(*args)
-      Template.new(*args).compile
-    end
-    
-    # Renders partial template - an underscore
-    # is automatically added to the passed name,
-    # so <%= partial 'footer' %> will render
-    # the '_footer.html.erb' template.
-    def partial(name, options={})
-      path = name.to_s.split('/')
-      path[-1] = '_' + path.last unless path.last.starts_with?('_')
-      name = path.join('/')
-      template = Template.new(name, false, options)
-      template.request = request
-      template.compile
-    end
-  end
 end

data/lib/boot.rb

@@ -1,21 +1,23 @@
-SYSTEM  = File.dirname(__FILE__)
-ROOT    = File.expand_path('.') unless Object.const_defined?(:ROOT)
-PAGES   = File.join(ROOT, 'pages')
-LAYOUTS = File.join(ROOT, 'layouts')
+require 'rubygems'
+require 'activesupport'
 
-$:.unshift(SYSTEM)
-$:.unshift(File.join(ROOT, 'lib'))
+require File.join(File.dirname(__FILE__), 'bones.rb')
+require File.join(File.dirname(__FILE__), 'extensions.rb')
+
+# Bones.root = BONES_ROOT if Object.const_defined?(:BONES_ROOT)
+ActiveSupport::Dependencies.load_paths.push << Bones.system_path
 
-require 'rubygems'
 require 'yaml'
 require 'rack'
 require 'rack/request'
 require 'rack/response'
-require 'activesupport'
-require 'extensions'
+
+require 'fileutils'
+require 'optparse'
+require 'ostruct'
 require 'erb'
-require 'bones'
-require 'bones/release'
+
+Bones.booted = true
 
 def directories(base)
   Dir.chdir(base) do
@@ -23,11 +25,11 @@ def directories(base)
       next if e =~ /^\.+$/ 
       File.directory?(base / e) ? '/' + e : nil
     end.compact
-  end  
+  end
 end
 
 def page_directories
-  directories(ROOT / 'pages')
+  directories(Bones.root / 'pages')
 end
 
 def versioned_directories
@@ -35,5 +37,5 @@ def versioned_directories
 end
 
 def public_directories
-  directories(ROOT / 'public') - page_directories - versioned_directories
+  directories(Bones.root / 'public') - page_directories - versioned_directories
 end

data/lib/server.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'boot')
-require 'init'
-
 # BonesProxy is simply a proxy class handler
 # to the actual Bones class - the reason for 
 # this is to allow live changes to Bones
@@ -22,17 +18,20 @@ end
 
 class BonesServer
   def self.run
+    statics = public_directories
+    
     app = Rack::Builder.new do
-       use Rack::CommonLogger
-       use Rack::ShowExceptions
-       use Rack::Reloader
-       use Rack::Static, :urls => public_directories, :root => ROOT / 'public'
-       run BonesProxy.new
+      use Rack::CommonLogger
+      use Rack::ShowExceptions
+      use Rack::Reloader
+      use Rack::Static, :urls => statics, :root => Bones.root / 'public'
+      run BonesProxy.new
     end
-
+    
     port = ARGV.shift || 3000
     puts "** Starting bones server on http://0.0.0.0:#{port}"
-    puts "** Public directories: #{public_directories.to_sentence}"
+    puts "** Public directories: #{statics.to_sentence}"
+    
     Rack::Handler::Mongrel.run app, :Port => port do |server|
       puts "** Use CTRL-C to stop."
     end

data/lib/tasks/bones.rb

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

data/test/example_site/helpers/custom_helper.rb

@@ -0,0 +1,5 @@
+module CustomHelper
+  def some_custom_helper
+    "Some custom helper"
+  end
+end

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

@@ -0,0 +1,2 @@
+Example Layout
+<%= @content_for_layout %>

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

@@ -0,0 +1,2 @@
+<% layout 'example_layout' %>
+<%= some_custom_helper %>

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

@@ -0,0 +1,9 @@
+<html>
+<head>
+  <link rel="stylesheet" type="text/css" src="/stylesheets/styles.css" />
+</head>
+<body>  
+  <a href="/things/a">Thing A</a>
+  <form action="/comment"></form> 
+</body>
+</html>

data/test/example_site/pages/partials/_footer.html.erb

@@ -0,0 +1 @@
+Footer text

data/test/test_bones.rb

@@ -0,0 +1,16 @@
+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
+  end
+  
+  test "should allow getting/setting Bones.base" do
+    assert_equal '', Bones.base
+    Bones.base = '/something'
+    assert_equal '/something', Bones.base
+  end
+end

data/test/test_cache.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+context "Bones::Cache with default options" do
+  uses_example_site
+  
+  setup do
+    @cache = Bones::Cache.new
+    @page = @cache.process_page('index')
+  end
+  
+  test "should process page correctly" do
+    assert_include @page, 'src="/stylesheets/styles.css"'
+    assert_include @page, 'action="/comment.html"'
+    assert_include @page, 'href="/things/a.html"'
+  end
+end
+  
+context "Bones::Cache with custom base" do
+  uses_example_site
+
+  setup do
+    @cache = Bones::Cache.new(:base => '/mysite')
+    @page = @cache.process_page('index')
+  end
+  
+  test "should process page correctly using custom base" do
+    assert_include @page, 'src="/mysite/stylesheets/styles.css"'
+    assert_include @page, 'action="/mysite/comment.html"'
+    assert_include @page, 'href="/mysite/things/a.html"'
+  end
+end
+
+context "Bones::Cache URL normalization" do
+  uses_example_site
+
+  setup do
+    @cache = Bones::Cache.new(:base => '/mysite')
+  end
+  
+  def assert_normalized(expected, actual=nil)
+    assert_equal(expected, @cache.normalize_url(actual))
+  end
+  
+  def assert_normalized_with_base(url)
+    assert_equal @cache.options.base / url, @cache.normalize_url(url)
+  end
+  
+  def assert_not_normalized(url)
+    assert_equal url, @cache.normalize_url(url)
+  end
+  
+  test "should not normalize URLs that have a protocol" do
+    assert_not_normalized "mailto:someone@example.com"
+    assert_not_normalized "http://www.example.com"
+    assert_not_normalized "ftp://ftp.example.com"
+  end
+  
+  test "should not add .html to URLs that have an extension" do
+    assert_normalized_with_base "/videos/hello.mov"
+    assert_normalized_with_base "/articles.rss"
+  end
+  
+  test "should not add .html to URLs in a public directory path" do
+    assert_normalized_with_base "/stylesheets"
+    assert_normalized_with_base "/images/spacer"
+  end
+  
+  test "should normalize URLs that match page paths" do
+    assert_normalized "/mysite/about.html", "/about"
+    assert_normalized "/mysite/things/a.html", "/things/a"
+  end
+end  

data/test/test_example_site.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+context "Bones Example Site" do
+  uses_example_site
+  
+  test "should have proper paths" do
+    assert_equal relative_path('./example_site'),         Bones.root
+    assert_equal relative_path('./example_site/pages'),   Bones.pages_path
+    assert_equal relative_path('./example_site/layouts'), Bones.layouts_path
+  end
+  
+  test "should have pages" do
+    assert 3, Bones.pages.length
+    assert ['about', 'index', 'things/a'], Bones.pages
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,68 @@
+$:.unshift(File.dirname(__FILE__) + '/../')
+require 'lib/boot'
+require 'test/unit'
+
+class String
+  def only_alphanumeric
+    self.gsub(/[^a-zA-Z0-9]/, '_').squeeze('_')
+  end
+  
+  def to_test_method_name
+    'test_' + self.downcase.only_alphanumeric
+  end
+  
+  def to_test_class_name
+    only_alphanumeric.camelize + 'Test'
+  end
+end
+
+def context(name, &block)
+  Object.const_set(name.to_s.to_test_class_name, Class.new(Test::Unit::TestCase, &block))
+end 
+
+
+class Test::Unit::TestCase
+  class << self; attr_accessor :bones_root; end
+  
+  def self.test(name, &block)
+    define_method(name.to_test_method_name, &block)
+  end
+  
+  def self.setup(&block)
+    define_method(:setup, &block)
+  end
+
+  # def self.reset_bones
+  #   Bones.reset
+  #   Bones.root = File.expand_path(File.dirname(__FILE__) + '/../../')
+  # end
+  
+  def self.uses_example_site
+    self.bones_root = File.expand_path(File.dirname(__FILE__) / 'example_site')
+  end
+
+  def run_with_bones_root(*args, &block)
+    with_bones_root do
+      run_without_bones_root(*args, &block)
+    end  
+  end
+  
+  alias_method_chain :run, :bones_root unless method_defined?(:run_without_bones_root)
+  
+  def with_bones_root(root=nil, &block)
+    previous_root, Bones.root = Bones.root, (root || self.class.bones_root)
+    yield(block)
+    Bones.root = previous_root
+  end
+  
+  def relative_path(path)
+    File.expand_path(File.dirname(__FILE__) / path)
+  end
+  
+  def assert_include(collection, obj, message=nil)
+    assert collection.include?(obj), message
+  end
+end
+
+class TestRequest < OpenStruct
+end

data/test/test_template.rb

@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+context "Bones Template" do
+  uses_example_site
+  
+  setup do
+    @template = Bones::Template.new('')
+  end
+
+  test "should return proper filename for top-level files" do
+    @template.path = 'about'
+    assert_include @template.filename, '/about.html.erb'
+  end
+  
+  test "should return proper filename for directories" do
+    @template.path = 'things'
+    assert_include @template.filename, '/things/index.html.erb'
+  end
+  
+  test "should return proper filename for files in directories" do
+    @template.path = 'things/a'
+    assert_include @template.filename, '/things/a.html.erb'
+  end
+  
+  test "should return proper layout filename" do
+    @template.layout = 'example_layout'
+    assert_equal Bones.layouts_path / 'example_layout.html.erb', @template.layout_filename
+  end
+  
+  test "should invoke custom helper" 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'
+  end
+  
+end
+
+context "Bones template helpers" do
+  uses_example_site
+
+  def assert_include_helper(helper)
+    assert_include Bones::Template.helpers_to_include, helper
+  end
+
+  test "should include system core helper" do
+    assert_include_helper Bones.system_path / 'helpers/core_helper.rb'
+  end
+
+  test "should include user custom helper" do
+    assert_include_helper Bones.root / 'helpers/custom_helper.rb'
+  end
+end  
+
+context "Bones template 'about'" do
+  uses_example_site
+  
+  setup do
+    @template = Bones::Template.new('about')
+    @template.request = TestRequest.new(:path_info => 'about')
+    @response = @template.compile
+  end
+  
+  test "should use layout 'example_layout'" do
+    assert_equal 'example_layout', @template.layout
+    assert_include @response, 'Example Layout'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scharfie-bones
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Scharf
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: bones
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,22 +40,55 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README
-- lib/Rakefile
+- bin
 - bin/bones
-- lib/bones.rb
+- bones.gemspec
+- lib/bones
+- lib/bones/cache.rb
+- lib/bones/initializer.rb
 - lib/bones/release.rb
+- lib/bones/template.rb
+- lib/bones/versioned_release.rb
+- lib/bones.rb
 - lib/boot.rb
-- lib/cache.rb
 - lib/extensions.rb
 - lib/helpers
 - lib/helpers/core_helper.rb
-- lib/init.rb
 - lib/pages/directory.html.erb
 - lib/pages/intro.html.erb
+- lib/Rakefile
 - lib/server.rb
+- lib/tasks
 - lib/tasks/bones.rb
-- bones.gemspec
+- Rakefile
+- README
+- test
+- test/example_site
+- test/example_site/helpers
+- test/example_site/helpers/custom_helper.rb
+- test/example_site/layouts
+- test/example_site/layouts/example_layout.html.erb
+- test/example_site/pages
+- 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/things
+- test/example_site/pages/things/a.html.erb
+- test/example_site/public
+- test/example_site/public/images
+- test/example_site/public/images/.gitignore
+- test/example_site/public/javascripts
+- test/example_site/public/javascripts/.gitignore
+- test/example_site/public/stylesheets
+- test/example_site/public/stylesheets/.gitignore
+- test/example_site/public/videos
+- test/example_site/public/videos/.gitignore
+- test/test_bones.rb
+- test/test_cache.rb
+- test/test_template.rb
+- test/test_example_site.rb
+- test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/scharfie/bones
 post_install_message: 

data/lib/init.rb

@@ -1,70 +0,0 @@
-require File.join(File.dirname(__FILE__), 'boot') if __FILE__ == $0
-require 'fileutils'
-
-class BonesInitializer
-  def self.ensure_file(path, &block)
-    return if File.exist?(path)
-    puts "** Writing #{path}"
-    File.open(path, 'w', &block)
-  end
-
-  def self.ensure_directory(path)
-    return nil if File.directory?(path)
-    puts "** Creating directory #{path}"
-    FileUtils.mkdir_p(path)  
-    return true
-  end
-
-  def self.run
-    puts "** Initializing"
-
-    ensure_directory(ROOT / 'public' / 'javascripts')
-    ensure_directory(ROOT / 'public' / 'stylesheets')
-    pages_new = ensure_directory(ROOT / 'pages')
-    ensure_directory(ROOT / 'layouts')
-    ensure_directory(ROOT / 'helpers')
-
-    if pages_new
-      ensure_file(ROOT / 'pages' / 'index.html.erb') do |f|
-        f.write File.read(SYSTEM / 'pages' / 'intro.html.erb')
-      end
-    end  
-
-    ensure_file(ROOT / 'layouts' / 'application.html.erb') do |f|
-      f.write <<-HTML
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-    <html>
-    <head>
-      <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-      <title>Welcome to bones</title>
-      <%= stylesheet_link_tag 'styles' %>
-      <%= javascript_include_tag %>
-    </head>  
-    <body>
-      <h1>Welcome to <strong>bones</strong></h1>
-      <%= @content_for_layout %>
-    </body>
-    </html>  
-      HTML
-    end
-
-    ensure_file(ROOT / 'public' / 'stylesheets' / 'styles.css')
-
-    ensure_file(ROOT / 'Rakefile') do |f|
-      puts "** Adding Rakefile to parent directory"
-      f.write File.read(SYSTEM / 'Rakefile')
-    end
-
-    puts <<-HELP if __FILE__ == $0
-
-     All set! Now just run:
-       ruby bones/server.rb
- 
-     The app will run on port 3000
- 
-    HELP
-  end
-end
-
-BonesInitializer.run if __FILE__ == $0