concord 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2bdb5ade2038b5884813deb9d527d44ddeed1322
+  data.tar.gz: 3f7a3684bd50c715622730568f9e99eb510273da
+SHA512:
+  metadata.gz: ef6645627811abf8ea289ede8ed2ef4ed6af2b04c5b8548cef13a3697dafa2a13cffdc439b8cfc962c263d1cf24b1af3de71736608d066870001065af31b9316
+  data.tar.gz: 798fe84211b8dca1afec360dc8b86b1d2519f605df699d21dd56314f1a54bc6f36d629a8afb257111b78d6cc2af311f174def3f38b239a0eb241b5146549e28c

data/.travis.yml

@@ -1,18 +1,19 @@
 language: ruby
 script: 'bundle exec rake ci'
 rvm:
-  - ree
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - rbx-18mode
   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 notifications:
-  irc: "irc.freenode.org#datamapper"
-  email:
-    - mbj@seonic.net
+  irc:
+    channels:
+      - irc.freenode.org#rom-rb
+    on_success: never
+    on_failure: change

data/Gemfile

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

data/Gemfile.devtools

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.0.4'
+  gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.13.0'
   gem 'yard',  '~> 0.8.6.1'
 end
@@ -11,12 +11,12 @@ group :yard do
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.0'
+  gem 'guard',         '~> 1.8.1'
   gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 2.5.4'
+  gem 'guard-rspec',   '~> 3.0.2'
 
   # file system change event handling
-  gem 'listen',     '~> 1.0.2'
+  gem 'listen',     '~> 1.2.2'
   gem 'rb-fchange', '~> 0.0.6', :require => false
   gem 'rb-fsevent', '~> 0.9.3', :require => false
   gem 'rb-inotify', '~> 0.9.0', :require => false
@@ -28,20 +28,20 @@ group :guard do
 end
 
 group :metrics do
-  gem 'backports',       '~> 3.3', '>= 3.3.0'
-  gem 'coveralls',       '~> 0.6.6'
-  gem 'flay',            '~> 2.2.0'
-  gem 'flog',            '~> 4.0.0'
-  gem 'reek',            '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
-  gem 'simplecov',       '~> 0.7.1'
-  gem 'yardstick',       '~> 0.9.6'
+  gem 'backports', '~> 3.3', '>= 3.3.2'
+  gem 'coveralls', '~> 0.6.7'
+  gem 'flay',      '~> 2.3.0'
+  gem 'flog',      '~> 4.1.0'
+  gem 'reek',      '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
+  gem 'simplecov', '~> 0.7.1'
+  gem 'yardstick', '~> 0.9.6'
 
   platforms :ruby_19 do
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :mri_19, :rbx do
-    gem 'mutant', '~> 0.2.20'
+  platforms :ruby_19, :ruby_20 do
+    gem 'mutant', '~> 0.3.0.beta6'
   end
 
   platforms :rbx do

data/README.md

@@ -12,7 +12,7 @@ class ComposedObject
   include Equalizer.new(:foo, :bar)
 
   # Return foo
-  # 
+  #
   # @return [Foo]
   #
   # @api private
@@ -54,6 +54,11 @@ end
 
 Sure the replacement is missing YARD docs, but IMHO it is better.
 
+Rubies
+------
+
+Tested under all >= 1.9 rubies.
+
 Installation
 ------------
 

data/Rakefile

@@ -1,29 +1,2 @@
 require 'devtools'
 Devtools.init_rake_tasks
-
-class Rake::Task
-  def overwrite(&block)
-    @actions.clear
-    enhance(&block)
-  end
-end
-
-Rake.application.load_imports
-
-begin
-  require 'mutant'
-rescue LoadError
-end
-
-mutant_present = defined?(Mutant)
-
-allowed_versions = %w(mri-1.9.3 rbx-1.9.3)
-
-if allowed_versions.include?(Devtools.rvm) and mutant_present and !ENV['DEVTOOLS_SELF']
-  Rake::Task['metrics:mutant'].overwrite do
-    status = Mutant::CLI.run(%W(--rspec-full -r ./spec/spec_helper.rb ::Concord))
-    unless status.zero?
-      fail "Not mutation covered :("
-    end
-  end
-end

data/concord.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name        = 'concord'
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   s.authors     = ['Markus Schirp']
-  s.email       = ['mbj@seonic.net']
-  s.homepage    = 'https://github.com/mbj/composition'
+  s.email       = ['mbj@schirp-dso.com']
+  s.homepage    = 'https://github.com/mbj/concord'
   s.summary     = %q{Helper for object composition}
   s.description = s.summary
 
@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
   s.executables   = []
   s.require_paths = ['lib']
 
-  s.add_dependency('adamantium',          '~> 0.0.7')
-  s.add_dependency('equalizer',           '~> 0.0.5')
+  s.add_dependency('adamantium', '~> 0.0.10')
+  s.add_dependency('equalizer',  '~> 0.0.5')
 end

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 5
-total_score: 13.0
+threshold: 3
+total_score: 16.0

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 10.0
+threshold: 23.3

data/config/mutant.yml

@@ -1,2 +1,3 @@
 name: concord
 namespace: Concord
+strategy: --rspec-unit

data/config/reek.yml

@@ -46,7 +46,8 @@ UncommunicativeModuleName:
   - !ruby/regexp /[0-9]$/
 NestedIterators:
   ignore_iterators: []
-  exclude: []
+  exclude:
+  - Concord#define_initialize
   enabled: true
   max_allowed_nesting: 1
 TooManyStatements:

data/config/roodi.yml

@@ -1,10 +1,10 @@
 ---
-AbcMetricMethodCheck:           
+AbcMetricMethodCheck:
   score: 25.1
 AssignmentInConditionalCheck:    { }
 CaseMissingElseCheck:            { }
 ClassLineCountCheck:             { line_count: 317 }
-ClassNameCheck:                  
+ClassNameCheck:
   pattern: !ruby/regexp /\A(?:[A-Z]+|[A-Z][a-z](?:[A-Z]?[a-z])+)\z/
 ClassVariableCheck:              { }
 CyclomaticComplexityBlockCheck:  { complexity: 3 }
@@ -12,9 +12,9 @@ CyclomaticComplexityMethodCheck: { complexity: 4 }
 EmptyRescueBodyCheck:            { }
 ForLoopCheck:                    { }
 MethodLineCountCheck:            { line_count: 14 }
-MethodNameCheck:                 
+MethodNameCheck:
   pattern: !ruby/regexp /\A(?:[a-z\d](?:_?[a-z\d])+[?!=]?|\[\]=?|==|<=>|<<|[+*&|-])\z/
 ModuleLineCountCheck:            { line_count: 320 }
-ModuleNameCheck:                 
+ModuleNameCheck:
   pattern: !ruby/regexp /\A(?:[A-Z]+|[A-Z][a-z](?:[A-Z]?[a-z])+)\z/
 ParameterNumberCheck:            { parameter_count: 3 }

data/lib/concord.rb

@@ -5,6 +5,9 @@ require 'equalizer'
 class Concord < Module
   include Adamantium::Flat, Equalizer.new(:names)
 
+  # The maximum number of objects the hosting class is composed of
+  MAX_NR_OF_OBJECTS = 3
+
   # Return names
   #
   # @return [Enumerable<Symbol>]
@@ -13,7 +16,7 @@ class Concord < Module
   #
   attr_reader :names
 
-private
+  private
 
   # Initialize object
   #
@@ -22,8 +25,8 @@ private
   # @api private
   #
   def initialize(*names)
-    if names.length > 3
-      raise 'Composition of more than three objects is not allowed'
+    if names.length > MAX_NR_OF_OBJECTS
+      raise "Composition of more than #{MAX_NR_OF_OBJECTS} objects is not allowed"
     end
 
     @names = names
@@ -38,7 +41,7 @@ private
   # @api private
   #
   def included(descendant)
-    define_initializer(descendant)
+    define_initialize(descendant)
     define_readers(descendant)
     define_equalizer(descendant)
   end
@@ -65,11 +68,13 @@ private
   #
   def define_readers(descendant)
     attribute_names = names
-    descendant.send(:attr_reader, *attribute_names)
-    descendant.send(:protected, *attribute_names)
+    descendant.class_eval do
+      attr_reader *attribute_names
+      protected   *attribute_names
+    end
   end
 
-  # Define initializer
+  # Define initialize method
   #
   # @param [Class|Module] descendant
   #
@@ -77,13 +82,18 @@ private
   #
   # @api private
   #
-  def define_initializer(descendant)
-    names = argument_names
-    descendant.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-      def initialize(#{names})                # def initialize(foo, bar)
-        #{instance_variable_names} = #{names} #   @foo, @bar = foo, bar
-      end                                     # end
-    RUBY
+  def define_initialize(descendant)
+    ivars, size = instance_variable_names, names.size
+    descendant.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})"
+        end
+        ivars.zip(args) { |ivar, arg| instance_variable_set(ivar, arg) }
+      end
+    end
   end
 
   # Return instance variable names
@@ -93,23 +103,13 @@ private
   # @api private
   #
   def instance_variable_names
-    names.map { |name| "@#{name}" }.join(', ')
-  end
-
-  # Return param names
-  #
-  # @return [String]
-  #
-  # @api private
-  #
-  def argument_names
-    names.join(', ')
+    names.map { |name| "@#{name}" }
   end
 
   # Mixin for public attribute readers
   class Public < self
 
-    # Hook called when module is included 
+    # Hook called when module is included
     #
     # @param [Class,Module] descendant
     #

data/spec/unit/concord/universal_spec.rb

@@ -16,48 +16,68 @@ describe Concord do
   let(:bar) { mock('Bar') }
 
   context 'initializer lines' do
-    unless Devtools.jruby?
-      it 'sets initializer correctly' do
-        klass = Class.new
-        # Nicer way to assert this?
-        klass.should_receive(:class_eval) do |code, file, line|
-          file.should eql(File.expand_path('../../../../lib/concord.rb', __FILE__))
-          line.should be(83)
-        end
-        klass.send(:include, Concord.new)
-      end
+    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)
+    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)')
+    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 sets the instance variables' do
+      instance = class_under_test.new(1, 2)
+      expect(instance.instance_variable_get(:@foo)).to be(1)
+      expect(instance.instance_variable_get(:@bar)).to be(2)
     end
   end
 
-  context 'visibiluty' do
-    it 'should set attribute readers to public' do
-      klass = Class.new
-      klass.send(:include, Concord.new(:foo))
-      klass.protected_instance_methods.map(&:to_sym).should == [:foo]
+  context 'with no objects to compose' do
+    it 'assigns no ivars' do
+      instance = Class.new { include Concord.new }.new
+      expect(instance.instance_variables).to be_empty
+    end
+  end
+
+  context 'visibility' do
+    it 'should set attribute readers to protected' do
+      protected_methods = class_under_test.protected_instance_methods
+      expect(protected_methods).to match_array([:foo, :bar])
     end
   end
 
   context 'attribute behavior' do
     subject { instance_a }
 
-    specify { subject.send(:foo).should be(foo) }
-    specify { subject.send(:bar).should be(bar) }
+    specify { expect(subject.send(:foo)).to be(foo) }
+    specify { expect(subject.send(:bar)).to be(bar) }
   end
 
   context 'equalization behavior' do
     specify 'composed objects are equalized on attributes' do
-      instance_a.should      == instance_b
-      instance_a.hash.should == instance_b.hash
-      instance_a.should      eql(instance_b)
-
-      instance_a.should_not  == instance_c
-      instance_a.should_not  eql(instance_c)
+      expect(instance_a).to      eql(instance_b)
+      expect(instance_a.hash).to eql(instance_b.hash)
+      expect(instance_a).to      eql(instance_b)
+      expect(instance_a).to_not  be(instance_c)
+      expect(instance_a).to_not  eql(instance_c)
     end
   end
 
-  context 'to much composition behavior' do
+  context 'when composing too many objects' do
     specify 'it raises an error' do
-      expect { Concord.new(:a, :b, :c, :d) }.to raise_error(RuntimeError, 'Composition of more than three objects is not allowed')
+      expect {
+        Concord.new(:a, :b, :c, :d)
+      }.to raise_error(RuntimeError, 'Composition of more than 3 objects is not allowed')
+      expect {
+        Concord.new(:a, :b, :c)
+      }.to_not raise_error
     end
   end
 
@@ -70,8 +90,8 @@ describe Concord do
 
     it 'should create public attr readers' do
       object = class_under_test.new(:foo, :bar)
-      object.foo.should eql(:foo)
-      object.bar.should eql(:bar)
+      expect(object.foo).to eql(:foo)
+      expect(object.bar).to eql(:bar)
     end
   end
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: concord
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,14 +34,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
 description: Helper for object composition
 email:
-- mbj@seonic.net
+- mbj@schirp-dso.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -70,29 +65,28 @@ files:
 - lib/concord.rb
 - spec/spec_helper.rb
 - spec/unit/concord/universal_spec.rb
-homepage: https://github.com/mbj/composition
+homepage: https://github.com/mbj/concord
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Helper for object composition
 test_files: []
 has_rdoc: