scharfie-bones 0.1.1 → 0.1.2

data/README

@@ -12,7 +12,7 @@ What it does:
 Requirements:
 
   - ActiveSupport
-  - rack
+  - rack (0.3.0 only at this time)
 
 Starting it up:
 
@@ -32,7 +32,7 @@ Starting it up:
 Flatten your views into .html files:
 
 	- Cache
-    rake cache:simple     # without versioning
+    rake cache            # without versioning
     rake cache:versioned  # with versioning
 
 Then upload the entire public/ directory to your server.

data/bones.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = "bones"
-  s.version     = "0.1.1"
-  s.date        = "2008-08-22"
+  s.version     = "0.1.2"
+  s.date        = "2009-02-02"
   s.authors     = ["Chris Scharf", "Ryan Heath"]
   s.email       = "scharfie@gmail.com"
 
@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
   ]
 
   # Dependencies
-  s.add_dependency("rack", [">= 0.3.0"])
+  s.add_dependency("rack", ["= 0.3.0"])
   s.add_dependency("activesupport", [">= 2.1.0"])
 end

data/lib/bones.rb

@@ -2,6 +2,14 @@
 # which BonesProxy loads and calls upon to
 # do the dirty work.
 class Bones
+  class << self
+    attr_accessor :base
+    
+    def base
+      @base || ''
+    end
+  end
+  
   # Process incoming request (for real this time!)
   def call(env)
     # Grab the request
@@ -60,6 +68,12 @@ class Bones
       @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
@@ -130,66 +144,9 @@ class Bones
       path = name.to_s.split('/')
       path[-1] = '_' + path.last unless path.last.starts_with?('_')
       name = path.join('/')
-      Template.compile(name, false, options)
-    end
-  end
-  
-  # Class used to encapsulate the logic needed to
-  # maintain mockup versions
-  class Versioned
-    # Pre-fix used for versioned directories
-    DIR_PREFIX = 'v'
-    
-    # Start with the original destination
-    def initialize(original_destination)
-      @original_destination = original_destination
-      @versioned_destination = nil
-    end
-    
-    # Returns the new destination, which depends on
-    # the existing amount of 'versions'
-    def destination      
-      @versioned_destination ||= get_versioned_destination
-    end
-    
-    # Copies all public directories to the new 'versioned'
-    # directory, so each version can contain it's own mockup
-    # (note: only copies asset directories - ignores "v1", "v2", etc)
-    def copy_public_directories
-      public_directories.each do |src|
-        FileUtils.copy_entry ROOT / 'public' / src, destination / src
-      end
-    end
-    
-    # Returns the versioned directories within the 'public' folder
-    # $> Bones::Versioned.directories
-    # $> => ["/v1", "/v2", ... "/vN"]
-    def self.directories
-      Dir.glob(ROOT / 'public' / "#{DIR_PREFIX}**").inject([]) do |dirs, dir|
-        dirs << '/' + dir.gsub(/^\/.+\//, '')
-      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.size + 1).to_s
-    end
-    
-    # constructs the next version path
-    def get_versioned_destination
-      @original_destination /= versioned_directory_name
+      template = Template.new(name, false, options)
+      template.request = request
+      template.compile
     end
   end
 end

data/lib/boot.rb

@@ -15,6 +15,7 @@ require 'activesupport'
 require 'extensions'
 require 'erb'
 require 'bones'
+require 'bones/release'
 
 def directories(base)
   Dir.chdir(base) do
@@ -30,7 +31,7 @@ def page_directories
 end
 
 def versioned_directories
-  Bones::Versioned.directories
+  Bones::VersionedRelease.directories
 end
 
 def public_directories

data/lib/cache.rb

@@ -1,105 +1,161 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require File.join(File.dirname(__FILE__), 'boot')
 require 'fileutils'
-require 'bones'
 require 'optparse'
 require 'ostruct'
 
-# Argument processor
-class CacheOptions < OpenStruct
-  # Default options
-  def self.default_options
-    returning new do |o|
-      o.destination = ROOT / 'public'  # Set original destination
-      o.versioned   = false            # No versions by default       
-      o.base        = ''               # Base URL is empty
-    end
-  end
+class Bones
+  class Cache
+    class Options
+      attr_accessor :base, :versioned, :release, :destination
+      
+      def initialize
+        super
+        self.base        = ''               # Base URL is empty
+        self.release     = nil
+        self.destination = ROOT / 'public'  # Set original destination
+      end
+      
+      def merge(options={})
+        options.each do |k, v|
+          method = "#{k}=".to_sym
+          send(method, v) if respond_to?(method)
+        end
+      end
   
-  # Process arguments
-  def self.process(args)
-    options = default_options
+      # Process arguments
+      def self.process(args)
+        options = new
+    
+        OptionParser.new do |o|
+          o.on('--destination PATH', '-d PATH', "Change the destination directory") do |path|
+            options.destination = path
+          end
+      
+          o.on('--versioned', '--versions', "Enable versioning") do
+            options.versioned = true
+          end
+      
+          o.on('--base PATH', "Change the base URL path") do |path|
+            options.base = path # Bones.base = path
+          end
+      
+          o.on_tail("-h", "--help", "Show this message") do
+            puts o; exit
+          end
+        end.parse!(args)
     
-    OptionParser.new do |o|
-      o.on('--versioned', '--versions', "Enable versioning") do
-        options.versioned   = Bones::Versioned.new(options.destination)
+        options
       end
       
-      o.on('--base PATH', "Change the base URL path") do |path|
-        options.base = path
+      def base=(path)
+        @base = Bones.base = path
       end
-
-      o.on_tail("-h", "--help", "Show this message") do
-        puts o
-        exit
+      
+      def versioned=(*args)
+        @release = Bones::VersionedRelease.new(@destination)
+        @destination = release.destination
+      end
+      
+      def destination=(path)
+        @release = Bones::Release.new(@destination, path)
+        @destination = release.destination
       end
-    end.parse!(args)
-    
-    options
-  end
   
-  # Returns true if the versions enabled
-  def versioned?
-    versioned != false
-  end
+      # Returns true if the versions enabled
+      def versioned?
+        Bones::VersionedRelease === release
+      end
   
-  # Returns destination
-  def destination
-    versioned? ?  versioned.destination : super
-  end
-end
-
-# Process arguments
-options = CacheOptions.process(ARGV)
-
-# Fixes the given URL path to begin at given base.
-# In addition, the .html extension will be added if
-# the path is a page.
-# 
-# For example, if the base is /some_folder,
-#   normalize_url('/page_path', '/some_folder')
-#   # => /some_folder/page_path.html
-def normalize_url(path, base='')
-  @known_pairs ||= {}
-  @public_directories_regex ||= Regexp.new(public_directories.join('|'))
+      def release?
+        !release.nil?
+      end
   
-  if v = @known_pairs[path]
-    return v
-  else
-    value = case
-    when path =~ @public_directories_regex
-      path
-    when File.directory?('pages' / path)
-      path
-    else
-      path + '.html'
+      # Returns destination
+      def destination
+        release? ? release.destination : super
+      end
     end
     
-    @known_pairs[path] = base / value
-  end    
-end
+    attr_accessor :options
+    
+    def initialize(options=nil)
+      self.options = Options === options ? options : Options.process(options)
+    end
+    
+    def self.run(options=nil)
+      new(options).run
+    end
 
-version = options.versioned? ? options.versioned.versioned_directory_name : nil
+    def run
+      version = options.versioned? ? options.release.versioned_directory_name : nil
+      
+      # Process each page
+      Dir.chdir(ROOT) do
+        puts "** Writing to: #{options.destination}"
+        puts "** Using base: #{options.base}" unless options.base.blank?
+        
+        Bones.pages.each do |page|
+          puts  "** Generating #{[version, page].compact.join('/')}.html"
+          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'
+          FileUtils.mkdir_p(File.dirname(path))
+          File.open(path, 'w') { |f| f.write(result) }
+        end
 
-# Process each page
-Dir.chdir(ROOT) do
-  Bones.pages.each do |page|
-    puts  "** Generating #{[version, page].compact.join('/')}.html"
-    result = Bones::Template.compile(page)
-    result.gsub!(/(href|src|action)="([-A-Za-z0-9_\.\/]+)(.*?)"/) do |match|
-      property, url, params = $1, normalize_url(original_url = $2, options.base), $3
-      '%s="%s%s"' % [property, url, params]
+        if options.release?  
+          puts "** Copying public files"
+          options.release.copy_public_directories
+        end
+  
+        puts "** Cached to: #{options.destination}" 
+        puts "** Using base: #{options.base}" unless options.base.blank?
+      end
+
+      puts "** Done."      
     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.
+    # 
+    # For example, if the base is /some_folder,
+    #   normalize_url('/page_path', '/some_folder')
+    #   # => /some_folder/page_path.html
+    def normalize_url(path, base='')
+      @known_pairs ||= {}
+      @public_directories_regex ||= Regexp.new(public_directories.join('|'))
   
-    path = options.destination / page + '.html'
-    FileUtils.mkdir_p(File.dirname(path))
-    File.open(path, 'w') { |f| f.write(result) }
-  end
+      if v = @known_pairs[path]
+        return v
+      else
+        value = case
+        when path =~ /^(\w{3,}:\/\/|mailto)/
+          return path
+        when path =~ @public_directories_regex
+          path
+        when File.directory?('pages' / path)
+          path
+        else
+          path + '.html'
+        end
+    
+        @known_pairs[path] = base / value
+      end    
+    end    
 
-  if options.versioned?  
-    puts "** Copying public files"
-    options.versioned.copy_public_directories
-  end  
+    def generate_mock_request(options={})
+      OpenStruct.new(options)
+    end
+  end
 end
 
-puts "** Done."
+if __FILE__ == $0
+  Bones::Cache.run(ARGV)
+end

data/lib/helpers/core_helper.rb

@@ -137,4 +137,9 @@ module CoreHelper
     return @content_for_title if value == -1
     @content_for_title = value
   end
+
+  # Returns base URL
+  def base
+    Bones.base
+  end
 end

data/lib/tasks/bones.rb

@@ -1,3 +1,7 @@
+require File.join(File.dirname(__FILE__), '..', 'cache.rb')
+
+task :default => :server
+
 desc "Start bones server"
 task :server do
   ARGV.shift
@@ -5,18 +9,27 @@ task :server do
   BonesServer.run
 end
 
+desc "Cache page templates for redistribution (non-versioned)"
+task :cache => 'cache:simple'
+
 namespace :cache do
-  desc "Cache page templates for redistribution (non-versioned)"
+  def generate_options_from_environment(extra={})
+    returning Bones::Cache::Options.new do |options|
+      options.base = ENV['BASE'] if ENV['BASE']
+      options.destination = ENV['DESTINATION'] if ENV['DESTINATION']
+      options.merge extra
+    end  
+  end
+  
   task :simple do
-    ARGV.shift
-    load File.join(File.dirname(__FILE__), '..', 'cache.rb')
+    options = generate_options_from_environment
+    Bones::Cache.run(options)
   end
   
   desc "Cache page templatets for redistribution (versioned)"
   task :versioned do
-    ARGV.shift
-    file = File.join(File.dirname(__FILE__), '..', 'cache.rb')
-    system "ruby #{file} '--versioned'"
+    options = generate_options_from_environment(:versioned => true)
+    Bones::Cache.run(options)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scharfie-bones
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris Scharf
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 -07:00
+date: 2009-02-02 00:00:00 -08:00
 default_executable: bones
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.3.0
     version: