galaxy_converter 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b623ff14335cdeefbdd51a3576e5c17873cce273ff1000285d5e42ab5ed5e1
-  data.tar.gz: fcd3f01c18c0c377fc6756c1e5d02a4ae64f0cdd6f571b0642bda9aa6147313a
+  metadata.gz: 818318a9be3585e70bd5e6bf29377b441325385e41430454421dd0d5f7ad8b05
+  data.tar.gz: 18db9e32c0ffa14551bae511f98d42d9bd841485b3680c4004dd22b1db66d0b2
 SHA512:
-  metadata.gz: d01ea972a57072f1704ca1b96f1e7a26d2b8c3d3c0b0a1b63fdb2b68f382a56a9a4417ae11d3bb466fbfbeaf47ece3b924d4b4010673bf04704ddb9933abde4f
-  data.tar.gz: '0592b1427e97f9f8fd7664708d130695faaab4d53e93d3bcbb391dea33c6250606aa3657f7221c7530c3fc106f6f7b5f175b3ef1b095ab623a97db46865004d5'
+  metadata.gz: 3403a2ec655b81beb9a216ec394a7fc08a0019f964bc1fd4bbb47b66baf9abc0ccbb08c7830e02dc29b578ea83cec3c667584a0a4609406eec492d4202aaed40
+  data.tar.gz: 5f896f540740558594bb98291378b643391e64660371fb87085a908fe6904a3dbf4dd7e5bbd07f266e351cf2b1f4db30eacb2a3ddcf0fb767def8b98107eb543

data/lib/galaxy_converter/detector.rb

@@ -10,12 +10,12 @@ module GalaxyConverter
 
     def initialize(notes, converter = Converter)
       notes = notes.reject(&:question?)
-      @commercials, @assertions = notes.partition(&:commercial?)
+      @credits, @assertions = notes.partition { |note| note.instance_of? Credit }
       @converter = converter.new(mapping)
     end
 
     def goods
-      @goods ||= @commercials.reduce({}) do |acc, note|
+      @goods ||= @credits.reduce({}) do |acc, note|
         matching = note.body.match(GOODS_RULE)
         next acc unless matching
         units, name, credits = matching.captures 

data/lib/galaxy_converter/note.rb

@@ -5,7 +5,10 @@ module GalaxyConverter
     NO_IDEA = "I have no idea what you are talking about"
 
     def self.from(notes)
-      Array(notes).map { |body| new(body) }
+      Array(notes).map do |body| 
+        klass = body.index(/credits/i) ? Credit : Note
+        klass.new(body)
+      end
     end
 
     attr_reader :body, :units, :good
@@ -19,10 +22,6 @@ module GalaxyConverter
       @body.end_with?(QUESTION)
     end
 
-    def commercial?
-      !!@body.index("credits")
-    end
-
     def answer(total = 0)
       return NO_IDEA if total.zero?
       [].tap do |s|
@@ -30,19 +29,28 @@ module GalaxyConverter
         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]
+      return stripped, nil
     end
 
     private def stripped
       @body.sub(/#{PREFIXES.join("|")}/, "").sub(QUESTION, "").strip
     end
   end
+
+  class Credit < Note
+    def answer(total = 0)
+      s = super
+      s << " Credits"
+    end
+
+    private def detect
+      tokens = stripped.split
+      good = tokens.pop
+      [tokens.join(" "), good]
+    end
+  end
 end

data/lib/galaxy_converter/roman_numeral.rb

@@ -1,5 +1,4 @@
 require "galaxy_converter/constraint"
-require "galaxy_converter/stretcher"
 
 module GalaxyConverter
   class RomanNumeral
@@ -13,10 +12,18 @@ module GalaxyConverter
       "I" => 1
     }
 
-    def initialize(value, constraint = Constraint, stretcher = Stretcher)
+    STRETCH_MAP = {
+      "DCCCC" => "CM", # 900
+      "CCCC"  => "CD", # 400
+      "LXXXX" => "XC", # 90
+      "XXXX"  => "XL", # 40
+      "VIIII" => "IX", # 9
+      "IIII"  => "IV"  # 4
+    }
+
+    def initialize(value, constraint = Constraint)
       @value = value.to_s.upcase
       @constraint = constraint
-      @stretcher = stretcher
     end
 
     def to_s
@@ -25,7 +32,13 @@ module GalaxyConverter
 
     def to_i
       return 0 unless valid?
-      @stretcher.call(@value).chars.sum { |symbol| SYMBOLS.fetch(symbol, 0) }
+      stretched.chars.sum { |symbol| SYMBOLS.fetch(symbol, 0) }
+    end
+
+    private def stretched
+      @stretched ||= STRETCH_MAP.reduce(@value) do |value, (long, short)|
+        value.gsub(short, long)
+      end
     end
 
     private def valid?

data/lib/galaxy_converter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galaxy_converter
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - costajob
@@ -76,7 +76,6 @@ files:
 - lib/galaxy_converter/note.rb
 - lib/galaxy_converter/responder.rb
 - lib/galaxy_converter/roman_numeral.rb
-- lib/galaxy_converter/stretcher.rb
 - lib/galaxy_converter/version.rb
 - notes.txt
 homepage: https://github.com/costajob/galaxy_converter

data/lib/galaxy_converter/stretcher.rb

@@ -1,20 +0,0 @@
-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