column_hider 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badf7c2c991d783e0e4b34b2008ad9e4dc05cc09
-  data.tar.gz: ba10ae1db681ea76972df423cda94c0da7372c3d
+  metadata.gz: 92694d59e054b7bf2a60bb47e269747e1d963fc3
+  data.tar.gz: 95ac8dcf140fb78bc66bac925793032f8e956c25
 SHA512:
-  metadata.gz: f49d270c3bf75e4f9feb9923729ea2f3834558dae2808db87b3d042b62437d20d3816e632914fdaf76cc88297efe09213d4f5a1d67594c1c0dd178a432627acb
-  data.tar.gz: 8d1cd306bf2e5886f85dc86fd5c581afd3be6f61edd9170a4d1614f2ab0e23254d73b4b1e1a832aeb114917d9222f6e85fc0791936f26274649a585de0531d80
+  metadata.gz: edaf3c141bf8d6963eabaf3dd30f928aac951951ecaa4d68f44bcdaf3f3bdda091c46986f7721e95a4cca7610f627624f66c3cc313374753790386cbb92c3121
+  data.tar.gz: 83d38ab53752217368371305e19f25e462a9480706b2b7a4c790d8f1a569a67f62ad72198d0136ca135762e851f437565e7e5e502c0de474939e05811804a265

data/lib/column_hider/version.rb

@@ -1,3 +1,3 @@
 module ColumnHider
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/column_hider.rb

@@ -5,20 +5,20 @@ module ColumnHider
   # Overrides the Rails ActiveRecord Attributes "columns" method.
   # This allows the logical removal of a column prior to its physical removal.
   # To use, add two lines to your model:
-  # `  extend ColumnHider`
+  # `  extend ColumnHider::ActiveRecordAttributes`
   # `  column_hider_columns :column_one, :column_two, ...`
   #
   module ActiveRecordAttributes
     def column_hider_columns(*cols)
-      @column_hider_columns = []
+      @column_hider_columns = {}
       cols.each do |col|
-        @column_hider_columns << col.to_s
+        @column_hider_columns[col] = true
       end
     end
 
     def columns
-      @column_hider_columns ||= [] # just in case the model includes the line "  extend ColumnHider", but doesn't call column_hider_columns
-      super.reject { |col| @column_hider_columns.include?(col.name) }
+      @column_hider_columns ||= {} # just in case the model has "extend ColumnHider::ActiveRecordAttributes", but doesn't call column_hider_columns
+      super.reject { |col| @column_hider_columns.has_key?(col.name.to_sym) }
     end
   end
 

data/test/column_hider_test.rb

@@ -10,7 +10,7 @@ describe ColumnHider do
   before do
     class Country < ActiveRecord::Base
       establish_connection :adapter => 'sqlite3', :database => ':memory:'
-      connection.create_table(:countries, :force => true) do |t|
+      connection.create_table(:countries) do |t|
         t.string :name
         t.string :capital
         t.string :comment
@@ -27,6 +27,7 @@ describe ColumnHider do
   describe '#column is removed in the model' do
     let(:mock_col_arr) { %w(id name comment) }
     col_arr = []
+
     it '#shows the column is not there' do
       Country.columns.each do |col|
         col_arr << col.name
@@ -35,11 +36,18 @@ describe ColumnHider do
       expect(col_arr).must_include('comment')
       expect(col_arr).wont_include('capital')
     end
+
+    it '#raises an error if we reference a hidden column' do
+      assert_raises ActiveRecord::UnknownAttributeError do
+        c = Country.new(name: 'USA', capital: 'Washington, DC', comment: 'America')
+      end
+    end
   end
 
   describe '#column is removed dynamically' do
     let(:mock_col_arr) { %w(id name capital) }
     col_arr = []
+
     it '#shows the column is not there' do
       Country.send :column_hider_columns, :comment
       Country.columns.each do |col|
@@ -50,4 +58,34 @@ describe ColumnHider do
       expect(col_arr).wont_include('comment')
     end
   end
+
+  describe '#multiple columns are removed dynamically' do
+    let(:mock_col_arr) { %w(id name) }
+    col_arr = []
+
+    it '#shows the column is not there' do
+      Country.send :column_hider_columns, :comment, :capital
+      Country.columns.each do |col|
+        col_arr << col.name
+      end
+      expect(col_arr).must_equal(mock_col_arr)
+      expect(col_arr).wont_include('capital')
+      expect(col_arr).wont_include('comment')
+    end
+  end
+
+  describe '#no columns are removed' do
+    let(:mock_col_arr) { %w(id name capital comment) }
+    col_arr = []
+
+    it '#shows the column is not there' do
+      Country.send :column_hider_columns
+      Country.columns.each do |col|
+        col_arr << col.name
+      end
+      expect(col_arr).must_equal(mock_col_arr)
+      expect(col_arr).must_include('capital')
+      expect(col_arr).must_include('comment')
+    end
+  end
 end