ignorable 0.1.0 → 0.2.0

data/lib/ignorable.rb

@@ -1,46 +1,52 @@
+require 'active_record'
+
 module Ignorable
-  def columns
-    @columns ||= super.reject do |col|
-      self.ignored_column?(col)
-    end
+  extend ActiveSupport::Concern
+  
+  def attribute_names # :nodoc:
+    super.reject{|col| self.class.ignored_column?(col)}
   end
 
-  attr_reader :ignored_columns
+  module ClassMethods
+    def columns # :nodoc:
+      @columns ||= super.reject{|col| ignored_column?(col)}
+    end
 
-  # Prevent Rails from loading a table column.
-  # Useful for legacy database schemas with problematic column names,
-  # like 'class' or 'attributes'.
-  #
-  #   class Topic < ActiveRecord::Base
-  #     ignore_columns :attributes, :class
-  #   end
-  #
-  #   Topic.new.respond_to?(:attributes) => false
-  def ignore_columns *columns
-    @ignored_columns ||= []
-    @ignored_columns += columns.map(&:to_s)
-    reset_column_information
-    @ignored_columns.tap(&:uniq!)
-  end
-  alias ignore_column ignore_columns
+    attr_reader :ignored_columns
 
-  # Has a column been ignored?
-  # Accepts both ActiveRecord::ConnectionAdapter::Column objects,
-  # and actual column names ('title')
-  def ignored_column? column
-    ignored_columns.present? && ignored_columns.include?(
-      column.respond_to?(:name) ? column.name : column.to_s
-    )
-  end
+    # Prevent Rails from loading a table column.
+    # Useful for legacy database schemas with problematic column names,
+    # like 'class' or 'attributes'.
+    #
+    #   class Topic < ActiveRecord::Base
+    #     ignore_columns :attributes, :class
+    #   end
+    #
+    #   Topic.new.respond_to?(:attributes) => false
+    def ignore_columns(*columns)
+      @ignored_columns ||= []
+      @ignored_columns += columns.map(&:to_s)
+      reset_column_information
+      @ignored_columns.tap(&:uniq!)
+    end
+    alias ignore_column ignore_columns
+
+    # Has a column been ignored?
+    # Accepts both ActiveRecord::ConnectionAdapter::Column objects,
+    # and actual column names ('title')
+    def ignored_column?(column)
+      ignored_columns.present? && ignored_columns.include?(
+        column.respond_to?(:name) ? column.name : column.to_s
+      )
+    end
 
-  def reset_ignored_columns
-    @ignored_columns = []
-    reset_column_information
+    def reset_ignored_columns
+      @ignored_columns = []
+      reset_column_information
+    end
   end
 end
 
-require 'rails'
-
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.send :extend, Ignorable
+if defined?(ActiveRecord::Base) && !ActiveRecord::Base.include?(Ignorable)
+  ActiveRecord::Base.send :include, Ignorable
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ignorable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,6 +28,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Ignore problematic column names (like 'attributes' or 'class') in ActiveRecord
   models for legacy database schemas
 email:
@@ -59,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ignorable
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ignore columns in ActiveRecord models