From 66d72d5cfd682b9d0a2ed74c411c61b394dff0bb Mon Sep 17 00:00:00 2001 From: nikola Date: Thu, 16 Feb 2012 18:30:45 +0100 Subject: [PATCH] cleanup and refactoring --- lib/green_midget/models/countable.rb | 3 +-- lib/green_midget/models/features.rb | 2 +- lib/green_midget/models/words.rb | 2 +- lib/green_midget/version.rb | 2 +- spec/spec_helper.rb | 7 +++---- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/green_midget/models/countable.rb b/lib/green_midget/models/countable.rb index fc2ad66..1e57a6b 100644 --- a/lib/green_midget/models/countable.rb +++ b/lib/green_midget/models/countable.rb @@ -2,8 +2,7 @@ module GreenMidget class Countable attr_accessor :key - - class << self; attr_accessor :prefix end + class_attribute :prefix def self.[](key) new(key) diff --git a/lib/green_midget/models/features.rb b/lib/green_midget/models/features.rb index e3849a1..da0e802 100644 --- a/lib/green_midget/models/features.rb +++ b/lib/green_midget/models/features.rb @@ -8,7 +8,7 @@ def probability_for(category) end def feature - key.gsub(/(^#{ self.class.prefix })|(::\w+_count$)/, '') + key.gsub(/(^#{self.class.prefix})|(::\w+_count$)/, '') end end end diff --git a/lib/green_midget/models/words.rb b/lib/green_midget/models/words.rb index 74d283e..61d9fa8 100644 --- a/lib/green_midget/models/words.rb +++ b/lib/green_midget/models/words.rb @@ -5,7 +5,7 @@ class Words < Countable def self.record_keys(words, category = nil) words.map do |word| - Array(category || GreenMidget::CATEGORIES).map{ |category| Words[word].record_key(category) } + Array(category || CATEGORIES).map{ |category| Words[word].record_key(category) } end.flatten end diff --git a/lib/green_midget/version.rb b/lib/green_midget/version.rb index 56b72bd..7c47b5e 100644 --- a/lib/green_midget/version.rb +++ b/lib/green_midget/version.rb @@ -1,3 +1,3 @@ module GreenMidget - VERSION = '0.0.3' + VERSION = '0.1.0' end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bfc70ae..ead55b7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,16 +1,15 @@ # Copyright (c) 2011, SoundCloud Ltd., Nikola Chochkov -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) -$LOAD_PATH.unshift(File.dirname(__FILE__)) -require 'rspec' require 'green_midget' require 'sqlite3' -conn = { :adapter => 'sqlite3', :database => ':memory:'} +conn = { :adapter => 'sqlite3', :database => ':memory:' } ActiveRecord::Base.establish_connection(conn) require 'green_midget/db/migrate/create_green_midget_records' +GreenMidget::CreateGreenMidgetRecords.verbose = false GreenMidget::CreateGreenMidgetRecords.up RSpec.configure do |config| end +