inci_score 4.1.3 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3837e2f0296c8005fb91b304beb3c6d70e6586779d699a2153e93493d92a6c
-  data.tar.gz: c7b3a1ee348aacf1b9f2b09aa9317936da2710f772361229a5cabab6f4eb6992
+  metadata.gz: eedaa61b1f912c5ee5209f3721437bd51798a80e33550cf1c999fa8a63f61acb
+  data.tar.gz: 83a0fd809370736dddba478bb6c3799a463bc88e9ece65598c8ff3f197693912
 SHA512:
-  metadata.gz: ee63d193fee347018d784c0542ee74a6d02e54103d93549caef3771def4a136374ff566a3c62d1e2fcf20942c6fc9fce081f18cf01a58eae6a773746ae778673
-  data.tar.gz: '085485afebc05f5a0d0bb0404478c42489c79281375875809e2d6cedb9194e8ec1812c427ed3e57db63e3a91c16371e7c85c597cfdaf5f33a3bffe512256c0f8'
+  metadata.gz: b0ba727bbf55f5d1627ed1889eb1d81a559d51759f575dbdc2cab62b7299839f130caf9d0d2c6d12e94b1301c56bf3c6e0795ebfea9ea84c76bd38a472b6da98
+  data.tar.gz: 8f0f697b513ab4f5f30619bb2c3619b82b1ed699ac4c610d3760bb134af28fa83b53b3a4ae75cb2d36ec054fa6c28570037826aaa1b39dcedc72cc6e29660851

data/lib/inci_score/computer.rb

@@ -18,10 +18,9 @@ module InciScore
     end
 
     def call
-      Response.new(components: components.map(&:name),
+      Response.new(components: components,
                    unrecognized: unrecognized,
                    score: score,
-                   valid: valid?,
                    precision: precision)
     end
 

data/lib/inci_score/response.rb

@@ -4,19 +4,18 @@ require 'oj'
 
 module InciScore
   class Response
-    attr_reader :components, :score, :unrecognized, :valid, :precision
+    attr_reader :components, :score, :unrecognized, :precision
 
     def initialize(options = {})
       @components = options.fetch(:components) { [] }
       @score = options.fetch(:score) { 0.0 }
       @unrecognized = options.fetch(:unrecognized) { [] }
-      @valid = options.fetch(:valid) { false }
       @precision = options.fetch(:precision) { 0 }
       freeze
     end
 
     def to_json
-      data = { components: components, unrecognized: unrecognized, score: score, valid: valid, precision: precision }.freeze
+      data = { components: components.map(&:to_h), unrecognized: unrecognized, score: score, precision: precision }.freeze
       Oj.dump(data, mode: :compat)
     end
 
@@ -24,14 +23,12 @@ module InciScore
       %Q{
 TOTAL SCORE:
       \t#{score}
-VALID STATE:
-      \t#{valid}
 PRECISION:
       \t#{precision}
 COMPONENTS:
-      #{components.map { |c| "\t#{c}" }.join('\n')}
+      \t#{components.map { |c| "#{c.name} (#{c.hazard})" }.join(', ')}
 UNRECOGNIZED:
-      #{unrecognized.map { |c| "\t#{c}" }.join('\n')}
+      \t#{unrecognized.join(', ')}
       }
     end
   end

data/lib/inci_score/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InciScore
-  VERSION = '4.1.3'
+  VERSION = '4.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.5
 platform: ruby
 authors:
 - costajob
@@ -98,17 +98,13 @@ description:
 email:
 - costajob@gmail.com
 executables:
-- inci_console
 - inci_score
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- bin/inci_console
 - bin/inci_score
-- bin/setup
 - config/catalog.yml
 - config/hazards.yml
 - ext/levenshtein.c

data/bin/inci_console

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'inci_score'
-require 'irb'
-require 'irb/completion'
-
-IRB.start

data/bin/setup

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install