json_serialize 2.0.0 → 2.1.0

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
 # DEPENDENCIES
-gem 'activerecord', require: 'active_record'
-gem 'activesupport', require: 'active_support/core_ext/object/try'
+gem 'activerecord', '>= 3.0', require: 'active_record'
+gem 'activesupport', '>= 3.0', require: 'active_support/core_ext/object/try'
 
 group :development do
   gem 'jeweler'

data/Gemfile.lock

@@ -2,17 +2,17 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.4)
-    arel (2.0.8)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
     diff-lcs (1.1.2)
     git (1.2.5)
@@ -31,16 +31,16 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
     sqlite3 (1.3.3)
-    tzinfo (0.3.24)
-    yard (0.6.4)
+    tzinfo (0.3.26)
+    yard (0.6.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth
-  activerecord
-  activesupport
+  activerecord (>= 3.0)
+  activesupport (>= 3.0)
   jeweler
   rspec
   sqlite3

data/README.textile

@@ -1,7 +1,7 @@
 h1. json_serialize -- JSON serialization in ActiveRecord
 
 | *Author* | Tim Morgan |
-| *Version* | 2.0 (Feb 21, 2011) |
+| *Version* | 2.1 (Apr 4, 2011) |
 | *License* | Released under the MIT license. |
 
 h2. About

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/json_serialize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json_serialize}
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = %q{2011-02-21}
+  s.date = %q{2011-04-04}
   s.description = %q{Adds to ActiveRecord the ability to JSON-serialize certain fields.}
   s.email = %q{git@timothymorgan.info}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/riscfuture/json_serialize}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Adds JSON serialization to ActiveRecord models}
   s.test_files = [
     "spec/json_serialize_spec.rb",
@@ -43,16 +43,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<RedCloth>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<RedCloth>, [">= 0"])
@@ -60,8 +60,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<RedCloth>, [">= 0"])

data/lib/json_serialize.rb

@@ -3,26 +3,34 @@
 # @example Basic usage
 #   class MyModel < ActiveRecord::Base
 #     include JsonSerialize
-#     json_serialize :some_field
+#     json_serialize :some_field, another_field: "Default value"
 #   end
 
 module JsonSerialize
   extend ActiveSupport::Concern
 
   module ClassMethods
-    # @overload json_serialize(field, ...)
+    # @overload json_serialize(field, ..., fields_with_default_values)
     #   Marks one or more fields as JSON-serialized. These fields are stored in
     #   the database as JSON and encoded/decoded automatically upon read/write.
     #   @param [Symbol] field The database field to JSON-serialize.
+    #   @param [Hash<Symbol, Object>] fields_with_default_values A map of
+    #     additional fields to JSON-serialize, with the default value that
+    #     should be given if the field is @NULL@.
 
     def json_serialize(*fields)
+      fields_with_defaults = fields.extract_options!
       fields.each do |field|
+        fields_with_defaults[field] = nil
+      end
+      
+      fields_with_defaults.each do |field, default_value|
         define_method field do
           if instance_variable_defined?(field_ivar(field)) then
             instance_variable_get field_ivar(field)
           else
             encoded = read_attribute(field)
-            decoded = encoded.nil? ? nil : ActiveSupport::JSON.decode(encoded)
+            decoded = encoded.nil? ? default_value : ActiveSupport::JSON.decode(encoded)
             instance_variable_set field_ivar(field), decoded
             decoded
           end

data/spec/json_serialize_spec.rb

@@ -15,6 +15,12 @@ describe JsonSerialize do
         Json.update_all(data: nil)
         object.reload.data.should be_nil
       end
+      
+      it "should return a default value if the value is nil and a default is set" do
+        object = Json.create!
+        Json.update_all(default: nil)
+        object.reload.default.should eql("default value")
+      end
     end
 
     context "[setter]" do

data/spec/spec_helper.rb

@@ -12,12 +12,12 @@ ActiveRecord::Base.establish_connection(
 
 class Json < ActiveRecord::Base
   include JsonSerialize
-  json_serialize :data
+  json_serialize :data, default: "default value"
 end
 
 RSpec.configure do |config|
   config.before(:each) do
     Json.connection.execute "DROP TABLE IF EXISTS jsons"
-    Json.connection.execute "CREATE TABLE jsons (id INTEGER PRIMARY KEY ASC, data TEXT)"
+    Json.connection.execute "CREATE TABLE jsons (id INTEGER PRIMARY KEY ASC, data TEXT, 'default' TEXT)"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: json_serialize
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Tim Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -08:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3149432936213936570
+      hash: 4158012258004995923
       segments: 
       - 0
       version: "0"
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Adds JSON serialization to ActiveRecord models