linnaeus 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b380bea103cd6825850436184c4ab35c9c07c089
-  data.tar.gz: 147508ab8b2610250a82acf5d11721040d9c721d
+  metadata.gz: df43732df7d9d0ef05621e4b61689ff5caca13c9
+  data.tar.gz: da7169077289b7edea978906dd0918549a339c6a
 SHA512:
-  metadata.gz: 12ef0f679970ad545fc3942f26a709626ed43647bbeb454656fb39c908691434746dd3cf21c3cc658be534a814c73aa5572af1e1c466c1f89048d326516dc97f
-  data.tar.gz: d982a11641d6be711117b270850d7309881ad74b4e5278f484bced8f1703a36bd058e7de093883f520916c378eba353ae3c01b331461301f41139699657bed8a
+  metadata.gz: 39629861a50d32557e78191fb804cfa51d1051b122c1d32cb0729a7317c724514c47f0101e0fcb53d2459f5ee21bb06c630295aec77f06cd4261083c398f8b27
+  data.tar.gz: 3b364ee8fbecc54a9e589e4902c63132dee0ab940ec70f0ca5f399b97317e7c8f699526d6b6a697b1b8a85afaa89cde3bc61fa0c25ad86cb0a73b04605cde04b

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p0
+2.0.0-p353

data/Gemfile.lock

@@ -3,49 +3,52 @@ GEM
   specs:
     addressable (2.3.5)
     builder (3.2.2)
+    descendants_tracker (0.0.3)
     diff-lcs (1.1.3)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+    docile (1.1.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.6)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
     hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    jeweler (1.8.6)
+    highline (1.6.21)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
+    json (1.8.1)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    multi_json (1.7.7)
-    multi_xml (0.5.4)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    mini_portile (0.5.2)
+    multi_json (1.9.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.0)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (3.0.0)
-    redis (3.0.4)
+    redcarpet (3.1.1)
+    redis (3.0.7)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -54,12 +57,13 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     stemmer (1.0.1)
-    yard (0.8.6.2)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/linnaeus/classifier.rb

@@ -13,6 +13,8 @@
 #   Set to true to skip porter stemming.
 # encoding::
 #   Force text to use this character set. UTF-8 by default.
+# redis_connection::
+#   An instantiated Redis connection, allowing you to reuse an existing Redis connection.
 # redis_host::
 #   Passed to persistence class constructor. Defaults to "127.0.0.1"
 # redis_port::

data/lib/linnaeus/persistence.rb

@@ -18,17 +18,21 @@ class Linnaeus::Persistence < Linnaeus
 
     @scope = options[:scope]
 
-    @redis = Redis.new(
-      host: options[:redis_host],
-      port: options[:redis_port],
-      db: options[:redis_db],
-      scheme: options[:redis_scheme],
-      path: options[:redis_path],
-      timeout: options[:redis_timeout],
-      password: options[:redis_password],
-      id: options[:redis_id],
-      tcp_keepalive: options[:redis_tcp_keepalive]
-    )
+    if options[:redis_connection]
+      @redis = options[:redis_connection]
+    else
+      @redis = Redis.new(
+        host: options[:redis_host],
+        port: options[:redis_port],
+        db: options[:redis_db],
+        scheme: options[:redis_scheme],
+        path: options[:redis_path],
+        timeout: options[:redis_timeout],
+        password: options[:redis_password],
+        id: options[:redis_id],
+        tcp_keepalive: options[:redis_tcp_keepalive]
+      )
+    end
 
     self
   end

data/linnaeus.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: linnaeus 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "linnaeus"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["djcp"]
-  s.date = "2013-07-12"
+  s.date = "2014-03-18"
   s.description = "Linnaeus provides a redis-backed Bayesian classifier. Words are stemmed, stopwords are stopped, and redis is used to allow for persistent and concurrent training and classification."
   s.email = "dan@collispuro.net"
   s.extra_rdoc_files = [
@@ -43,8 +45,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/djcp/linnaeus"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0"
+  s.rubygems_version = "2.2.1"
   s.summary = "Another redis-backed Bayesian classifier"
 
   if s.respond_to? :specification_version then

data/spec/linnaeus_persistence_spec.rb

@@ -6,10 +6,15 @@ describe Linnaeus::Persistence do
     lp.clear_training_data
   end
 
+  it "should accept an existing redis connection" do
+    lp = Linnaeus::Persistence.new(redis_connection: Redis.new)
+    lp.redis.should_not be_nil
+  end
+
   it 'sets keys properly with defaults' do
     lp2 = get_linnaeus_persistence
     train_a_document_in('foobar')
-    lp2.redis.keys('*').should eq ['Linnaeus:category', 'Linnaeus:cat:foobar']
+    lp2.redis.keys('*').should match_array ['Linnaeus:category', 'Linnaeus:cat:foobar']
   end
 
   context "custom scopes" do
@@ -19,7 +24,7 @@ describe Linnaeus::Persistence do
 
       train_a_document_in('foobar', scope: 'new-scope')
 
-      lp2.redis.keys('*').sort.should eq [
+      lp2.redis.keys('*').should match_array [
         'Linnaeus:new-scope:cat:foobar', 'Linnaeus:new-scope:category'
       ]
     end
@@ -33,14 +38,14 @@ describe Linnaeus::Persistence do
 
       train_a_document_in('foobar', scope: 'new-scope')
 
-      lp.redis.keys.sort.should eq [
+      lp.redis.keys.should match_array [
         "Linnaeus:cat:foobar", "Linnaeus:category",
         "Linnaeus:new-scope:cat:foobar", "Linnaeus:new-scope:category"
       ]
 
       lp2.clear_training_data
 
-      lp.redis.keys.sort.should eq [
+      lp.redis.keys.should match_array [
         "Linnaeus:cat:foobar", "Linnaeus:category"
       ]
     end
@@ -52,8 +57,8 @@ describe Linnaeus::Persistence do
       lp2 = get_linnaeus_persistence(scope: 'new-scope')
       add_categories lp2, ['slack' , 'frop']
 
-      lp2.get_categories.sort.should eq ['frop', 'slack']
-      lp.get_categories.sort.should eq ['bar','baz','foo']
+      lp2.get_categories.should match_array ['frop', 'slack']
+      lp.get_categories.should match_array ['bar','baz','foo']
     end
   end
 
@@ -68,14 +73,14 @@ describe Linnaeus::Persistence do
   it 'stores categories successfully' do
     lp = get_linnaeus_persistence
     add_categories lp
-    lp.get_categories.sort.should eq ['bar','baz','foo']
+    lp.get_categories.should match_array ['bar','baz','foo']
   end
 
   it 'can remove categories' do
     lp = get_linnaeus_persistence
     add_categories lp
     lp.remove_category 'bar'
-    lp.get_categories.sort.should eq ['baz','foo']
+    lp.get_categories.should match_array ['baz','foo']
   end
 
   it '#get_words_with_count_for_category' do

data/spec/linnaeus_stopwords_spec.rb

@@ -14,7 +14,7 @@ describe Linnaeus::Stopwords do
   end
   it 'can have stopwords overridden' do
     subject.stopwords = ['foo','bar']
-    subject.to_a.should eq ['foo','bar']
+    subject.to_a.should match_array ['foo','bar']
     subject.to_set.should eq ['foo','bar'].to_set
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linnaeus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - djcp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Another redis-backed Bayesian classifier