activerecord_null_object 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/activerecord_null_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord_null_object}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Woods"]

data/init.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 ActiveRecord::ActiveRecordError   # Workaround for loading bug in AR 2.3.2.
 require File.dirname(__FILE__) + '/lib/activerecord_null_object'
 require File.dirname(__FILE__) + '/lib/null_object'

data/lib/activerecord_null_object.rb

@@ -2,6 +2,35 @@ module ActiveRecord
   module Associations
     module ClassMethods
       
+      # Add null object support to the given accessor method.
+      def add_null_object_support(association_id, options = {}) #:nodoc:
+        # Determine the class of the association.
+        association_class_name = options[:class_name] || association_id.to_s.classify
+        association_class = association_class_name.constantize
+
+        # Determine the null class for this association.
+        null_class_name = "Null" + association_class_name
+        if Object.const_defined?(null_class_name)
+          null_class = Object.const_get(null_class_name.to_sym)
+        else
+          # Define the null class as an ancestor of the association class.
+          null_class = Object.const_set(null_class_name, Class.new(association_class))
+          null_class.class_eval do
+            include Singleton
+            include ActiveRecordNullObject::NullObject
+          end
+        end
+
+        # Modify the "getter" of the relationship to return an
+        # instance of the association's null object instead of returning nil.
+        class_eval do
+          define_method("#{association_id}_with_null_object".to_sym) do
+            send("#{association_id}_without_null_object".to_sym) || null_class.instance
+          end
+          alias_method_chain association_id, :null_object
+        end
+      end
+      
       # Add a boolean :null_object option to belongs_to.
       def belongs_to_with_null_object(association_id, options = {}) #:nodoc:
         # Extract our custom option.
@@ -9,37 +38,20 @@ module ActiveRecord
         # Call the real belongs_to so that the association gets defined.
         belongs_to_without_null_object(association_id, options)
         # Modify the association if need be.
-        if use_null_object
-          
-          # Determine the class of the association.
-          association_class_name = options[:class_name] || association_id.to_s.classify
-          association_class = association_class_name.constantize
-
-          # Determine the null class for this association.
-          null_class_name = "Null" + association_class_name
-          if Object.const_defined?(null_class_name)
-            null_class = Object.const_get(null_class_name.to_sym)
-          else
-            # Define the null class as an ancestor of the association class.
-            null_class = Object.const_set(null_class_name, Class.new(association_class))
-            null_class.class_eval do
-              include Singleton
-              include ActiveRecordNullObject::NullObject
-            end
-          end
-
-          # Modify the "getter" of the belongs_to relationship to return an
-          # instance of the association's null object instead of returning nil.
-          class_eval do
-            define_method("#{association_id}_with_null_object".to_sym) do
-              send("#{association_id}_without_null_object".to_sym) || null_class.instance
-            end
-            alias_method_chain association_id, :null_object
-          end
-          
-        end
+        add_null_object_support(association_id, options) if use_null_object
       end
       alias_method_chain :belongs_to, :null_object
+
+      # Add a boolean :null_object option to has_one.
+      def has_one_with_null_object(association_id, options = {}) #:nodoc:
+        # Extract our custom option.
+        use_null_object = options.delete(:null_object)
+        # Call the real has_one so that the association gets defined.
+        has_one_without_null_object(association_id, options)
+        # Modify the association if need be.
+        add_null_object_support(association_id, options) if use_null_object
+      end
+      alias_method_chain :has_one, :null_object
       
     end
   end

data/spec/schema.rb

@@ -5,6 +5,27 @@ ActiveRecord::Schema.define(:version => 0) do
     t.datetime "updated_at"
   end
   
+  create_table "accounts", :force => true do |t|
+    t.integer  "author_id"
+    t.string   "password"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "addresses", :force => true do |t|
+    t.integer  "author_id"
+    t.string   "street"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+  
+  create_table "profiles", :force => true do |t|
+    t.integer  "author_id"
+    t.integer  "age"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "comments", :force => true do |t|
     t.text     "body"
     t.integer  "author_id"

data/spec/spec.opts

@@ -1 +1,2 @@
 --color
+--format nested

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 require 'yaml'
 require 'spec'
 require File.dirname(__FILE__) + '/../init.rb'
@@ -9,11 +9,28 @@ config = YAML::load(File.open(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.establish_connection(config['test'])
 load(File.dirname(__FILE__) + "/schema.rb")
 
+# Fixes 'address'.singularize  # => 'addres'
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.singular(/ess$/i, 'ess')
+end
+
+class Account < ActiveRecord::Base
+end
+
+class Address < ActiveRecord::Base
+end
+
+class Profile < ActiveRecord::Base
+end
+
 # Define ActiveRecord classes to use while testing.
 class Author < ActiveRecord::Base
   has_many :posts
   has_many :comments
   has_many :sessions
+  has_one  :profile
+  has_one  :account, :null_object => false
+  has_one  :address, :null_object => true
 end
 
 class Comment < ActiveRecord::Base
@@ -27,3 +44,4 @@ end
 class Session < ActiveRecord::Base
   belongs_to :author
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord_null_object
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Scott Woods