serialize_with_options 0.2.0 → 0.2.1

data/.gitignore

@@ -3,3 +3,4 @@ test.db
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/README.markdown

@@ -68,13 +68,15 @@ The `serialize_with_options` class method takes an optional argument for naming
 Installation
 ------------
 
-From your app root:
+Simply add "`serialize_with_options`" to your Gemfile:
 
-    script/plugin install git://github.com/vigetlabs/serialize_with_options.git
+    gem "serialize_with_options"
+
+And run "`bundle install`"
 
 * * *
 
-Copyright (c) 2009-2010 David Eisinger ([Viget Labs][vgt]), released under the MIT license.
+Copyright (c) 2009-2011 David Eisinger ([Viget Labs][vgt]), released under the MIT license.
 
 [ser]: http://api.rubyonrails.org/classes/ActiveRecord/Serialization.html
 [vgt]: http://www.viget.com/

data/lib/serialize_with_options/railtie.rb

@@ -0,0 +1,9 @@
+module SerializeWithOptions
+  class Railtie < Rails::Railtie
+    initializer 'serialize_with_options.extend_active_record', :after => 'active_record.initialize_database' do |app|
+      ActiveSupport.on_load(:active_record) do
+        self.extend SerializeWithOptions
+      end
+    end
+  end
+end

data/lib/serialize_with_options/version.rb

@@ -1,3 +1,3 @@
 module SerializeWithOptions
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/serialize_with_options.rb

@@ -1,3 +1,5 @@
+require 'serialize_with_options/railtie' if defined?(Rails)
+
 module SerializeWithOptions
   def self.extended(base)
     base.class_attribute :serialization_conf
@@ -70,9 +72,9 @@ module SerializeWithOptions
       super(self.class.serialization_options(set).deep_merge(opts))
     end
 
-    def to_json(opts = {})
+    def as_json(opts = nil)
       set, opts = parse_serialization_options(opts)
-      super(self.class.serialization_options(set).deep_merge(opts))
+      super(self.class.serialization_options(set).deep_merge(opts || {}))
     end
 
     private

data/serialize_with_options.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", "~> 3"
+  s.add_dependency "activerecord", "~> 3.0"
 
   s.add_development_dependency "shoulda"
   s.add_development_dependency "sqlite3"

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'test/unit'
 require 'shoulda'
 require 'json'
 require 'serialize_with_options'
-require 'init'
+ActiveRecord::Base.extend SerializeWithOptions
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serialize_with_options
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153419300 !ruby/object:Gem::Requirement
+  requirement: &70169796710200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153419300
+  version_requirements: *70169796710200
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2153418880 !ruby/object:Gem::Requirement
+  requirement: &70169796709760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153418880
+  version_requirements: *70169796709760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153418420 !ruby/object:Gem::Requirement
+  requirement: &70169796709180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153418420
+  version_requirements: *70169796709180
 description: Simple XML and JSON APIs for your Rails app
 email:
 - david.eisinger@gmail.com
@@ -57,13 +56,12 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- init.rb
 - lib/serialize_with_options.rb
+- lib/serialize_with_options/railtie.rb
 - lib/serialize_with_options/version.rb
 - serialize_with_options.gemspec
 - test/serialize_with_options_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://www.viget.com/extend/simple-apis-using-serializewithoptions
 licenses: []
 post_install_message: 
@@ -84,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: serialize_with_options
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple XML and JSON APIs for your Rails app

data/init.rb

@@ -1 +0,0 @@
-ActiveRecord::Base.extend(SerializeWithOptions)