gigo-activerecord 1.0.0 → 1.1.0

data/Appraisals

@@ -1,4 +1,8 @@
 
+appraise 'activerecord30' do
+  gem 'activerecord', '~> 3.0.0'
+end
+
 appraise 'activerecord31' do
   gem 'activerecord', '~> 3.1.0'
 end

data/gemfiles/activerecord30.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.0.0"
+
+gemspec :path=>"../"

data/gemfiles/activerecord30.gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: /Users/kencollins/Repositories/customink/gigo-activerecord
+  specs:
+    gigo-activerecord (1.1.0)
+      activerecord (>= 3.0)
+      gigo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.20)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    ensure_valid_encoding (0.5.3)
+    gigo (2.0.0)
+      activesupport (>= 3.0)
+      ensure_valid_encoding (~> 0.5.3)
+    i18n (0.5.0)
+    minitest (5.0.2)
+    rake (10.0.4)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  appraisal
+  gigo-activerecord!
+  minitest (~> 5.0)
+  rake
+  sqlite3

data/gemfiles/activerecord31.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/kencollins/Repositories/customink/gigo-activerecord
   specs:
-    gigo-activerecord (1.0.0)
-      activerecord (>= 3.1)
+    gigo-activerecord (1.1.0)
+      activerecord (>= 3.0)
       gigo
 
 GEM
@@ -29,7 +29,7 @@ GEM
       activesupport (>= 3.0)
       ensure_valid_encoding (~> 0.5.3)
     i18n (0.6.4)
-    minitest (5.0.1)
+    minitest (5.0.2)
     multi_json (1.7.3)
     rake (10.0.4)
     sqlite3 (1.3.7)

data/gemfiles/activerecord32.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/kencollins/Repositories/customink/gigo-activerecord
   specs:
-    gigo-activerecord (1.0.0)
-      activerecord (>= 3.1)
+    gigo-activerecord (1.1.0)
+      activerecord (>= 3.0)
       gigo
 
 GEM
@@ -29,7 +29,7 @@ GEM
       activesupport (>= 3.0)
       ensure_valid_encoding (~> 0.5.3)
     i18n (0.6.1)
-    minitest (5.0.1)
+    minitest (5.0.2)
     multi_json (1.7.3)
     rake (10.0.4)
     sqlite3 (1.3.7)

data/gemfiles/activerecord40.gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 3b266bcfeaa2268cabf4afa362ea0982b92e5b4c
+  revision: f47b4236e089b07cb683ee9b7ff8b06111a0ec10
   specs:
     activemodel (4.1.0.beta)
       activesupport (= 4.1.0.beta)
@@ -20,8 +20,8 @@ GIT
 PATH
   remote: /Users/kencollins/Repositories/customink/gigo-activerecord
   specs:
-    gigo-activerecord (1.0.0)
-      activerecord (>= 3.1)
+    gigo-activerecord (1.1.0)
+      activerecord (>= 3.0)
       gigo
 
 GEM

data/gigo-activerecord.gemspec

@@ -17,7 +17,7 @@ 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.1'
+  spec.add_runtime_dependency     'activerecord', '>= 3.0'
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', '~> 5.0'

data/lib/gigo/active_record.rb

@@ -1,4 +1,5 @@
 require 'gigo'
 require 'active_record'
+require 'active_record/version'
 require 'gigo/active_record/version'
 require 'gigo/active_record/base'

data/lib/gigo/active_record/base.rb

@@ -1,46 +1,90 @@
 module GIGO
   module ActiveRecord
     module Base
-      
-      def gigo_serialized_attribute(*attrs)
-        attrs.each do |attr|
-          yaml_column = self.serialized_attributes[attr.to_s]
-          next unless yaml_column
-          yaml_column.class_eval do
-            def load_with_gigo(yaml)
+
+      module Shared
+
+        def gigo_column(*attrs)
+          mod = begin
+            if defined?(GIGOColumns)
+              const_get(:GIGOColumns)
+            else
+              m = const_set(:GIGOColumns, Module.new)
+              include m
+              m
+            end
+          end
+          attrs.each do |attr|
+            mod.module_eval <<-CODE, __FILE__, __LINE__
+              def #{attr}
+                GIGO.load(super)
+              end
+            CODE
+          end
+        end
+
+      end
+
+      module ThreeOhOnly
+
+        include Shared
+
+        def gigo_serialized_attribute(*attrs)
+          # ActiveRecord 3.0 has no proper hooks. So we fix all YAML object laoding for this class.
+          include InstanceMethods
+        end
+
+        module InstanceMethods
+          
+          private
+
+          def object_from_yaml(string)
+            return string unless string.is_a?(String) && string =~ /^---/
+            begin
               existing_encoding = Encoding.default_internal
               Encoding.default_internal = GIGO.encoding
-              yaml = GIGO.load(yaml)
-              load_without_gigo(yaml)
+              s = GIGO.load(string)
+              YAML::load(s) rescue s
             ensure
               Encoding.default_internal = existing_encoding
             end
-            alias_method_chain :load, :gigo
           end
+
         end
+
       end
 
-      def gigo_column(*attrs)
-        mod = begin
-          if defined?(GIGOColumns)
-            const_get(:GIGOColumns)
-          else
-            m = const_set(:GIGOColumns, Module.new)
-            include m
-            m
-          end
-        end
-        attrs.each do |attr|
-          mod.module_eval <<-CODE, __FILE__, __LINE__
-            def #{attr}
-              GIGO.load(super)
+      module ThreeOneAndUp
+
+        include Shared
+
+        def gigo_serialized_attribute(*attrs)
+          attrs.each do |attr|
+            yaml_column = self.serialized_attributes[attr.to_s]
+            next unless yaml_column
+            yaml_column.class_eval do
+              def load_with_gigo(yaml)
+                existing_encoding = Encoding.default_internal
+                Encoding.default_internal = GIGO.encoding
+                yaml = GIGO.load(yaml)
+                load_without_gigo(yaml)
+              ensure
+                Encoding.default_internal = existing_encoding
+              end
+              alias_method_chain :load, :gigo
             end
-          CODE
+          end
         end
+        
       end
 
     end
   end
 end
 
-ActiveRecord::Base.extend GIGO::ActiveRecord::Base
+if ActiveRecord::VERSION::STRING < '3.1'
+  ActiveRecord::Base.extend GIGO::ActiveRecord::Base::ThreeOhOnly
+else
+  ActiveRecord::Base.extend GIGO::ActiveRecord::Base::ThreeOneAndUp
+end
+

data/lib/gigo/active_record/version.rb

@@ -1,5 +1,5 @@
 module GIGO
   module ActiveRecord
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: gigo-activerecord
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ken Collins
@@ -34,13 +34,13 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
     none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
     none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -120,6 +120,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/activerecord30.gemfile
+- gemfiles/activerecord30.gemfile.lock
 - gemfiles/activerecord31.gemfile
 - gemfiles/activerecord31.gemfile.lock
 - gemfiles/activerecord32.gemfile
@@ -146,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -546867824294194641
+      hash: -2101830360572712562
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -155,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -546867824294194641
+      hash: -2101830360572712562
       version: '0'
   none: false
 requirements: []