galaxy_converter 2.1.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 926e70aea3b0007b1152a89577439f189097a2e1
-  data.tar.gz: 245d7fc2333bd3cda19c23425b209fe80c81112f
+SHA256:
+  metadata.gz: 87b623ff14335cdeefbdd51a3576e5c17873cce273ff1000285d5e42ab5ed5e1
+  data.tar.gz: fcd3f01c18c0c377fc6756c1e5d02a4ae64f0cdd6f571b0642bda9aa6147313a
 SHA512:
-  metadata.gz: a199e6059d7d47b3935b93078011ba898af15def875dd4da5b2a89c816ed5b1584a66de896fbe8c93ed7dd15ba4372683a03d76e091755148d304a4cd446cd99
-  data.tar.gz: 177ca1ed410ed1cd3708c85dfff2a9bb7e1898db969afb60b9fe9e232df992f966a9844345f35422928fb48cd9fd7192f3c9151eb90a04570ab1d43ff59c5629
+  metadata.gz: d01ea972a57072f1704ca1b96f1e7a26d2b8c3d3c0b0a1b63fdb2b68f382a56a9a4417ae11d3bb466fbfbeaf47ece3b924d4b4010673bf04704ddb9933abde4f
+  data.tar.gz: '0592b1427e97f9f8fd7664708d130695faaab4d53e93d3bcbb391dea33c6250606aa3657f7221c7530c3fc106f6f7b5f175b3ef1b095ab623a97db46865004d5'

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
-before_install: gem install bundler -v 1.11.2
+  - 2.4.1
+  - 2.5.1
+  - 2.6.1
+before_install: gem install bundler -v 2.0.2

data/README.md

@@ -5,7 +5,6 @@
   * [Roman numerals](#roman-numerals)
 * [Installation](#installation)
 * [Usage](#usage)
-  * [Library](#library)
   * [CLI](#cli)
 
 ## Scope
@@ -28,35 +27,8 @@ gem install galaxy_converter
 
 ## Usage
 
-### Library
-Just require the library into your program and pass an array of notes to the converter:
-```ruby
-require "galaxy_converter"
-
-notes = ["glob is I", "prok is V", "pish is X", "tegj is L", "glob glob Silver is 34 Credits", "glob prok Gold is 57800 Credits", "pish pish Iron is 3910 Credits", "how much is pish tegj glob glob ?", "how many Credits is glob prok Silver ?", "how many Credits is glob prok Gold ?", "how many Credits is glob prok Iron ?", "how much wood could a woodchuck chuck if a woodchuck could chuck wood ? "]
-
-puts GalaxyConverter.call(notes)
-# pish tegj glob glob is 42
-# glob prok Silver is 68 Credits
-# glob prok Gold is 57800 Credits
-# glob prok Iron is 782 Credits
-# I have no idea what you are talking about
-```
-
 ### CLI
 The gem provides a CLI interface. 
-Once installed you will be able to use the `galaxy_converter` command from the terminal.  
-
-#### Help
-You can print CLI help by:
-```shell
-galaxy_converter -h
-Usage: galaxy_converter ~/notes.txt
-    -h --help               Print this help
-    <path-to-file>          Load conversion notes
-```
-
-#### Input
 The program accepts as input a file containing several conversion notes:
 ```txt
 # ~/notes.txt

data/bin/galaxy_converter

@@ -5,5 +5,4 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "galaxy_converter"
 
-input = ARGV.fetch(0, "")
-GalaxyConverter::CLI.new(input).call
+puts GalaxyConverter.call(ARGV[0])

data/galaxy_converter.gemspec

@@ -16,10 +16,8 @@ Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables << "galaxy_converter"
   s.require_paths = ["lib"]
-  s.required_ruby_version = ">= 2.2.2"
-
-  s.add_development_dependency "bundler", "~> 1.15"
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "minitest", "~> 5.0"
-  s.add_development_dependency "benchmark-ips", "~> 2"
+  s.required_ruby_version = ">= 2.4.1"
+  s.add_development_dependency "bundler", "~> 2.0"
+  s.add_development_dependency "rake", "~> 12.3"
+  s.add_development_dependency "minitest", "~> 5.11"
 end

data/lib/galaxy_converter.rb

@@ -1,11 +1,13 @@
 require "galaxy_converter/version"
-require "galaxy_converter/cli"
+require "galaxy_converter/responder"
 
 module GalaxyConverter
   extend self
 
-  def call(notes)
-    notes = Note.bulk(notes)
+  def call(path_to_file)
+    f = File.expand_path(path_to_file) 
+    return unless File.exist?(f)
+    notes = Note.from(File.readlines(f).map(&:strip))
     Responder.new(notes).call
   end
 end

data/lib/galaxy_converter/constraint.rb

@@ -0,0 +1,44 @@
+module GalaxyConverter
+  module Constraint
+    extend self
+
+    def call(value)
+      return if value.empty?
+      violations.any? { |violation| value.index(violation) }
+    end
+
+    private def violations
+      @violations ||= repetitions + subtractions
+    end
+
+    private def repetitions
+      too_many_repetitions + unrepeatable
+    end
+
+    private def too_many_repetitions
+      %w[I X C M].map { |c| c * 4 }
+    end
+
+    private def unrepeatable
+      %w[D L V].map { |c| c * 2 }
+    end
+
+    private def subtractions
+      repeated_sub + wrong_sub
+    end
+
+    private def repeated_sub
+      %w[V X].map { |c| "II#{c}"} +
+        %w[L C].map { |c| "XX#{c}"} +
+        %w[D M].map { |c| "CC#{c}"}
+    end 
+
+    private def wrong_sub
+      %w[L C D M].map { |c| "I#{c}" } +
+        %w[D M].map { |c| "X#{c}" } +
+        %w[X L C D M].map { |c| "V#{c}" } + 
+        %w[C D M].map { |c| "L#{c}"} +
+        %w[M].map { |c| "D#{c}" }
+    end
+  end
+end

data/lib/galaxy_converter/converter.rb

@@ -0,0 +1,21 @@
+require "galaxy_converter/roman_numeral"
+
+module GalaxyConverter
+  class Converter
+    def initialize(mapping = {}, unit = RomanNumeral)
+      @mapping = mapping
+      @unit = unit
+    end
+
+    def call(units)
+      converted = convert(units)
+      @unit.new(converted).to_i
+    end
+
+    private def convert(units)
+      units.split(" ").reduce("") do |acc, unit|
+        acc << @mapping.fetch(unit, "")
+      end
+    end
+  end
+end

data/lib/galaxy_converter/{recognizer.rb → detector.rb}

@@ -1,44 +1,39 @@
-require "galaxy_converter/abacus"
+require "galaxy_converter/converter"
 require "galaxy_converter/note"
 
 module GalaxyConverter
-  class Recognizer
-    attr_reader :abacus
+  class Detector
+    MAPPING_RULE = /(\w+) is (\w+)/
+    GOODS_RULE = /([\w+\s]+) (\w+) is (\d+) credits/i
 
-    def initialize(notes, abacus = Abacus)
+    attr_reader :converter
+
+    def initialize(notes, converter = Converter)
       notes = notes.reject(&:question?)
       @commercials, @assertions = notes.partition(&:commercial?)
-      @abacus = abacus.new(mapping)
+      @converter = converter.new(mapping)
     end
 
     def goods
       @goods ||= @commercials.reduce({}) do |acc, note|
-        matching = note.body.match(goods_rule)
+        matching = note.body.match(GOODS_RULE)
         next acc unless matching
         units, name, credits = matching.captures 
-        value = @abacus.call(units)
+        value = @converter.call(units)
         next acc if value.zero?
         acc[name] = credits.to_f / value
         acc
       end
     end
 
-    private def goods_rule
-      /([#{mapping.keys.join("|")}\s]+) (\w+) is (\d+)/
-    end
-
     private def mapping
       @mapping ||= @assertions.reduce({}) do |acc, note|
-        matching = note.body.match(mapping_rule)
+        matching = note.body.match(MAPPING_RULE)
         next acc unless matching
         unit, roman = matching.captures
         acc[unit.strip] = roman.upcase
         acc
       end
     end
-
-    private def mapping_rule
-      /(\w+) is (\w)/
-    end
   end
 end

data/lib/galaxy_converter/note.rb

@@ -1,28 +1,48 @@
 module GalaxyConverter
   class Note
     PREFIXES = ["how much is", "how many credits is"]
-    QUESTION_MARK = "?"
+    QUESTION = "?"
+    NO_IDEA = "I have no idea what you are talking about"
 
-    def self.bulk(notes)
+    def self.from(notes)
       Array(notes).map { |body| new(body) }
     end
 
-    attr_reader :body
+    attr_reader :body, :units, :good
 
     def initialize(body)
       @body = body.to_s.strip.downcase
+      @units, @good = detect
     end
 
     def question?
-      @body.end_with?(QUESTION_MARK)
+      @body.end_with?(QUESTION)
     end
 
     def commercial?
       !!@body.index("credits")
     end
 
-    def stripped
-      @body.sub(/#{PREFIXES.join("|")}/, "").sub(QUESTION_MARK, "").strip
+    def answer(total = 0)
+      return NO_IDEA if total.zero?
+      [].tap do |s|
+        s << units
+        s << good.to_s.capitalize
+        s << "is"
+        s << "%g" % total
+        s << "Credits" if commercial?
+      end.reject(&:empty?).join(" ")
+    end
+
+    private def detect
+      tokens = stripped.split
+      return [tokens.join(" "), nil] unless commercial?
+      good = tokens.pop
+      [tokens.join(" "), good]
+    end
+
+    private def stripped
+      @body.sub(/#{PREFIXES.join("|")}/, "").sub(QUESTION, "").strip
     end
   end
 end

data/lib/galaxy_converter/responder.rb

@@ -1,49 +1,26 @@
 require "forwardable"
-require "galaxy_converter/recognizer"
+require "galaxy_converter/detector"
 
 module GalaxyConverter
   class Responder
     extend Forwardable
 
-    def_delegators :@recognizer, :goods, :abacus
+    def_delegators :@detector, :goods, :converter
 
-    UNKNOWN_ANSWER = "I have no idea what you are talking about"
-
-    def initialize(notes, recognizer = Recognizer, abacus = Abacus)
+    def initialize(notes, detector = Detector)
       @questions = notes.select(&:question?)
-      @recognizer = recognizer.new(notes, abacus)
+      @detector = detector.new(notes)
     end
 
     def call
       @questions.reduce([]) do |acc, note|
-        units, good = detect(note)
-        total = total(units, good)
-        acc << to_s(units, good, total, note.commercial?)
-        acc
+        total = total(note)
+        acc << note.answer(total)
       end
     end 
 
-    private def to_s(units, good, total, commercial)
-      return UNKNOWN_ANSWER if total.zero?
-      [].tap do |s|
-        s << units
-        s << good.to_s.capitalize
-        s << "is"
-        s << "%g" % total
-        s << "Credits" if commercial
-      end.reject(&:empty?).join(" ")
-    end
-
-    private def total(units, good)
-      return abacus.call(units) unless good
-      abacus.call(units) * goods.fetch(good, 0)
-    end
-
-    private def detect(note)
-      tokens = note.stripped.split
-      return [tokens.join(" "), nil] unless note.commercial?
-      good = tokens.pop
-      [tokens.join(" "), good]
+    private def total(note)
+      converter.call(note.units) * goods.fetch(note.good, 1)
     end
   end
 end

data/lib/galaxy_converter/roman_numeral.rb

@@ -1,39 +1,35 @@
-require "galaxy_converter/roman_constraint"
-require "galaxy_converter/roman_rule"
+require "galaxy_converter/constraint"
+require "galaxy_converter/stretcher"
 
 module GalaxyConverter
-  module Roman
-    class Numeral
-      SYMBOLS = {
-        "M" => 1000,
-        "D" => 500,
-        "C" => 100,
-        "L" => 50,
-        "X" => 10,
-        "V" => 5,
-        "I" => 1
-      }
+  class RomanNumeral
+    SYMBOLS = {
+      "M" => 1000,
+      "D" => 500,
+      "C" => 100,
+      "L" => 50,
+      "X" => 10,
+      "V" => 5,
+      "I" => 1
+    }
 
-      def initialize(value, constraint = Constraint, rule = Rule)
-        @value = value.to_s.upcase
-        @constraint = constraint
-        @rule = rule
-      end
+    def initialize(value, constraint = Constraint, stretcher = Stretcher)
+      @value = value.to_s.upcase
+      @constraint = constraint
+      @stretcher = stretcher
+    end
 
-      def to_s
-        @value
-      end
+    def to_s
+      @value
+    end
 
-      def to_i
-        @rule.call(@value).chars.reduce(0) do |total, symbol|
-          total += SYMBOLS.fetch(symbol, 0)
-        end
-      end
+    def to_i
+      return 0 unless valid?
+      @stretcher.call(@value).chars.sum { |symbol| SYMBOLS.fetch(symbol, 0) }
+    end
 
-      def valid?
-        return false if @value.empty?
-        !@constraint.violated?(@value)
-      end
+    private def valid?
+      !@constraint.call(@value)
     end
   end
 end

data/lib/galaxy_converter/stretcher.rb

@@ -0,0 +1,20 @@
+module GalaxyConverter
+  module Stretcher
+    extend self
+
+    LONG_TO_SHORT = {
+      "DCCCC" => "CM", # 900
+      "CCCC"  => "CD", # 400
+      "LXXXX" => "XC", # 90
+      "XXXX"  => "XL", # 40
+      "VIIII" => "IX", # 9
+      "IIII"  => "IV"  # 4
+    }
+
+    def call(value)
+      LONG_TO_SHORT.reduce(value) do |to_convert, (long, short)|
+        to_convert.gsub(short, long)
+      end
+    end
+  end
+end

data/lib/galaxy_converter/version.rb

@@ -1,3 +1,3 @@
 module GalaxyConverter
-  VERSION = "2.1.2"
+  VERSION = "3.0.1"
 end

data/notes.txt

@@ -0,0 +1,12 @@
+glob is I
+prok is V
+pish is X
+tegj is L
+glob glob Silver is 34 Credits
+glob prok Gold is 57800 Credits
+pish pish Iron is 3910 Credits
+how much is pish tegj glob glob ?
+how many Credits is glob prok Silver ?
+how many Credits is glob prok Gold ?
+how many Credits is glob prok Iron ?
+how much wood could a woodchuck chuck if a woodchuck could chuck wood ?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: galaxy_converter
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.1
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '5.11'
 description: 
 email:
 - costajob@gmail.com
@@ -84,15 +70,15 @@ files:
 - bin/setup
 - galaxy_converter.gemspec
 - lib/galaxy_converter.rb
-- lib/galaxy_converter/abacus.rb
-- lib/galaxy_converter/cli.rb
+- lib/galaxy_converter/constraint.rb
+- lib/galaxy_converter/converter.rb
+- lib/galaxy_converter/detector.rb
 - lib/galaxy_converter/note.rb
-- lib/galaxy_converter/recognizer.rb
 - lib/galaxy_converter/responder.rb
-- lib/galaxy_converter/roman_constraint.rb
 - lib/galaxy_converter/roman_numeral.rb
-- lib/galaxy_converter/roman_rule.rb
+- lib/galaxy_converter/stretcher.rb
 - lib/galaxy_converter/version.rb
+- notes.txt
 homepage: https://github.com/costajob/galaxy_converter
 licenses:
 - MIT
@@ -105,15 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Implementation of the Merchant's Guide to the Galaxy kata

data/lib/galaxy_converter/abacus.rb

@@ -1,24 +0,0 @@
-require "galaxy_converter/roman_numeral"
-
-module GalaxyConverter
-  class Abacus
-    def initialize(mapping = {}, unit = Roman::Numeral)
-      @mapping = mapping
-      @unit = unit
-    end
-
-    def call(units)
-      converted = convert(units)
-      result = @unit.new(converted)
-      return 0 unless result.valid?
-      result.to_i
-    end
-
-    private def convert(units)
-      units.split(" ").reduce("") do |to_convert, unit|
-        return unless @mapping[unit]
-        to_convert << @mapping[unit]
-      end
-    end
-  end
-end

data/lib/galaxy_converter/cli.rb

@@ -1,47 +0,0 @@
-require "galaxy_converter/note"
-require "galaxy_converter/responder"
-
-module GalaxyConverter
-  class CLI
-    HELP_FLAGS = %w[-h --help]
-    COL_WIDTH = 23
-
-    def initialize(input, 
-                   pipe = STDOUT, 
-                   responder = Responder,
-                   note = Note)
-      @input = input
-      @pipe = pipe
-      @responder = responder
-      @note = note
-    end
-
-    def call
-      @pipe.puts output
-    end
-
-    private def output
-      return help if help?
-      return unless file?
-      data = File.readlines(@input).map(&:strip)
-      notes = @note.bulk(data)
-      @responder.new(notes).call
-    end
-
-    private def file?
-      File.file?(File.expand_path(@input))
-    end
-
-    private def help?
-      HELP_FLAGS.include?(@input)
-    end
-
-    private def help
-      [].tap do |h|
-        h << %q{Usage: galaxy_converter ~/notes.txt}
-        h << "    %-#{COL_WIDTH}s Print this help" % "-h --help"
-        h << "    %-#{COL_WIDTH}s Load conversion notes" % "<path-to-file>"
-      end
-    end
-  end
-end

data/lib/galaxy_converter/roman_constraint.rb

@@ -1,31 +0,0 @@
-module GalaxyConverter
-  module Roman
-    module Constraint
-      extend self
-
-      def violated?(value)
-        violations.any? { |violation| value.index(violation) }
-      end
-
-      private def violations
-        @violations ||= repetitions + subtractions
-      end
-
-      private def repetitions
-        %w[I X C M].map { |c| c * 4 } +
-          %w[D L V].map { |c| c * 2 }
-      end
-
-      private def subtractions
-        %w[V X].map { |c| "II#{c}"} +
-          %w[L C].map { |c| "XX#{c}"} +
-          %w[D M].map { |c| "CC#{c}"} +
-          %w[L C D M].map { |c| "I#{c}" } +
-          %w[D M].map { |c| "X#{c}" } +
-          %w[X L C D M].map { |c| "V#{c}" } + 
-          %w[C D M].map { |c| "L#{c}"} +
-          ["DM"]
-      end
-    end
-  end
-end

data/lib/galaxy_converter/roman_rule.rb

@@ -1,22 +0,0 @@
-module GalaxyConverter
-  module Roman
-    module Rule
-      extend self
-
-      LONG_TO_SHORT = {
-        "DCCCC" => "CM", # 900
-        "CCCC"  => "CD", # 400
-        "LXXXX" => "XC", # 90
-        "XXXX"  => "XL", # 40
-        "VIIII" => "IX", # 9
-        "IIII"  => "IV"  # 4
-      }
-
-      def call(value)
-        LONG_TO_SHORT.reduce(value) do |to_convert, (long, short)|
-          to_convert.gsub(short, long)
-        end
-      end
-    end
-  end
-end