diff --git a/Gemfile b/Gemfile index 44535f1..5aa7501 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,4 @@ source 'https://rubygems.org' -gem "bronto-gem", git: "https://github.com/hale/bronto.git" - # Specify your gem's dependencies in rails_nlp.gemspec gemspec diff --git a/lib/rails_nlp/keyword.rb b/lib/rails_nlp/keyword.rb index 9e89a5d..ade8de4 100644 --- a/lib/rails_nlp/keyword.rb +++ b/lib/rails_nlp/keyword.rb @@ -1,6 +1,6 @@ require 'active_record' require 'text' -require 'bronto-gem' +require 'bronto' module RailsNlp class Keyword < ActiveRecord::Base @@ -28,7 +28,8 @@ def set_stem end def set_synonyms - self.synonyms = BrontoGem.lookup(name) + @thesaurus ||= Bronto::Thesaurus.new + self.synonyms = @thesaurus.lookup(name) end end end diff --git a/rails_nlp.gemspec b/rails_nlp.gemspec index 120131a..9adccf0 100644 --- a/rails_nlp.gemspec +++ b/rails_nlp.gemspec @@ -33,4 +33,5 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "activerecord", "~> 4.0" spec.add_runtime_dependency "ffi-hunspell", "~> 0.3.0" spec.add_runtime_dependency "text", "~> 1.2.3" + spec.add_runtime_dependency "bronto-gem", "~> 0.1.0" end diff --git a/spec/rails_nlp/keyword_spec.rb b/spec/rails_nlp/keyword_spec.rb index e66bde4..0799ff2 100644 --- a/spec/rails_nlp/keyword_spec.rb +++ b/spec/rails_nlp/keyword_spec.rb @@ -2,6 +2,14 @@ module RailsNlp describe Keyword do + #before(:each) do + #@model = flexmock("analysable model") + #@model.should_receive(:id).and_return(1) + #@model.should_receive(:title).and_return("Title").by_default + #@model.should_receive(:content).and_return("Content").by_default + #@thesaurus = Bronto::Thesaurus.new + #end + it { should validate_presence_of(:name)} it { should validate_uniqueness_of(:name)} it { should have_many(:wordcounts) } @@ -34,7 +42,8 @@ module RailsNlp end it "sets the #synonyms to be an array of synonyms" do - flexmock(BrontoGem).should_receive(:lookup).with("cat").and_return({ + thesaurus = Bronto::Thesaurus.new + flexmock(thesaurus).should_receive(:lookup).with("cat").and_return({ noun: { syn: ["adult female", "adult male"]}, verb: { syn: ["barf", "cast", "chuck"]} }) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b22779b..97f0800 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,6 +8,9 @@ require_relative 'factories.rb' require 'shoulda/matchers' +require 'bronto' + + RSpec.configure do |config| config.order = "random" config.tty = true @@ -19,9 +22,9 @@ raise ActiveRecord::Rollback end end - config.before(:all) do - flexmock(BrontoGem).should_receive(:lookup).and_return({}).by_default - end + #config.before(:all) do + # flexmock(BrontoGem).should_receive(:lookup).and_return({}).by_default + #end end ActiveRecord::Base.establish_connection(