omnicat 0.2.0 → 0.2.1

data/CHANGELOG.txt

@@ -1,4 +1,6 @@
 Master Branch
+0.2.1
+# to_hash method delegated to 'hashable' gem
 
 0.2.0
 # bayes classifier moved to another gem which is 'omnicat-bayes'

data/README.md

@@ -35,7 +35,7 @@ OmniCat allows you to change strategy on runtime.
     classifier.classify('I am happy :)')
     ...
     # change strategy to Support Vector Machine (SVM) on runtime
-    classifier = OmniCat::Classifier.new(OmniCat::Classifiers::SVM.new())
+    classifier.strategy = OmniCat::Classifiers::SVM.new
     # now you do not need to re-train, add category and so on..
     # just classify with new strategy
     classifier.classify('I am happy :)')

data/Rakefile

@@ -9,7 +9,7 @@ task :default => [ :test ]
 desc "Run all unit tests"
 Rake::TestTask.new do |t|
   t.libs << 'lib'
-  t.test_files = FileList['lib/test/unit/*_test.rb']
+  t.test_files = FileList['test/unit/*_test.rb']
   t.verbose = true
 end
 

data/lib/omnicat.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/omnicat/version'
 require File.dirname(__FILE__) + '/omnicat/configuration'
 require File.dirname(__FILE__) + '/omnicat/array'
-require File.dirname(__FILE__) + '/omnicat/hash'
 require File.dirname(__FILE__) + '/omnicat/base'
 require File.dirname(__FILE__) + '/omnicat/doc'
 require File.dirname(__FILE__) + '/omnicat/result'

data/lib/omnicat/base.rb

@@ -1,16 +1,8 @@
+require 'hashable'
+
 module OmniCat
   class Base
-    # Returns Base object as Hash
-    #
-    # @return Base object instance variables in a Hash
-    def to_hash
-      hash = {}
-      self.instance_variables.each do |key|
-        if val = instance_variable_get(key)
-          hash[key[1..-1].to_sym] = val.class.to_s.include?('OmniCat') ? val.to_hash : val
-        end
-      end
-      hash
-    end
+    include Hashable
+    def to_hash; self.to_dh; end
   end
 end

data/lib/omnicat/classifiers/strategy.rb

@@ -17,7 +17,7 @@ module OmniCat
       attr_accessor :uniq_token_count # Integer - Total uniq token count
 
       def initialize(strategy_hash = {})
-        @categories = ::OmniCat::Hash.new
+        @categories = {}
         @category_count = strategy_hash[:category_count].to_i
         @category_size_limit = strategy_hash[:category_size_limit].to_i
         @doc_count = strategy_hash[:doc_count].to_i

data/lib/omnicat/version.rb

@@ -1,3 +1,3 @@
 module OmniCat
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'
 end

data/omnicat.gemspec

@@ -4,20 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'omnicat/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "omnicat"
+  spec.name          = 'omnicat'
   spec.version       = OmniCat::VERSION
-  spec.authors       = ["Mustafa Turan"]
-  spec.email         = ["mustafaturan.net@gmail.com"]
+  spec.authors       = ['Mustafa Turan']
+  spec.email         = ['mustafaturan.net@gmail.com']
   spec.description   = %q{A generalized framework for text classifications.}
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/mustafaturan/omnicat"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/mustafaturan/omnicat'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_dependency 'hashable', '~> 0.1.0'
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
 end

data/{lib/test → test}/test_helper.rb

@@ -1,2 +1,2 @@
 require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'omnicat'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'omnicat'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnicat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hashable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -65,16 +81,14 @@ files:
 - lib/omnicat/classifiers/strategy_internals/category.rb
 - lib/omnicat/configuration.rb
 - lib/omnicat/doc.rb
-- lib/omnicat/hash.rb
 - lib/omnicat/result.rb
 - lib/omnicat/version.rb
-- lib/test/test_helper.rb
-- lib/test/unit/array_test.rb
-- lib/test/unit/classifier_test.rb
-- lib/test/unit/classifiers/strategy_test.rb
-- lib/test/unit/doc_test.rb
-- lib/test/unit/hash_test.rb
 - omnicat.gemspec
+- test/test_helper.rb
+- test/unit/array_test.rb
+- test/unit/classifier_test.rb
+- test/unit/classifiers/strategy_test.rb
+- test/unit/doc_test.rb
 homepage: https://github.com/mustafaturan/omnicat
 licenses:
 - MIT
@@ -100,4 +114,9 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A generalized framework for text classifications.
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/unit/array_test.rb
+- test/unit/classifier_test.rb
+- test/unit/classifiers/strategy_test.rb
+- test/unit/doc_test.rb

data/lib/omnicat/hash.rb

@@ -1,13 +0,0 @@
-module OmniCat
-  class Hash < ::Hash
-    def to_hash
-      hash = {}
-      self.keys.each do |key|
-        if val = self[key]
-          hash[key] = val.class.to_s.include?('OmniCat') ? val.to_hash : val
-        end
-      end
-      hash
-    end
-  end
-end

data/lib/test/unit/hash_test.rb

@@ -1,12 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
-
-class TestHash < Test::Unit::TestCase
-  def test_to_hash
-    categories_hash = { 
-      "pos" => { doc_count: 0, docs: {}, tokens: {}, token_count: 0 } 
-    }
-    categories = OmniCat::Hash.new
-    categories["pos"] = OmniCat::Classifiers::StrategyInternals::Category.new(categories_hash["pos"])
-    assert_equal(categories_hash, categories.to_hash)
-  end
-end