highscore 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODQ1NGUyMjdjNGUzNjdlYTA4MjFlYjViMmY0NzM1MjBhMTU2ODlhOQ==
-  data.tar.gz: !binary |-
-    MTVmNzMyOTVhZjFkNjBhMTFjODc5NWM2MzdlN2E1NTljYzNjY2ExMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGVlOWUwNTgxM2MwMTlkMGMzN2MzYjViYjdhZDkxMjkxYmZiZTNkYTEzOThi
-    Yzg2Y2E4MjdmOGE1NWJhNDMzYjBkZGM4MDMyNzA4ODEwMmFiMTVmYWQyMzk2
-    ODIwOTIwMjRkMzgyN2E1Y2QzNTMxYjFmNzllM2NlOTE2ZjA4ZjM=
-  data.tar.gz: !binary |-
-    NDZlMzFiYjVjYmNiMDcyOGVlZGI1YWZkYmY1YWZhNWI5ZWRmNzgyNWU1NjZi
-    NzJlZDEzZjNmYWJhOGJhMWM3NTE1NDJiNDhlYWI1MTVkNmI1MjNhNzY0OTg0
-    MDhjZGY5MDkxY2FjZWU4NTU1NzcwYzNiNzA4MGVjZDlhMDVmMGI=
+SHA1:
+  metadata.gz: 22d9984fa42f47bf64ceedeb67865d010a372dc5
+  data.tar.gz: 7cba36ed7d9f7baac8f3a58313044936b22caf2d
+SHA512:
+  metadata.gz: c9d4835fc043f35deef40d74e6bbb83f59b8acd166daba1ea72073757e1910c436f32be1a6ab6065ee24ba35558a1062371b999781c17edf44b02eb848419965
+  data.tar.gz: 6fa57679daaedc26c9c62361738e5ab9748f86d1e8eeb75a79044b8859b4e3dec0dc14faaaa4ddc167024086d7f047f9349f0de5a6d09232163d21a31289ec67

data/History.txt

@@ -1,8 +1,6 @@
-== 1.2.0 / 2013-12-06
+== 1.2.1 / 2016-08-23
 
-* configurable minimum word length
-* bonus words get rated higher than normal words (configurable just like blacklists)
-* (Thanks to Tim-B for the new features)
+* removed hard dependency to bloomfilter-rb
 
 == 1.1.0 / 2013-04-
 

data/lib/highscore.rb

@@ -24,4 +24,3 @@ module Highscore
 end
 
 Highscore.load_modules
-

data/lib/highscore/content.rb

@@ -105,7 +105,8 @@ module Highscore
     #
     # @return Symbol
     def language
-      @content.language
+      wl = WhatLanguage.new(:all)
+      wl.language(@content)
     end
 
     private

data/lib/highscore/wordlist.rb

@@ -10,14 +10,14 @@ module Highscore
     # @return Highscore::Wordlist
     def self.load_file(file_path, use_bloom_filter = true)
       words = File.read(file_path).split(' ')
-      self.load(words)
+      self.load(words, use_bloom_filter)
     end
 
     # load a file or array of words
     #
     # @param data String Array
     # @return Highscore::Wordlist
-    def self.load(data)
+    def self.load(data, use_bloom_filter = true)
       if data.instance_of?(String)
         words = data.split(' ')
       elsif data.instance_of? Array
@@ -28,7 +28,7 @@ module Highscore
 
       words.map! {|x| x.gsub(/[\!\.\:\,\;\-\+]/, '') }
 
-      self.new(words)
+      self.new(words, use_bloom_filter)
     end
 
     attr_reader :words
@@ -37,7 +37,8 @@ module Highscore
     def initialize(words = [], use_bloom_filter = true)
       @words = words
       @bloom_filter = nil
-      
+      @use_bloom_filter = use_bloom_filter
+
       init_bloom_filter
     end
 
@@ -80,11 +81,13 @@ module Highscore
       @words << word
       @bloom_filter << word unless @bloom_filter.nil?
     end
-    
+
   private
-    
+
     # determine whether bloom filters should be used
     def use_bloom_filter
+      return false unless @use_bloom_filter
+
       begin
         require 'bloomfilter-rb'
         true
@@ -92,15 +95,15 @@ module Highscore
         false
       end
     end
-    
+
     # build a bloom filter out of this wordlist to determine faster
     # if words should be black- or whitelisted
     #
     def init_bloom_filter
       return unless use_bloom_filter
-      
+
       n = length # number of filter elements
-    
+
       if n > 0
         b = 4  # bits per bucket
         m = n * b * 10 # number of filter buckets
@@ -112,6 +115,6 @@ module Highscore
         each { |w| @bloom_filter.insert(w) }
       end
     end
-    
+
   end
-end
+end

data/test/highscore/test_content.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 $:.unshift(File.join(File.dirname(__FILE__), %w{.. .. lib highscore}))
 require "content"
-require "test/unit"
-require 'rubygems'
 
 class TestContent < Highscore::TestCase
   def setup

data/test/highscore/test_keyword.rb

@@ -8,7 +8,7 @@ class TestKeyword < Highscore::TestCase
   def test_init
 
     # don't allow 'empty' keywords
-    assert_raise(ArgumentError) do
+    assert_raises(ArgumentError) do
       Highscore::Keyword.new
     end
   end

data/test/highscore/test_multiple_blacklists.rb

@@ -2,10 +2,8 @@ $:.unshift(File.join(File.dirname(__FILE__), %w{.. .. lib highscore}))
 require "content"
 require "blacklist"
 require "whitelist"
-require "test/unit"
-require 'rubygems'
 
-class TestMultipleBlacklists < Test::Unit::TestCase
+class TestMultipleBlacklists < Highscore::TestCase
   def setup
     @nonsense = "Oui monsieur, je suis un programmer. You OK?"
     
@@ -30,7 +28,7 @@ class TestMultipleBlacklists < Test::Unit::TestCase
   end
   
   def test_bad_wordlist
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       @content.add_wordlist 3.14159, "pi"
     end
   end

data/test/highscore/test_wordlist.rb

@@ -54,12 +54,23 @@ class TestBlacklist < Highscore::TestCase
     assert blacklist.include?("foobar")
     assert !blacklist.include?("bla")
   end
-  
+
   def test_each
     blacklist = Highscore::Wordlist.load "foo bar baz"
-    
+
     a = []
     blacklist.each { |x| a << x }
     assert_equal ['foo', 'bar', 'baz'], a
   end
-end
+
+  def test_use_bloom_filter_flag
+    list = Highscore::Wordlist.load "foo bar baz"
+    assert list.instance_variable_get(:@bloom_filter)
+
+    list = Highscore::Wordlist.load "foo bar baz", true
+    assert list.instance_variable_get(:@bloom_filter)
+
+    list = Highscore::Wordlist.load "foo bar baz", false
+    assert_nil list.instance_variable_get(:@bloom_filter)
+  end
+end

data/test/test_highscore.rb

@@ -8,12 +8,12 @@ rescue LoadError
 end
 
 require 'highscore'
-require 'test/unit'
+require 'minitest/autorun'
 
 module Highscore
-  class TestCase < Test::Unit::TestCase
+  class TestCase < Minitest::Test
     def test_version
-      assert_not_nil Highscore::VERSION
+      assert (not Highscore::VERSION.nil?)
     end
   end
-end
+end

data/version.txt

@@ -1 +1 @@
-1.2.0
+1.2.1

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: highscore
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Dominik Liebler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: whatlanguage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bloomfilter-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.1
 description: Find and rank keywords in text.
 email: liebler.dominik@googlemail.com
 executables:
@@ -63,25 +49,25 @@ extra_rdoc_files:
 files:
 - bin/highscore
 - lib/blacklist.txt
-- lib/highscore.rb
-- lib/highscore/wordlist.rb
-- lib/highscore/keywords.rb
+- lib/highscore/blacklist.rb
 - lib/highscore/bonuslist.rb
-- lib/highscore/whitelist.rb
+- lib/highscore/content.rb
 - lib/highscore/keyword.rb
+- lib/highscore/keywords.rb
 - lib/highscore/string.rb
-- lib/highscore/content.rb
-- lib/highscore/blacklist.rb
+- lib/highscore/whitelist.rb
+- lib/highscore/wordlist.rb
+- lib/highscore.rb
+- test/fixtures/blacklist.txt
+- test/highscore/test_blacklist.rb
 - test/highscore/test_bonuslist.rb
-- test/highscore/test_multiple_blacklists.rb
+- test/highscore/test_content.rb
 - test/highscore/test_keyword.rb
+- test/highscore/test_keywords.rb
+- test/highscore/test_multiple_blacklists.rb
+- test/highscore/test_string.rb
 - test/highscore/test_whitelist.rb
 - test/highscore/test_wordlist.rb
-- test/highscore/test_string.rb
-- test/highscore/test_content.rb
-- test/highscore/test_blacklist.rb
-- test/highscore/test_keywords.rb
-- test/fixtures/blacklist.txt
 - test/test_highscore.rb
 - README.md
 - History.txt
@@ -98,29 +84,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: highscore
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 3
 summary: Easily find and rank keywords in long texts.
 test_files:
+- test/fixtures/blacklist.txt
+- test/highscore/test_blacklist.rb
 - test/highscore/test_bonuslist.rb
-- test/highscore/test_multiple_blacklists.rb
+- test/highscore/test_content.rb
 - test/highscore/test_keyword.rb
+- test/highscore/test_keywords.rb
+- test/highscore/test_multiple_blacklists.rb
+- test/highscore/test_string.rb
 - test/highscore/test_whitelist.rb
 - test/highscore/test_wordlist.rb
-- test/highscore/test_string.rb
-- test/highscore/test_content.rb
-- test/highscore/test_blacklist.rb
-- test/highscore/test_keywords.rb
-- test/fixtures/blacklist.txt
 - test/test_highscore.rb