active_null_object 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df250c8f885aa2477056a8b38f5a7c6b5aa3f9b2
-  data.tar.gz: f374b3854f95573d4dc80b1fc9a9c6db8e965279
+  metadata.gz: 7e8fbf97673b27b4967b211923df0901636be09f
+  data.tar.gz: 432a2be04b42248319a0b4d0c471dbcc6c7aaefa
 SHA512:
-  metadata.gz: 7b42aaf752802243a6025122516de4a4e5099bb59d5f99e70807b85fcebeb549c30cfbc4f85ea08f705bad85ece2e27f19f09cd5da8304c3d5e1eef0ff62c2a0
-  data.tar.gz: 7b5fb5f4bb01c3a7bb2b2ef2849c87a02bab4f57e94f9f361cbb6e3aada693c21623dd796718bb9cca54e61264afa9d405b8aefc47ccca94f4d911a749dc1e51
+  metadata.gz: 83ee41e7d52451c3f2614ef77ee1c315afd2edcfd0caff730b74163c2d75cfbdf9c49fc3c2d5387577f5f925325c0fed1a02912947b4239771f177be868d6926
+  data.tar.gz: fd224e50c9d079b5d82a125cecb28c864fabbb1d36d20d0d0b40f283e291c92c43dc50fdfb9ff4784d65b1ccd0785c2957244f00cdb5766e739147723d91bd84

data/README.md

@@ -1,6 +1,9 @@
 Active Null Object
 ==================
 
+[![Gem Version](https://badge.fury.io/rb/active_null_object.svg)](http://badge.fury.io/rb/active_null_object)
+[![Build Status](https://travis-ci.org/stefanroex/active_null_object.svg)](https://travis-ci.org/stefanroex/active_null_object)
+
 Instead of returning nil when an association is not found, return a [Null Object](http://martinfowler.com/eaaCatalog/specialCase.html).
 
 Associations
@@ -18,4 +21,7 @@ Finder
 ```ruby
 # Use a specialized finder if you want a Null Object if the record is not found.
 User.find_or_null_object(1)
+
+# ...or pass explicit class name.
+User.find_or_null_object(1, null_object: 'NullAdmin')
 ```

data/VERSION

@@ -1 +1 @@
-0.0.2
+1.0.0

data/lib/active_null_object.rb

@@ -2,11 +2,12 @@ require 'active_record'
 require 'active_support'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_null_object/association'
+require 'active_null_object/create_null_object'
 require 'active_null_object/finder'
 
 module ActiveNullObject
   mattr_accessor :initialize_method
-  self.initialize_method = "new"
+  self.initialize_method = 'new'
 end
 
 ActiveRecord::Base.send(:include, ActiveNullObject::Association)

data/lib/active_null_object/association.rb

@@ -9,21 +9,19 @@ module ActiveNullObject
     end
 
     module ClassMethods
-      def belongs_to_with_null_object(name, scope = nil, options = {})
+      def belongs_to_with_null_object(relation_name, scope = nil, options = {})
         options = scope if scope.is_a?(Hash)
         null_object_name = options.delete(:null_object)
-        belongs_to_without_null_object(name, scope, options)
-        define_null_object_getter(name, null_object_name) if null_object_name
+        belongs_to_without_null_object(relation_name, scope, options)
+        if null_object_name
+          define_null_object_getter(relation_name, null_object_name)
+        end
       end
 
-      def define_null_object_getter(name, null_object_name)
-        null_object = if null_object_name.is_a?(String)
-                        null_object_name
-                      else
-                        "Null#{name.to_s.classify}"
-                      end
-        define_method(name) do
-          super() || null_object.constantize.public_send(ActiveNullObject.initialize_method)
+      def define_null_object_getter(relation_name, custom_name)
+        create_null_object = CreateNullObject.new(relation_name, custom_name)
+        define_method(relation_name) do
+          super() || create_null_object.call
         end
       end
     end

data/lib/active_null_object/create_null_object.rb

@@ -0,0 +1,17 @@
+module ActiveNullObject
+  CreateNullObject = Struct.new(:class_name, :custom_name) do
+    def call
+      object_name.constantize.public_send(ActiveNullObject.initialize_method)
+    end
+
+    private
+
+    def object_name
+      if custom_name.is_a?(String)
+        custom_name
+      else
+        "Null#{class_name.to_s.classify}"
+      end
+    end
+  end
+end

data/lib/active_null_object/finder.rb

@@ -3,8 +3,9 @@ module ActiveNullObject
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def find_or_null_object(id)
-        find_by(id: id) || "Null#{name}".constantize.public_send(ActiveNullObject.initialize_method)
+      def find_or_null_object(id, options = {})
+        custom_name = options.delete(:null_object)
+        find_by(id: id) || CreateNullObject.new(name, custom_name).call
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_null_object
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Stefan Roex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.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: rubocop
+  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
@@ -76,6 +104,7 @@ files:
 - VERSION
 - lib/active_null_object.rb
 - lib/active_null_object/association.rb
+- lib/active_null_object/create_null_object.rb
 - lib/active_null_object/finder.rb
 homepage: http://stefanroex.nl
 licenses: []
@@ -96,8 +125,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple null objects in Active Record
 test_files: []
+has_rdoc: