scharfie-bones 0.2.5 → 0.2.6

data/bin/bones

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bones/boot.rb'))
+
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bones.rb'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bones/initializer.rb'))
 path = ARGV.shift
 
@@ -12,4 +13,4 @@ end
 path = File.expand_path(path)
 FileUtils.mkdir(path) unless File.directory?(path)
 
-Bones::Initializer.run(path)
+Bones::Initializer.run(path)

data/lib/bones/bones.rb

@@ -37,6 +37,27 @@ class Bones
     def booted?
       @booted
     end
+
+    def directories(base)
+      Dir.chdir(base) do
+        Dir.entries(base).map do |e|
+          next if e =~ /^\.+$/ 
+          File.directory?(base / e) ? '/' + e : nil
+        end.compact
+      end
+    end
+
+    def page_directories
+      directories(Bones.root / 'pages')
+    end
+
+    def versioned_directories
+      Bones::VersionedRelease.directories
+    end
+
+    def public_directories
+      directories(Bones.root / 'public') - page_directories - versioned_directories
+    end
   end
   
   # Resets root, pages, and layouts paths and the base setting
@@ -70,4 +91,4 @@ class Bones
       end.compact
     end
   end  
-end
+end

data/lib/bones/cache.rb

@@ -162,7 +162,7 @@ class Bones
     #   # => /some_folder/page_path.html
     def normalize_url(path)
       @known_pairs ||= {}
-      @public_directories_regex ||= Regexp.new(public_directories.join('|'))
+      @public_directories_regex ||= Regexp.new(Bones.public_directories.join('|'))
   
       if v = @known_pairs[path]
         return v
@@ -192,4 +192,4 @@ end
 
 if __FILE__ == $0
   Bones::Cache.run(ARGV)
-end
+end

data/lib/bones/extensions.rb

@@ -6,6 +6,13 @@ class String
   end
 end
 
+
+class Object
+  def self.remove
+    
+  end
+end
+
 # Loads filename, removing the associated
 # class if defined
 # 
@@ -20,7 +27,16 @@ end
 # and then load the application.rb file
 def force_load(map={})
   map.each do |klass, filename|
-    Class.remove_class(klass) if Object.const_defined?(klass)
+    if defined?(klass.name)
+      basename = klass.to_s.split("::").last
+      parent = klass.parent
+      
+      # Skip this class if it does not match the current one bound to this name
+      next unless parent.const_defined?(basename) && klass = parent.const_get(basename)
+
+      parent.instance_eval { remove_const basename } unless parent == klass
+    end
+
     load filename 
   end
-end
+end

data/lib/bones/release.rb

@@ -20,9 +20,9 @@ class Bones
   
     # Copies all public directories to the new release directory
     def copy_public_directories
-      public_directories.each do |src|
+      Bones.public_directories.each do |src|
         FileUtils.copy_entry Bones.root / 'public' / src, destination / src
       end
     end  
   end
-end
+end

data/lib/bones/server.rb

@@ -1,7 +1,7 @@
 class Bones
   class Server
     def self.run
-      statics = public_directories
+      statics = Bones.public_directories
       app = Rack::Builder.new do
         use Rack::CommonLogger
         use Rack::ShowExceptions
@@ -21,4 +21,4 @@ class Bones
   end  
 end
 
-Bones::Server.run if __FILE__ == $0
+Bones::Server.run if __FILE__ == $0

data/lib/bones/static.rb

@@ -1,8 +1,8 @@
 class Bones
   class Static < Rack::Static
     def initialize(app, *args, &block)
-      super app, :urls => public_directories, 
+      super app, :urls => Bones.public_directories, 
         :root => Bones.root / 'public', &block
     end
   end    
-end
+end

data/lib/bones.rb

@@ -1 +1,23 @@
-require File.join(File.dirname(__FILE__), "bones/bones.rb")
+require 'rubygems'
+
+gem 'activesupport', '>= 2.3.10'
+gem 'rack',          '>= 0.3.0'
+
+require 'rack'
+require 'active_support'
+require 'active_support/dependencies'
+require 'active_support/core_ext'
+require 'pathname'
+require 'yaml'
+require 'fileutils'
+require 'optparse'
+require 'ostruct'
+require 'erb'
+
+require Pathname.new(__FILE__).dirname.join('bones/bones.rb')
+require Pathname.new(__FILE__).dirname.join('bones/extensions.rb')
+
+ActiveSupport::Dependencies.autoload_paths.push Bones.system_path
+$:.push Bones.system_path
+
+Bones.booted = true

data/lib/tasks/bones.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../bones/boot.rb')
+require File.join(File.dirname(__FILE__), '../bones.rb')
 
 task :default => :server
 
@@ -22,13 +22,13 @@ namespace :cache do
   end
   
   def generate_options_from_environment(extra={})
-    returning Bones::Cache::Options.new do |options|
-      destination = destination_from_environment
-      options.base = ENV['BASE'] unless ENV['BASE'].blank?
-      options.destination = destination unless destination.blank?
-      options.noop = true if ENV['NOOP']
-      options.merge extra
-    end  
+    options = Bones::Cache::Options.new
+    destination = destination_from_environment
+    options.base = ENV['BASE'] unless ENV['BASE'].blank?
+    options.destination = destination unless destination.blank?
+    options.noop = true if ENV['NOOP']
+    options.merge extra
+    options
   end
   
   task :simple do
@@ -48,4 +48,4 @@ task :clean do
   # ARGV.shift
   # ARGV.unshift '--clean'
   # load File.join(File.dirname(__FILE__), 'cache.rb')
-end
+end

data/pushables/Rakefile

@@ -1,3 +1,3 @@
 require File.join(File.dirname(__FILE__), 'boot.rb')
 require 'rake'
-require 'tasks/bones'
+require 'tasks/bones'

data/pushables/boot.rb

@@ -1,11 +1,10 @@
-bones_boot = File.join(File.dirname(__FILE__), 'vendor/bones/lib/bones/boot.rb')
+vendor_bones = File.join(File.dirname(__FILE__), 'vendor/bones/lib/bones.rb')
 
-if File.file?(bones_boot)
-  require bones_boot
+if File.file?(vendor_bones)
+  require vendor_bones
 else
   require 'rubygems'
   require 'bones'
-  require 'bones/boot'
 end
   
-Bones.root = File.expand_path(File.dirname(__FILE__))
+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.5"
-  s.date        = "2009-10-27"
+  s.version     = "0.2.6"
+  s.date        = "2011-02-15"
   s.authors     = ["Chris Scharf", "Ryan Heath"]
   s.email       = "scharfie@gmail.com"
 
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
     '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/helpers',
@@ -77,7 +76,15 @@ Gem::Specification.new do |s|
     'pushables/Rakefile'
   ]
 
+  s.test_files = [
+    'test/test_bones.rb',
+    'test/test_cache.rb',
+    'test/test_template.rb',
+    'test/test_example_site.rb',
+    'test/test_helper.rb'  
+  ]
+
   # Dependencies
   s.add_dependency("rack", [">= 0.3.0"])
-  s.add_dependency("activesupport", [">= 2.1.0"])
-end
+  s.add_dependency("activesupport", [">= 2.3.10"])
+end

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 $:.unshift(File.dirname(__FILE__) + '/../')
-require 'lib/bones/boot'
+require 'lib/bones'
 require 'test/unit'
 
 class String
@@ -65,4 +65,4 @@ class Test::Unit::TestCase
 end
 
 class TestRequest < OpenStruct
-end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scharfie-bones
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Chris Scharf
@@ -10,29 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -04:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: bones
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
-    version: 
+        hash: 23
+        segments: 
+        - 2
+        - 3
+        - 10
+        version: 2.3.10
+  type: :runtime
+  version_requirements: *id002
 description: Simple HTML mockup framework for designers using ERB
 email: scharfie@gmail.com
 executables: 
@@ -53,7 +71,6 @@ files:
 - 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/helpers/application_helper.rb
@@ -92,23 +109,33 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple HTML mockup framework for designers using ERB
-test_files: []
-
+test_files: 
+- test/test_bones.rb
+- test/test_cache.rb
+- test/test_template.rb
+- test/test_example_site.rb
+- test/test_helper.rb

data/lib/bones/boot.rb

@@ -1,38 +0,0 @@
-require 'rubygems'
-require 'activesupport'
-require 'rack'
-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
-
-require 'yaml'
-require 'fileutils'
-require 'optparse'
-require 'ostruct'
-require 'erb'
-
-Bones.booted = true
-
-def directories(base)
-  Dir.chdir(base) do
-    Dir.entries(base).map do |e|
-      next if e =~ /^\.+$/ 
-      File.directory?(base / e) ? '/' + e : nil
-    end.compact
-  end
-end
-
-def page_directories
-  directories(Bones.root / 'pages')
-end
-
-def versioned_directories
-  Bones::VersionedRelease.directories
-end
-
-def public_directories
-  directories(Bones.root / 'public') - page_directories - versioned_directories
-end