interjectable 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d810c4b31d398d621d728de427a57e078be0a83
-  data.tar.gz: dcc2d93576e3f08436a32527719e6a56b24a998f
+  metadata.gz: cc5668f979eb51feb5f750c012299e11afbb3f92
+  data.tar.gz: 6d302846198716cc7723fb930b465b92ead1b350
 SHA512:
-  metadata.gz: 307d9bb43b2faaf88ac043c32f1ef693ebd7871ef586403f1a9909064896e15269d59d1f335753ca43dec477bb21755367ff36e7406b12e3efde6006ce9738eb
-  data.tar.gz: 3f33bc63f27d399025beb5b19009d38de81f196b38b26bd8d884df878bb619992c58cd7bc0120cfce1b4ec6ec237be06acc98227e60d97ab3d0cc620fb5a7b3c
+  metadata.gz: d06494d8a15447db4b5df5ede8c8cfb17b3676c50f0a8a54222a13e72b1bb6a7bb203ce64719d0338463296b5da0ce412026efc8effc9916cbf168bd93bd6830
+  data.tar.gz: b112f4d0623cccf90df647776a2712738a5cb6d105786b0f2f8ed767a79d24d496b713d0d26dd5d8dea3f028f2a112347b3d7e26a01880e7d2029eea123d0164

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Change Log
 
+# v0.3.0
+
+- Clear previously set class variables an subsequent calls to `#inject_static`
+- Don't include `#inject` and `#inject_static` as instance variables on `include Interjectable`
+
 # v0.2.0
 
 Small feature.
@@ -18,4 +23,4 @@ Small patch.
 
 Initial release.
 
-- Added `Interjectable#inject`
+- Added `Interjectable#inject`

data/README.md

@@ -58,7 +58,7 @@ Let's check it out: we can build a class A that normally references B, but in ou
 ```ruby
 # a.rb
 class A
-  extend Interjectable
+  include Interjectable
 
   inject(:b) { B.new }
 
@@ -77,7 +77,7 @@ describe A do
     end
 
     it "parses from its b" do
-      subject.read.should == 'result'
+      expect(subject.read).to eq('result')
     end
   end
 end

data/interjectable.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", ">= 3.0.0"
 end

data/lib/interjectable.rb

@@ -2,51 +2,62 @@ require "interjectable/version"
 
 module Interjectable
   def self.included(mod)
-    mod.send(:extend, self)
+    mod.send(:extend, ClassMethods)
   end
 
-  # Defines a helper methods on instances that memoize values per-instance.
-  # Similar to writing
-  #
-  #   attr_writer :dependency
-  #
-  #   def dependency
-  #     @dependency ||= instance_eval(&default_block)
-  #   end
-  def inject(dependency, &default_block)
-    attr_writer dependency
+  def self.extended(mod)
+    mod.send(:extend, ClassMethods)
+  end
+
+  module ClassMethods
+    # Defines a helper methods on instances that memoize values per-instance.
+    # Similar to writing
+    #
+    #   attr_writer :dependency
+    #
+    #   def dependency
+    #     @dependency ||= instance_eval(&default_block)
+    #   end
+    def inject(dependency, &default_block)
+      attr_writer dependency
 
-    define_method(dependency) do
-      ivar_name = "@#{dependency}"
-      if instance_variable_defined?(ivar_name)
-        instance_variable_get(ivar_name)
-      else
-        instance_variable_set(ivar_name, instance_eval(&default_block))
+      define_method(dependency) do
+        ivar_name = "@#{dependency}"
+        if instance_variable_defined?(ivar_name)
+          instance_variable_get(ivar_name)
+        else
+          instance_variable_set(ivar_name, instance_eval(&default_block))
+        end
       end
     end
-  end
 
-  # Defines helper methods on instances that memoize values per-class.
-  # (shared across all instances of a class, including instances of subclasses)
-  # Similar to writing
-  #
-  #   cattr_writer :dependency
-  #
-  #   def dependency
-  #     @@dependency ||= instance_eval(&default_block)
-  #   end
-  def inject_static(dependency, &default_block)
-    cvar_name = "@@#{dependency}"
+    # Defines helper methods on instances that memoize values per-class.
+    # (shared across all instances of a class, including instances of subclasses).
+    #
+    # Calling a second time clears the value (if set) from previous times. This should
+    # probably only be called a second time in tests.
+    #
+    # Similar to writing
+    #
+    #   cattr_writer :dependency
+    #
+    #   def dependency
+    #     @@dependency ||= instance_eval(&default_block)
+    #   end
+    def inject_static(dependency, &default_block)
+      cvar_name = "@@#{dependency}"
+      remove_class_variable(cvar_name) if class_variable_defined?(cvar_name)
 
-    define_method("#{dependency}=") do |value|
-      self.class.class_variable_set(cvar_name, value)
-    end
+      define_method("#{dependency}=") do |value|
+        self.class.class_variable_set(cvar_name, value)
+      end
 
-    define_method(dependency) do
-      if self.class.class_variable_defined?(cvar_name)
-        self.class.class_variable_get(cvar_name)
-      else
-        self.class.class_variable_set(cvar_name, instance_eval(&default_block))
+      define_method(dependency) do
+        if self.class.class_variable_defined?(cvar_name)
+          self.class.class_variable_get(cvar_name)
+        else
+          self.class.class_variable_set(cvar_name, instance_eval(&default_block))
+        end
       end
     end
   end

data/lib/interjectable/version.rb

@@ -1,3 +1,3 @@
 module Interjectable
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/spec/interjectable_spec.rb

@@ -9,35 +9,39 @@ describe Interjectable do
         klass.inject(:some_dependency) { :service }
       end
 
+      it "doesn't have #inject as an instance method" do
+        expect { instance.inject(:some_dependency) { :service } }.to raise_error(NameError)
+      end
+
       it "adds an instance method getter and setter" do
         instance.some_dependency = 'aaa'
-        instance.some_dependency.should == 'aaa' 
+        expect(instance.some_dependency).to eq('aaa')
       end
 
       it "lazy-loads the default block" do
-        instance.instance_variable_get("@some_dependency").should be_nil
-        instance.some_dependency.should == :service
-        instance.instance_variable_get("@some_dependency").should_not be_nil
+        expect(instance.instance_variable_get("@some_dependency")).to be_nil
+        expect(instance.some_dependency).to eq(:service)
+        expect(instance.instance_variable_get("@some_dependency")).not_to be_nil
       end
 
       it "allows transitive dependencies (via instance_eval)" do
         klass.inject(:first_dependency) { second_dependency }
         klass.inject(:second_dependency) { :value }
 
-        instance.first_dependency.should == :value
+        expect(instance.first_dependency).to eq(:value)
       end
 
       it "calls dependency block once, even with a falsy value" do
         count = 0;
         klass.inject(:some_falsy_dependency) { count += 1; nil }
 
-        2.times { instance.some_falsy_dependency.should be_nil }
-        count.should == 1
+        2.times { expect(instance.some_falsy_dependency).to be_nil }
+        expect(count).to eq(1)
       end
 
       context "with a dependency on another class" do
         before do
-          defined?(SomeOtherClass).should be_false
+          expect(defined?(SomeOtherClass)).to be_falsey
 
           klass.inject(:some_other_class) { SomeOtherClass.new }
         end
@@ -45,7 +49,7 @@ describe Interjectable do
         it "does not need to load that class (can be stubbed away)" do
           instance.some_other_class = :fake_other_class
 
-          instance.some_other_class.should == :fake_other_class
+          expect(instance.some_other_class).to eq(:fake_other_class)
         end
       end
     end
@@ -57,24 +61,35 @@ describe Interjectable do
         klass.inject_static(:static_dependency) { :some_value }
       end
 
+      it "doesn't have #inject_static as an instance method" do
+        expect { instance.inject_static(:static_dependency) { :some_value } }.to raise_error(NameError)
+      end
+
       it "adds an instance method and setter" do
         instance.static_dependency = 'aaa'
-        instance.static_dependency.should == 'aaa'
+        expect(instance.static_dependency).to eq('aaa')
       end
 
       it "shares a value across all instances of a class" do
         instance.static_dependency = 'bbb'
-        other_instance.static_dependency.should == 'bbb'
+        expect(other_instance.static_dependency).to eq('bbb')
       end
 
       it "calls its dependency block once across all instances" do
         count = 0;
         klass.inject_static(:falsy_static_dependency) { count += 1; nil }
 
-        instance.falsy_static_dependency.should be_nil
-        other_instance.falsy_static_dependency.should be_nil
+        expect(instance.falsy_static_dependency).to be_nil
+        expect(other_instance.falsy_static_dependency).to be_nil
 
-        count.should == 1
+        expect(count).to eq(1)
+      end
+
+      it "clears class variable on subsequent calls to inject_static" do
+        expect(instance.static_dependency).to eq(:some_value)
+        klass.inject_static(:static_dependency) { :another_value }
+        expect(instance.static_dependency).to eq(:another_value)
+        expect(other_instance.static_dependency).to eq(:another_value)
       end
 
       context "with a subclas" do
@@ -83,7 +98,7 @@ describe Interjectable do
 
         it "shares its values with its superclass" do
           instance.static_dependency = 'ccc'
-          subclass_instance.static_dependency.should == 'ccc'
+          expect(subclass_instance.static_dependency).to eq('ccc')
         end
       end
     end
@@ -96,7 +111,7 @@ describe Interjectable do
   end
 
   context "when included" do
-    let(:klass) { Class.new { extend Interjectable } }
+    let(:klass) { Class.new { include Interjectable } }
 
     it_should_behave_like "an interjectable class"
   end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: interjectable
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Zach Margolis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description: A simple dependency injection library for unit testing
 email:
 - zbmargolis@gmail.com
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -80,17 +80,17 @@ require_paths:
 - lib
 required_ruby_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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A simple dependency injection library for unit testing