that_language 0.1.0.pre2 → 0.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01aa4fee3d5fc120da25a313d1e930bf6dace5f4
-  data.tar.gz: 80832c8a3f3b45f83ae9bd95e46bf966c017f0c7
+  metadata.gz: 8d9e07c608c8697fff8ea1c101e9ff7bbe76f210
+  data.tar.gz: 7dc5a309d40dcc6b55f421c4b91cc363398d73ca
 SHA512:
-  metadata.gz: dfb3a7992eec2e4cc7a0cefb5401c7825f9d0da19941d3a9801ad727e177144e00d66e24c976ca0bcdccf9a80782c1d4e11f708aa74df0f5454b489b83a0aa7d
-  data.tar.gz: ea684a08e0ed92c6a631de19c9528457ec5e941a66d77bd06a666493a4279a496737f945d853a61dcb1f533cd072b13c28431be106e9fa8b0dce7f4699549536
+  metadata.gz: e452b3820aa528314595e704beda91a7da3e30b7dcb180655b3f81f14e1f15e1308a3f26d48e2bb4dbded2b5c85899be71fc844fbf7fe83a900993106c18b3a7
+  data.tar.gz: 05a4d5214eefa073e8267e63eeb5884919d26e855c0a8e98e150791e963e46a5444711fbf3df388bcc67dfa442a235a181df5001de8996156f2e2092df8652bd

data/lib/that_language.rb

@@ -15,11 +15,15 @@ module ThatLanguage
     alias_method :config, :configuration
 
     def language_code(text)
-      detect.language_code(text)
+      detect_context.language_code(text)
+    end
+
+    def detect(text)
+      detect_context.detect(text)
     end
 
     def details(text)
-      detect.details(text)
+      detect_context.details(text)
     end
 
     def available_language_codes
@@ -34,8 +38,8 @@ module ThatLanguage
 
   private
 
-    def detect
-      @detect ||= Detect.new(lookup_context)
+    def detect_context
+      @detect_context ||= Detect.new(lookup_context)
     end
 
     def lookup_context

data/lib/that_language/result.rb

@@ -3,14 +3,13 @@ require 'json'
 module ThatLanguage
   class Result
     attr_reader :language_code, :value, :hit_count
-    attr_accessor :words_count, :total_value
+    attr_accessor :words_count
 
     def initialize(language_code:)
       @language_code = language_code
       @value = 0.0
       @hit_count = 0
       @words_count = 0
-      @total_value = 0.0
     end
 
     def add(value)
@@ -20,8 +19,10 @@ module ThatLanguage
       @value += value
     end
 
-    def score
-      hit_ratio * percentage
+    def confidence
+      return 0 unless words_count > 0
+
+      value / words_count
     end
 
     def hit_ratio
@@ -30,30 +31,23 @@ module ThatLanguage
       @hit_count.to_f / @words_count
     end
 
-    def percentage
-      return 0.0 if @total_value == 0
-
-      @value / @total_value
-    end
-
     def <=>(other)
-      score <=> other.score
+      value <=> other.value
     end
 
     def <(other)
-      score < other.score
+      value < other.value
     end
 
     def >(other)
-      score > other.score
+      value > other.value
     end
 
     def to_h
       {
         language_code: language_code,
+        confidence: confidence,
         value: value,
-        score: score,
-        percentage: percentage,
         hit_ratio: hit_ratio,
         hit_count: hit_count,
         words_count: words_count
@@ -63,21 +57,5 @@ module ThatLanguage
     def to_json
       to_h.to_json
     end
-
-    # TODO: spec
-    def winner!(second_score:)
-      @second_score = second_score
-    end
-
-    # TODO: spec
-    def winner?
-      !@second_score.nil?
-    end
-
-    # TODO: spec
-    def confidence
-      factor = 1 - (@second_score / score)
-      factor * hit_ratio
-    end
   end
 end

data/lib/that_language/result_set.rb

@@ -11,7 +11,7 @@ module ThatLanguage
     end
 
     def winner
-      results.max.tap { |r| r.winner!(second_score: results[1].score) }
+      results.max
     end
 
     def results
@@ -43,14 +43,9 @@ module ThatLanguage
     def finalize_results
       _results.each do |result|
         result.words_count = @words_count
-        result.total_value = total_value
       end
     end
 
-    def total_value
-      _results.inject(0) { |sum, result| sum += result.value }
-    end
-
     def lookup
       @lookup ||= Hash.new do |hash, language_code|
         hash[language_code] = Result.new(language_code: language_code)

data/lib/that_language/version.rb

@@ -1,3 +1,3 @@
 module ThatLanguage
-  VERSION = "0.1.0.pre2"
+  VERSION = "0.1.0.pre3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: that_language
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0.pre3
 platform: ruby
 authors:
 - Patrick Helm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler