orthorings 0.1.2 → 0.1.3

data/README.markdown

@@ -17,9 +17,9 @@ As a gem (from gemcutter.org)
 
 Add a new file (e.g. orthor_config.rb) with the something like the below to your startup directory (e.g. in Rails config/initializers)
 
-    Orthorings.setup do |config|
-      config.account_id = "orthor"
-      config.caching :memory, 300, {}
+    Orthorings.setup do
+      account_id "orthor"
+      caching :memory, 300, {}
     end
 
 You can specify any Moneta cache class as the first argument to config.caching, the second argument is expiry time in seconds. The third is any additional arguments you want passed to the cache class on initialize.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/orthorings.rb

@@ -8,7 +8,8 @@ class Orthorings
   require 'net/http'
   
   class << self
-    attr_accessor :account_id, :cache, :cache_expiry
+    dsl_accessor :account_id
+    attr_accessor :cache, :cache_expiry
 
     def content(id)
       get_content(id, "http://content.orthor.com/#{@account_id}/content_items/#{id}.html")
@@ -33,10 +34,11 @@ class Orthorings
       @cache_expiry = expiry
     end
 
-    def setup
+    def setup(&block)
+      raise "Block required" unless block_given?
       @cache = false # default
 
-      yield self
+      class_eval &block
 
       raise "No orthor account id given... Please add one to your Orthorings setup block" if Orthorings.account_id.nil?
       ActionView::Base.send(:include, OrthorHelper) if defined?(ActionView::Base) && !ActionView::Base.include?(OrthorHelper)

data/orthorings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orthorings}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Langhorne"]
-  s.date = %q{2009-09-28}
+  s.date = %q{2009-10-07}
   s.email = %q{anthony@orthor.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/orthor/dsl_spec.rb

@@ -244,6 +244,8 @@ describe Orthor::Site, "orthor site dsl" do
         static_page "/" do
           name "Home"
           cache_for 3600
+          action :blah
+          controller :asdf
         end
       end
       @page_1 = Orthor::Site.static_pages[0]
@@ -254,6 +256,14 @@ describe Orthor::Site, "orthor site dsl" do
     it 'should support multiple pages' do
       Orthor::Site.static_pages.length.should == 3
     end
+
+    it 'should support setting action' do
+      @page_3.action.should == :blah
+    end
+
+    it 'should support setting controller' do
+      @page_3.controller.should == :asdf
+    end
     
     it 'should support specifying pages with or without a block' do
       @page_1.name.should == "About us"

data/spec/orthorings_spec.rb

@@ -7,8 +7,8 @@ describe Orthorings, "fetching content" do
     FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/queries/latest-news-items.html", :body => File.join(SPEC_DIR, 'resources', 'latest-news-items.html'))
     FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/news.html", :body => File.join(SPEC_DIR, 'resources', 'news.html'))
     
-    Orthorings.setup do |config|
-      config.account_id = "orthor"
+    Orthorings.setup do
+      account_id "orthor"
     end
   end
   
@@ -35,9 +35,9 @@ describe Orthorings, "caching content" do
     FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/queries/latest-news-items.html", :body => File.join(SPEC_DIR, 'resources', 'latest-news-items.html'))
     FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/news.html", :body => File.join(SPEC_DIR, 'resources', 'news.html'))
     
-    Orthorings.setup do |config|
-      config.account_id = "orthor"
-      config.caching :memory
+    Orthorings.setup do 
+      account_id "orthor"
+      caching :memory
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orthorings
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Anthony Langhorne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 +10:00
+date: 2009-10-07 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency