rrbayes 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/rrbayes/rrbayes.rb

@@ -1,5 +1,8 @@
 module Rrbayes
 
+  class LoadingError < ArgumentError
+  end
+
   class Classifier
 
     attr_reader :categories, :db
@@ -11,10 +14,9 @@ module Rrbayes
     #  Rrbayes.new(:categories => %w(spam ham), {:host => '127.0.0.1'})
     #
     def initialize(options = {}, redis_options = {})
-      raise "No categories specified for the classifier" unless options[:categories] || load_categories
       @db = Redis.new(redis_options)
       @db.connect_to_server
-      @categories = options[:categories].map { |c| Category.new(c, self) }
+      @categories = find_categories(options).map { |c| Category.new(c, self) }
     end
 
     #given a frequency hash and a category, stores teh frequency data
@@ -49,6 +51,17 @@ module Rrbayes
       @db.set_members('categories')
     end
 
+    def find_categories(options)
+      categories = load_categories
+      if categories.empty?
+        categories = options[:categories]
+        raise LoadingError, "No categories specified for the classifier" unless categories
+      elsif options[:categories] && options[:categories].sort != categories.sort
+        raise LoadingError, "you specified categories #{options[:as].inspect} but #{categories.inspect} were found in the db"
+      end
+      categories
+    end
+
   end
 
 end

data/rrbayes.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rrbayes}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hungryblank"]

data/test/rrbayes_test.rb

@@ -15,6 +15,12 @@ context "a new classifier" do
 
   should("load categories") { topic.send(:load_categories) }.equals %w(spam ham)
 
+  should("initialize with no categories") { Classifier.new.categories.map { |c| c.name } }.equals %w(spam ham)
+
+  should("initialize with same categories") { Classifier.new(:categories => %w(spam ham)).categories.map { |c| c.name } }.equals %w(spam ham)
+
+  should("detect category mismatch") { Classifier.new({:categories => %w(bad good)}) }.raises(LoadingError)
+
   context "in training" do
 
     setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rrbayes
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - hungryblank