orthorings 0.1.1 → 0.1.2

data/README.markdown

@@ -9,8 +9,9 @@ The 2 main things you can do with Orthorings are:
 
 ## Installation
 
-As a gem (coming soon)
-  sudo gem install anthony-orthorings
+As a gem (from gemcutter.org)
+    
+    sudo gem install orthorings --source http://gemcutter.org
 
 ## Configuration
 
@@ -71,8 +72,6 @@ Inside of any block in the dsl, you can specify the orthor id, if you don't give
 Things that are being mulled over
 
 * Nav helpers (generate navigation based off of the DSL structure)
-* Static Page use needs to be defined more (perhaps define a action to render?)
-* Release as a 0.1 gem
 * ...I'm sure there'll be something else here soon
 
 ## Example Usage (as provided by the OrthorHelper module, defined as class methods of Orthorings)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/{orthor/content_controller.rb → orthor_content_controller.rb}

@@ -1,4 +1,4 @@
-class Orthor::ContentController < ApplicationController
+class OrthorContentController < ApplicationController
   def orthor_content
     expires_in Orthor::Site.cache_for, :public => true if Orthor::Site.cache_for > 0
     

data/config/routes.rb

@@ -3,7 +3,10 @@ ActionController::Routing::Routes.draw do |map|
     if resource.is_a?(::Orthor::Category) && !resource.page_path.nil?
       map.send("#{resource.path_name}_pages", resource.page_path, :controller => "orthor/content", :action => "orthor_content")
     end
-    
-    map.send(resource.path_name, resource.path, :controller => "orthor/content", :action => "orthor_content")
+    if resource.is_a?(::Orthor::StaticPage)
+      map.send(resource.path_name, resource.path, :controller => resource.controller.to_s, :action => resource.action.to_s)
+    else
+      map.send(resource.path_name, resource.path, :controller => "orthor_content", :action => "orthor_content")
+    end
   end
-end
+end

data/lib/orthor/static_page.rb

@@ -4,7 +4,7 @@ module Orthor
     include Orthor::MetaData
 
     attr_accessor :path
-    dsl_accessor :name
+    dsl_accessor :name, :action, :controller
 
     def initialize(path, page_name, &block)
       @path = path
@@ -13,5 +13,9 @@ module Orthor
 
       instance_eval &block if block_given?
     end
+
+    def path_name
+      @path.gsub("/", " ").strip.gsub(/[^a-z0-9]+/i, '_')
+    end
   end
-end
+end

data/lib/sinatra/orthor.rb

@@ -4,12 +4,11 @@ require 'erb'
 module Sinatra
   module OrthorRequestHelpers
     def handle_request(resource)
+      headers['Cache-Control'] = "public, max-age=#{resource.cache_for}"
       @name = resource.name
       @meta_keywords = resource.keywords
       @meta_description = resource.description
-      @orthor_feeds = resource.respond_to?(:feeds) ? resource.feeds : []
-      headers['Cache-Control'] = "public, max-age=#{resource.cache_for}"
-      erb :orthor_content, { :layout => ::Orthor::Site.layout }      
+      @orthor_feeds = resource.respond_to?(:feeds) ? resource.feeds : [] 
     end
   end
   
@@ -23,18 +22,21 @@ module Sinatra
           get resource.page_path do |id|
             @orthor_content = orthor_content(id)
             handle_request(resource)
+            erb :orthor_content, { :layout => ::Orthor::Site.layout }
           end
         end
         
-        if resource.is_a?(::Orthor::Feed)
-          get resource.path do
+        get resource.path do
+          if resource.is_a?(::Orthor::Feed)
             headers['Cache-Control'] = "public, max-age=#{resource.cache_for}"
             resource.content
-          end
-        else
-          get resource.path do
+          elsif resource.is_a?(::Orthor::StaticPage)
+            handle_request(resource)
+            erb resource.action.to_sym, { :layout => ::Orthor::Site.layout }
+          else
             @orthor_content = resource.content
             handle_request(resource)
+            erb :orthor_content, { :layout => ::Orthor::Site.layout }
           end
         end
       end

data/orthorings.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orthorings}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Langhorne"]
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "VERSION",
-     "app/controllers/orthor/content_controller.rb",
+     "app/controllers/orthor_content_controller.rb",
      "app/views/layouts/orthor_layout.html.erb",
-     "app/views/orthor/content/orthor_content.html.erb",
+     "app/views/orthor_content/orthor_content.html.erb",
      "config/routes.rb",
      "lib/core_ext/dsl_accessor.rb",
      "lib/orthor/category.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orthorings
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Anthony Langhorne
@@ -36,9 +36,9 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
-- app/controllers/orthor/content_controller.rb
+- app/controllers/orthor_content_controller.rb
 - app/views/layouts/orthor_layout.html.erb
-- app/views/orthor/content/orthor_content.html.erb
+- app/views/orthor_content/orthor_content.html.erb
 - config/routes.rb
 - lib/core_ext/dsl_accessor.rb
 - lib/orthor/category.rb