activerecord_null_object 0.2.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8e814ba60434b9563a80ed56708733bcce37ac810148403ce512eede9006e0dc
+  data.tar.gz: 7a79cb743fb799deb9ed2b899357fbbd34c71eeda7468cdd3e00737a1f1c3329
+SHA512:
+  metadata.gz: 5c3d744c96242745bfd230f952de637728e2e8788407b72a5f95ca08d3fa4bbc1e804fbbc5953bde4cca15f5450e14f1e53499aafe37907e6f353b8c937958fc
+  data.tar.gz: 95e60bb581a2f19dee479161bcad3a6dda3048986521f31228a2ff344e2808ccde837724b5724362b8d339447b64109499ff1574b6ef3592c622db93d906dbd1

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/release.yml

@@ -0,0 +1,59 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bundle exec rake
+
+  release:
+    needs: build
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Generate Changelog
+        run: |
+          # Get version from github ref (remove 'refs/tags/' and prefix 'v')
+          version="${GITHUB_REF#refs/tags/v}"
+          npx changelog-parser CHANGELOG.md | jq -cr ".versions | .[] | select(.version == \"$version\") | .body" > ${{ github.workflow }}-CHANGELOG.txt
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          body_path: ${{ github.workflow }}-CHANGELOG.txt
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish:
+    needs: [build, release]
+    name: Publish
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/ruby.yml

@@ -0,0 +1,24 @@
+name: Build and Test
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [rails60, rails61, rails70]
+        ruby: ["2.7", "3.0", "3.1"]
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: coverage/lcov.info

data/.gitignore

@@ -1,3 +1,5 @@
-.DS_Store
-test.db
 pkg
+coverage
+Gemfile.lock
+tmp
+vendor

data/.ruby-version

@@ -0,0 +1 @@
+3.1.0

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Change Log
+
+## 0.6.0
+
+- [PLAT-183] Ruby 3.0, Rails 7 and coveralls github action
+
+## 0.5.0
+
+- [TT-8620] Update to build with github actions / ruby 3.0 / Rails 6.1
+
+## 0.4.0
+
+* Use coverage kit to enforce maximum coverage
+* [TT-6631] Fix present? and blank? checks on Rails6

data/Gemfile

@@ -0,0 +1,2 @@
+source 'http://rubygems.org'
+gemspec

data/README.md

@@ -0,0 +1,25 @@
+ActiveRecord Null Object
+========================
+
+[![Gem Version](https://badge.fury.io/rb/activerecord_null_object.svg)](http://badge.fury.io/rb/activerecord_null_object)
+[![Build Status](https://github.com/sealink/activerecord_null_object/workflows/Build%20and%20Test/badge.svg?branch=master)](https://github.com/sealink/activerecord_null_object/actions)
+[![Coverage Status](https://coveralls.io/repos/sealink/activerecord_null_object/badge.png)](https://coveralls.io/r/sealink/activerecord_null_object)
+[![Code Climate](https://codeclimate.com/github/sealink/activerecord_null_object.png)](https://codeclimate.com/github/sealink/activerecord_null_object)
+
+# DESCRIPTION
+
+Implements the Null Object Pattern for nil values in ActiveRecord associations.
+
+# RELEASE
+
+To publish a new version of this gem the following steps must be taken.
+
+* Update the version in the following files
+  ```
+    CHANGELOG.md
+    lib/activerecord_null_object/version.rb
+  ````
+* Create a tag using the format v0.1.0
+* Follow build progress in GitHub actions
+
+Copyright (c) 2009 West Arete Computing, Inc., released under the MIT license

data/Rakefile

@@ -1,25 +1,12 @@
-require 'spec'
-require 'spec/rake/spectask'
-require 'init'
+require "bundler/gem_tasks"
 
 desc 'Default: run specs.'
 task :default => :spec
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rspec/core/rake_task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = %q{activerecord_null_object}
-    s.summary = %q{Implements the Null Object Pattern for nil values in ActiveRecord associations.}
-    s.email = %q{info@westarete.com}
-    s.homepage = %q{http://github.com/westarete/activerecord_null_object/}
-    s.description = ""
-    s.authors = ["Scott Woods"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
 end

data/activerecord_null_object.gemspec

@@ -1,54 +1,30 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
-Gem::Specification.new do |s|
-  s.name = %q{activerecord_null_object}
-  s.version = "0.2.0"
+require File.expand_path('lib/activerecord_null_object/version', __dir__)
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Woods"]
-  s.date = %q{2009-09-02}
-  s.description = %q{}
-  s.email = %q{info@westarete.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "activerecord_null_object.gemspec",
-     "init.rb",
-     "lib/activerecord_null_object.rb",
-     "lib/null_object.rb",
-     "spec/belongs_to_spec.rb",
-     "spec/database.yml",
-     "spec/null_object_spec.rb",
-     "spec/schema.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/westarete/activerecord_null_object/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Implements the Null Object Pattern for nil values in ActiveRecord associations.}
-  s.test_files = [
-    "spec/belongs_to_spec.rb",
-     "spec/null_object_spec.rb",
-     "spec/schema.rb",
-     "spec/spec_helper.rb"
-  ]
+Gem::Specification.new do |spec|
+  spec.name          = "activerecord_null_object"
+  spec.version       = ActiveRecordNullObject::VERSION
+  spec.authors       = ["Scott Woods", "Alessandro Berardi"]
+  spec.email         = ["support@travellink.com.au"]
+  spec.description   = %q{Implements the Null Object Pattern for nil values in ActiveRecord associations.}
+  spec.summary       = %q{Implements the Null Object Pattern for nil values in ActiveRecord associations.}
+  spec.homepage      = 'http://github.com/sealink/activerecord_null_object'
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+  spec.license       = "MIT"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency "activesupport", ">= 6.0", "< 8"
+  spec.add_runtime_dependency "activerecord", ">= 6.0", "< 8"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-its"
+  spec.add_development_dependency "coverage-kit"
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'pry-byebug'
 end

data/gemfiles/rails60.gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activesupport', '~> 6.0'
+  gem 'activerecord', '~> 6.0'
+  gem 'actionpack', '~> 6.0'
+end

data/gemfiles/rails61.gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activesupport', '~> 6.1'
+  gem 'activerecord', '~> 6.1'
+  gem 'actionpack', '~> 6.1'
+end

data/gemfiles/rails70.gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activesupport', '~> 7.0'
+  gem 'activerecord', '~> 7.0'
+  gem 'actionpack', '~> 7.0'
+end

data/lib/activerecord_null_object/null_object.rb

@@ -0,0 +1,36 @@
+require 'active_support/concern'
+
+module ActiveRecordNullObject
+  module NullObject
+    extend ActiveSupport::Concern
+
+    included do
+      validate :unsavable
+    end
+
+    def id
+      nil
+    end
+
+    def nil?
+      true
+    end
+
+    def empty?
+      true
+    end
+
+    def blank?
+      true
+    end
+
+    def present?
+      false
+    end
+
+    def unsavable
+      errors.add(:base, "is a null object and can't be saved")
+    end
+
+  end
+end

data/lib/activerecord_null_object/null_object_support.rb

@@ -0,0 +1,64 @@
+require 'active_support/concern'
+
+module ActiveRecordNullObject
+  module NullObjectSupport
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      # Add null object support to the given accessor method.
+      def add_null_object_support(name, options = {}) #:nodoc:
+        # Determine the class of the association.
+        association_class_name = options[:class_name] || name.to_s.classify
+        association_class = association_class_name.constantize
+        null_class_name = "Null" + association_class_name
+
+        # Determine the null class for this association.
+        null_class = options[:null_object].to_s.classify.safe_constantize || null_class_name.safe_constantize
+
+        unless null_class
+          # 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("#{name}".to_sym) do |*args|
+            super(*args) || null_class.instance
+          end
+        end
+      end
+
+      # Add a :null_object option to belongs_to.
+      def belongs_to(name, scope = nil, **options)
+        # args << options.except(:null_object)
+        # Call the real belongs_to so that the association gets defined.
+        super(name, scope, **options.except(:null_object))
+
+        # Modify the association if need be.
+        if options[:null_object]
+          add_null_object_support(name, options)
+        end
+      end
+
+      # Add a :null_object option to has_one.
+      def has_one(name, scope = nil, **options)
+        # args = options.except(:null_object)
+
+        # Call the real belongs_to so that the association gets defined.
+        super(name, scope, **options.except(:null_object))
+
+        # Modify the association if need be.
+        if options[:null_object]
+          add_null_object_support(name, options)
+        end
+      end
+
+    end
+  end
+end

data/lib/activerecord_null_object/version.rb

@@ -0,0 +1,3 @@
+module ActiveRecordNullObject
+  VERSION = '0.6.0'
+end

data/lib/activerecord_null_object.rb

@@ -1,58 +1,7 @@
-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
+require 'active_record'
 
-        # 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
+require 'activerecord_null_object/version'
+require 'activerecord_null_object/null_object'
+require 'activerecord_null_object/null_object_support'
 
-        # 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.
-        use_null_object = options.delete(:null_object)
-        # 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.
-        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
-end
+ActiveRecord::Base.send :include, ActiveRecordNullObject::NullObjectSupport

data/spec/belongs_to_spec.rb

@@ -1,93 +1,61 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Comment do
-  before(:each) do
-    @comment = Comment.create!(:body => 'The body.')
-  end
-  
-  it "should contain a body" do
-    @comment.body.should == 'The body.'
-  end
+  subject(:comment) { Comment.create!(:body => 'The body.') }
 
-  describe "without an author" do
-    it "should return a null object for the author" do
-      @comment.author.kind_of?(NullAuthor).should be_true
-    end
-    
-    it "should be nil" do
-      @comment.author.should be_nil
-    end
-    
-    it "should return true for comment.author.nil?" do
-      @comment.author.nil?.should be_true
-    end
-    
-    it "should return false for comment.author.present?" do
-      @comment.author.present?.should be_false
-    end
-    
-    it "should return nil for the author's name" do
-      @comment.author.name.should be_nil
-    end
-  end
-  
-  describe "with an author" do
-    before(:each) do
-      @comment.author = Author.create!(:name => 'James Baker')
-    end
-    
-    it "should return the author object" do
-      @comment.author.kind_of?(Author).should be_true
-      @comment.author.kind_of?(NullAuthor).should_not be_true
-    end
-    
-    it "should return false for comment.author.nil?" do
-      @comment.author.nil?.should be_false
-    end
-    
-    it "should return true for comment.author.present?" do
-      @comment.author.present?.should be_true
-    end
-    
-    it "should return the author's name" do
-      @comment.author.name.should == 'James Baker'
+  its(:body) { should == 'The body.' }
+
+  context "its author" do
+    subject(:author) { comment.author }
+
+    context "when not present" do
+      it { should be_kind_of NullAuthor }
+      it { should be_nil }
+      it { should_not be_present }
+      its(:name) { should be_nil }
     end
-    
-    it "should revert to a null object if assigned nil" do
-      @comment.author = nil
-      @comment.author.name.should be_nil
+
+    context "when present" do
+      before { comment.create_author!(:name => 'James Baker') }
+
+      it { should be_kind_of Author }
+      it { should_not be_kind_of NullAuthor }
+      it { should_not be_nil }
+      it { should be_present }
+      its(:name) { should == 'James Baker' }
+
+      context "when removed" do
+        before { comment.author = nil }
+        its(:name) { should be_nil }
+      end
     end
   end
 end
 
 describe Post do
-  before(:each) do
-    @post = Post.create!(:body => 'The body.')
-  end
-  
-  it "should contain a body" do
-    @post.body.should == 'The body.'
-  end
-  
-  it "should not have null object support for the author" do
-    @post.author.should be_nil
-    @post.author.kind_of?(Author).should be_false
-    @post.author.respond_to?(:name).should be_false
+  subject(:post) { Post.create!(:body => 'The body.') }
+
+  its(:body) { should == 'The body.' }
+
+  context "without null object support for the author" do
+    subject(:author) { post.author }
+
+    it { should be_nil }
+    it { should_not be_kind_of Author }
+    it { should_not respond_to :name }
   end
 end
 
 describe Session do
-  before(:each) do
-    @session = Session.create!(:description => 'The description.')
-  end
-  
-  it "should contain a description" do
-    @session.description.should == 'The description.'
-  end
-  
-  it "should not have null object support for the author" do
-    @session.author.should be_nil
-    @session.author.kind_of?(Author).should be_false
-    @session.author.respond_to?(:name).should be_false
+  subject(:session) { Session.create!(:description => 'The description.') }
+
+  its(:description) { should == 'The description.' }
+
+  context "without null object support for the author" do
+    subject(:author) { session.author }
+
+    it { should be_nil }
+    it { should_not be_kind_of Author }
+    it { should_not respond_to :name }
   end
 end

data/spec/has_one_spec.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Author do
+  subject(:author) { Author.create!(:name => 'James Madison') }
+
+  context "its profile" do
+    subject(:profile) { author.profile }
+
+    context "when not present" do
+      context "without null object support for the profile" do
+        it { should be_nil }
+        it { should_not be_kind_of Profile }
+        it { should_not respond_to :age }
+      end
+    end
+
+    context "when present" do
+      before { author.create_profile!(:age => 56) }
+
+      its(:age) { should == 56 }
+    end
+  end
+
+  context "its account" do
+    subject(:account) { author.account }
+
+    context "when not present" do
+      context "without null object support for the account" do
+        it { should be_nil }
+        it { should_not be_kind_of Account }
+        it { should_not respond_to :password }
+      end
+    end
+
+    context "when present" do
+      before { author.create_account!(:password => 'secret') }
+
+      its(:password) { should == 'secret' }
+    end
+  end
+
+
+  context "its address" do
+    subject(:address) { author.address }
+
+    context "when not present" do
+      it { should be_kind_of NullAddress }
+      it { should be_nil }
+      it { should_not be_present }
+      its(:street) { should be_nil }
+    end
+
+    context "when present" do
+      before { author.create_address!(:street => '1600 Pennsylvania Ave') }
+
+      it { should be_kind_of Address }
+      it { should_not be_kind_of NullAddress }
+      it { should_not be_nil }
+      it { should be_present }
+      its(:street) { should == '1600 Pennsylvania Ave' }
+
+      context "when the address is removed" do
+        before { author.address = nil }
+        its(:street) { should be_nil }
+      end
+    end
+
+  end
+
+end

data/spec/null_object_spec.rb

@@ -1,99 +1,67 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe NullAuthor do
-  
-  before(:each) do
-    @null_author = Comment.new.author
-  end
-  
-  it "should be a kind of Author" do
-    @null_author.kind_of?(Author).should be_true
-  end
+
+  subject(:null_author) { Comment.new.author }
+
+  it { should be_kind_of Author }
 
   it "should be a singleton" do
-    lambda { NullAuthor.new }.should raise_error(NoMethodError)
-  end
-  
-  it "should be nil" do
-    @null_author.nil?.should be_true
-    @null_author.should be_nil
-  end
-  
-  it "should be empty" do
-    @null_author.empty?.should be_true
-  end
-  
-  it "should be blank" do
-    @null_author.blank?.should be_true
-  end
-  
-  it "should not be present" do
-    @null_author.present?.should be_false
+    expect { NullAuthor.new }.to raise_error(NoMethodError)
   end
 
-  describe "#id" do
-    it "should return nil" do
-      @null_author.id.should be_nil
-    end
-  end
-  
-  describe "#new_record?" do
-    it "should return true" do
-      @null_author.new_record?.should be_true
-    end
-  end
-  
-  describe "#save" do
-    it "should return false" do
-      @null_author.save.should be_false
-    end
-    
+  it { should be_nil }
+  it { should be_empty }
+  it { should be_blank }
+  it { should_not be_present }
+  its(:id) { should be_nil }
+  it { should be_new_record }
+
+  context "when saving with save" do
+    its(:save) { should be false }
+
     it "should not create a new record" do
-      lambda { @null_author.save }.should_not change { NullAuthor.count }
+      expect { null_author.save }.to_not change { NullAuthor.count }
     end
-    
+
     it "should add an error" do
-      @null_author.errors.on(:base).should == "is a null object and can't be saved"
+      expect(null_author.errors[:base]).to eq ["is a null object and can't be saved"]
     end
   end
-  
-  describe "#save!" do
+
+  context "when saving with save!" do
     it "should raise an exception" do
-      lambda { @null_author.save! }.should raise_error(ActiveRecord::RecordInvalid)
+      expect { null_author.save! }.to raise_error(ActiveRecord::RecordInvalid)
     end
-    
+
     it "should not create a new record" do
-      lambda { 
+      expect {
         begin
-          @null_author.save! 
+          null_author.save!
         rescue ActiveRecord::RecordInvalid
         end
-      }.should_not change { NullAuthor.count }
+      }.to_not change { NullAuthor.count }
     end
 
     it "should add an error" do
-      @null_author.errors.on(:base).should == "is a null object and can't be saved"
+      expect(null_author.errors[:base]).to eq ["is a null object and can't be saved"]
     end
   end
 
-  describe "#update_attributes" do
+  context "when updating attributes" do
     it "should return false" do
-      @null_author.update_attributes({}).should be_false
+      expect(null_author.update({})).to be false
     end
-    
+
     it "should not create a new record" do
-      lambda { @null_author.update_attributes({}) }.should_not change { NullAuthor.count }
+      expect { null_author.update({}) }.to_not change { NullAuthor.count }
     end
 
     it "should add an error" do
-      @null_author.errors.on(:base).should == "is a null object and can't be saved"
-    end
-  end
-  
-  describe "#name" do
-    it "should return nil" do
-      @null_author.name.should be_nil
+      expect(null_author.errors[:base]).to eq ["is a null object and can't be saved"]
     end
   end
-  
-end
+
+  its(:name) { should be_nil }
+
+end

data/spec/spec_helper.rb

@@ -1,19 +1,29 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'active_record'
 require 'yaml'
-require 'spec'
-require File.dirname(__FILE__) + '/../init.rb'
+require 'rspec'
+require 'rspec/its'
 
-# Establish database connection.
-config = YAML::load(File.open(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection(config['test'])
-load(File.dirname(__FILE__) + "/schema.rb")
+I18n.enforce_available_locales = true if I18n.respond_to? :enforce_available_locales=
+
+require 'support/coverage_loader'
+
+require 'activerecord_null_object'
 
 # Fixes 'address'.singularize  # => 'addres'
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.singular(/ess$/i, 'ess')
 end
 
+DB_FILE = 'tmp/test_db'
+FileUtils.mkdir_p File.dirname(DB_FILE)
+FileUtils.rm_f DB_FILE
+
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => DB_FILE
+
+load('spec/schema.rb')
+
 class Account < ActiveRecord::Base
 end
 
@@ -29,12 +39,20 @@ class Author < ActiveRecord::Base
   has_many :comments
   has_many :sessions
   has_one  :profile
-  has_one  :account, :null_object => false
+  if ::ActiveRecord::VERSION::MAJOR == 4
+    has_one :account, -> {order :created_at}, :null_object => false
+  else
+    has_one :account, :null_object => false
+  end
   has_one  :address, :null_object => true
 end
 
 class Comment < ActiveRecord::Base
-  belongs_to :author, :null_object => true
+  if ::ActiveRecord::VERSION::MAJOR == 4
+    belongs_to :author, -> {order :name}, :null_object => true
+  else
+    belongs_to :author, :null_object => true
+  end
 end
 
 class Post < ActiveRecord::Base
@@ -45,3 +63,6 @@ class Session < ActiveRecord::Base
   belongs_to :author
 end
 
+RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
+end

data/spec/support/coverage_loader.rb

@@ -0,0 +1,3 @@
+require 'coverage/kit'
+
+Coverage::Kit.setup(minimum_coverage: 100)

metadata

@@ -1,72 +1,215 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord_null_object
-version: !ruby/object:Gem::Version 
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Scott Woods
+- Alessandro Berardi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-09-02 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
-description: ""
-email: info@westarete.com
+date: 2022-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coverage-kit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Implements the Null Object Pattern for nil values in ActiveRecord associations.
+email:
+- support@travellink.com.au
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-files: 
-- .gitignore
+extra_rdoc_files: []
+files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/ruby.yml"
+- ".gitignore"
+- ".ruby-version"
+- CHANGELOG.md
+- Gemfile
 - MIT-LICENSE
-- README
+- README.md
 - Rakefile
 - VERSION
 - activerecord_null_object.gemspec
-- init.rb
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/activerecord_null_object.rb
-- lib/null_object.rb
+- lib/activerecord_null_object/null_object.rb
+- lib/activerecord_null_object/null_object_support.rb
+- lib/activerecord_null_object/version.rb
 - spec/belongs_to_spec.rb
-- spec/database.yml
+- spec/has_one_spec.rb
 - spec/null_object_spec.rb
 - spec/schema.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/westarete/activerecord_null_object/
-licenses: []
-
+- spec/support/coverage_loader.rb
+homepage: http://github.com/sealink/activerecord_null_object
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 3.3.3
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Implements the Null Object Pattern for nil values in ActiveRecord associations.
-test_files: 
+test_files:
 - spec/belongs_to_spec.rb
+- spec/has_one_spec.rb
 - spec/null_object_spec.rb
 - spec/schema.rb
+- spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/coverage_loader.rb

data/README

@@ -1,5 +0,0 @@
-= ActiveRecordWithNullObject
-
-Implements the Null Object Pattern for nil values in ActiveRecord associations.
-
-Copyright (c) 2009 West Arete Computing, Inc., released under the MIT license

data/init.rb

@@ -1,5 +0,0 @@
-require 'rubygems'
-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/null_object.rb

@@ -1,21 +0,0 @@
-module ActiveRecordNullObject
-  module NullObject
-  
-    def id 
-      nil
-    end
-  
-    def nil?
-      true
-    end
-    
-    def empty?
-      true
-    end
-  
-    def validate
-      errors.add_to_base("is a null object and can't be saved")
-    end
-  
-  end
-end

data/spec/database.yml

@@ -1,3 +0,0 @@
-test:
-  :adapter: sqlite3
-  :database: test.db