concord 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1555b598a21553d1cca1aafeab0f8795732fa9f7
-  data.tar.gz: 6a0e4001b0199b12ecec827a185f6960b7ed7ef3
+  metadata.gz: f74165f31b905e23604129b63bee915d27163b01
+  data.tar.gz: a0c18289f47110909de05e3a0af56b10a282101a
 SHA512:
-  metadata.gz: 61668efefc3e1c12968d9bca72f5ba20f40216cb97005303f4da3579524fff6dbf4ada18f2b8b0d7aee0aae8c75c7c386cdc7469b0b6d76cb6215e66acf07b89
-  data.tar.gz: 3db7049d7fea5c3d76310ca541f542922e0bef9ccda912a5c42bd7fed2c3d33e039e4714532bf7b6d1f7bb663910619081fd328a92b0a24a1967427a4a6a12f2
+  metadata.gz: 4efa105dc76a5bdff0b93d2fb91897a56f16ae1115314472bc25b913d7eb2f153ef0c0514d123b1d257856a2524008c7463d61a2e97ea447bfb30a8b878b9229
+  data.tar.gz: 1c13e549d343a704e9df9d336e7f6d9430280c8a24a069a90c2c81e20ec9a1256792aa294e90ae54a1df10392d028b703b8faf22eb97979173f32a9302cbc780

data/.rubocop.yml

@@ -0,0 +1,7 @@
+AllCops:
+  Includes:
+    - 'Gemfile'
+  Excludes:
+    - 'Gemfile.devtools'
+    - 'vendor/**'
+    - 'benchmarks/**'

data/.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 script: 'bundle exec rake ci'
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
   - jruby-19mode
   - jruby-head
-  - rbx-19mode
+  - rbx
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Changelog.md

@@ -1,3 +1,21 @@
+# v0.1.5 2014-04-10
+
+* Dependency bumps
+* Support calling (z)super from custom initialize
+
+# v0.1.4 2013-09-22
+
+* Dependency bumps
+
+# v0.1.3 2013-08-31
+
+* Dependency bumps
+
+# v0.1.2 2013-08-07
+
+* Dependency bumps
+* Internal refactorings
+
 # v0.1.1 2013-05-15
 
 + Add Concord::Public mixin defaulting to public attr_readers

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'devtools', :git => 'https://github.com/rom-rb/devtools.git'
-eval File.read('Gemfile.devtools')
+gem 'devtools', git: 'https://github.com/rom-rb/devtools.git', branch: 'master'
+eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -1,47 +1,63 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.1.0'
-  gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.7'
+  gem 'rake',       '~> 10.2.1'
+  gem 'rspec',      '~> 2.14.1'
+  gem 'rspec-core', '~> 2.14.8'
+  gem 'yard',       '~> 0.8.7.4'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.1.0'
+  gem 'kramdown', '~> 1.3.3'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.1'
-  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',         '~> 2.6.0'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.8'
+  gem 'guard-rubocop', '~> 1.0.2'
 
   # file system change event handling
-  gem 'listen',     '~> 1.3.0'
+  gem 'listen',     '~> 2.7.1'
   gem 'rb-fchange', '~> 0.0.6', require: false
-  gem 'rb-fsevent', '~> 0.9.3', require: false
-  gem 'rb-inotify', '~> 0.9.0', require: false
+  gem 'rb-fsevent', '~> 0.9.4', require: false
+  gem 'rb-inotify', '~> 0.9.3', require: false
 
   # notification handling
-  gem 'libnotify',               '~> 0.8.0', require: false
+  gem 'libnotify',               '~> 0.8.2', require: false
   gem 'rb-notifu',               '~> 0.0.4', require: false
   gem 'terminal-notifier-guard', '~> 1.5.3', require: false
 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 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.11.0'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+  gem 'flog',      '~> 4.2.0'
+  gem 'reek',      '~> 1.3.7'
+  gem 'rubocop',   '~> 0.19.1'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'yardstick', '~> 0.9.9'
+
+  platforms :mri do
+    gem 'mutant',       '~> 0.5.10'
+    gem 'mutant-rspec', '~> 0.5.10'
+  end
 
   platforms :ruby_19, :ruby_20 do
-    # gem 'mutant', git: 'https://github.com/mbj/mutant.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
+
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4.11'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.3'
+  end
 end
 
 group :benchmarks do

data/Rakefile

@@ -1,2 +1,11 @@
 require 'devtools'
 Devtools.init_rake_tasks
+
+Rake.application.load_imports
+task('metrics:mutant').clear
+
+namespace :metrics do
+  task :mutant => :coverage do
+    $stderr.puts 'Concord is a dependency of mutant and zombification is currently defunkt :('
+  end
+end

data/circle.yml

@@ -0,0 +1,4 @@
+---
+test:
+  override:
+    - bundle exec rake ci

data/concord.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name        = 'concord'
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.authors     = ['Markus Schirp']
   s.email       = ['mbj@schirp-dso.com']
   s.homepage    = 'https://github.com/mbj/concord'
   s.summary     = %q{Helper for object composition}
+  s.license     = 'MIT'
   s.description = s.summary
 
   s.files            = `git ls-files`.split("\n")
@@ -14,6 +15,8 @@ Gem::Specification.new do |s|
   s.executables   = []
   s.require_paths = ['lib']
 
-  s.add_dependency('adamantium', '~> 0.1')
-  s.add_dependency('equalizer',  '~> 0.0.7')
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_dependency('adamantium', '~> 0.2.0')
+  s.add_dependency('equalizer',  '~> 0.0.9')
 end

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 3
-total_score: 16.0
+total_score: 18.0

data/config/reek.yml

@@ -51,8 +51,9 @@ NestedIterators:
   enabled: true
   max_allowed_nesting: 1
 TooManyStatements:
-  max_statements: 5
-  exclude: []
+  max_statements: 7
+  exclude:
+  - Concord#define_initialize
   enabled: true
 DuplicateMethodCall:
   allow_calls: []

data/config/rubocop.yml

@@ -0,0 +1,82 @@
+inherit_from: ../.rubocop.yml
+
+AllCops:
+  Includes:
+    - '**/*.rake'
+    - 'Gemfile'
+    - 'Gemfile.triage'
+
+# Avoid parameter lists longer than five parameters.
+ParameterLists:
+  Max: 3
+  CountKeywordArgs: true
+
+MethodLength:
+  CountComments: false
+  Max: 15
+
+# Avoid more than `Max` levels of nesting.
+BlockNesting:
+  Max: 3
+
+# Align with the style guide.
+CollectionMethods:
+  PreferredMethods:
+    collect:  'map'
+    inject:   'reduce'
+    find:     'detect'
+    find_all: 'select'
+
+# Limit line length
+LineLength:
+  Max: 113  # TODO: lower to 79 once the rubocop branch in shared/Gemfile is removed
+
+ClassLength:
+  Max: 204
+
+# Disabled because of indenting with private keyword in class bodies.
+IndentationWidth:
+  Enabled: false
+
+# I like raise more
+SignalException:
+  Enabled: false
+
+# False positive in unparser source
+OneLineConditional:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+# Disable documentation checking until a class needs to be documented once
+Documentation:
+  Enabled: false
+
+# Do not favor modifier if/unless usage when you have a single-line body
+IfUnlessModifier:
+  Enabled: false
+
+# Allow case equality operator (in limited use within the specs)
+CaseEquality:
+  Enabled: false
+
+# Constants do not always have to use SCREAMING_SNAKE_CASE
+ConstantName:
+  Enabled: false
+
+# Not all trivial readers/writers can be defined with attr_* methods
+TrivialAccessors:
+  Enabled: false
+
+# Do not prefer do/end over {} for multiline blocks
+Blocks:
+  Enabled: false
+
+# I like to have an empty line before closing the currently opened body
+EmptyLinesAroundBody:
+  Enabled: false
+
+# I like my style more
+AccessModifierIndentation:
+  Enabled: false

data/lib/concord.rb

@@ -30,6 +30,10 @@ class Concord < Module
     end
 
     @names = names
+    @module = Module.new
+    define_initialize
+    define_readers
+    define_equalizer
   end
 
   # Hook run when module is included
@@ -41,9 +45,7 @@ class Concord < Module
   # @api private
   #
   def included(descendant)
-    define_initialize(descendant)
-    define_readers(descendant)
-    define_equalizer(descendant)
+    descendant.send(:include, @module)
   end
 
   # Define equalizer
@@ -54,8 +56,8 @@ class Concord < Module
   #
   # @api private
   #
-  def define_equalizer(descendant)
-    descendant.send(:include, Equalizer.new(*@names))
+  def define_equalizer
+    @module.send(:include, Equalizer.new(*@names))
   end
 
   # Define readers
@@ -66,9 +68,9 @@ class Concord < Module
   #
   # @api private
   #
-  def define_readers(descendant)
+  def define_readers
     attribute_names = names
-    descendant.class_eval do
+    @module.class_eval do
       attr_reader(*attribute_names)
       protected(*attribute_names)
     end
@@ -82,14 +84,13 @@ class Concord < Module
   #
   # @api private
   #
-  def define_initialize(descendant)
+  def define_initialize
     ivars, size = instance_variable_names, names.size
-    descendant.class_eval do
+    @module.class_eval do
       define_method :initialize do |*args|
         args_size = args.size
         if args_size != size
-          raise ArgumentError,
-            "wrong number of arguments (#{args_size} for #{size})"
+          raise ArgumentError, "wrong number of arguments (#{args_size} for #{size})"
         end
         ivars.zip(args) { |ivar, arg| instance_variable_set(ivar, arg) }
       end

data/spec/unit/concord/universal_spec.rb

@@ -18,20 +18,56 @@ describe Concord do
   context 'initializer lines' do
     it 'creates a private #initialize method' do
       mod = Module.new
-      expect { mod.send(:include, Concord.new) }.
-        to change { mod.private_method_defined?(:initialize) }.
-        from(false).to(true)
+      expect { mod.send(:include, Concord.new) }
+        .to change { mod.private_method_defined?(:initialize) }
+        .from(false).to(true)
     end
 
     it 'creates an initializer that asserts the number of arguments' do
-      expect { class_under_test.new(1) }.
-        to raise_error(ArgumentError, 'wrong number of arguments (1 for 2)')
+      expect { class_under_test.new(1) }
+        .to raise_error(ArgumentError, 'wrong number of arguments (1 for 2)')
     end
 
     it 'creates an initializer that allows 2 arguments' do
       expect { class_under_test.new(1, 2) }.to_not raise_error
     end
 
+    it 'creates an initializer that is callable via super' do
+      class_under_test.class_eval do
+        attr_reader :baz
+        public :foo
+        public :bar
+
+        def initialize(foo, bar)
+          @baz = foo + bar
+          super(foo, bar)
+        end
+      end
+
+      instance = class_under_test.new(1, 2)
+      expect(instance.foo).to eql(1)
+      expect(instance.bar).to eql(2)
+      expect(instance.baz).to eql(3)
+    end
+
+    it 'creates an initializer that is callable via zsuper' do
+      class_under_test.class_eval do
+        attr_reader :baz
+        public :foo
+        public :bar
+
+        def initialize(foo, bar)
+          @baz = foo + bar
+          super
+        end
+      end
+
+      instance = class_under_test.new(1, 2)
+      expect(instance.foo).to eql(1)
+      expect(instance.bar).to eql(2)
+      expect(instance.baz).to eql(3)
+    end
+
     it 'creates an initializer that sets the instance variables' do
       instance = class_under_test.new(1, 2)
       expect(instance.instance_variable_get(:@foo)).to be(1)

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: concord
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
 description: Helper for object composition
 email:
 - mbj@schirp-dso.com
@@ -45,10 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .circle.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".circle.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.devtools
@@ -56,18 +57,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- circle.yml
 - concord.gemspec
 - config/flay.yml
 - config/flog.yml
 - config/mutant.yml
 - config/reek.yml
 - config/roodi.yml
+- config/rubocop.yml
 - config/yardstick.yml
 - lib/concord.rb
 - spec/spec_helper.rb
 - spec/unit/concord/universal_spec.rb
 homepage: https://github.com/mbj/concord
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -75,19 +79,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 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.2.2
 signing_key: 
 specification_version: 4
 summary: Helper for object composition
 test_files: []
-has_rdoc: