active_record_serialize_json 0.0.2 → 0.1.0

data/CHANGES

@@ -1,3 +1,5 @@
+2011-05-27 - 0.1.0
+  * Now Rails 2 and 3 compatible
 2011-03-21 - 0.0.2
   * Use ActiveRecord::Base API methods to get/set attributes.
 2010-08-19 - 0.0.1

data/Rakefile

@@ -44,7 +44,6 @@ if defined? Gem
 
     s.require_path = 'lib'
 
-    s.has_rdoc     = true
     s.rdoc_options = PKG_RDOC_OPTIONS
     s.extra_rdoc_files << 'README'
     #s.test_files << 'test/serialize_json_test.rb'
@@ -53,8 +52,8 @@ if defined? Gem
     s.email             = "flori@ping.de"
     s.homepage          = "http://flori.github.com/#{PKG_NAME}"
     s.rubyforge_project = "#{PKG_NAME}"
-    s.add_dependency    'json',         '~>1.4'
-    s.add_dependency    'activerecord', '~>2.3'
+    s.add_dependency    'json',         '~>1.0'
+    s.add_dependency    'activerecord'
   end
 
   Rake::GemPackageTask.new(spec) do |pkg|

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/active_record/serialize_json.rb

@@ -13,12 +13,14 @@ module ActiveRecord
 
     def before_save(record)
       json = serialize record
-      record.write_attribute(@attribute, json)
+      a = @attribute
+      record.instance_eval { write_attribute(a, json) }
     end
 
     def after_save(record)
       data = deserialize record
-      record.write_attribute(@attribute, data)
+      a = @attribute
+      record.instance_eval { write_attribute(a, data) }
     end
 
     def serialize(record)
@@ -31,14 +33,18 @@ module ActiveRecord
 
     def self.serialize(value, opts = {})
       opts ||= {}
-      JSON.generate(value, opts)
+      value.to_json(opts)
     end
 
     def self.deserialize(value, opts = {})
       opts ||= {}
       JSON.parse(value, opts)
     rescue => e
-      Rails.logger.warn e
+      if defined?(::Rails)
+        ::Rails.logger.warn e
+      else
+        warn "#{e.class}: #{e}"
+      end
       value
     end
   end
@@ -47,8 +53,8 @@ module ActiveRecord
     def self.serialize_json(attribute, opts = {})
       sj = SerializeJSON.new(attribute, opts)
 
-      before_save sj
       after_save  sj
+      before_save sj
 
       unless respond_to?(:serialize_json_attributes)
         cattr_accessor :serialize_json_attributes
@@ -56,11 +62,23 @@ module ActiveRecord
       end
       serialize_json_attributes[sj.attribute] = sj
 
-      class_eval do
-        define_method(:after_find) do
-          super if defined? super
-          self.class.serialize_json_attributes.each do |attribute, sj|
-            write_attribute(attribute, sj.deserialize(self))
+      if ::ActiveRecord::VERSION::MAJOR >= 3
+        class_eval do
+          after_find do |record|
+            serialize_json_attributes.each do |attribute, sj|
+              record.instance_eval do
+                write_attribute(attribute, sj.deserialize(record))
+              end
+            end
+          end
+        end
+      else
+        class_eval do
+          define_method(:after_find) do
+            super if defined? super
+            self.class.serialize_json_attributes.each do |attribute, sj|
+              write_attribute(attribute, sj.deserialize(self))
+            end
           end
         end
       end

data/lib/active_record/serialize_json/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module SerializeJSON
     # ActiveRecord::SerializeJSON version
-    VERSION       = '0.0.2'
+    VERSION       = '0.1.0'
     VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
     VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
     VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:

data/test/serialize_json_test.rb

@@ -6,7 +6,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'active_record/serialize_json'
 
 ActiveRecord::Base.establish_connection(
-  :adapter  => "mysql",
+  :adapter  => ActiveRecord::VERSION::MAJOR >= 3 ? 'mysql2' : 'mysql',
   :database => ENV['DATABASE'] || "test",
   :username => ENV['USER'],
   :password => ENV['PASSWORD']

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Florian Frank
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 15
         segments: 
         - 1
-        - 4
-        version: "1.4"
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,13 +39,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
-        - 2
-        - 3
-        version: "2.3"
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id002
 description: Serialize an ActiveRecord::Base attribute via JSON in Ruby on Rails