gigo-activerecord 1.2.0 → 1.3.0

data/Appraisals

@@ -12,5 +12,5 @@ appraise 'activerecord32' do
 end
 
 appraise 'activerecord40' do
-  gem 'activerecord', :github => 'rails/rails'
+  gem 'activerecord', '~> 4.0.0'
 end

data/README.md

@@ -45,6 +45,14 @@ end
 @note.subject # => "€20 – “WOOHOO”"
 ```
 
+If you want to exten all `:string` and `:text` columns, use the `gigo_columns` method. All string/text columns will be GIGO'ized. Any arguments passed to `gigi_columns` will be exculded.
+
+```ruby
+class LegacyTable < ActiveRecord::Base
+  gigo_columns
+end
+```
+
 #### Serialized Attributes
 
 Sometimes your serialized attributes need GIGO before loading the YAML.

data/gemfiles/activerecord30.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/kencollins/Repositories/customink/gigo-activerecord
   specs:
-    gigo-activerecord (1.2.0)
-      activerecord (>= 3.0)
+    gigo-activerecord (1.2.1)
+      activerecord (>= 3.0, < 5.0)
       gigo
 
 GEM
@@ -28,10 +28,10 @@ GEM
       activesupport (>= 3.0)
       ensure_valid_encoding (~> 0.5.3)
     i18n (0.5.0)
-    minitest (5.0.4)
-    rake (10.0.4)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
+    minitest (4.7.5)
+    rake (10.1.0)
+    sqlite3 (1.3.8)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
@@ -40,6 +40,6 @@ DEPENDENCIES
   activerecord (~> 3.0.0)
   appraisal
   gigo-activerecord!
-  minitest (~> 5.0)
+  minitest (~> 4.2)
   rake
   sqlite3

data/gemfiles/activerecord31.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/kencollins/Repositories/customink/gigo-activerecord
   specs:
-    gigo-activerecord (1.2.0)
-      activerecord (>= 3.0)
+    gigo-activerecord (1.2.1)
+      activerecord (>= 3.0, < 5.0)
       gigo
 
 GEM
@@ -28,12 +28,12 @@ GEM
     gigo (2.0.0)
       activesupport (>= 3.0)
       ensure_valid_encoding (~> 0.5.3)
-    i18n (0.6.4)
-    minitest (5.0.4)
-    multi_json (1.7.6)
-    rake (10.0.4)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
+    i18n (0.6.5)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    rake (10.1.0)
+    sqlite3 (1.3.8)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
@@ -42,6 +42,6 @@ DEPENDENCIES
   activerecord (~> 3.1.0)
   appraisal
   gigo-activerecord!
-  minitest (~> 5.0)
+  minitest (~> 4.2)
   rake
   sqlite3

data/gemfiles/activerecord32.gemfile.lock

@@ -1,39 +1,39 @@
 PATH
   remote: /Users/kencollins/Repositories/customink/gigo-activerecord
   specs:
-    gigo-activerecord (1.2.0)
-      activerecord (>= 3.0)
+    gigo-activerecord (1.2.1)
+      activerecord (>= 3.0, < 5.0)
       gigo
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (0.5.2)
       bundler
       rake
-    arel (3.0.2)
+    arel (3.0.3)
     builder (3.0.4)
     ensure_valid_encoding (0.5.3)
     gigo (2.0.0)
       activesupport (>= 3.0)
       ensure_valid_encoding (~> 0.5.3)
-    i18n (0.6.1)
-    minitest (5.0.4)
-    multi_json (1.7.6)
-    rake (10.0.4)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
+    i18n (0.6.5)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    rake (10.1.0)
+    sqlite3 (1.3.8)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
@@ -42,6 +42,6 @@ DEPENDENCIES
   activerecord (~> 3.2.0)
   appraisal
   gigo-activerecord!
-  minitest (~> 5.0)
+  minitest (~> 4.2)
   rake
   sqlite3

data/gemfiles/activerecord40.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", :github=>"rails/rails"
+gem "activerecord", "~> 4.0.0"
 
 gemspec :path=>"../"

data/gemfiles/activerecord40.gemfile.lock

@@ -1,59 +1,54 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: ebf2113a0565d2e38802f29291b3971b2c7f7922
-  specs:
-    activemodel (4.1.0.beta)
-      activesupport (= 4.1.0.beta)
-      builder (~> 3.1.0)
-    activerecord (4.1.0.beta)
-      activemodel (= 4.1.0.beta)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.1.0.beta)
-      arel (~> 4.0.0)
-    activesupport (4.1.0.beta)
-      i18n (~> 0.6, >= 0.6.4)
-      json (~> 1.7)
-      minitest (~> 5.0)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-
 PATH
   remote: /Users/kencollins/Repositories/customink/gigo-activerecord
   specs:
-    gigo-activerecord (1.2.0)
-      activerecord (>= 3.0)
+    gigo-activerecord (1.2.1)
+      activerecord (>= 3.0, < 5.0)
       gigo
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activerecord-deprecated_finders (1.0.2)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     appraisal (0.5.2)
       bundler
       rake
-    arel (4.0.0)
-    atomic (1.1.9)
+    arel (4.0.1)
+    atomic (1.1.14)
     builder (3.1.4)
     ensure_valid_encoding (0.5.3)
     gigo (2.0.0)
       activesupport (>= 3.0)
       ensure_valid_encoding (~> 0.5.3)
-    i18n (0.6.4)
-    json (1.8.0)
-    minitest (5.0.4)
-    rake (10.0.4)
-    sqlite3 (1.3.7)
-    thread_safe (0.1.0)
+    i18n (0.6.5)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    rake (10.1.0)
+    sqlite3 (1.3.8)
+    thread_safe (0.1.3)
       atomic
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord!
+  activerecord (~> 4.0.0)
   appraisal
   gigo-activerecord!
-  minitest (~> 5.0)
+  minitest (~> 4.2)
   rake
   sqlite3

data/gigo-activerecord.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency     'gigo'
-  spec.add_runtime_dependency     'activerecord', '>= 3.0'
+  spec.add_runtime_dependency     'activerecord', '>= 3.0', '< 5.0'
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest', '~> 4.2'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/gigo/active_record/base.rb

@@ -6,7 +6,7 @@ module GIGO
 
         def gigo_column(*attrs)
           mod = begin
-            if defined?(GIGOColumns)
+            if const_defined?(:GIGOColumns)
               const_get(:GIGOColumns)
             else
               m = const_set(:GIGOColumns, Module.new)
@@ -27,6 +27,11 @@ module GIGO
           end
         end
 
+        def gigo_columns(*excepts)
+          cols = columns.select{ |c| c.type == :string || c.type == :text }.map{ |c| c.name.to_s } - excepts.map(&:to_s)
+          gigo_column(*cols)
+        end
+
       end
 
       module ThreeOhOnly

data/lib/gigo/active_record/version.rb

@@ -1,5 +1,5 @@
 module GIGO
   module ActiveRecord
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/test/cases/all_test.rb

@@ -25,6 +25,10 @@ module GIGO
         let(:seralized_data_iso8859_raw)   { with_db_encoding(iso8859) { UserRaw.find(user_data_iso8859.id).notes } }
         let(:seralized_data_iso8859_gigo)  { with_db_encoding(iso8859) { UserGIGO.find(user_data_iso8859.id).notes[:data] } }
 
+        it 'allows dual calls' do
+          UserWithDualGIGO
+        end
+        
         it 'can setup different DB data in other encodings so other test assumptions work' do
           seralized_data_utf8_raw.encoding.must_equal     utf8
           seralized_data_cp1252_raw.encoding.must_equal   cp1252
@@ -87,6 +91,23 @@ module GIGO
 
       end
 
+      describe 'gigo_columns' do
+
+        it 'converts all columns' do
+          LegacyAll.gigo_columns
+          assert LegacyAll::GIGOColumns.method_defined?(:subject)
+          assert LegacyAll::GIGOColumns.method_defined?(:body)
+          assert LegacyAll::GIGOColumns.method_defined?(:data)
+        end
+
+        it 'converts all but specified columns' do
+          LegacySome.gigo_columns :data
+          assert LegacySome::GIGOColumns.method_defined?(:subject)
+          assert LegacySome::GIGOColumns.method_defined?(:body)
+          refute LegacySome::GIGOColumns.method_defined?(:data)
+        end
+
+      end
       
     end
   end

data/test/test_helper.rb

@@ -62,6 +62,11 @@ module GIGO
               t.text :notes
               t.timestamps
             end
+            create_table :legacies, :force => true do |t|
+              t.string :subject
+              t.text   :body
+              t.text   :data
+            end
           end
         end
       end
@@ -102,6 +107,19 @@ module GIGO
         end
       end
 
+      class UserWithDualGIGO < ::ActiveRecord::Base
+        gigo_column :subject
+        gigo_column :subject
+      end
+
+      class LegacyAll < ::ActiveRecord::Base
+        self.table_name = :legacies
+      end
+
+      class LegacySome < ::ActiveRecord::Base
+        self.table_name = :legacies
+      end
+
     end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: gigo-activerecord
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gigo
@@ -35,12 +35,18 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
     none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
     none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -82,13 +88,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -148,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -1606933277418764219
+      hash: -3544303589874900389
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -157,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -1606933277418764219
+      hash: -3544303589874900389
       version: '0'
   none: false
 requirements: []