json_serialize 2.1.0 → 2.2.0

data/README.textile

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

data/json_serialize.gemspec

@@ -4,40 +4,28 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{json_serialize}
-  s.version = "2.1.0"
+  s.name = "json_serialize"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  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.date = "2011-09-15"
+  s.description = "Adds to ActiveRecord the ability to JSON-serialize certain fields."
+  s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
   ]
   s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.textile",
-    "Rakefile",
-    "VERSION",
     "json_serialize.gemspec",
-    "lib/json_serialize.rb",
-    "spec/json_serialize_spec.rb",
-    "spec/spec_helper.rb"
+    "lib/json_serialize.rb"
   ]
-  s.homepage = %q{http://github.com/riscfuture/json_serialize}
+  s.homepage = "http://github.com/riscfuture/json_serialize"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Adds JSON serialization to ActiveRecord models}
-  s.test_files = [
-    "spec/json_serialize_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Adds JSON serialization to ActiveRecord models"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/json_serialize.rb

@@ -30,7 +30,8 @@ module JsonSerialize
             instance_variable_get field_ivar(field)
           else
             encoded = read_attribute(field)
-            decoded = encoded.nil? ? default_value : ActiveSupport::JSON.decode(encoded)
+            default = default_value.kind_of?(Proc) ? default_value.call : (default_value.duplicable? ? default_value.dup : default_value)
+            decoded = encoded.nil? ? default : ActiveSupport::JSON.decode(encoded)
             instance_variable_set field_ivar(field), decoded
             decoded
           end

metadata

@@ -1,148 +1,130 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json_serialize
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.2.0
   prerelease: 
-  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-04 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2166665180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2166665180
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2166664700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2166664700
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2166664200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2166664200
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2166663680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2166663680
+- !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2166663200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2166663200
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2166662620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2166662620
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2166662080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *2166662080
 description: Adds to ActiveRecord the ability to JSON-serialize certain fields.
 email: git@timothymorgan.info
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
-- .document
-- .rspec
-- Gemfile
-- Gemfile.lock
+files:
 - LICENSE
 - README.textile
-- Rakefile
-- VERSION
 - json_serialize.gemspec
 - lib/json_serialize.rb
-- spec/json_serialize_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/riscfuture/json_serialize
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4158012258004995923
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 680352968988499889
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Adds JSON serialization to ActiveRecord models
-test_files: 
-- spec/json_serialize_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.rspec

@@ -1 +0,0 @@
--cfs

data/Gemfile

@@ -1,13 +0,0 @@
-source 'http://rubygems.org'
-
-# DEPENDENCIES
-gem 'activerecord', '>= 3.0', require: 'active_record'
-gem 'activesupport', '>= 3.0', require: 'active_support/core_ext/object/try'
-
-group :development do
-  gem 'jeweler'
-  gem 'yard'
-  gem 'RedCloth', require: 'redcloth'
-  gem 'rspec'
-  gem 'sqlite3'
-end

data/Gemfile.lock

@@ -1,47 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.7)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 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.5)
-    arel (2.0.9)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sqlite3 (1.3.3)
-    tzinfo (0.3.26)
-    yard (0.6.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  activerecord (>= 3.0)
-  activesupport (>= 3.0)
-  jeweler
-  rspec
-  sqlite3
-  yard

data/Rakefile

@@ -1,38 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "json_serialize"
-  gem.summary = %Q{Adds JSON serialization to ActiveRecord models}
-  gem.description = %Q{Adds to ActiveRecord the ability to JSON-serialize certain fields.}
-  gem.email = "git@timothymorgan.info"
-  gem.homepage = "http://github.com/riscfuture/json_serialize"
-  gem.authors = [ "Tim Morgan" ]
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-
-require 'yard'
-YARD::Rake::YardocTask.new('doc') do |doc|
-  doc.options << "-m" << "textile"
-  doc.options << "--protected"
-  doc.options << "--no-private"
-  doc.options << "-r" << "README.textile"
-  doc.options << "-o" << "doc"
-  doc.options << "--title" << "json_serialize Documentation".inspect
-  
-  doc.files = [ 'lib/**/*', 'README.textile' ]
-end
-
-task(default: :spec)

data/VERSION

@@ -1 +0,0 @@
-2.1.0

data/spec/json_serialize_spec.rb

@@ -1,54 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe JsonSerialize do
-  describe "#json_serialize" do
-    context "[getter]" do
-      it "should JSON-decode the value" do
-        require 'logger'
-        object = Json.create!
-        Json.update_all(data: '{"foo":"bar"}')
-        object.reload.data.should eql('foo' => 'bar')
-      end
-
-      it "should return nil if the value is nil" do
-        object = Json.create!
-        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
-      it "should JSON-encode the value" do
-        object = Json.create!(data: { foo: 'bar' })
-        object.send(:read_attribute, :data).should eql({ foo: 'bar' }.to_json)
-      end
-
-      it "should leave nil as nil" do
-        object = Json.create!(data: nil)
-        object.send(:read_attribute, :data).should be_nil
-      end
-    end
-    
-    context "[database backing]" do
-      it "should back the instance object with the database" do
-        object = Json.create!(data: { foo: 'bar' })
-        object.data[:foo2] = 'bar2'
-        object.save!
-        object.data.should eql('foo' => 'bar', 'foo2' => 'bar2')
-      end
-      
-      it "should clear the in-memory reference on reload" do
-        object = Json.create!(data: { foo: 'bar' })
-        object.data[:foo2] = 'bar2'
-        object.reload
-        object.data.should eql('foo' => 'bar')
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,23 +0,0 @@
-Bundler.require :default, :test
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'json_serialize'
-
-ActiveRecord::Base.establish_connection(
-  adapter: 'sqlite3',
-  database: 'test.sqlite'
-)
-
-class Json < ActiveRecord::Base
-  include JsonSerialize
-  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, 'default' TEXT)"
-  end
-end