heritage 0.1.0 → 0.2.0

data/README.textile

@@ -65,7 +65,7 @@ We need a @heir_id@ column of type @integer@ and a @heir_type@ column of type @s
       drop_table :blog_posts
     end
   end
-<end>
+</pre>
   
 When this is done and the database is migrated, we can begin using the models.
 
@@ -209,6 +209,10 @@ If you absolutely need to do a direct delete in the database, then you need to m
 
 For instance, if you manually delete a @BlogPost@ that is heir of @Post@, then you need to first find the right @Post@, then delete the heir and finally delete the predecessor.
 
+h2. Advanced usage
+
+It is always possible to traverse between a predecessor and it's associated heir, through the @predecessor@ method of an heir, and the @heir@ method of a predecessor.
+
 h2. Questions, Feedback
 
 Feel free to message me on Github (murui)
@@ -222,25 +226,6 @@ h2. Credits
 Credits goes out to Gerry from TechSpry.com for the idea for this implementation:
 http://techspry.com/ruby_and_rails/multiple-table-inheritance-in-rails-3/
 
-h2. Copyright
-
-Copyright (c) 2011 Benjamin Media A/S
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+h2. License
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dct:title" rel="dct:type">Heritage</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="https://github.com/BenjaminMedia/Heritage" property="cc:attributionName" rel="cc:attributionURL">Thomas Dippel @ Benjamin Media A/S</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://techspry.com/ruby_and_rails/multiple-table-inheritance-in-rails-3/" rel="dct:source">techspry.com</a>

data/heritage_demo/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ~/Projects/benjamin/heritage
   specs:
-    heritage (0.0.1)
+    heritage (0.1.0)
 
 GEM
   remote: http://rubygems.org/

data/heritage_demo/app/models/blog_post.rb

@@ -2,6 +2,9 @@ class BlogPost < ActiveRecord::Base
   
   acts_as_heir_of :post
   
+  validates_presence_of :body
+  validates_presence_of :title
+  
   def hello
     "Yo! #{predecessor.hello}"
   end

data/heritage_demo/app/models/category.rb

@@ -0,0 +1,5 @@
+class Category < ActiveRecord::Base
+  
+  has_many :posts
+  
+end

data/heritage_demo/app/models/post.rb

@@ -2,6 +2,8 @@ class Post < ActiveRecord::Base
   
   acts_as_predecessor :exposes => :hello
   
+  belongs_to :category
+  
   def hello
     "Hi there!"
   end

data/heritage_demo/app/views/blog_posts/_form.html.erb

@@ -1,10 +1,24 @@
+<% if @blog_post.errors.any? %>
+  <p>
+    <%#= @blog_post.errors.inspect %>
+  </p>
+<div id="errorExplanation">
+  <h2><%= pluralize(@blog_post.errors.count, "error") %> prohibited this record from being saved:</h2>
+  <ul>
+  <% @blog_post.errors.full_messages.each do |msg| %>
+    <li><%= msg %></li>
+  <% end %>
+  </ul>
+</div>
+<% end %>
+
 <% form_for @blog_post do |f| -%>
   <p>
-    <%= f.label :title, "Title" %>
+    <%= f.label :title %>
     <%= f.text_field :title %>
   </p>
   <p>
-    <%= f.label :body, "Body" %>
+    <%= f.label :body %>
     <%= f.text_field :body %>
   </p>
   <p>

data/heritage_demo/config/locales/en.yml

@@ -3,3 +3,12 @@
 
 en:
   hello: "Hello world"
+  
+  activerecord:
+    attributes:
+      blog_post:
+        predecessor:
+          title: Gnap
+        body: Shazam
+        title: Yauza
+      

data/heritage_demo/db/migrate/20110412094758_create_categories.rb

@@ -0,0 +1,15 @@
+class CreateCategories < ActiveRecord::Migration
+  def self.up
+    create_table :categories do |t|
+      t.string      :name
+      t.timestamps
+    end
+    
+    add_column :posts, :category_id, :integer
+  end
+
+  def self.down
+    remove_column :posts, :category_id
+    drop_table :categories
+  end
+end

data/heritage_demo/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110411095655) do
+ActiveRecord::Schema.define(:version => 20110412094758) do
 
   create_table "_blog_posts_old_20110411", :force => true do |t|
     t.integer  "predecessor_id"
@@ -30,6 +30,12 @@ ActiveRecord::Schema.define(:version => 20110411095655) do
     t.text "body"
   end
 
+  create_table "categories", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "image_posts", :force => true do |t|
     t.integer "aspect"
   end
@@ -40,6 +46,7 @@ ActiveRecord::Schema.define(:version => 20110411095655) do
     t.string   "title"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "category_id"
   end
 
 end

data/heritage_demo/test/fixtures/categories.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value

data/heritage_demo/test/unit/category_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class CategoryTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/lib/heritage/active_record/acts_as_heir.rb

@@ -14,7 +14,8 @@ module Heritage
 
         alias_method_chain :predecessor, :build
         
-        self._predecessor_klass.content_columns.map(&:name).each do |att|
+        # Expose columns from the predecessor
+        self._predecessor_klass.columns.reject{|c| c.primary || c.name == Post.inheritance_column || c.name =~ /^heir_/}.map(&:name).each do |att|
           define_method(att) do
             predecessor.send(att)
           end
@@ -23,6 +24,16 @@ module Heritage
           end
         end
         
+        # Expose associations from the predecessor
+        self._predecessor_klass.reflect_on_all_associations.reject{|a| a.name == :heir}.each do |association|
+          define_method(association.name) do
+            predecessor.send(association.name)
+          end
+          define_method("#{association.name}=") do |val|
+            predecessor.send("#{association.name}=",val)
+          end
+        end
+        
         # We need to make sure that updated_at values in the predecessor table is updated when the heir is saved.
         after_update :touch_predecessor
         

data/lib/heritage/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heritage
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Thomas Dippel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +02:00
+date: 2011-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +48,7 @@ files:
 - heritage_demo/app/helpers/image_posts_helper.rb
 - heritage_demo/app/helpers/posts_helper.rb
 - heritage_demo/app/models/blog_post.rb
+- heritage_demo/app/models/category.rb
 - heritage_demo/app/models/image_post.rb
 - heritage_demo/app/models/post.rb
 - heritage_demo/app/views/blog_posts/_form.html.erb
@@ -80,6 +81,7 @@ files:
 - heritage_demo/db/migrate/20110411095519_create_posts.rb
 - heritage_demo/db/migrate/20110411095612_create_blog_posts.rb
 - heritage_demo/db/migrate/20110411095655_create_image_posts.rb
+- heritage_demo/db/migrate/20110412094758_create_categories.rb
 - heritage_demo/db/schema.rb
 - heritage_demo/db/seeds.rb
 - heritage_demo/doc/README_FOR_APP
@@ -100,6 +102,7 @@ files:
 - heritage_demo/public/stylesheets/.gitkeep
 - heritage_demo/script/rails
 - heritage_demo/test/fixtures/blog_posts.yml
+- heritage_demo/test/fixtures/categories.yml
 - heritage_demo/test/fixtures/image_posts.yml
 - heritage_demo/test/fixtures/posts.yml
 - heritage_demo/test/functional/blog_posts_controller_test.rb
@@ -108,6 +111,7 @@ files:
 - heritage_demo/test/performance/browsing_test.rb
 - heritage_demo/test/test_helper.rb
 - heritage_demo/test/unit/blog_post_test.rb
+- heritage_demo/test/unit/category_test.rb
 - heritage_demo/test/unit/helpers/blog_posts_helper_test.rb
 - heritage_demo/test/unit/helpers/image_posts_helper_test.rb
 - heritage_demo/test/unit/helpers/posts_helper_test.rb