Merge pull request #2 from plukevdh/inheritance-fix

fix inheritance issues

lib/schemad/entity.rb

@@ -6,7 +6,7 @@ class Entity
     extend Schemad::Extensions
 
     def self.inherited(subclass)
-      subclass.instance_variable_set(:@attributes, [])
+      subclass.instance_variable_set(:@attributes, inherited_attrs)
     end
 
     def self.attribute(name, args={}, &block)
@@ -45,6 +45,10 @@ def to_hash
     alias_method :attributes, :to_hash
 
     private
+    def self.inherited_attrs
+      parent_attrs = self.instance_variable_get(:@attributes)
+      default_attrs = (parent_attrs ? parent_attrs.dup : [])
+    end
 
     def self.define_parser_for(name, args, &block)
       define_method "parse_#{name}" do |data|

spec/entity_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'timecop'
+require 'schemad/default_types'
 require 'schemad/entity'
 
 require_relative 'fixtures/demo_class'
@@ -53,4 +54,57 @@
       }}
     end
   end
+
+  context "inherited entities" do
+    class Base < Schemad::Entity
+      attribute :name
+    end
+
+    class Sub < Base
+      attribute :place
+    end
+
+    context "via setters" do
+      Given(:parent) { Base.new }
+      Given(:child) { Sub.new }
+
+      context "parent has top-level attributes" do
+        When { parent.name = "Whil Wheaton" }
+        Then { parent.name.should == "Whil Wheaton" }
+      end
+
+      context "parent does not get child attributes" do
+        When(:result) { parent.place }
+        Then { expect(result).to have_failed(NoMethodError) }
+      end
+
+      context "child has all attributes" do
+        Given do
+          child.name = "Bill Cosby"
+          child.place = "NY, NY"
+        end
+        Then { child.name.should == "Bill Cosby" }
+        And { child.place.should == "NY, NY" }
+      end
+    end
+
+    context 'via #from_data' do
+      Given(:parent) { Base.from_data({ name: "Whil Wheaton", place: "Burt's Bees" }) }
+
+      context "parent has top-level attributes" do
+        Then { parent.name.should == "Whil Wheaton" }
+      end
+
+      context "parent does not get child attributes" do
+        When(:result) { parent.place }
+        Then { expect(result).to have_failed(NoMethodError) }
+      end
+
+      context "child has all attributes" do
+        Given(:child) { Sub.from_data({ name: "Jim Beam", place: "Black, Not" }) }
+        Then { child.name.should == "Jim Beam" }
+        And { child.place.should == "Black, Not" }
+      end
+    end
+  end
 end