content_driven 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3403e03f4fc413624e8ce2e5f2d73bd279bc83c
-  data.tar.gz: 6b0d0ab09da151ba396bae5eb3700c5b025ddd0f
+  metadata.gz: ca15caf0ab486baf01025ee59176a8af87105d63
+  data.tar.gz: cc7802c13a37324c11e058111ade263041bef7cc
 SHA512:
-  metadata.gz: a3d3a1724d30c2bd7ee8f5ef159894ee2eff2b374d815345b1a40794101b9b19ec9989ca0673ae85473a493330147e72bf396486ebffa878000af29e65c109cf
-  data.tar.gz: a33a5eb1b9435cfa87c0d719df4eca2d49a99acdfd7c129c8264793f5393c1a8076825af847a4d8d343e2733cc74d19e2d90b3f1197097c7084912256c311b29
+  metadata.gz: 13b3ac06b258383c7f6f6d2a83acd4072e973d36a4b2b321655f7bd9bff852cb6b432df160464e065493c6b6a67fe11f288e413e2fb6d3bceb916fc68d68e3c0
+  data.tar.gz: d8c69dae0a02923f509b7c62a545e833af838f0dcecd541d93394167a956c14da04469af29722cc555069d3f9c0d0b8fa42789d0e518237cd125fa19f6eac937

data/changelog.md

@@ -0,0 +1,6 @@
+Content Driven Changelog
+
+Version 0.2.0
+
+* Added Article content type
+* Removed children. Page now inherits directly from Hash.

data/lib/content_driven.rb

@@ -1,3 +1,4 @@
+require_relative "content_driven/article"
 require_relative "content_driven/blog"
 require_relative "content_driven/blog_post"
 require_relative "content_driven/tag"

data/lib/content_driven/article.rb

@@ -0,0 +1,6 @@
+require_relative 'page'
+
+module ContentDriven
+  class Article < Page
+  end
+end

data/lib/content_driven/blog.rb

@@ -1,7 +1,6 @@
 require_relative 'page'
 
 module ContentDriven
-
   class Blog < Page
     # TODO: Convenience shorthand methods
     # alias_method :add_post,  :add_blog_post

data/lib/content_driven/dsl.rb

@@ -10,8 +10,8 @@ module ContentDriven
 
       # Allows us to call methods like site.blogs and blog.blog_posts
       define_method("get_#{class_name.pluralise}") do
-        children.dup.delete_if do |child|
-          !children[child].is_a? subclass
+        self.dup.delete_if do |child|
+          !self[child].is_a? subclass
         end
       end
 

data/lib/content_driven/hooks.rb

@@ -0,0 +1,21 @@
+
+module ContentDriven
+  module Hooks
+
+    attr :after_hooks
+    def after_hooks
+      @after_hooks ||= []
+    end
+
+    def call_after_hooks
+      after_hooks.each do |hook|
+        self.instance_eval &hook
+      end
+    end
+
+    def after &block
+      after_hooks << block
+    end
+
+  end
+end

data/lib/content_driven/page.rb

@@ -1,6 +1,7 @@
 require_relative "support"
 require_relative "dsl"
 require_relative "page_list"
+require_relative "hooks"
 require_relative "routes"
 require 'active_support/core_ext/string'
 
@@ -8,11 +9,12 @@ module ContentDriven
 
   # ContentDriven defines a tree of content. Page is the base class.
   # A Page has a parent and zero or more children
-  class Page
-    attr_accessor :parent, :children, :url, :title, :date
+  class Page < Hash
+    attr_accessor :parent, :url, :title, :date
 
     extend ContentDriven::DSL
     include ContentDriven::Routes
+    extend ContentDriven::Hooks
 
     # Extend the DSL when Page is subclasses
     def self.inherited(subclass)
@@ -20,21 +22,21 @@ module ContentDriven
     end
 
     def initialize &block
-      self.children = PageList.new
       if block_given?
         self.instance_eval &block
       end
+      self.class.call_after_hooks
     end
 
     # Add a child page. You will seldom need to call this directly.
     # Instead use add_blog or add_article
     def add_child key, page = nil
       if key.is_a? Page
-        page, key = key, (children.keys.length + 1).to_sym
+        page, key = key, (self.keys.length + 1).to_sym
       end
       page.parent = self
       page.url = key
-      children[key] = page
+      self[key] = page
     end
 
     # Is this a root page, i.e. it has no parent?
@@ -44,12 +46,13 @@ module ContentDriven
 
     # Returns the URL fragment as a symbol, or :root if it is the root page
     def to_sym
-      if root?
-        return :root
-      else
-        return self.url.to_sym
-      end
+      root? ? :root : self.url.to_sym
+    end
+
+    def children
+      self
     end
 
+
   end
 end

data/lib/content_driven/version.rb

@@ -1,3 +1,3 @@
 module ContentDriven
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/dsl_spec.rb

@@ -16,8 +16,8 @@ describe ContentDriven::Page do
     expect(ContentDriven::Page.instance_methods.include? :add_pony).to be_true
     page = ContentDriven::Page.new
     page.add_pony :wow_a_pony
-    expect(page.children.length).to eq(1)
-    expect(page.children[:wow_a_pony].class).to be(ContentDriven::Pony)
+    expect(page.length).to eq(1)
+    expect(page[:wow_a_pony].class).to be(ContentDriven::Pony)
   end
 
   it "will gain a method of the form get_x when subclassed" do
@@ -42,7 +42,7 @@ describe ContentDriven::Page do
       add_dog :fifth
     end
     puts "Cats"
-    expect(page.children.length).to be(5)
+    expect(page.length).to be(5)
     expect(page.get_dogs.length).to be(2)
     expect(page.get_cats.length).to be(3)
   end

data/spec/page_spec.rb

@@ -11,8 +11,8 @@ describe ContentDriven::Page do
 
   it "can be initialized with a block" do
     page = ContentDriven::Page.new {add_blog :test}
-    expect(page.children.length).to be(1)
-    expect(page.children[:test].class).to be(ContentDriven::Blog)
+    expect(page.length).to be(1)
+    expect(page[:test].class).to be(ContentDriven::Blog)
   end
 
   it "can be initialized with a nested block" do
@@ -21,10 +21,10 @@ describe ContentDriven::Page do
         add_blog :test_2
       end
     end
-    expect(page.children.length).to be(1)
-    expect(page.children[:test].class).to be(ContentDriven::Blog)
-    expect(page.children[:test].children.length).to be(1)
-    expect(page.children[:test].children[:test_2].class).to be(ContentDriven::Blog)
+    expect(page.length).to be(1)
+    expect(page[:test].class).to be(ContentDriven::Blog)
+    expect(page[:test].children.length).to be(1)
+    expect(page[:test].children[:test_2].class).to be(ContentDriven::Blog)
   end
 
   it "has a title" do
@@ -35,8 +35,8 @@ describe ContentDriven::Page do
   it "can add a child page with a key" do
     child = ContentDriven::Page.new
     @page.add_child :child, child
-    expect(@page.children.length).to be(1)
-    expect(@page.children[:child]).to be(child)
+    expect(@page.length).to be(1)
+    expect(@page[:child]).to be(child)
     expect(child.parent).to be(@page)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content_driven
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nicholas Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,11 +79,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- changelog.md
 - content_driven.gemspec
 - lib/content_driven.rb
+- lib/content_driven/article.rb
 - lib/content_driven/blog.rb
 - lib/content_driven/blog_post.rb
 - lib/content_driven/dsl.rb
+- lib/content_driven/hooks.rb
 - lib/content_driven/page.rb
 - lib/content_driven/page_list.rb
 - lib/content_driven/routes.rb
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Emphasised great Information Architecture, Metadata and SEO. Define your