inci_score 3.1.3 → 4.1.0

data/lib/inci_score/response.rb

@@ -1,30 +1,37 @@
-require "json"
+# frozen_string_literal: true
+
+require 'oj'
 
 module InciScore
   class Response
-    attr_reader :components, :score, :unrecognized, :valid
+    attr_reader :components, :score, :unrecognized, :valid, :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
-      { components: @components, unrecognized: @unrecognized, score: @score, valid: @valid }.to_json
+      data = { components: components, unrecognized: unrecognized, score: score, valid: valid, precision: precision }.freeze
+      Oj.dump(data, mode: :compat)
     end
 
     def to_s
       %Q{
 TOTAL SCORE:
-      \t#{@score}
+      \t#{score}
 VALID STATE:
-      \t#{@valid}
+      \t#{valid}
+PRECISION:
+      \t#{precision}
 COMPONENTS:
-      #{@components.map { |c| "\t#{c}" }.join("\n")}
+      #{components.map { |c| "\t#{c}" }.join('\n')}
 UNRECOGNIZED:
-      #{@unrecognized.map { |c| "\t#{c}" }.join("\n")}
+      #{unrecognized.map { |c| "\t#{c}" }.join('\n')}
       }
     end
   end

data/lib/inci_score/score.rb

@@ -1,15 +1,20 @@
+# frozen_string_literal: true
+
 module InciScore
   class Score
-    attr_reader :value
+    attr_reader :value, :hazard, :weight
 
     def initialize(hazard, weight)
       @hazard = hazard
       @weight = weight
       @value = compute
+      freeze
     end
 
-    private def compute
-      (@hazard - @weight).tap do |s|
+    private
+
+    def compute
+      (hazard - weight).tap do |s|
         return 0.0 if s < 0
       end
     end

data/lib/inci_score/scorer.rb

@@ -1,43 +1,50 @@
-require "inci_score/score"
+# frozen_string_literal: true
+
+require 'inci_score/score'
 
 module InciScore
   class Scorer
     HAZARD_PERCENT = 25
     WEIGHT_FACTOR = 5
 
+    attr_reader :hazards, :size
+
     def initialize(hazards)
       @hazards = Array(hazards)
       @size = @hazards.size
+      freeze
     end
 
     def call
-      return 0 if @hazards.empty?
+      return 0 if hazards.empty?
       (100 - avg * HAZARD_PERCENT).round(4)
     end
 
-    private def avg
-      avg_weighted / @size.to_f
+    private
+
+    def avg
+      avg_weighted / size.to_f
     end
 
-    private def avg_weighted
-      return @hazards.reduce(&:+) if same_hazard?
-      weighted.reduce(0.0) do |acc,score| 
+    def avg_weighted
+      return hazards.reduce(&:+) if same_hazard?
+      weighted.reduce(0.0) do |acc,score|
         acc += score.value
       end
     end
 
-    private def same_hazard?
-      @hazards.uniq.size == 1
+    def same_hazard?
+      hazards.uniq.size == 1
     end
 
-    private def weighted
-      @hazards.each_with_index.map do |h,i|
+    def weighted
+      hazards.each_with_index.map do |h, i|
         Score.new(h, weight(i))
       end
     end
 
-    private def weight(index)
-      Math.log(index+1, @size * WEIGHT_FACTOR)
+    def weight(index)
+      Math.log(index+1, size * WEIGHT_FACTOR)
     end
   end
 end

data/lib/inci_score/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InciScore
-  VERSION = "3.1.3"
+  VERSION = '4.1.0'
 end

data/lib/inci_score.rb

@@ -1,4 +1,10 @@
-require "inci_score/version"
-require "inci_score/catalog"
-require "inci_score/cli"
-require "inci_score/api"
+# frozen_string_literal: true
+
+require 'inci_score/ingredient'
+require 'inci_score/normalizer'
+require 'inci_score/recognizer'
+require 'inci_score/response'
+require 'inci_score/scorer'
+require 'inci_score/version'
+require 'inci_score/config'
+require 'inci_score/cli'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 4.1.0
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: RubyInline
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -126,27 +98,21 @@ description:
 email:
 - costajob@gmail.com
 executables:
+- console
 - inci_score
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
+- LICENSE.txt
 - README.md
-- Rakefile
 - bin/console
 - bin/inci_score
 - bin/setup
-- config.ru
-- config/catalog.yml
-- ext/levenshtein.c
-- inci_score.gemspec
 - lib/inci_score.rb
-- lib/inci_score/api.rb
-- lib/inci_score/catalog.rb
 - lib/inci_score/cli.rb
 - lib/inci_score/computer.rb
+- lib/inci_score/config.rb
 - lib/inci_score/ingredient.rb
 - lib/inci_score/levenshtein.rb
 - lib/inci_score/normalizer.rb
@@ -157,9 +123,7 @@ files:
 - lib/inci_score/response.rb
 - lib/inci_score/score.rb
 - lib/inci_score/scorer.rb
-- lib/inci_score/server.rb
 - lib/inci_score/version.rb
-- log/.gitignore
 homepage: https://github.com/costajob/inci_score.git
 licenses:
 - MIT
@@ -172,15 +136,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A library that computes the hazard of cosmetic products components, based

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/sample
-/spec/reports/
-/spec/sample
-/tmp/
-/**/.DS_Store
-*.gem

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
-  - 2.5.0
-before_install: gem install bundler -v 1.11.2

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in inci_score.gemspec
-gemspec

data/Rakefile

@@ -1,24 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-namespace :spec do
-  Rake::TestTask.new(:unit) do |t|
-    t.libs << "spec"
-    t.libs << "lib"
-    t.test_files = FileList["spec/unit/*_spec.rb"]
-  end
-
-  Rake::TestTask.new(:integration) do |t|
-    t.libs << "spec"
-    t.libs << "lib"
-    t.test_files = FileList["spec/integration/*_spec.rb"]
-  end
-
-  Rake::TestTask.new(:bench) do |t|
-    t.libs << "spec"
-    t.libs << "lib"
-    t.test_files = FileList["spec/bench/*_bench.rb"]
-  end
-end
-
-task :default => :"spec:unit"