orthorings 0.2.0 → 0.3.0

data/README.markdown

@@ -9,7 +9,7 @@ The 2 main things you can do with Orthorings are:
 
 ## Installation
 
-As a gem (from gemcutter.org)
+As a gem 
     
     gem install orthorings 
 
@@ -36,14 +36,14 @@ Here is some example usage (more docs to come, this is still a WIP and some aspe
       keywords "your, site, specific, keywords"
       description "what's your site doing?"
   
-      page "/", "Home" 
-      page "/about", "About Us"
+      page "/", "home"
+      page "/about"
 
-      feed "/blog.rss", "Blog" do
-        id "our-blog"
+      feed "/blog.rss", "our-blog" do
+        name "Our Blog Feed"
       end
       
-      static_page "/about-us", "About Us" do
+      static_page "/about-us" do
         view "public/about_us"
       end
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/orthor/object.rb

@@ -6,11 +6,10 @@ module Orthor
     attr_accessor :path
     dsl_accessor :name, :id, :view
 
-    def initialize(path, object_name = nil, &block)
+    def initialize(path, id = nil, &block)
       @path = path
       raise "Path required" unless @path
-      @id = @path.split("/").last # by default, can be passed in
-      name(object_name)
+      @id = id || @path.split("/").last
 
       instance_eval &block if block_given?
     end
@@ -27,4 +26,4 @@ module Orthor
       raise "This must be overriden in any Orthor::Object subclass"
     end
   end
-end
+end

data/orthorings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orthorings}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Langhorne"]
-  s.date = %q{2010-04-04}
+  s.date = %q{2010-04-06}
   s.email = %q{anthony@orthor.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/orthor/dsl_spec.rb

@@ -173,8 +173,10 @@ describe Orthor::Site, "orthor site dsl" do
   describe "pages" do
     before(:all) do
       Orthor::Site.define do
-        page "/about-us", "About us"
-        page "/contact", "Contact Us"
+        page "/about-us", "about" do
+          name "About us"
+        end
+        page "/contact"
         page "/" do
           name "Home"
           cache_for 3600
@@ -205,9 +207,12 @@ describe Orthor::Site, "orthor site dsl" do
     end
     
     it "id should be inferred from the path if none is given" do
-      @page_1.id.should == "about-us"
       @page_2.id.should == "contact"
     end
+
+    it "id should be 2nd argument if any is given" do
+      @page_1.id.should == "about"
+    end
     
     it 'should allow setting specific http cache lengths' do
       @page_1.cache_for.should == 0 # sites default

data/spec/orthor_helper_spec.rb

@@ -36,7 +36,9 @@ describe OrthorHelper do
         keywords "site keywords"
         description "site description"
 
-        feed "/news.rss", "News"
+        feed "/news.rss" do
+          name "News"
+        end
 
         category "/writings" do
           feed "/writings.rss" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orthorings
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Anthony Langhorne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +11:00
+date: 2010-04-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency