active_record_schema 0.5.7 → 0.5.8

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/active_record_schema.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "active_record_schema"
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]

data/lib/active_record_schema/dsl.rb

@@ -4,14 +4,8 @@ module ActiveRecordSchema
   module Dsl
     extend ActiveSupport::Concern
     module ClassMethods
-     
-      def schema    
-        # if self.superclass != ActiveRecord::Base
-        #   table_holder = self.ancestors.find {|c| c.is_a?(Class) && c.superclass == ActiveRecord::Base}
-        #   table_holder.schema
-        # else
-        # end
-
+          
+      def schema
         @active_record_schema_schema ||= ActiveRecordSchema::Schema.new(self)
         
       end # ~ schema

data/lib/active_record_schema/schema.rb

@@ -15,6 +15,17 @@ module ActiveRecordSchema
       @indexes = {}
       @joins   = {}
     end
+    
+    def hierarchy_fields
+      if @hierarchy_fields
+        @hierarchy_fields
+      else
+        @hierarchy_fields ||= ActiveSupport::OrderedHash.new
+        self.ancestors.select { |c| c.is_a?(Class) && c.superclass == ActiveRecord::Base }.reverse_each do |klass|
+          @hierarchy_fields = @hierarchy_fields.merge(klass.fields)
+        end      
+      end
+    end    
 
     def field_names
       fields.values.map(&:name).map(&:to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -86,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2405613424171215143
+      hash: 3702613398432765162
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: