foreigner-matcher 0.0.2 → 0.0.3

data/.gitignore

@@ -2,7 +2,7 @@
 .bundle
 .rvmrc
 .rspec
-Gemfile.lock
 pkg/*
 doc/*
 spec/config/database.yml
+*.swp

data/Gemfile

@@ -8,9 +8,8 @@ group :development do
 end
 
 group :test do
-  gem "rspec",        "~> 2.5"
-  gem "ruby-debug",   "~> 0.10.4"
-  gem "activerecord", ">= 2.3.11"
+  gem "rspec",        "~> 2.6.0"
+  gem "activerecord", "~> 3.0.0"
   gem "mysql2",       "~> 0.2.7"
   gem "mysql",        "~> 2.8.1"
 end

data/Gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: .
+  specs:
+    foreigner-matcher (0.0.2)
+      foreigner (~> 0.9.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.8)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    foreigner (0.9.2)
+    i18n (0.5.0)
+    kramdown (0.13.3)
+    mysql (2.8.1)
+    mysql2 (0.2.10)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  foreigner-matcher!
+  kramdown (~> 0.13.2)
+  mysql (~> 2.8.1)
+  mysql2 (~> 0.2.7)
+  rspec (~> 2.6.0)

data/README.md

@@ -46,6 +46,13 @@ In addition to the table name, you can include any options that add_foreign_key
 
 These examples will also work passing <tt>:user</tt> as the table name. Why? The example has a <tt>belongs_to</tt> relationship, and my feeling is that it reads better to say "it should have foreign key for user". This is just my taste; use what makes sense to you!
 
+## My Testing Environment
+
+Specs have been run with [Ruby 1.9.2p180](http://www.ruby-lang.org/) and [Ruby Enterprise Edition 2011.03](http://www.rubyenterpriseedition.com/) with the following combinations:
+
+* ActiveRecord ~> 3.0.0, Rspec ~> 2.6.0
+* ActiveRecord ~> 2.3.11, Rsepc ~> 1.3.2
+
 ## Copyright
 
 Copyright (c) 2011 Cameron Dykes. See LICENSE.txt for further details.

data/lib/foreigner-matcher.rb

@@ -13,16 +13,16 @@ module ForeignerMatcher # :nodoc:
 
     def description
       desc  = "have a foreign key for #{@parent}"
-      desc += " with #{@options.inspect}" unless @options.empty?
+      desc += " with #{ordered_options}" unless @options.empty?
       desc
     end
 
     def failure_message_for_should
-      "expected #{child_foreign_keys} to include #{foreign_key_definition}"
+      "expected #{display_child_foreign_keys} to include #{foreign_key_definition}"
     end
 
     def failure_message_for_should_not
-      "expected #{child_foreign_keys} to exclude #{foreign_key_definition}"
+      "expected #{display_child_foreign_keys} to exclude #{foreign_key_definition}"
     end
 
     private
@@ -37,6 +37,19 @@ module ForeignerMatcher # :nodoc:
     def child_foreign_keys
       @child.connection.foreign_keys(@child.class.table_name)
     end
+
+    def ordered_options
+      ordered = @options.to_a.sort { |a,b| a[0].to_s <=> b[0].to_s }
+      display = "{"
+      display << ordered.collect { |opt| "#{opt[0].inspect}=>#{opt[1].inspect}" }.join(', ')
+      display << "}"
+      display
+    end
+
+    def display_child_foreign_keys
+      fks = child_foreign_keys
+      fks.empty? ? 'foreign keys' : fks
+    end
   end
 
 end

data/lib/foreigner-matcher/version.rb

@@ -1,5 +1,5 @@
 module Foreigner
   module Matcher
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'ruby-debug'
 require 'yaml'
 require 'active_record'
 require 'foreigner-matcher'

data/spec/test_models/table_without_foreign_key_spec.rb

@@ -10,12 +10,12 @@ describe TableWithoutForeignKey do
 
     it 'should set failure_message_for_should message' do
       matcher.matches?(subject)
-      matcher.failure_message_for_should.should == "expected  to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('table_without_foreign_keys', 'users', :primary_key => 'id', :column => 'user_id', :name => 'table_without_foreign_keys_user_id_fk')}"
+      matcher.failure_message_for_should.should == "expected foreign keys to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('table_without_foreign_keys', 'users', :primary_key => 'id', :column => 'user_id', :name => 'table_without_foreign_keys_user_id_fk')}"
     end
 
     it 'should set failure_message_for_should_not message' do
       matcher.matches?(subject)
-      matcher.failure_message_for_should_not.should == "expected  to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('table_without_foreign_keys', 'users', :primary_key => 'id', :column => 'user_id', :name => 'table_without_foreign_keys_user_id_fk')}"
+      matcher.failure_message_for_should_not.should == "expected foreign keys to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('table_without_foreign_keys', 'users', :primary_key => 'id', :column => 'user_id', :name => 'table_without_foreign_keys_user_id_fk')}"
     end
   end
 

metadata

@@ -1,51 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: foreigner-matcher
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Cameron Dykes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-12 00:00:00 -05:00
+date: 2011-06-17 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: foreigner
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &14843940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  version_requirements: *id001
-description: Adds rspec matcher to verify the presence of foreign keys generated by Foreigner in a table schema
-email: 
+  prerelease: false
+  version_requirements: *14843940
+description: Adds rspec matcher to verify the presence of foreign keys generated by
+  Foreigner in a table schema
+email:
 - yellow5c@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -65,45 +53,26 @@ files:
 has_rdoc: true
 homepage: https://github.com/yellow5/foreigner-matcher
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: foreigner-matcher
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rspec matcher for testing the presence of foreign keys generated by Foreigner
-test_files: 
-- spec/config/database.yml.example
-- spec/foreigner_matcher_spec.rb
-- spec/spec_helper.rb
-- spec/support/test_models.rb
-- spec/test_models/comment_spec.rb
-- spec/test_models/search_spec.rb
-- spec/test_models/special_user_record_spec.rb
-- spec/test_models/table_without_foreign_key_spec.rb
-- spec/test_models/user_login_spec.rb
-- spec/test_models/user_type_spec.rb
+test_files: []