orthorings 0.1.5 → 0.2.0

data/README.markdown

@@ -11,7 +11,7 @@ The 2 main things you can do with Orthorings are:
 
 As a gem (from gemcutter.org)
     
-    sudo gem install orthorings --source http://gemcutter.org
+    gem install orthorings 
 
 ## Configuration
 
@@ -46,6 +46,8 @@ Here is some example usage (more docs to come, this is still a WIP and some aspe
       static_page "/about-us", "About Us" do
         view "public/about_us"
       end
+
+      query "/latest-news"
   
       category "/writings" do
         keywords "lets, do, some, seo"

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/orthor/category.rb

@@ -5,7 +5,7 @@ module Orthor
     dsl_accessor :page_path
 
     def initialize(path, category_name, &block)
-      @feeds, @categories, @pages, @static_pages = [], [], [], []
+      @feeds, @categories, @pages, @static_pages, @queries = [], [], [], [], []
       super path, category_name, &block
     end
     
@@ -13,4 +13,4 @@ module Orthor
       Orthorings.category(@id)
     end
   end
-end
+end

data/lib/orthor/collections.rb

@@ -1,6 +1,6 @@
 module Orthor
   module Collections
-    attr_accessor :feeds, :categories, :pages, :static_pages
+    attr_accessor :feeds, :categories, :pages, :static_pages, :queries
 
     def feed(path, name = nil, &block)
       feeds << Orthor::Feed.new(path, name, &block)
@@ -17,10 +17,14 @@ module Orthor
     def static_page(path, name = nil, &block)
       static_pages << Orthor::StaticPage.new(path, name, &block)
     end 
+
+    def query(path, name = nil, &block)
+      queries << Orthor::Query.new(path, name, &block)
+    end
     
     def resources
-      return [] unless @feeds && @pages && @static_pages && @categories
-      (@feeds + @pages + @static_pages + @categories + @categories.collect { |category| category.resources }).flatten
+      return [] unless @feeds && @pages && @static_pages && @categories && @queries
+      ((@feeds + @pages + @static_pages + @categories + @queries) + @categories.collect { |category| category.resources }).flatten
     end
   end
-end
+end

data/lib/orthor/query.rb

@@ -0,0 +1,7 @@
+module Orthor
+  class Query < Orthor::Object
+    def fetch_content
+      Orthorings.query(@id)
+    end
+  end
+end

data/lib/orthor/site.rb

@@ -8,7 +8,7 @@ module Orthor
       dsl_accessor :layout
 
       def define(&block)
-        @feeds, @categories, @pages, @static_pages = [], [], [], []
+        @feeds, @categories, @pages, @static_pages, @queries = [], [], [], [], []
         layout(:orthor_layout) 
         cache_for 0
         keywords ""
@@ -26,4 +26,4 @@ module Orthor
       end
     end
   end
-end
+end

data/lib/orthorings.rb

@@ -1,5 +1,6 @@
 Dir[File.dirname(__FILE__) + '/core_ext/*.rb'].each { |e| require e }
-%w(orthor/http_caching orthor/meta_data orthor/collections orthor/site orthor/object orthor/category orthor/feed orthor/page orthor/static_page).each { |r| require File.join(File.dirname(__FILE__), r) }
+%w(orthor/http_caching orthor/meta_data orthor/collections orthor/site orthor/object orthor/category orthor/feed orthor/page orthor/static_page orthor/query).each { |r| require File.join(File.dirname(__FILE__), r) }
+
 require File.join(File.dirname(__FILE__), 'orthorings')
 require File.join(File.dirname(__FILE__), 'orthor_helper')
 require 'moneta'

data/orthorings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orthorings}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Langhorne"]
-  s.date = %q{2010-02-02}
+  s.date = %q{2010-04-04}
   s.email = %q{anthony@orthor.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/orthor/meta_data.rb",
      "lib/orthor/object.rb",
      "lib/orthor/page.rb",
+     "lib/orthor/query.rb",
      "lib/orthor/site.rb",
      "lib/orthor/static_page.rb",
      "lib/orthor_helper.rb",

data/spec/orthor/dsl_spec.rb

@@ -17,7 +17,7 @@ describe Orthor::Site, "orthor site dsl" do
       Orthor::Site.layout.should == :application
     end
     
-    [ :categories, :feeds, :pages, :static_pages ].each do |collection|
+    [ :categories, :feeds, :pages, :static_pages, :queries ].each do |collection|
       it "should have a #{collection} array" do
         Orthor::Site.send(collection).should == []
       end
@@ -43,6 +43,10 @@ describe Orthor::Site, "orthor site dsl" do
     before(:all) do
       Orthor::Site.define do
         page "/", "Home"
+
+        query "/news" do
+          id "latest-news"
+        end
         
         category "/writings" do
           page "/writings/why", "Why we write"
@@ -51,6 +55,10 @@ describe Orthor::Site, "orthor site dsl" do
             id "our-writings"
             name "Our Writings"
           end
+        
+          query "/latest" do
+            id "latest-article"
+          end
 
           category "/writings/announcements" do
             page "/3rd-level", "3rd level"
@@ -63,10 +71,12 @@ describe Orthor::Site, "orthor site dsl" do
       @page_1 = Orthor::Site.pages.first
       @page_2 = @category_1.pages.first
       @page_3 = @category_2.pages.first
+      @query = Orthor::Site.queries.first
+      @query_1 = @category_1.queries.first
     end
     
     it 'should return all resources defined in the dsl' do
-      Orthor::Site.resources.length.should == 6
+      Orthor::Site.resources.length.should == 8
       
       Orthor::Site.resources.should include(@category_1)
       Orthor::Site.resources.should include(@category_2)
@@ -74,6 +84,8 @@ describe Orthor::Site, "orthor site dsl" do
       Orthor::Site.resources.should include(@page_1)
       Orthor::Site.resources.should include(@page_2)
       Orthor::Site.resources.should include(@page_3)  
+      Orthor::Site.resources.should include(@query)
+      Orthor::Site.resources.should include(@query_1)
     end
   end
   
@@ -206,6 +218,32 @@ describe Orthor::Site, "orthor site dsl" do
       @page_3.id.should == "homepage"
     end
   end
+
+  describe "queries" do
+    before(:all) do
+      Orthor::Site.define do
+        query "/news" do
+          id "news"
+        end
+
+        query "/latest-release"
+      end
+      @query_1 = Orthor::Site.queries.first
+      @query_2 = Orthor::Site.queries.last
+    end
+
+    it "should support multiple queries" do
+      Orthor::Site.queries.length.should == 2
+    end
+
+    it "should support setting a query id" do
+      @query_1.id.should == "news"
+    end
+
+    it "should infer id from path when none is given" do
+      @query_2.id.should == "latest-release"
+    end
+  end
   
   describe "feeds" do
     before(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orthorings
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Anthony Langhorne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 +11:00
+date: 2010-04-04 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - lib/orthor/meta_data.rb
 - lib/orthor/object.rb
 - lib/orthor/page.rb
+- lib/orthor/query.rb
 - lib/orthor/site.rb
 - lib/orthor/static_page.rb
 - lib/orthor_helper.rb