equalizer 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f081b71232d8ecf91f28b2dd4710cf36b5cd2936
-  data.tar.gz: 49a8eb253f2c6168a3ef15a0d96a150abc30cfab
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGRlOGMwM2JjYmE4MzM0Yzg0YmQxN2MwYzZmM2U3MWIzNjkxNmNkMA==
+  data.tar.gz: !binary |-
+    ZDVhZGIwM2U5MTdhNWYyNDZjYTlkOTY4ZTM4NzZhNzEyOTQzZGRiZQ==
 SHA512:
-  metadata.gz: a96e4b95601585fcb934831c4825bfd8394d8e1d146f1ab5b89290ba3667a32a4d16b732f58c16d728dfbb33fd31d44383b406ed985e01996e30a6a62bd36295
-  data.tar.gz: 474ae8729aa767e617328fe05be9205f3fc72470f9ab5c79fb88aa2a894c3eea2029fecee7f36dad7a2bee526308690319aa5ce55cf31a471dc9beb6cd6c9457
+  metadata.gz: !binary |-
+    OGM3NDcwMzhjY2M3MWJjNDBlYWRjZDk4YWY4NjYyNTI1NzdiZDc3MzBiMGEz
+    ZjAwYmJhNzgwNTg4YjU5ZmFlOTU1N2NiYjBmMWY4NmU0N2ZhOWZjZTNiNzhi
+    ZTdiN2NjODk1YWMyNzE5OWY0ZjY2NmQ3ZjNhYjY5Yzk1NjQ5OTI=
+  data.tar.gz: !binary |-
+    MGM3YzJhODdkMDZhOTVmOWNkNWIzMTdhMWY1MjY5Njg1OWRmYWU5NDg5MGQw
+    M2RmNjVmOTM4OWYzODQ0NTk5Y2I3YTViYjgwMTdmMTI3MmVlMjVlZDZmMjE0
+    ZTc1Y2YzZGRhZWYyYTQyMWExNDJiYjY3NTljMDA5ZmIxYWVkZjI=

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
-before_install: gem install bundler
 bundler_args: --without yard guard benchmarks
 script: "bundle exec rake ci"
 rvm:
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - rbx-19mode
+  - rbx
 matrix:
   include:
     - rvm: jruby-19mode
@@ -14,10 +13,7 @@ matrix:
     - rvm: jruby-head
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
   allow_failures:
-    - rvm: 1.9.3       # mutant fails
-    - rvm: 2.0.0       # mutant fails
-    - rvm: ruby-head   # travis broken
-    - rvm: rbx-19mode  # mutant fails
+    - rvm: 2.0.0  # travis broken
 notifications:
   irc:
     channels:

data/Gemfile.devtools

@@ -4,10 +4,14 @@ group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
   gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.1.0'
+  gem 'kramdown', '~> 1.2.0'
 end
 
 group :guard do
@@ -15,7 +19,7 @@ group :guard do
   gem 'guard-bundler', '~> 1.0.0'
   gem 'guard-rspec',   '~> 3.0.2'
   gem 'guard-rubocop', '~> 0.2.0'
-  # gem 'guard-mutant',  '~> 0.0.1'
+  gem 'guard-mutant',  '~> 0.0.1'
 
   # file system change event handling
   gem 'listen',     '~> 1.3.0'
@@ -30,18 +34,27 @@ group :guard do
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.6.7'
+  gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.1.1'
+  gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.11.0'
-  gem 'simplecov', '~> 0.7.1'
+  gem 'rubocop',   '~> 0.15.0'
+  gem 'simplecov', '~> 0.8.2'
   gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
 
   platforms :ruby_19, :ruby_20 do
-    # gem 'mutant', git: 'https://github.com/mbj/mutant.git'
+    gem 'mutant',          '~> 0.3.0.rc3', git: 'https://github.com/mbj/mutant.git'
+    gem 'unparser',        '~> 0.1.5',     git: 'https://github.com/mbj/unparser.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
+
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4.10'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
+  end
 end
 
 group :benchmarks do

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 20.9
+threshold: 18.7

data/config/rubocop.yml

@@ -29,7 +29,7 @@ CollectionMethods:
 # sections of code and visually separate them. When the keyword is at the same
 # level I think it sort of blends in with the def keywords and makes it harder
 # to scan the code and see where the sections are.
-AccessControl:
+AccessModifierIndentation:
   Enabled: false
 
 # Disable documentation checking until a class needs to be documented once
@@ -55,3 +55,7 @@ ConstantName:
 # Not all trivial readers/writers can be defined with attr_* methods
 TrivialAccessors:
   Enabled: false
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
+  Enabled: false

data/lib/equalizer.rb

@@ -16,12 +16,24 @@ class Equalizer < Module
   def initialize(*keys)
     @keys = keys
     define_methods
-    include_comparison_methods
     freeze
   end
 
 private
 
+  # Hook called when module is included
+  #
+  # @param [Module] descendant
+  #   the module or class including Equalizer
+  #
+  # @return [self]
+  #
+  # @api private
+  def included(descendant)
+    super
+    descendant.module_eval { include Methods }
+  end
+
   # Define the equalizer methods based on #keys
   #
   # @return [undefined]
@@ -41,7 +53,7 @@ private
   def define_cmp_method
     keys = @keys
     define_method(:cmp?) do |comparator, other|
-      keys.all? { |key| send(key).send(comparator, other.send(key)) }
+      keys.all? { |key| send(key).public_send(comparator, other.send(key)) }
     end
     private :cmp?
   end
@@ -72,15 +84,6 @@ private
     end
   end
 
-  # Include the #eql? and #== methods
-  #
-  # @return [undefined]
-  #
-  # @api private
-  def include_comparison_methods
-    module_eval { include Methods }
-  end
-
   # The comparison methods
   module Methods
 

data/lib/equalizer/version.rb

@@ -3,6 +3,6 @@
 class Equalizer < Module
 
   # Gem version
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 
 end # class Equalizer

data/spec/unit/equalizer/included_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Equalizer, '#included' do
+  subject { descendant.instance_exec(object) { |mod| include mod } }
+
+  let(:object)     { described_class.new        }
+  let(:descendant) { Class.new                  }
+  let(:superclass) { described_class.superclass }
+
+  before do
+    # Prevent Module.included from being called through inheritance
+    described_class::Methods.stub(:included)
+  end
+
+  around do |example|
+    # Restore included method after each example
+    superclass.class_eval do
+      alias_method :original_included, :included
+      example.call
+      undef_method :included
+      alias_method :included, :original_included
+    end
+  end
+
+  it 'delegates to the superclass #included method' do
+    # This is the most succinct approach I could think of to test whether the
+    # superclass#included method is called. All of the built-in rspec helpers
+    # did not seem to work for this.
+    included = false
+    superclass.class_eval { define_method(:included) { |_| included = true } }
+    expect { subject }.to change { included }.from(false).to(true)
+  end
+
+  it 'includes methods into the descendant' do
+    subject
+    expect(descendant.included_modules).to include(described_class::Methods)
+  end
+end

data/spec/unit/equalizer/methods/eql_predicate_spec.rb

@@ -5,14 +5,20 @@ require 'spec_helper'
 describe Equalizer::Methods, '#eql?' do
   subject { object.eql?(other) }
 
-  let(:object) { described_class.new }
+  let(:object) { described_class.new(true) }
 
   let(:described_class) do
     Class.new do
       include Equalizer::Methods
 
+      attr_reader :boolean
+
+      def initialize(boolean)
+        @boolean = boolean
+      end
+
       def cmp?(comparator, other)
-        !!(comparator && other)
+        boolean.send(comparator, other.boolean)
       end
     end
   end
@@ -38,7 +44,17 @@ describe Equalizer::Methods, '#eql?' do
   end
 
   context 'with an equivalent object of a subclass' do
-    let(:other) { Class.new(described_class).new }
+    let(:other) { Class.new(described_class).new(true) }
+
+    it { should be(false) }
+
+    it 'is symmetric' do
+      should eql(other.eql?(object))
+    end
+  end
+
+  context 'with a different object' do
+    let(:other) { described_class.new(false) }
 
     it { should be(false) }
 

data/spec/unit/equalizer/methods/equality_operator_spec.rb

@@ -95,4 +95,14 @@ describe Equalizer::Methods, '#==' do
       should_not eql(other == object)
     end
   end
+
+  context 'with a different object' do
+    let(:other) { described_class.new(false) }
+
+    it { should be(false) }
+
+    it 'is symmetric' do
+      should eql(other == object)
+    end
+  end
 end

data/spec/unit/equalizer/universal_spec.rb

@@ -84,6 +84,7 @@ describe Equalizer, '.new' do
     let(:klass) do
       ::Class.new do
         attr_reader :firstname, :lastname
+        private :firstname, :lastname
 
         def initialize(firstname, lastname)
           @firstname, @lastname = firstname, lastname

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: equalizer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dan Kubb
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,7 +18,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
@@ -28,7 +28,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
 description: Module to define equality, equivalence and inspection methods
@@ -68,6 +68,7 @@ files:
 - lib/equalizer/version.rb
 - spec/spec_helper.rb
 - spec/support/config_alias.rb
+- spec/unit/equalizer/included_spec.rb
 - spec/unit/equalizer/methods/eql_predicate_spec.rb
 - spec/unit/equalizer/methods/equality_operator_spec.rb
 - spec/unit/equalizer/universal_spec.rb
@@ -81,21 +82,22 @@ 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.0.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Module to define equality, equivalence and inspection methods
 test_files:
+- spec/unit/equalizer/included_spec.rb
 - spec/unit/equalizer/methods/eql_predicate_spec.rb
 - spec/unit/equalizer/methods/equality_operator_spec.rb
 - spec/unit/equalizer/universal_spec.rb