irv 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8a99789b0cbe5756c7d1dfd5666e9096102c748a82dc51c8b032f8c9667fe94
-  data.tar.gz: bf4f6f58576731266a3d825a7bdb910ec1ddd7b355f39f3647bd40262d1f0a01
+  metadata.gz: e1c7dab221fc890b8f1554931888a15424b0681ef69067c659b667f761ece99b
+  data.tar.gz: 1c9586e673288fd6e05da683cd36221108feb9891d756325abde00950bf2d3f5
 SHA512:
-  metadata.gz: c4e2ec30b5492857c20edc92587e62f81c0720d0c20005b7c3e1537e82d3d01b865393601fc567b8be517df25d70b25000721c0757ef8b6bdf8c1f31462bd934
-  data.tar.gz: 3125e2cf89fda760e11bc0102feec0411f08d58c16e9d0e5e73e4e633ba30f8200481562f5df071118d632948e0029de7acf3838f76a2e38f762744f3d7a047e
+  metadata.gz: 4d81a7d58cfd8c1b6c90ef749d31f0ff2d9ebfcb3d3a8ec3838f5d2b49b0f5fa123cbbc0667bef76a11e56f57c5bbef8d27e07b62636bdadc36f62fec21b03cf
+  data.tar.gz: 0dfa531db816393e1de5b29231a3755d1e70d9cb989d4c1c96be81adf189dc300088a536b6ababef10e6cab3e3795e70e776aaa43330fcde4dac1e912690bb28

data/.rubocop.yml

@@ -1,7 +1,15 @@
 AllCops:
-  TargetRubyVersion: 2.6.3
+  TargetRubyVersion: 3.3
   DisplayCopNames: true
 
+Layout/ExtraSpacing:
+  Exclude:
+    - 'irv.gemspec'
+
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'irv.gemspec'
+
 Style/AsciiComments:
   Enabled: false
 
@@ -17,6 +25,10 @@ Style/RegexpLiteral:
 Style/NegatedWhile:
   Enabled: false
 
+Style/WordArray:
+  Exclude:
+    - 'spec/irv_spec.rb'
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -32,7 +44,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Metrics/MethodLength:

data/.travis.yml

@@ -3,5 +3,10 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.3
+  - 2.4
+  - 2.5
+  - 2.6
 before_install: gem install bundler -v 1.17.2
+script:
+  - bundle exec rubocop
+  - bundle exec rake spec

data/Gemfile.lock

@@ -1,51 +1,63 @@
 PATH
   remote: .
   specs:
-    irv (0.1.1)
+    irv (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    diff-lcs (1.3)
-    jaro_winkler (1.5.2)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    ast (2.4.2)
+    diff-lcs (1.5.0)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    parallel (1.24.0)
+    parser (3.3.0.2)
+      ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.71.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.59.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
+  x86_64-darwin-22
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.4)
   irv!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 0.71.0)
+  rubocop (~> 1.59.0)
 
 BUNDLED WITH
-   1.17.2
+   2.5.4

data/README.md

@@ -1,4 +1,6 @@
 # Irv
+[![Gem Version](https://badge.fury.io/rb/irv.svg)](https://badge.fury.io/rb/irv)
+[![Build Status](https://travis-ci.org/highwide/irv.svg?branch=master)](https://travis-ci.org/highwide/irv)
 
 This gem provides [Instant-Runoff Voting](https://en.wikipedia.org/wiki/Instant-runoff_voting) for Ruby program.
 
@@ -25,16 +27,12 @@ require 'irv'
 
 irv = Irv.new(['John', 'Paul', 'Ringo', 'George'])
 
-ballots = []
-5.times { ballots << irv.issue_ballot }
-
-ballots[0].fill!(['John', 'George', 'Ringo'])
-ballots[1].fill!(['John', 'Ringo', 'George', 'Paul'])
-ballots[2].fill!(['Paul', 'George', 'Ringo', 'John'])
-ballots[3].fill!(['Ringo', 'Paul', 'George'])
-ballots[4].fill!(['George', 'Ringo', 'John'])
-
-ballots.each { |ballot| irv.poll!(ballot) }
+irv
+  .poll!(['John', 'George', 'Ringo'])
+  .poll!(['John', 'Ringo', 'George', 'Paul'])
+  .poll!(['Paul', 'George', 'Ringo', 'John'])
+  .poll!(['Ringo', 'Paul', 'George'])
+  .poll!(['George', 'Ringo', 'John'])
 
 puts irv.winner
 
@@ -79,7 +77,7 @@ So, Ringo got lose in this round
 
 George got three first ranked votes! It was a majority. So George became winner.
 
-#### If you know these stuff in a Ruby program
+#### If you want to know these stuff in a Ruby program
 
 ```ruby
 # After polled...

data/irv.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Instant-runoff Voting is a type of ranked preferential voting method. This gem makes it enable Ruby program.'
   spec.homepage      = 'https://github.com/highwide/irv'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 3.3.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -24,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.4'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.59.0'
 end

data/lib/irv/election.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'irv/ballot'
 require 'irv/result'
 
 module Irv
@@ -12,12 +11,16 @@ module Irv
       @ballots = []
     end
 
-    def issue_ballot
-      Ballot.new(@candidates)
-    end
+    def poll!(ranked_candidates)
+      if incorrect_candidates?(ranked_candidates)
+        raise(
+          PollingWithIncorrectCandidatesError,
+          "Polling #{ranked_candidates}, but acceptable for only #{@candidates}"
+        )
+      end
 
-    def poll!(ballot)
-      @ballots << ballot
+      @ballots << ranked_candidates
+      self
     end
 
     def result
@@ -29,5 +32,13 @@ module Irv
     def winner
       result&.winner
     end
+
+    private
+
+    def incorrect_candidates?(ranked_candidates)
+      ranked_candidates.class != Array ||
+        ranked_candidates.count - ranked_candidates.uniq.count != 0 ||
+        ranked_candidates.any? { |c| !@candidates.include?(c) }
+    end
   end
 end

data/lib/irv/result.rb

@@ -9,9 +9,9 @@ module Irv
     def initialize(candidates, ballots)
       @process = []
       round_order = 1
-      round = Round.new(round_order, candidates, ballots.map(&:ranked_candidates))
+      round = Round.new(round_order, candidates, ballots)
 
-      (candidates.count - 1).times do
+      candidates.count.times do
         @process << round
         break if round.exist_majority?
 

data/lib/irv/round.rb

@@ -79,7 +79,7 @@ module Irv
       end
 
       # if last ranked votes can't decide loser, choose it at random
-      target_candidates.sample
+      target_candidates.sample.to_s
     end
   end
 end

data/lib/irv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Irv
-  VERSION = '0.1.1'
+  VERSION = '0.3.0'
 end

data/lib/irv.rb

@@ -10,5 +10,5 @@ module Irv
     Election.new(candidates)
   end
 
-  class FillingWithIncorrectCandidatesError < StandardError; end
+  class PollingWithIncorrectCandidatesError < StandardError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - highwide
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 1.59.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 1.59.0
 description: Instant-runoff Voting is a type of ranked preferential voting method.
   This gem makes it enable Ruby program.
 email:
@@ -88,7 +88,6 @@ files:
 - bin/setup
 - irv.gemspec
 - lib/irv.rb
-- lib/irv/ballot.rb
 - lib/irv/election.rb
 - lib/irv/result.rb
 - lib/irv/round.rb
@@ -97,7 +96,7 @@ homepage: https://github.com/highwide/irv
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,15 +104,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Providing a Instant-runoff Voting.
 test_files: []

data/lib/irv/ballot.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Irv
-  class Ballot
-    attr_reader :candidates, :ranked_candidates
-
-    def initialize(candidates)
-      @candidates = candidates
-      @ranked_candidates = []
-    end
-
-    def fill!(ranked_candidates)
-      unless correct_candidates?(ranked_candidates)
-        raise(
-          FillingWithIncorrectCandidatesError,
-          "Filling #{ranked_candidates}, but acceptable for only #{@candidates}"
-        )
-      end
-
-      @ranked_candidates = ranked_candidates
-    end
-
-    private
-
-    def correct_candidates?(ranked_candidates)
-      ranked_candidates.all? { |c| @candidates.include?(c) } &&
-        (ranked_candidates.count == ranked_candidates.uniq.count)
-    end
-  end
-end