green_midget 0.0.1 → 0.0.2

data/lib/green_midget.rb

@@ -7,7 +7,7 @@ require 'green_midget/models/examples'
 require 'green_midget/models/features'
 require 'green_midget/models/green_midget_records'
 require 'green_midget/models/words'
-require 'extensions/green_midget_check'
+require 'green_midget/extensions/classifier'
 
 if (classifier = Gem.searcher.find('green_midget'))
   path = classifier.full_gem_path

data/lib/green_midget/base.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2011, SoundCloud Ltd., Nikola Chochkov
-require 'green_midget/constants'
-require 'green_midget/logger'
-require 'green_midget/url_detection'
+%w(logger constants url_detection).each do |file|
+  require File.join(File.dirname(__FILE__), file)
+end
 
 module GreenMidget
   class Base

data/lib/green_midget/extensions/classifier.rb

@@ -0,0 +1,11 @@
+# Copyright (c) 2011, SoundCloud Ltd., Nikola Chochkov
+module GreenMidget
+  class Classifier < Base
+    attr_accessor :text
+
+    def initialize(text)
+      self.text = text
+    end
+  end
+end
+

data/lib/green_midget/extensions/sample.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2011, SoundCloud Ltd., Nikola Chochkov
+#
+# This is a sample of how to define new features to be
+# tracked by GreenMidget. Eg: define user features and check
+# them on the message sender.
+#
+
+class Sample < GreenMidget::Base
+  attr_accessor :user
+
+  def initialize(text, user)
+    @text = text
+    @user = user
+  end
+
+  private
+
+  def features
+    %w(regular_user) + super
+  end
+
+  def regular_user?
+    # implement a method checking user type
+  end
+end

data/lib/green_midget/green_midget.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2011, SoundCloud Ltd., Nikola Chochkov
-require 'green_midget/constants'
+require File.join(File.dirname(__FILE__), 'constants')
 
 module GreenMidget
   include Constants

data/lib/green_midget/models/countable.rb

@@ -27,7 +27,8 @@ module GreenMidget
     end
 
     def record_key(category)
-      self.key + "::#{category}_count"
+      "#{self.key}::#{category}_count"
     end
   end
 end
+

data/lib/green_midget/version.rb

@@ -1,3 +1,3 @@
 module GreenMidget
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/tasks/green_midget.rake

@@ -1,32 +1,36 @@
 # Copyright (c) 2011, SoundCloud Ltd., Nikola Chochkov
 require 'fileutils'
 require 'rake'
-require File.join(File.dirname(__FILE__), '..', '..', 'db', 'migrate', 'create_green_midget_records')
+require 'green_midget/db/migrate/create_green_midget_records'
 
 namespace :green_midget do
-  desc "prepare this project for a world without spam"
-  task :setup => :environment do
-    include GreenMidget
+  namespace :setup do
+    desc "prepare this project for a world without spam using ActiveRecord"
+    task :active_record => :environment do
+      include GreenMidget
 
-    unless GreenMidgetRecords.table_exists?
-      CreateGreenMidgetRecords.up
-    end
-
-    keys = ["url_in_text", "email_in_text"].map do |feature|
-      [ Features[feature].record_key(ALTERNATIVE), Features[feature].record_key(NULL) ]
-    end.flatten
+      unless GreenMidgetRecords.table_exists?
+        CreateGreenMidgetRecords.up
+      end
 
-    keys += [Examples::GENERAL_FEATURE_NAME, "url_in_text", "email_in_text"].map do |feature|
-      [ Examples[feature].record_key(ALTERNATIVE), Examples[feature].record_key(NULL) ]
-    end.flatten
+      keys = [ ALTERNATIVE, NULL ].map do |hypothesis|
+        [
+          "feature::url_in_text::#{hypothesis}_count",
+          "feature::email_in_text::#{hypothesis}_count",
+          "examples::any::#{hypothesis}_count",
+          "examples::url_in_text::#{hypothesis}_count",
+          "examples::email_in_text::#{hypothesis}_count",
+        ]
+      end.flatten
 
-    puts '==  Creating records ==='
-    keys.each { |key|
-      unless GreenMidgetRecords.find_by_key(key)
-        GreenMidgetRecords.create(key)
-        puts "--  Created #{key}"
-      end
-    }
-    puts '==  Done ==='
+      puts '==  Creating records ==='
+      keys.each { |key|
+        unless GreenMidgetRecords.find_by_key(key)
+          GreenMidgetRecords.create(key)
+          puts "--  Created #{key}"
+        end
+      }
+      puts '==  Done ==='
+    end
   end
 end

data/spec/tester.rb

@@ -3,7 +3,7 @@ class Tester < GreenMidget::Base
   attr_accessor :text
 
   def initialize(text = '')
-    self.text = text
+    @text = text
   end
 
   def words

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: green_midget
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152593220 !ruby/object:Gem::Requirement
+  requirement: &2152860260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152593220
+  version_requirements: *2152860260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152592800 !ruby/object:Gem::Requirement
+  requirement: &2152859840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152592800
+  version_requirements: *2152859840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152592380 !ruby/object:Gem::Requirement
+  requirement: &2152859420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152592380
+  version_requirements: *2152859420
 description: Naive Bayesian Classifier with customizable features
 email:
 - nikola@howkul.info
@@ -63,13 +63,15 @@ files:
 - Rakefile
 - benchmark/benchmark.rb
 - benchmark/test.rb
-- db/migrate/create_green_midget_records.rb
+- extensions/green_midget_check.rb
+- extensions/sample.rb
 - green_midget.gemspec
-- lib/extensions/green_midget_check.rb
-- lib/extensions/sample.rb
 - lib/green_midget.rb
 - lib/green_midget/base.rb
 - lib/green_midget/constants.rb
+- lib/green_midget/db/migrate/create_green_midget_records.rb
+- lib/green_midget/extensions/classifier.rb
+- lib/green_midget/extensions/sample.rb
 - lib/green_midget/green_midget.rb
 - lib/green_midget/logger.rb
 - lib/green_midget/models/countable.rb