active_null 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34802b6bb45c168b836473546d630a125fe6b116
-  data.tar.gz: db5beef0d960320f86938d4a04cc38b22d9be4bd
+SHA256:
+  metadata.gz: 43176e04bb964761222c58d11c0aeef9fcdcbbc11cc67845bbd08867f7ea919a
+  data.tar.gz: 806ba32adadf898cc76a82707fb6f94fc20ed9be961f4322d33e9f87bcd69118
 SHA512:
-  metadata.gz: 53077a09ae14ecb32e5ef97df52b7178580fabde3cb0f9e5136219e9e6fdabae7eefa200986d95c899a76c76ec682d237a222ebcac9f978422979d82377c6d9d
-  data.tar.gz: d9a9dbf632553cf2eaa5ec794b17a1fd83b3f510cd77d81eeaa94d47c1cd5960fb3c2ca2b88f641f83279b48ada6168af5fbf1d28c1b1fbd52d0218c317e0011
+  metadata.gz: 457eb6028294ebd1a5c55f11db46a1400cda19dffa12222e73d9007245da2bd600873f0233315d3b0edeafffea3b146032fc43fbd7c2b8705e0696351307fcda
+  data.tar.gz: 465e65a8cf576925d29733a6d857e772b9941741c368d6c2e09be955fe3999a43ba27480c90a6154ab84967308c334ac13227dfd929aaae877c11b16c9ec4cd0

data/README.md

@@ -96,6 +96,21 @@ You can then safely do something like:
 @post = Post.find_by(id: 1).decorate
 ```
 
+You can also define an alias for your `null` method for convenience
+
+```ruby
+class User < ActiveRecord::Base
+  extend ActiveNull
+
+  null_model(:guest)
+end
+
+User.first    # => <User>
+User.null     # => <null:User>
+User.guest    # => <null:User>
+```
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/Originate/active_null/fork )

data/active_null.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |spec|
   spec.name          = 'active_null'
   spec.version       = ActiveNull::VERSION
   spec.authors       = ['alexpeachey']
-  spec.email         = ['alex.peachey@originate.com']
+  spec.email         = ['alex.peachey@gmail.com']
   spec.summary       = %q{Make ActiveRecord null model aware.}
   spec.description   = %q{Make ActiveRecord null model aware.}
-  spec.homepage      = 'https://github.com/Originate/active_null'
+  spec.homepage      = 'https://github.com/alexpeachey/active_null'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'activerecord', '~> 4.2'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
   spec.add_development_dependency 'draper', '~> 2.1'
   spec.add_development_dependency 'coveralls'
 end

data/lib/active_null.rb

@@ -14,10 +14,16 @@ module ActiveNull
     @polymorphic_null_defaults || {}
   end
 
-  def null_model(&block)
+  def null_model(method_name=nil, &block)
     @null_model_overrides = if block_given?
       Module.new.tap { |m| m.module_eval(&block) }
     end
+
+    if method_name
+      singleton_class.class_eval do
+        define_method(method_name) { null }
+      end
+    end
   end
 
   def find_by(*args, &block)

data/lib/active_null/null_model_builder.rb

@@ -92,12 +92,22 @@ module ActiveNull
     end
 
     def full_name
-      return name if model.parent == Object
-      "#{model.parent.name}::#{name}"
+      return name if module_parent == Object
+      "#{module_parent_name}::#{name}"
     end
 
     def set_null_model(null)
-      model.parent.const_set name, null
+      module_parent.const_set name, null
+    end
+
+    private
+
+    def module_parent
+      @module_parent ||= model.try(:module_parent) || model.parent
+    end
+
+    def module_parent_name
+      @module_parent_name ||= model.try(:module_parent_name) || model.parent.name
     end
   end
 end

data/lib/active_null/version.rb

@@ -1,3 +1,3 @@
 module ActiveNull
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/active_null_spec.rb

@@ -21,6 +21,11 @@ describe ActiveNull do
     specify { expect(Test::TestModel.null).to be_instance_of(Test::NullTestModel) }
   end
 
+  describe '.guest' do
+    specify { expect(User.null).to be_instance_of(NullUser) }
+    specify { expect(User.guest).to be_instance_of(NullUser) }
+  end
+
   describe '.null_model' do
     specify { expect(Post.null.override).to eq 'I am an override.' }
   end

data/spec/models.rb

@@ -15,6 +15,8 @@ end
 class User < ActiveRecord::Base
   extend ActiveNull
   has_many :comments, as: :author
+
+  null_model(:guest)
 end
 
 class Comment < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_null
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - alexpeachey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naught
@@ -84,16 +84,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: Make ActiveRecord null model aware.
 email:
-- alex.peachey@originate.com
+- alex.peachey@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -145,7 +145,7 @@ files:
 - spec/null_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
-homepage: https://github.com/Originate/active_null
+homepage: https://github.com/alexpeachey/active_null
 licenses:
 - MIT
 metadata: {}
@@ -164,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Make ActiveRecord null model aware.