RubyGems - hyper - Versions diffs - 0.3.0beta1 → 0.3.0 - Mend

hyper 0.3.0beta1 → 0.3.0

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 (10) hide show

data/README.md CHANGED

@@ -14,6 +14,16 @@ Five steps from install to a functioning website:
 Point your browser at <a href="http://0.0.0.0:9292/">0.0.0.0:9292</a> and you'll see your website's home page.
+## Deployment
+If you love Heroku, deployment is easy:
+	$ cd my_website
+	$ heroku create
+	$ git push heroku master
+Any other rack-compatible host should work too.
 ## Adding Content
 To add content to your site, you just need to know two things:
@@ -29,19 +39,32 @@ Also note: your home page content goes in <code>views/index.html.erb</code>; Hyp
 Put your stylesheets, images, javascripts, etc in <code>public</code>: Hyper will handle the rest. When referencing these files in your HTML, drop the "public" from the path &mdash; <code>public/images/logo.png</code> should become <code>&lt;img src="/images/logo.png" /&gt;</code>.
-## Deployment
+## Helper Code
-If you love Heroku, deployment is easy:
+Put your custom helper methods in <code>lib/helper.rb</code>:
-	$ cd my_website
-	$ heroku create
-	$ git push heroku master
+	# in lib/helper.rb
+	module Hyper::Helper
+	  def the_time
+	    Time.now.to_s
+	  end
+	end
-Any other rack-compatible host should work too.
+	# in templates/layout.html.erb
+	<html>
+	  <head>
+	    <title>Clock</title>
+	  </head>
+	  <body>
+	    <h1>Hello! The time is <%= the_time -%></h1>
+	  </body>
+	</html>
+Helper methods have access to a <code>request</code> object which is an instance of <a href="http://rack.rubyforge.org/doc/classes/Rack/Request.html"><code>Rack::Request</code></a>.
 ## In-Depth
-There's not a whole lot of depth to go into: hyper is intentionally simple. Once you've generated a new site, you'll get the following files and folders:
+Hyper is intentionally simple. Once you've generated a new site, you'll get the following files and folders:
 <table>
 	<tr>
@@ -54,7 +77,7 @@ There's not a whole lot of depth to go into: hyper is intentionally simple. Once
 	</tr>
 	<tr>
 		<td><code>templates/views</code></td>
-		<td>This is where your page-specific content lives. See "Adding Content for more details"</td>
+		<td>This is where your page-specific content lives. See "Adding Content" for more details</td>
 	</tr>
 	<tr>
 		<td><code>public</code></td>
@@ -70,7 +93,7 @@ There's not a whole lot of depth to go into: hyper is intentionally simple. Once
 	</tr>
 </table>
-Defaults are set so you don't have to worry about anything outside <code>templates</code> if you don't want to. If you understand rack and want to add middleware, do that in <code>config.ru</code> (but note that Hyper already knows to serve static content from <code>public</code>, so you don't need to use <code>Rack::Static</code>).
+Defaults are set so you don't have to worry about anything outside <code>templates</code> if you don't want to. If you understand rack and want to add middleware, do that in <code>config.ru</code> &mdash; note that Hyper already knows to serve static content from <code>public</code>, so you don't need to use <code>Rack::Static</code>.
 ## Author

data/bin/hyper CHANGED

@@ -6,15 +6,20 @@ options = {}
 parser  = OptionParser.new do |opts|
   opts.banner = "Usage: hyper new NAME [options]"
-  opts.on('-f', '--force', 'Overwrite existing files') do
+  opts.on('-f', '--force', '# Overwrite existing files') do
     options[:force] = true
   end
+  opts.on('-v', '--version', '# Show version and exit') do
+    puts "Hyper #{Hyper::Version.to_s}"; exit
+  end
 end
+parser.parse!
 case ARGV.first
 when 'new'
   if name = ARGV[1]
-    parser.parse!
     Hyper::Generator.new(name, options).generate
   else
     puts "Please provide a name"

data/lib/hyper.rb CHANGED

@@ -1,30 +1,35 @@
 require 'rack/builder'
 module Hyper
-  autoload :Generator, 'hyper/generator'
-  autoload :Response,  'hyper/response'
-  autoload :Static,    'hyper/static'
-  autoload :Utils,     'hyper/utils'
-  autoload :Version,   'hyper/version'
+  autoload :Application, 'hyper/application'
+  autoload :Generator,   'hyper/generator'
+  autoload :Static,      'hyper/static'
+  autoload :Utils,       'hyper/utils'
+  autoload :Version,     'hyper/version'
   extend self
-  # @api public
   def call(env)
     builder = Rack::Builder.new do
       use Hyper::Static
-      run Hyper::Response.new
+      run Hyper::Application.new
     end
     builder.to_app.call(env)
   end
-  # @api public
   def root
-    Pathname.new(Dir.pwd)
+    @root ||= Pathname.new(Dir.pwd)
+  end
+  def root=(path)
+    @root = Pathname.new(path)
+  end
+  def template_root
+    @template_root ||= root.join('templates')
   end
-  # @api public
   def template_root=(path)
     @template_root = Pathname.new(path)
   end
@@ -32,9 +37,4 @@ module Hyper
   def view_root
     @view_root ||= template_root.join('views')
   end
-  # @api private
-  def template_root
-    @template_root ||= root.join('templates')
-  end
 end

data/lib/hyper/application.rb ADDED

@@ -0,0 +1,41 @@
+require 'rack/request'
+require 'tilt'
+require Hyper.root.join('lib/helper')
+module Hyper
+  class Application
+    include Hyper::Helper
+    attr :request
+    def call(env)
+      @request = Rack::Request.new(env)
+      url      = request.path
+      layout   = Utils.layout_path
+      view     = Utils.view_path(url)
+      if File.file?(view)
+        respond_with(200, rendered_templates(layout, view))
+      else
+        respond_with(404, "404 Not Found: #{url}")
+      end
+    end
+    private
+    def respond_with(status, body)
+      [status, headers_for(body), StringIO.new(body)]
+    end
+    def headers_for(body)
+      {'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s}
+    end
+    def rendered_templates(layout, view)
+      render_erb(layout) { render_erb(view) }
+    end
+    def render_erb(template, &block)
+      Tilt.new(template, :trim => '-').render(self, &block)
+    end
+  end
+end

data/lib/hyper/generator.rb CHANGED

@@ -1,7 +1,6 @@
 require 'term/ansicolor'
 module Hyper
-  # @api private
   class Generator
     include Term::ANSIColor

data/lib/hyper/static.rb CHANGED

@@ -1,7 +1,6 @@
 require 'rack/builder'
 module Hyper
-  # @api private
   class Static
     class << self
       def urls

data/lib/hyper/utils.rb CHANGED

@@ -1,5 +1,4 @@
 module Hyper
-  # @api private
   module Utils
     extend self
@@ -25,7 +24,7 @@ module Hyper
       if ['', '/'].include?(url)  # Root URL
         '/index'
       elsif url =~ /.+\/$/        # Folder indexes
-        File.join(url, 'index')
+        url + 'index'
       else                        # Everything else
         url
       end

data/lib/hyper/version.rb CHANGED

@@ -2,7 +2,7 @@ module Hyper
   module Version
     MAJOR = 0
     MINOR = 3
-    TINY  = '0beta1'
+    TINY  = 0
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')

metadata CHANGED

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hyper
 version: !ruby/object:Gem::Version
-  hash: 62196369
-  prerelease: 5
+  hash: 19
+  prerelease:
   segments:
   - 0
   - 3
   - 0
-  - beta
-  - 1
-  version: 0.3.0beta1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Wilding
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-05-18 00:00:00 +01:00
+date: 2011-07-07 00:00:00 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -89,8 +87,8 @@ extensions: []
 extra_rdoc_files: []
 files:
+- lib/hyper/application.rb
 - lib/hyper/generator.rb
-- lib/hyper/response.rb
 - lib/hyper/static.rb
 - lib/hyper/template/config.ru
 - lib/hyper/template/Gemfile
@@ -122,14 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      hash: 25
+      hash: 3
       segments:
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 rubyforge_project:

data/lib/hyper/response.rb DELETED

@@ -1,34 +0,0 @@
-require 'rack/request'
-require 'tilt'
-module Hyper
-  # @api private
-  class Response
-    def call(env)
-      request  = Rack::Request.new(env)
-      headers  = {'Content-Type' => 'text/html'}
-      layout   = Utils.layout_path
-      view     = Utils.view_path(request.path)
-      if File.file?(view)
-        status = 200
-        body   = render_templates(layout, view)
-      else
-        status = 404
-        body   = "404 Not Found: #{request.path}"
-      end
-      [status, headers, StringIO.new(body)]
-    end
-    private
-    def render_templates(layout, view)
-      render_erb(layout) { render_erb(view) }
-    end
-    def render_erb(template, &block)
-      Tilt.new(template, :trim => '-').render(&block)
-    end
-  end
-end