RubyGems - scharfie-bones - Versions diffs - 0.2.1 → 0.2.2 - Mend

scharfie-bones 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

data/README +1 -1
data/bones.gemspec +10 -4
data/lib/bones/initializer.rb +8 -21
data/lib/bones/proxy.rb +19 -0
data/lib/bones/server.rb +24 -0
data/lib/bones/static.rb +8 -0
data/lib/bones/template.rb +4 -0
data/lib/bones.rb +4 -3
data/lib/boot.rb +0 -5
data/lib/config.ru +6 -0
data/lib/helpers/application_helper.rb +3 -0
data/lib/layouts/application.html.erb +14 -0
data/lib/tasks/bones.rb +1 -1
metadata +12 -4
data/lib/server.rb +0 -41

data/README CHANGED Viewed

@@ -12,7 +12,7 @@ What it does:
 Requirements:
   - ActiveSupport
-  - rack (0.3.0 only at this time)
+  - rack (0.3.0 or later should work)
 Starting it up:

data/bones.gemspec CHANGED Viewed

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = "bones"
-  s.version     = "0.2.1"
-  s.date        = "2009-02-10"
+  s.version     = "0.2.2"
+  s.date        = "2009-04-18"
   s.authors     = ["Chris Scharf", "Ryan Heath"]
   s.email       = "scharfie@gmail.com"
@@ -22,18 +22,24 @@ Gem::Specification.new do |s|
     'lib/bones',
     'lib/bones/cache.rb',
     'lib/bones/initializer.rb',
+    'lib/bones/proxy.rb',
     'lib/bones/release.rb',
+    'lib/bones/server.rb',
+    'lib/bones/static.rb',
     'lib/bones/template.rb',
     'lib/bones/versioned_release.rb',
     'lib/bones.rb',
     'lib/boot.rb',
+    'lib/config.ru',
     'lib/extensions.rb',
     'lib/helpers',
+    'lib/helpers/application_helper.rb',
     'lib/helpers/core_helper.rb',
+    'lib/layouts',
+    'lib/layouts/application.html.erb',
     'lib/pages/directory.html.erb',
     'lib/pages/intro.html.erb',
     'lib/Rakefile',
-    'lib/server.rb',
     'lib/tasks',
     'lib/tasks/bones.rb',
     'Rakefile',
@@ -68,6 +74,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/initializer.rb CHANGED Viewed

@@ -28,6 +28,7 @@ class Bones
       pages_new = ensure_directory(Bones.root / 'pages')
       ensure_directory(Bones.root / 'layouts')
       ensure_directory(Bones.root / 'helpers')
+      ensure_directory(Bones.root / 'tmp')
       if pages_new
         ensure_file(Bones.root / 'pages' / 'index.html.erb') do |f|
@@ -36,38 +37,24 @@ class Bones
       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>
-  <%= yield %>
-</body>
-</html>
-        HTML
+        f.write File.read(Bones.system_path / 'layouts' / 'application.html.erb')
       end
       ensure_file(Bones.root / 'public' / 'stylesheets' / 'styles.css')
       ensure_file(Bones.root / 'helpers' / 'application_helper.rb') do |f|
-        f.write <<-HELPER
-# Provide any custom helpers that want in this module
-module ApplicationHelper
-end
-        HELPER
+        f.write File.read(Bones.system_path / 'helpers' / 'application_helper.rb')
       end
       ensure_file(Bones.root / 'Rakefile') do |f|
         puts "** Adding Rakefile to parent directory"
         f.write File.read(Bones.system_path / 'Rakefile')
       end
+      ensure_file(Bones.root / 'config.ru') do |f|
+        puts "** Adding config.ru to parent directory"
+        f.write File.read(Bones.system_path / 'config.ru')
+      end
       puts <<-HELP if __FILE__ == $0

data/lib/bones/proxy.rb ADDED Viewed

@@ -0,0 +1,19 @@
+# BonesProxy is simply a proxy class handler
+# to the actual Bones class - the reason for
+# this is to allow live changes to Bones
+# and helpers, etc.  The proxy reloads on every
+# request
+class Bones
+  class Proxy
+    # Process incoming request
+    def call(env)
+      reload!
+      Bones.new.call(env)
+    end
+    # Reloads the application
+    def reload!
+      force_load 'Bones' => File.join(File.dirname(__FILE__), '..', 'bones.rb')
+    end
+  end
+end

data/lib/bones/server.rb ADDED Viewed

@@ -0,0 +1,24 @@
+class Bones
+  class Server
+    def self.run
+      statics = public_directories
+      app = Rack::Builder.new do
+        use Rack::CommonLogger
+        use Rack::ShowExceptions
+        use Rack::Reloader
+        use Bones::Static
+        run Bones::Proxy.new
+      end
+      port = ARGV.shift || 3000
+      puts "** Starting bones server on http://0.0.0.0:#{port}"
+      puts "** Public directories: #{statics.to_sentence}"
+      Rack::Handler::Mongrel.run app, :Port => port do |server|
+        puts "** Use CTRL-C to stop."
+      end
+    end
+  end
+end
+Bones::Server.run if __FILE__ == $0

data/lib/bones/static.rb ADDED Viewed

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

data/lib/bones/template.rb CHANGED Viewed

@@ -76,6 +76,10 @@ class Bones
     # Compiles the template (along with the layout
     # if necessary)
     def compile
+      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) # erb.result(binding)

data/lib/bones.rb CHANGED Viewed

@@ -57,9 +57,10 @@ class Bones
     output   = template.compile
     # Build a rack response
-    Rack::Response.new.finish do |response|
-      response.write output
-    end
+    # Rack::Response.new.finish do |response|
+    #   response.write output
+    # end
+    [200, { 'Content-Type' => 'text/html'}, output]
   end
   # Returns array of all pages (excluding partials)

data/lib/boot.rb CHANGED Viewed

@@ -4,14 +4,9 @@ require 'activesupport'
 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 'yaml'
-require 'rack'
-require 'rack/request'
-require 'rack/response'
 require 'fileutils'
 require 'optparse'
 require 'ostruct'

data/lib/config.ru ADDED Viewed

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

data/lib/helpers/application_helper.rb ADDED Viewed

@@ -0,0 +1,3 @@
+# Provide any custom helpers that want in this module
+module ApplicationHelper
+end

data/lib/layouts/application.html.erb ADDED Viewed

@@ -0,0 +1,14 @@
+<!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>
+  <%= yield %>
+</body>
+</html>

data/lib/tasks/bones.rb CHANGED Viewed

@@ -6,7 +6,7 @@ desc "Start bones server"
 task :server do
   ARGV.shift
   load File.join(File.dirname(__FILE__), '..', 'server.rb')
-  BonesServer.run
+  Bones::Server.run
 end
 desc "Cache page templates for redistribution (non-versioned)"

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scharfie-bones
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Scharf
@@ -10,20 +10,22 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-04-18 00:00:00 -07:00
 default_executable: bones
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
+  type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
     version:
 - !ruby/object:Gem::Dependency
   name: activesupport
+  type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -46,18 +48,24 @@ files:
 - lib/bones
 - lib/bones/cache.rb
 - lib/bones/initializer.rb
+- lib/bones/proxy.rb
 - lib/bones/release.rb
+- lib/bones/server.rb
+- lib/bones/static.rb
 - lib/bones/template.rb
 - lib/bones/versioned_release.rb
 - lib/bones.rb
 - lib/boot.rb
+- lib/config.ru
 - lib/extensions.rb
 - lib/helpers
+- lib/helpers/application_helper.rb
 - lib/helpers/core_helper.rb
+- lib/layouts
+- lib/layouts/application.html.erb
 - lib/pages/directory.html.erb
 - lib/pages/intro.html.erb
 - lib/Rakefile
-- lib/server.rb
 - lib/tasks
 - lib/tasks/bones.rb
 - Rakefile

data/lib/server.rb DELETED Viewed

@@ -1,41 +0,0 @@
-# BonesProxy is simply a proxy class handler
-# to the actual Bones class - the reason for
-# this is to allow live changes to Bones
-# and helpers, etc.  The proxy reloads on every
-# request
-class BonesProxy
-  # Process incoming request
-  def call(env)
-    reload!
-    Bones.new.call(env)
-  end
-  # Reloads the application
-  def reload!
-    force_load 'Bones' => 'bones.rb'
-  end
-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 => 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: #{statics.to_sentence}"
-    Rack::Handler::Mongrel.run app, :Port => port do |server|
-      puts "** Use CTRL-C to stop."
-    end
-  end
-end
-BonesServer.run if __FILE__ == $0