semantically-taggable 0.2.0 → 0.2.2

data/spec/semantically_taggable/article_tagging_spec.rb

@@ -4,6 +4,8 @@ describe "Tagging articles" do
   before(:each) do
     reset_database!
     @article = Article.new(:name => "Bob Jones")
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+
   end
 
   it "should have tag schemes" do
@@ -37,9 +39,6 @@ describe "Tagging articles" do
 
   it "should assign the associated scheme when tagging" do
     @article.keyword_list = %w{one two three}
-    ActiveRecord::Base.logger.info "******* "
-    ActiveRecord::Base.logger.info "******* ASSOCIATED SCHEME"
-    ActiveRecord::Base.logger.info "******* "
     @article.save
     @article.keywords.each {|k| k.scheme.should == SemanticallyTaggable::Scheme.by_name(:keywords)}
   end

data/spec/semantically_taggable/tag_parentage_spec.rb

@@ -8,6 +8,7 @@ describe SemanticallyTaggable::TagParentage do
       reset_database!
       import_rdf('dg_abridged.rdf')
       SemanticallyTaggable::TagParentage.refresh_closure!
+      ActiveRecord::Base.logger = Logger.new(STDOUT)
     end
 
     let(:taxonomy_tag) { SemanticallyTaggable::Tag.find_by_name('Directgov Taxonomy') }
@@ -17,7 +18,7 @@ describe SemanticallyTaggable::TagParentage do
 
     specify { taxonomy_tag.should parent(travel_health_tag).at_distance(2) }
     specify { taxonomy_tag.should parent(nhs_direct_tag).at_distance(3) }
-    specify { health_and_care_tag.should parent(nhs_direct_tag).at_distance(2)}
+    specify { health_and_care_tag.should parent(nhs_direct_tag).at_distance(2) }
 
     it "should not make direct connections to indirect tags through narrower_tags" do
       taxonomy_tag.narrower_tags.should_not include(nhs_direct_tag)
@@ -37,9 +38,28 @@ describe SemanticallyTaggable::TagParentage do
         Article.tagged_with('Health and care', :on => :dg_topics).should have(1).article
       end
 
+
       it "should get all articles for the taxonomy" do
         Article.tagged_with('Directgov taxonomy', :on => :dg_topics).should have(2).articles
       end
+
+      describe "The :any option" do
+        subject { Article.tagged_with('Health and care', :on => :dg_topics, :any => true) }
+
+        it { should have(1).article }
+        its(:first) { should eql(@nhs_article) }
+        specify do
+          Article.tagged_with(['Health and care', 'Job Grants'], :on => :dg_topics, :any => true).
+              should have(2).articles
+        end
+      end
+
+      describe "Indirect exclusions" do
+        subject { Article.tagged_with(['Health and care', 'Travel'], :on => :dg_topics, :exclude => true) }
+
+        its(:length) { should eql(1) }
+        its(:first)  { should eql(@jobs_article) }
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,50 +1,51 @@
-$LOAD_PATH << "." unless $LOAD_PATH.include?(".")
-
-begin
-  require "rubygems"
-  require "bundler"
+require 'rubygems'
+require 'spork'
+
+spec_dir = File.dirname(__FILE__)
+Spork.prefork do
+  # Loading more in this block will cause your tests to run faster. However, 
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+  $LOAD_PATH << spec_dir unless $LOAD_PATH.include?(spec_dir)
+  lib_path = File.expand_path(File.join(spec_dir, '../lib'))
+  $LOAD_PATH << lib_path unless $LOAD_PATH.include?(lib_path)
+
+  begin
+    require "rubygems"
+    require "bundler"
+
+    if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.5")
+      raise RuntimeError, "Your bundler version is too old." +
+          "Run `gem install bundler` to upgrade."
+    end
 
-  if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.5")
-    raise RuntimeError, "Your bundler version is too old." +
-        "Run `gem install bundler` to upgrade."
+    # Set up load paths for all bundled gems
+    Bundler.setup(:development)
+  rescue Bundler::GemNotFound
+    raise RuntimeError, "Bundler couldn't find some gems." +
+        "Did you run `bundle install`?"
   end
 
-  # Set up load paths for all bundled gems
-  Bundler.setup
-rescue Bundler::GemNotFound
-  raise RuntimeError, "Bundler couldn't find some gems." +
-      "Did you run `bundle install`?"
-end
-
-Bundler.require
-
-require 'active_record'
+  Bundler.require
 
-ENV['DB'] ||= 'mysql'
+  require 'rspec'
+  require 'active_record'
+  require File.expand_path('../../lib/semantically-taggable', __FILE__)
+  require 'database_seeder'
+  require 'semantically_taggable/shared_spec_helpers'
 
-database_yml = File.expand_path('../database.yml', __FILE__)
-if File.exists?(database_yml)
-  active_record_configuration = YAML.load_file(database_yml)[ENV['DB']]
 
-  ActiveRecord::Base.establish_connection(active_record_configuration)
-  ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
-else
-  raise "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
-end
+  ENV['DB'] ||= 'mysql'
 
-require File.expand_path('../../lib/semantically-taggable', __FILE__)
-require 'database_seeder'
-require 'semantically_taggable/shared_spec_helpers'
+  database_yml = File.expand_path('../database.yml', __FILE__)
+  if File.exists?(database_yml)
+    active_record_configuration = YAML.load_file(database_yml)[ENV['DB']]
 
-unless [].respond_to?(:freq)
-  class Array
-    def freq
-      k = Hash.new(0)
-      each { |e| k[e]+=1 }
-      k
-    end
+    ActiveRecord::Base.establish_connection(active_record_configuration)
+    ActiveRecord::Base.logger = Logger.new(File.join(spec_dir, "debug.log"))
+  else
+    raise "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
   end
-end
 
 # Set @@variable_name in a before(:all) block and give access to it
 # via let(:variable_name)
@@ -57,42 +58,56 @@ end
 # transaction.state.should == 'in_progress'
 # end
 # end
-def set(variable_name, &block)
-  before(:all) do
-    self.class.send(:class_variable_set, "@@#{variable_name}".to_sym, instance_eval(&block))
-  end
+  def set(variable_name, &block)
+    before(:all) do
+      self.class.send(:class_variable_set, "@@#{variable_name}".to_sym, instance_eval(&block))
+    end
 
-  let(variable_name) do
-    self.class.send(:class_variable_get, "@@#{variable_name}".to_sym).tap do |i|
-      if i.respond_to?(:new_record?)
-        i.reload unless i.new_record?
+    let(variable_name) do
+      self.class.send(:class_variable_get, "@@#{variable_name}".to_sym).tap do |i|
+        if i.respond_to?(:new_record?)
+          i.reload unless i.new_record?
+        end
       end
     end
   end
-end
 
-RSpec::Matchers.define :parent do |expected|
-  match do |actual|
-    sql = "SELECT * FROM tag_parentages WHERE parent_tag_id = #{actual.id} AND child_tag_id = #{expected.id} AND distance = #{@distance}"
-    rows = SemanticallyTaggable::TagParentage.find_by_sql(sql)
-    rows.length == 1
-  end
+  RSpec::Matchers.define :parent do |expected|
+    match do |actual|
+      sql = "SELECT * FROM tag_parentages WHERE parent_tag_id = #{actual.id} AND child_tag_id = #{expected.id} AND distance = #{@distance}"
+      rows = SemanticallyTaggable::TagParentage.find_by_sql(sql)
+      rows.length == 1
+    end
 
-  failure_message_for_should do
-    "Expected #{actual.name} to parent #{expected.name} at a distance of #{@distance}"
+    failure_message_for_should do
+      "Expected #{actual.name} to parent #{expected.name} at a distance of #{@distance}"
+    end
+
+    chain :at_distance do |distance|
+      @distance = distance
+    end
   end
 
-  chain :at_distance do |distance|
-    @distance = distance
+  unless [].respond_to?(:freq)
+    class Array
+      def freq
+        k = Hash.new(0)
+        each { |e| k[e]+=1 }
+        k
+      end
+    end
   end
 end
 
-ActiveRecord::Base.silence do
-  ActiveRecord::Migration.verbose = false
+Spork.each_run do
+  # This code will be run each time you run your specs.
+  ActiveRecord::Base.silence do
+    ActiveRecord::Migration.verbose = false
 
-  load(File.dirname(__FILE__) + '/schema.rb')
-  load_schemes!
-  load(File.dirname(__FILE__) + '/models.rb')
-end
+    load(spec_dir + '/schema.rb')
+    load_schemes!
+    load(spec_dir + '/models.rb')
+  end
 
-reset_database!
+  reset_database!
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: semantically-taggable
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Russell Garner
@@ -15,129 +14,134 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +01:00
+date: 2011-07-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
-  name: rails
+  type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: activerecord
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
-  name: activerecord
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: mysql
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: mysql
+  type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+  name: nokogiri
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: nokogiri
+  type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
+  name: rspec
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 2
-        - 4
+        - 5
         - 0
-        version: 2.4.0
-  name: rspec
+        version: 2.5.0
+  type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
+  name: bundler
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  name: bundler
+  type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
+  name: jeweler
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
+  type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
+  name: rcov
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: rcov
+  type: :development
+  prerelease: false
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: spork
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: |-
   Based really very heavily on acts_as_taggable_on, but introduces tagging schemes and moves
     context into tags (so, for example, "Environment" in a 'green_tags' scheme is not semantically equivalent
@@ -201,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1510912516109491173
       segments: 
       - 0
       version: "0"
@@ -210,14 +214,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A semantic tagging system for Rails 3