lib/active_house/model.rb in active_house-0.5.0 vs lib/active_house/model.rb in active_house-0.5.1

@@ -9,21 +9,32 @@
 require_relative 'logging'
 
 module ActiveHouse
   class Model
     extend PlainModel::Modeling::Queryable
-    include PlainModel::Modeling::Base
+    include ActiveModel::Model
     include ActiveHouse::Modeling::Scope
     include ActiveHouse::Modeling::Query
     include ActiveHouse::Modeling::Attributes
     include ActiveHouse::Modeling::Connection
     include ActiveHouse::Logging
 
+    Column = Struct.new(:name)
     class_attribute :_table_name, instance_accessor: false
 
     class << self
       def table_name(name)
         self._table_name = name.to_s
+      end
+
+      def columns
+        return @columns if defined?(@columns)
+
+        @columns = attribute_types.keys.map { |name| Column.new(name.to_sym) }
+      end
+
+      def column_names
+        columns.map(&:name)
       end
     end
   end
 end