remarkable_activerecord 3.1.4 → 3.1.5

data/lib/remarkable_activerecord/matchers/association_matcher.rb

@@ -8,16 +8,16 @@ module Remarkable
         optionals :select, :conditions, :include, :group, :having, :order, :limit, :offset, :finder_sql, :counter_sql
         optionals :uniq, :readonly, :validate, :autosave, :polymorphic, :counter_cache, :default => true
 
-        collection_assertions :association_exists?, :macro_matches?, :through_exists?, :source_exists?,
-                              :join_table_exists?, :foreign_key_exists?, :polymorphic_exists?,
+        collection_assertions :association_exists?, :macro_matches?, :through_exists?, :source_exists?,
+                              :klass_exists?, :join_table_exists?, :foreign_key_exists?, :polymorphic_exists?,
                               :counter_cache_exists?, :options_match?
 
         protected
 
           def association_exists?
             reflection
-          end
-
+          end
+
           def macro_matches?
             reflection.macro == @macro
           end
@@ -30,6 +30,10 @@ module Remarkable
           def source_exists?
             return true unless @options.key?(:through)
             reflection.source_reflection rescue false
+          end
+
+          def klass_exists?
+            reflection.klass rescue nil
           end
 
           # has_and_belongs_to_many only works if the tables are in the same
@@ -73,10 +77,17 @@ module Remarkable
           def reflection
             @reflection ||= subject_class.reflect_on_association(@association.to_sym)
           end
+
+          def subject_table_name
+            subject_class.table_name.to_s
+          end
 
-          # Rescue nil to avoid raising errors in invalid through associations
           def reflection_class_name
             reflection.class_name.to_s rescue nil
+          end
+
+          def reflection_table_name
+            reflection.klass.table_name.to_s rescue nil
           end
 
           def reflection_foreign_key
@@ -107,9 +118,9 @@ module Remarkable
             elsif reflection.macro == :has_and_belongs_to_many
               reflection.options[:join_table]
             elsif reflection.macro == :belongs_to
-              subject_class.table_name
+              subject_table_name
             else
-              reflection.klass.table_name
+              reflection_table_name
             end
           end
 
@@ -132,14 +143,14 @@ module Remarkable
             if @subject && reflection
               options.merge!(
                 :actual_macro         => Remarkable.t(reflection.macro, :scope => matcher_i18n_scope, :default => reflection.macro.to_s),
-                :subject_table        => subject_class.table_name.inspect,
-                :reflection_table     => reflection.klass.table_name.inspect,
+                :subject_table        => subject_table_name.inspect,
+                :reflection_table     => reflection_table_name.inspect,
                 :foreign_key_table    => foreign_key_table.inspect,
                 :polymorphic_column   => reflection_foreign_key.sub(/_id$/, '_type').inspect,
                 :counter_cache_column => reflection.counter_cache_column.to_s.inspect,
                 :join_table           => reflection.options[:join_table].inspect,
                 :foreign_key          => reflection_foreign_key.inspect
-              ) rescue nil # rescue to allow specs to run properly
+              )
             end
 
             options

data/locale/en.yml

@@ -53,10 +53,11 @@ en:
         has_one: have one
         description: "{{macro}} {{associations}}"
         expectations:
-          association_exists: "{{subject_name}} records {{macro}} {{association}}, got no association"
+          association_exists: "{{subject_name}} records {{macro}} {{association}}, but the association does not exist"
           macro_matches: "{{subject_name}} records {{macro}} {{association}}, got {{subject_name}} records {{actual_macro}} {{association}}"
           through_exists: "{{subject_name}} records {{macro}} {{association}} through {{through}}, through association does not exist"
-          source_exists: "{{subject_name}} records {{macro}} {{association}} through {{through}}, source association does not exist"
+          source_exists: "{{subject_name}} records {{macro}} {{association}} through {{through}}, source association does not exist"
+          klass_exists: "{{subject_name}} records {{macro}} {{association}}, but the association class does not exist"
           join_table_exists: "join table {{join_table}} to exist, but does not"
           foreign_key_exists: "foreign key {{foreign_key}} to exist on {{foreign_key_table}}, but does not"
           polymorphic_exists: "{{subject_table}} to have {{polymorphic_column}} as column, but does not"

data/spec/association_matcher_spec.rb

@@ -8,11 +8,13 @@ describe 'association_matcher' do
     # Defines a model, create a validation and returns a raw matcher
     def define_and_validate(options={})
       columns = options.delete(:association_columns) || { :projects_count => :integer }
-      define_model :company, columns
+      define_model :company, columns
+      define_model :super_company, columns
 
       columns = options.delete(:model_columns) || { :company_id => :integer, :company_type => :string }
       @model = define_model :project, columns do
-        belongs_to :company, options
+        belongs_to :company, options
+        belongs_to :unknown
       end
 
       belong_to :company
@@ -47,7 +49,7 @@ describe 'association_matcher' do
         define_and_validate
         matcher = belong_to('whatever')
         matcher.matches?(@model)
-        matcher.failure_message.should == 'Expected Project records belong to whatever, got no association'
+        matcher.failure_message.should == 'Expected Project records belong to whatever, but the association does not exist'
       end
 
       it 'should set macro_matches? message' do
@@ -55,6 +57,13 @@ describe 'association_matcher' do
         matcher = have_one('company')
         matcher.matches?(@model)
         matcher.failure_message.should == 'Expected Project records have one company, got Project records belong to company'
+      end
+
+      it 'should set klass_exists? message' do
+        define_and_validate
+        matcher = belong_to('unknown')
+        matcher.matches?(@model)
+        matcher.failure_message.should == 'Expected Project records belong to unknown, but the association class does not exist'
       end
 
       it 'should set foreign_key_exists? message' do
@@ -92,7 +101,8 @@ describe 'association_matcher' do
       describe 'without options' do
         before(:each){ define_and_validate }
 
-        it { should belong_to(:company) }
+        it { should belong_to(:company) }
+        it { should_not belong_to(:unknown) }
         it { should_not belong_to(:project) }
         it { should_not have_one(:company) }
         it { should_not have_many(:company) }
@@ -157,7 +167,8 @@ describe 'association_matcher' do
         m.class_name = "Company"
         m.foreign_key = :company_id
       end
-
+
+      should_not_belong_to :unknown
       should_not_belong_to :project
       should_not_have_one  :company
       should_not_have_many :companies
@@ -173,7 +184,8 @@ describe 'association_matcher' do
 
     # Defines a model, create a validation and returns a raw matcher
     def define_and_validate(options={})
-      define_model :label
+      define_model :label
+      define_model :super_label
 
       columns = options.delete(:association_columns) || [ :label_id, :project_id ]
       create_table(options.delete(:association_table) || :labels_projects) do |table|
@@ -209,7 +221,7 @@ describe 'association_matcher' do
         define_and_validate
         matcher = have_and_belong_to_many('whatever')
         matcher.matches?(@model)
-        matcher.failure_message.should == 'Expected Project records have and belong to many whatever, got no association'
+        matcher.failure_message.should == 'Expected Project records have and belong to many whatever, but the association does not exist'
       end
 
       it 'should set macro_matches? message' do
@@ -365,7 +377,7 @@ describe 'association_matcher' do
         define_and_validate
         matcher = have_many('whatever')
         matcher.matches?(@model)
-        matcher.failure_message.should == 'Expected Project records have many whatever, got no association'
+        matcher.failure_message.should == 'Expected Project records have many whatever, but the association does not exist'
       end
 
       it 'should set macro_matches? message' do
@@ -502,7 +514,8 @@ describe 'association_matcher' do
 
       @model = define_model :project, options.delete(:model_columns) || {} do
         has_many :project_managers unless options.delete(:skip_through)
-        has_one  :manager, options
+        has_one  :manager, options
+        has_one  :unknown
       end
 
       have_one :manager
@@ -524,8 +537,15 @@ describe 'association_matcher' do
         define_and_validate
         matcher = have_one('whatever')
         matcher.matches?(@model)
-        matcher.failure_message.should == 'Expected Project records have one whatever, got no association'
+        matcher.failure_message.should == 'Expected Project records have one whatever, but the association does not exist'
       end
+
+      it 'should set klass_exists? message' do
+        define_and_validate
+        matcher = have_one('unknown')
+        matcher.matches?(@model)
+        matcher.failure_message.should == 'Expected Project records have one unknown, but the association class does not exist'
+      end
 
       it 'should set macro_matches? message' do
         define_and_validate
@@ -570,7 +590,8 @@ describe 'association_matcher' do
       describe 'without options' do
         before(:each){ define_and_validate }
 
-        it { should have_one(:manager) }
+        it { should have_one(:manager) }
+        it { should_not have_one(:unknown) }
         it { should_not belong_to(:manager) }
         it { should_not have_many(:managers) }
         it { should_not have_and_belong_to_many(:managers) }
@@ -634,7 +655,8 @@ describe 'association_matcher' do
         m.validate
         m.through = :project_managers
       end
-
+
+      should_not_have_one :unknown
       should_not_have_one :manager, :validate => false
       should_not_have_one :manager, :through => :another_thing
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_activerecord
 version: !ruby/object:Gem::Version 
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors: 
 - Carlos Brando
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-29 00:00:00 +02:00
+date: 2009-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.4
+        version: 3.1.5
     version: 
 description: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
 email: