acts_as_serializable 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/acts_as_serializable.rb

@@ -3,6 +3,11 @@ require 'active_support'
 require 'find'
 require 'serializable/version'
 
+def using_rails_3?
+  # Assume 3 unless we have 2.
+  defined?(Rails) && Rails::VERSION::MAJOR != 2
+end
+
 module Serializable
   SERIALIZE_TO_VERSION_REGEXP = /^serialize_to_version_((:?\d+_?)+)$/
   SERIALIZED_CLASS_NAME_REGEXP = /\/version_((:?\d+_?)+)\.rb$/
@@ -15,6 +20,8 @@ module Serializable
     if defined?(RAILS_ROOT)
       # Rails plugin usage
       project_paths = Array.new
+      # The app directory itself is not in $LOAD_PATH in Rails 3
+      project_paths << Rails.root.join('app') if defined?(Rails) && File.exists?(Rails.root.join('app'))
       $LOAD_PATH.each do |path|
         if path.match(/#{Regexp.escape(RAILS_ROOT)}.*\/app$/)
           project_paths << path

data/lib/serializable/xbuilder.rb

@@ -1,6 +1,8 @@
 module Serializable
-  class XBuilder < ::ActionView::TemplateHandler
-    include ActionView::TemplateHandlers::Compilable
+  xbuilder_parent  = using_rails_3? ? Object : ::ActionView::TemplateHandler
+
+  class XBuilder < xbuilder_parent
+    include ActionView::TemplateHandlers::Compilable unless using_rails_3?
 
     def compile(template)
       compiled_code = <<-CODE
@@ -21,6 +23,7 @@ module Serializable
       compiled_code
     end
 
+    alias_method :call, :compile
   end
 end
 

data/spec/acts_as_serializable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 class SerializableObject
   include Serializable

data/spec/spec_helper.rb

@@ -3,6 +3,15 @@ require 'rubygems'
 ::RAILS_ROOT = File.join(File.dirname(__FILE__))
 $LOAD_PATH.push(File.join(::RAILS_ROOT, 'app'))
 
-require 'lib/serializable/version'
-require 'lib/serializable/versions'
-require 'lib/acts_as_serializable'
+require 'serializable/version'
+require 'serializable/versions'
+require 'acts_as_serializable'
+
+def silence_warnings
+  begin
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+end

data/spec/version_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Serializable::Version, 'when created with a version numeric string' do
 

data/spec/versions_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Serializable::Versions do
 

data/spec/xbuilder_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+module ActionView
+  class TemplateHandler
+  end
+
+  module TemplateHandlers
+    module Compilable
+    end
+  end
+
+  class Template
+    def self.register_template_handler(*args)
+    end
+  end
+end
+
+module Rails
+  module VERSION
+    def self.set(val)
+      silence_warnings do
+        const_set(:MAJOR, val)
+      end
+    end
+  end
+end
+
+def set_rails(version)
+  Rails::VERSION.set(version)
+  if defined?(Serializable::XBuilder)
+    Serializable.send(:remove_const, "XBuilder")
+    xbuilder_path = $".detect { |lib| lib =~ /xbuilder/ }
+    $".delete(xbuilder_path)
+  end
+  require 'serializable/xbuilder'
+end
+
+describe "XBuilder", 'when in Rails' do
+  context 'and Rails is version 2' do
+    it 'should inherit from ActionView::TemplateHandler' do
+      set_rails(2)
+      Serializable::XBuilder.ancestors.include?(ActionView::TemplateHandler).should be_true
+    end
+    it 'should include Compilable' do
+      set_rails(2)
+      Serializable::XBuilder.ancestors.include?(ActionView::TemplateHandlers::Compilable).should be_true
+    end
+  end
+
+  context 'and Rails is version 3' do
+    it 'should not inherit from ActionView::TemplateHandler' do
+      set_rails(3)
+      Serializable::XBuilder.ancestors.include?(ActionView::TemplateHandler).should be_false
+    end
+
+    it 'should not include Compilable' do
+      set_rails(3)
+      Serializable::XBuilder.ancestors.include?(ActionView::TemplateHandlers::Compilable).should be_false
+    end
+  end
+end

metadata

@@ -1,83 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts_as_serializable
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Birkir A. Barkarson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-21 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <=
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jsonbuilder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: jsonbuilder
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Easy versioning of serialization methods
 email: birkirb@stoicviking.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - Rakefile
 - VERSION
-- acts_as_serializable.gemspec
 - init.rb
 - lib/acts_as_serializable.rb
 - lib/serializable/version.rb
@@ -93,39 +84,29 @@ files:
 - spec/spec_helper.rb
 - spec/version_spec.rb
 - spec/versions_spec.rb
-has_rdoc: true
+- spec/xbuilder_spec.rb
 homepage: http://github.com/birkirb/acts_as_serializable
 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: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: serializable
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easy versioning of serialization methods
 test_files: []
-

data/acts_as_serializable.gemspec

@@ -1,64 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{acts_as_serializable}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Birkir A. Barkarson"]
-  s.date = %q{2011-09-21}
-  s.description = %q{Easy versioning of serialization methods}
-  s.email = %q{birkirb@stoicviking.net}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "acts_as_serializable.gemspec",
-    "init.rb",
-    "lib/acts_as_serializable.rb",
-    "lib/serializable/version.rb",
-    "lib/serializable/versions.rb",
-    "lib/serializable/xbuilder.rb",
-    "spec/acts_as_serializable_spec.rb",
-    "spec/app/serializations/test_rails_model/version_1_0_0.rb",
-    "spec/app/serializations/test_rails_model/version_1_5.rb",
-    "spec/app/serializations/test_rails_model/version_2_1.rb",
-    "spec/serializations/test_model/version_1_0_0.rb",
-    "spec/serializations/test_model/version_1_5.rb",
-    "spec/serializations/test_model/version_2_1.rb",
-    "spec/spec_helper.rb",
-    "spec/version_spec.rb",
-    "spec/versions_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/birkirb/acts_as_serializable}
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{serializable}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Easy versioning of serialization methods}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<builder>, ["<= 2.1.2"])
-      s.add_runtime_dependency(%q<jsonbuilder>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 1.2"])
-    else
-      s.add_dependency(%q<builder>, ["<= 2.1.2"])
-      s.add_dependency(%q<jsonbuilder>, [">= 0.1.0"])
-      s.add_dependency(%q<activesupport>, [">= 1.2"])
-    end
-  else
-    s.add_dependency(%q<builder>, ["<= 2.1.2"])
-    s.add_dependency(%q<jsonbuilder>, [">= 0.1.0"])
-    s.add_dependency(%q<activesupport>, [">= 1.2"])
-  end
-end
-