nil_conditional 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480a9c37b75244a79017defb5f87a09ec00bb4d2
-  data.tar.gz: c8ade086f96dccf7122da47898c418e923851579
+  metadata.gz: 0fc18e077b2f985f98ac155b7aa1517b02d2b0ca
+  data.tar.gz: 807b525fb2bb0f95665213975d00b9937a4aa9e9
 SHA512:
-  metadata.gz: 4cecbcded18c99be80b8a9ba7e69cc11bc6d5eeee237b67f5013f4f8e3c43027ca5d8e18220aad045d22decba661a971d027a8dd65fcbab69a2bbb48cd5709d6
-  data.tar.gz: 40bb5fd2b473e6fdcd3635cdff15aba19d7c2007b373efbe64e770995276192a860329d8e7ebebc9de0f0bf283ee66cd7af12df2baaeddfecaa6718719ab894b
+  metadata.gz: b8ab231f5f82c32c5fd62b0b3f8078555049cd3d7dc5eb9a2a422d831f9ee48e32e9e819d12ae572a3ba7018af1843771265ae56a1949538f13c7d95dec35150
+  data.tar.gz: 4e1632f12d50a069259c1ea3165d382fa4c258b6fc48252bf1ac7dc19a20e2e59a85cfdf99629c48867b43d4c0b72a0c3d85722c541d8e6cb828126e59d52ff2

data/README.md

@@ -16,8 +16,8 @@ Nil Conditional Operator is inspired by Null Conditional Operator introduced in
 
 ## Usage
 
-Use preceding double underscore (`__`) for methods (for ex. `__method`)
-Use preceding double underscore and trailing block for local variables  (for ex. `__var{}`)
+Use `?_` method as Nil Conditional Operator.
+For example: `logger._?.log('some debug information')`
 
 ```ruby
 
@@ -25,53 +25,60 @@ Use preceding double underscore and trailing block for local variables  (for ex.
 logger.foo.bar.car.cow
 NoMethodError: undefined method `foo` for #<NilClass>
 
-# logger is nil or doesn't exist
-__logger{}.foo.bar.car.cow
+# logger is nil
+logger._?.foo.bar.car.cow
 => #<NilConditional>
 
-# object exists and all methods are valid
-__object{}.foo.bar.car.cow
+# logger exists and all methods are valid
+logger._?.foo.bar.car.cow
+=> "moooo"
+
+# logger exists and all methods are valid
+logger._?.foo.bar.car.cow
 => "moooo"
 
 # logger exists but doesn't have warn method
-logger.__warn('some warning')
+logger._?.warn('some warning')
 => #<NilConditional>
 
-__non_existent_local_variable{}
-=> #<NilConditional>
+# logger exists and have warn method, but foo is invalid
+logger._?.warn('some warning').foo
+=> NoMethodError: undefined method `foo`
 
-__non_existent_method
+logger._?.warn('some warning')._?.foo
 => #<NilConditional>
 
 Object.new.non_existent_method
 NoMethodError: undefined method `non_existent_method` for #<Object>
 
-Object.new.__non_existent_method
+Object.new._?.non_existent_method
 => #<NilConditional>
 
-Object.new.__non_existent_method.nil?
+Object.new._?.non_existent_method.nil?
 => true
-
-__new_object.foo.bar.car_?.cow_?
-=> nil
 ```
 
-`NilConditional` instanced return always new NilConditional object if method is missing.
+`NilConditional` instances always return new NilConditional object if method is missing.
 These objects are also `eql` to `nil`.
 
 
 ## Changelog
 
+* Changes from version with major 1
+
+  Previous version used different syntax
+
 * Changes from version with major 0
 
-  Previous version didn't support methods with special characters and there was no support for local variables
-  Previous version used trailing `_?` as NilConditional operator. Current version uses preceding double underscore character `__`.
+  * Previous version didn't support methods with special characters and there was no support for local variables.
+  * Previous version used trailing `_?` as NilConditional operator. Current version uses preceding double underscore character `__`.
 
 
 ## Discussion
 
 Feel free to submit ideas via issues and discuss better solution to Nil Conditional Operator in Ruby
 
+
 ## License
 
 This is free software, licensed under MIT License. See LICENSE.txt file.

data/Rakefile

@@ -1,5 +1,13 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new('spec')
-task :default => :spec
+RuboCop::RakeTask.new
+
+task :test do
+  Rake::Task['spec'].invoke
+  Rake::Task['rubocop'].invoke
+end
+
+task default: :test

data/lib/nil_conditional.rb

@@ -1,34 +1,29 @@
 # NilConditional Operator in Ruby
 
+# Patch Object class
 class Object
-  def method_missing(name, *params)
-    if name =~ /^__.+$/
-      original = name.to_s.sub(/^__/, '').to_sym
-
-      if block_given? && original =~ /^\w+$/
-        binding = Proc.new.binding
-        if binding.local_variable_defined?(original)
-          var = binding.local_variable_get(original)
-          return var unless var.nil?
-        end
-      end
-
-      if respond_to?(original)
-        return_value = block_given? ? send(original, *params, &Proc.new) : 
-          send(original, *params)
-        return return_value unless return_value.nil?
-      end
-
-      NilConditional.new
-    else
-      super
-    end
+  def _?
+    NilConditional.new(self)
   end
 end
 
+# Nil Conditional class
 class NilConditional
+  def initialize(object)
+    @object = object
+  end
+
   def method_missing(name, *params)
-    return self.class.new
+    if @object.respond_to?(name)
+      return_value = nil
+      if block_given?
+        return_value = @object.public_send(name, *params, &Proc.new)
+      else
+        return_value = @object.public_send(name, *params)
+      end
+      return return_value unless return_value.nil?
+    end
+    self.class.new(@object)
   end
 
   def nil?
@@ -36,7 +31,7 @@ class NilConditional
   end
 
   def ==(other)
-    return true if other == nil
+    return true if other.nil?
     super
   end
 

data/nil_conditional.gemspec

@@ -3,20 +3,21 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "nil_conditional"
-  spec.version       = '1.0.0'
-  spec.authors       = ["Grzegorz Bizon"]
-  spec.email         = ["grzegorz.bizon@ntsn.pl"]
-  spec.summary       = %q{Nil Conditional Operator in Ruby}
-  spec.homepage      = "http://github.com/grzesiek/nil-conditional"
-  spec.license       = "MIT"
+  spec.name          = 'nil_conditional'
+  spec.version       = '2.0.0'
+  spec.authors       = ['Grzegorz Bizon']
+  spec.email         = ['grzegorz.bizon@ntsn.pl']
+  spec.summary       = 'Nil Conditional Operator in Ruby'
+  spec.homepage      = 'http://github.com/grzesiek/nil-conditional'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   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.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake",    "~> 10.0"
-  spec.add_development_dependency "rspec",   "~> 3.2.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake',    '~> 10.0'
+  spec.add_development_dependency 'rspec',   '~> 3.2.0'
+  spec.add_development_dependency 'rubocop', '~> 0.30.0'
 end

data/spec/nil_conditional_spec.rb

@@ -1,15 +1,16 @@
 describe NilConditional do
   context 'nil value' do
     it 'should be considered as nil' do
-      expect(NilConditional.new.nil?).to be(true)
-      expect(NilConditional.new).to eq(nil)
-      expect(NilConditional.new).to eql(nil)
+      expect(NilConditional.new(Object.new).nil?).to be(true)
+      expect(NilConditional.new(Object.new)).to eq(nil)
+      expect(NilConditional.new(Object.new)).to eql(nil)
     end
   end
 
   context 'missing method behavior' do
     it 'return new NilConditional object when method is missing' do
-      expect(NilConditional.new.non_existent_method).to be_a(NilConditional)
+      conditional = NilConditional.new(Object.new)
+      expect(conditional.non_existent_method).to be_a(NilConditional)
     end
   end
 end

data/spec/nil_spec.rb

@@ -1,8 +1,7 @@
 describe 'nil object' do
   context 'local variable' do
     it 'should return nil conditional if var is nil' do
-      var = nil
-      expect(__var{}).to be_a(NilConditional)
+      expect(nil._?).to be_a(NilConditional)
     end
   end
 
@@ -13,11 +12,11 @@ describe 'nil object' do
 
     it 'should return NilConditional instance when method return nil' do
       expect(Object.nil_test).to be nil
-      expect(Object.new.__nil_test?).to be_a(NilConditional)
+      expect(Object.new._?.nil_test).to be_a(NilConditional)
     end
 
-    it 'should return NilConditional instance when method return nil and uses block' do
-      expect(Object.new.__nil_test?{}).to be_a(NilConditional)
+    it 'should return NilConditional when method returns nil using block' do
+      expect(Object.new._?.nil_test {}).to be_a(NilConditional)
     end
   end
 end

data/spec/object_spec.rb

@@ -4,27 +4,27 @@ describe Object do
       expect { Object.new.test_method }.to raise_error(NoMethodError)
     end
 
-    it 'should not raise error when receiving __test_method' do
-      expect { Object.new.__test_method }.to_not raise_error
+    it 'should not raise error when receiving test_method' do
+      expect { Object.new._?.test_method }.to_not raise_error
     end
 
-    it 'should return NilConditional instance when received non existent method with preceding __' do
-      expect(Object.new.__test_method).to be_a(NilConditional)
+    it 'should return NilConditional instance when received unknown method' do
+      expect(Object.new._?.test_method).to be_a(NilConditional)
     end
 
     it 'should support chained methods with nil conditional' do
-      expect { Object.new.__test_method.foo_?.bar_?.car_?.cow_? }.to_not raise_error
-      expect(Object.new.__test_method.foo_?.bar_?.car_?.cow_?).to be_a(NilConditional)
+      expect { Object.new._?.test_method.foo.bar.car.cow }.to_not raise_error
+      expect(Object.new._?.test_method.foo.bar.car.cow).to be_a(NilConditional)
     end
 
     it 'should support methods with arguments' do
-      expect { Object.__test_method_with_args(1, 2, 3) }.to_not raise_error
-      expect(Object.__test_method_with_args(1, 2, 3)).to be_a(NilConditional)
+      expect { Object._?.test_method_with_args(1, 2, 3) }.to_not raise_error
+      expect(Object._?.test_method_with_args(1, 2, 3)).to be_a(NilConditional)
     end
 
     it 'should support methods with blocks' do
-      expect(Object.__test_method_with_block{ a = 'b' }).to be_a(NilConditional)
-      expect(['a', 'b'].__delete_if { |i| i == 'b' }).to eq([ 'a' ])
+      expect(Object._?.test_with_block { 'test' }).to be_a(NilConditional)
+      expect(%w(a b)._?.delete_if { |i| i == 'b' }).to eq(['a'])
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1 @@
 require 'nil_conditional'
-
-RSpec.configure do |config|
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nil_conditional
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
 description: 
 email:
 - grzegorz.bizon@ntsn.pl
@@ -68,7 +82,6 @@ files:
 - Rakefile
 - lib/nil_conditional.rb
 - nil_conditional.gemspec
-- spec/local_variables_spec.rb
 - spec/nil_conditional_spec.rb
 - spec/nil_spec.rb
 - spec/object_spec.rb
@@ -98,8 +111,8 @@ signing_key:
 specification_version: 4
 summary: Nil Conditional Operator in Ruby
 test_files:
-- spec/local_variables_spec.rb
 - spec/nil_conditional_spec.rb
 - spec/nil_spec.rb
 - spec/object_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/local_variables_spec.rb

@@ -1,20 +0,0 @@
-describe 'local variables' do
-  context 'test variable' do
-    it 'should raise error when using non existent test variable' do
-      expect { test_variable }.to raise_error(NameError)
-    end
-
-    it 'should not raise error when using  __test_variable{}' do
-      expect { __test_variable{} }.to_not raise_error
-    end
-
-    it 'should return NilConditional instance when using non existent var with preceding __ and trailing block' do
-      expect(__test_variable{}).to be_a(NilConditional)
-    end
-
-    it 'should support chained methods with nil conditional' do
-      expect { __test_variable{}.foo_?.bar_?.car_?.cow_? }.to_not raise_error
-      expect(__test_variable{}.foo_?.bar_?.car_?.cow_?).to be_a(NilConditional)
-    end
-  end
-end