active_null 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3c0f5012e574af5bf4631f2afe52bfe920b08f
-  data.tar.gz: f6fb398c452e6c905e4450baf8bcef4ba20c8051
+  metadata.gz: a3494bf9c332cedeb22db3910a21b9164ce99082
+  data.tar.gz: e1a18e65f9a6b31af45896a73b307847d70341d0
 SHA512:
-  metadata.gz: d9db77e86963d17e00e6077dc636f7b0611204be04b7b36307a55f1c1125fbdaa58e079001a5720463f3381b934d87cb39fe7bf1fdd05d1584227283478eefa2
-  data.tar.gz: 7b3337aa31623594ece05fbdcb00d4602f09026026024d1a5fc4765c1164da69520fadfe67e9c44f524386c58b6d416ffa9c26716cba1e7897f3b7e9570b8cb0
+  metadata.gz: ff9327d00259b3a0c21f9e3c032e77b674d5ed6740b96bcc65cba07482f95f5393d3c1dcc85a516a6a426bee5f8319e7231bdde78ba9b6187dbb5cf877634a94
+  data.tar.gz: e6171f1aedabb49e2faf150848e855d4d984e4b8942c78e83352c0dae57598faa556522c263f26096d946ab469baecd7e7ca1a523386a4a2428c93d4df7bffad

data/README.md

@@ -34,11 +34,13 @@ For each model you would like to be null aware, `extend ActiveNull`.
 class Post < ActiveRecord::Base
   extend ActiveNull
   has_many :comments
+  null_model
 end
 
 class Comment < ActiveRecord::Base
   extend ActiveNull
   belongs_to :post
+  null_model
 end
 ```
 

data/lib/active_null.rb

@@ -3,12 +3,14 @@ require 'active_null/null_model_builder'
 
 module ActiveNull
   def null
-    NullModelBuilder.new(self, @null_model_overrides).build.get
+    @null_class.get
   end
 
   def null_model(&block)
-    @null_model_overrides = Module.new
-    @null_model_overrides.module_eval(&block)
+    null_model_overrides = if block_given?
+      Module.new.tap { |m| m.module_eval(&block) }
+    end
+    @null_class = NullModelBuilder.new(self, null_model_overrides).build
   end
 
   def find_by(*args, &block)

data/lib/active_null/null_model_builder.rb

@@ -72,8 +72,8 @@ module ActiveNull
           end
         end
       end
-      null.include Draper::Decoratable if Object.const_defined? 'Draper'
-      null.include overrides if overrides
+      null.send(:include, Draper::Decoratable) if Object.const_defined? 'Draper'
+      null.send(:include, overrides) if overrides
       set_null_model null
     end
 

data/lib/active_null/version.rb

@@ -1,3 +1,3 @@
 module ActiveNull
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/active_null_spec.rb

@@ -1,8 +1,13 @@
 require 'spec_helper'
 
 describe ActiveNull do
+  it 'defines the null class' do
+    expect(Object.const_defined? 'NullPost').to eq true
+  end
+
   describe '.null' do
     specify { expect(Post.null).to be_instance_of(NullPost) }
+    specify { expect(Test::TestModel.null).to be_instance_of(Test::NullTestModel) }
   end
 
   describe '.null_model' do

data/spec/models.rb

@@ -11,6 +11,7 @@ end
 class Comment < ActiveRecord::Base
   extend ActiveNull
   belongs_to :post
+  null_model
 end
 
 class NullPostDecorator < Draper::Decorator
@@ -20,3 +21,10 @@ end
 class PostDecorator < Draper::Decorator
   delegate_all
 end
+
+module Test
+  class TestModel < ActiveRecord::Base
+    extend ActiveNull
+    null_model
+  end
+end

data/spec/schema.rb

@@ -11,4 +11,8 @@ ActiveRecord::Schema.define do
     t.references :post
     t.timestamps
   end
+
+  create_table :test_models, force: true do |t|
+    t.timestamps
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_null
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - alexpeachey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naught