remockable 0.2.1 → 0.3.0

data/lib/remockable/active_record/have_and_belong_to_many.rb

@@ -1,30 +1,33 @@
-RSpec::Matchers.define(:have_and_belong_to_many) do |*association|
-  extend Remockable::ActiveRecord::Helpers
+RSpec::Matchers.define(:have_and_belong_to_many) do
+  include Remockable::ActiveRecord::Helpers
 
-  @expected = association.extract_options!
-  @association = association.shift
-
-  valid_options %w(class_name join_table foreign_key association_foreign_key
-    validate autosave)
+  valid_options %i(
+    association_foreign_key
+    autosave
+    class_name
+    foreign_key
+    join_table
+    validate
+  )
 
   match do |actual|
-    if association = subject.class.reflect_on_association(@association)
+    if association = subject.class.reflect_on_association(attribute)
       macro_matches = association.macro == :has_and_belongs_to_many
-      options_match = association.options.slice(*expected.keys) == expected
+      options_match = association.options.slice(*options.keys) == options
       macro_matches && options_match
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{expected.inspect}" if expected.any?
-    "have and belong to #{@association}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "have and belong to #{attribute}#{with}"
   end
 end

data/lib/remockable/active_record/have_column.rb

@@ -1,27 +1,30 @@
-RSpec::Matchers.define(:have_column) do |*column|
-  extend Remockable::ActiveRecord::Helpers
+RSpec::Matchers.define(:have_column) do
+  include Remockable::ActiveRecord::Helpers
 
-  @expected = column.extract_options!
-  @column = column.shift
+  valid_options %i(default limit null precision scale type)
 
-  valid_options %w(default limit null precision scale type)
+  def column
+    @column ||= subject.class.columns.detect { |column|
+      column.name == attribute.to_s
+    }
+  end
 
   match do |actual|
-    if column = subject.class.columns.detect { |column| column.name == @column.to_s }
-      @expected.all? { |key, value| column.send(key).should == value }
+    if column
+      options.all? { |key, value| column.send(key) == value }
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{expected.inspect}" if expected.any?
-    "have column #{@column}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "have column #{attribute}#{with}"
   end
 end

data/lib/remockable/active_record/have_default_scope.rb

@@ -1,23 +1,22 @@
-RSpec::Matchers.define(:have_default_scope) do |*expected|
-  extend Remockable::ActiveRecord::Helpers
+RSpec::Matchers.define(:have_default_scope) do
+  include Remockable::ActiveRecord::Helpers
 
-  @expected = expected.extract_options!
-  @relation = nil
+  attr_accessor :relation
 
-  valid_options %w()
+  valid_options %i()
 
   match do |actual|
     if subject.class.respond_to?(:all)
       scope = subject.class.all
 
       if scope.is_a?(ActiveRecord::Relation)
-        if @relation
-          query_matches = scope.arel.to_sql == @relation.arel.to_sql
-          eager_load_matches = scope.eager_load_values == @relation.eager_load_values
-          includes_matches = scope.includes_values == @relation.includes_values
-          lock_matches = scope.lock_value == @relation.lock_value
-          preload_matches = scope.preload_values == @relation.preload_values
-          readonly_matches = scope.readonly_value == @relation.readonly_value
+        if relation
+          query_matches = scope.arel.to_sql == relation.arel.to_sql
+          eager_load_matches = scope.eager_load_values == relation.eager_load_values
+          includes_matches = scope.includes_values == relation.includes_values
+          lock_matches = scope.lock_value == relation.lock_value
+          preload_matches = scope.preload_values == relation.preload_values
+          readonly_matches = scope.readonly_value == relation.readonly_value
 
           query_matches && eager_load_matches && includes_matches && lock_matches && preload_matches && readonly_matches
         elsif subject.class.respond_to?(:default_scopes) # Rails 3.1
@@ -30,28 +29,47 @@ RSpec::Matchers.define(:have_default_scope) do |*expected|
   end
 
   def method_missing(method, *args, &block)
-    unsupported_query_methods = %(create_with eager_load includes lock preload readonly)
-    query_methods = %w(from group having joins limit offset order reorder select where)
+    unsupported_query_methods = %i(
+      create_with
+      eager_load
+      includes
+      lock
+      preload
+      readonly
+    )
 
-    if query_methods.include?(method.to_s)
-      @relation ||= subject.class.unscoped
-      @relation = @relation.send(method, *args)
+    query_methods = %i(
+      from
+      group
+      having
+      joins
+      limit
+      offset
+      order
+      reorder
+      select
+      where
+    )
+
+    if query_methods.include?(method)
+      self.relation ||= subject.class.unscoped
+      self.relation = relation.send(method, *args)
       self
     else
       super
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{@expected.inspect}" if @expected.any?
+    with = " with #{options.inspect}" if options.any?
     "have a default scope#{with}"
   end
 end

data/lib/remockable/active_record/have_index.rb

@@ -1,18 +1,17 @@
-RSpec::Matchers.define(:have_index) do |*columns|
-  extend Remockable::ActiveRecord::Helpers
+RSpec::Matchers.define(:have_index) do
+  include Remockable::ActiveRecord::Helpers
 
-  @expected = columns.extract_options!
-  @columns = columns
+  valid_options %i(name unique)
 
-  valid_options %w(name unique)
+  def column_names
+    @column_names ||= expected_as_array.flatten.collect(&:to_s)
+  end
 
   match do |actual|
-    name = @expected[:name]
-    unique = @expected[:unique]
+    name = options[:name]
+    unique = options[:unique]
     indexes = ActiveRecord::Base.connection.indexes(subject.class.table_name)
 
-    column_names = @columns.flatten.collect(&:to_s)
-
     index = indexes.detect do |index|
       if column_names.any?
         index.columns == column_names
@@ -33,16 +32,16 @@ RSpec::Matchers.define(:have_index) do |*columns|
     index.name == name.to_s
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{expected.inspect}" if expected.any?
-    "have index on #{@columns.to_sentence}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "have index on #{column_names.to_sentence}#{with}"
   end
 end

data/lib/remockable/active_record/have_many.rb

@@ -1,30 +1,39 @@
-RSpec::Matchers.define(:have_many) do |*association|
-  extend Remockable::ActiveRecord::Helpers
+RSpec::Matchers.define(:have_many) do
+  include Remockable::ActiveRecord::Helpers
 
-  @expected = association.extract_options!
-  @association = association.shift
-
-  valid_options %w(class_name foreign_key primary_key dependent counter_cache
-    as through source source_type validate autosave inverse_of)
+  valid_options %i(
+    as
+    autosave
+    class_name
+    counter_cache
+    dependent
+    foreign_key
+    inverse_of
+    primary_key
+    source
+    source_type
+    through
+    validate
+  )
 
   match do |actual|
-    if association = subject.class.reflect_on_association(@association)
+    if association = subject.class.reflect_on_association(attribute)
       macro_matches = association.macro == :has_many
-      options_match = association.options.slice(*expected.keys) == expected
+      options_match = association.options.slice(*options.keys) == options
       macro_matches && options_match
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{expected.inspect}" if expected.any?
-    "have many #{@association}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "have many #{attribute}#{with}"
   end
 end

data/lib/remockable/active_record/have_one.rb

@@ -1,30 +1,38 @@
-RSpec::Matchers.define(:have_one) do |*association|
-  extend Remockable::ActiveRecord::Helpers
+RSpec::Matchers.define(:have_one) do
+  include Remockable::ActiveRecord::Helpers
 
-  @expected = association.extract_options!
-  @association = association.shift
-
-  valid_options %w(class_name dependent foreign_key primary_key as through
-    source source_type validate autosave inverse_of)
+  valid_options %i(
+    class_name
+    dependent
+    foreign_key
+    primary_key
+    as
+    through
+    source
+    source_type
+    validate
+    autosave
+    inverse_of
+  )
 
   match do |actual|
-    if association = subject.class.reflect_on_association(@association)
+    if association = subject.class.reflect_on_association(attribute)
       macro_matches = association.macro == :has_one
-      options_match = association.options.slice(*expected.keys) == expected
+      options_match = association.options.slice(*options.keys) == options
       macro_matches && options_match
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{expected.inspect}" if expected.any?
-    "have a #{@association}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "have a #{attribute}#{with}"
   end
 end

data/lib/remockable/active_record/have_scope.rb

@@ -1,29 +1,27 @@
 RSpec::Matchers.define(:have_scope) do |*name|
-  extend Remockable::ActiveRecord::Helpers
+  include Remockable::ActiveRecord::Helpers
 
-  @expected = name.extract_options!
-  @name = name.shift
-  @relation = nil
+  attr_accessor :relation
 
-  valid_options %w(with)
+  valid_options %i(with)
 
   match do |actual|
-    if subject.class.respond_to?(@name)
-      scope = if @expected.key?(:with)
-        with = [@expected[:with]] unless @expected[:with].is_a?(Array)
-        subject.class.send(@name, *with)
+    if subject.class.respond_to?(attribute)
+      scope = if options.key?(:with)
+        with = [options[:with]] unless options[:with].is_a?(Array)
+        subject.class.send(attribute, *with)
       else
-        subject.class.send(@name)
+        subject.class.send(attribute)
       end
 
       if scope.is_a?(ActiveRecord::Relation)
-        if @relation
-          query_matches = scope.arel.to_sql == @relation.arel.to_sql
-          eager_load_matches = scope.eager_load_values == @relation.eager_load_values
-          includes_matches = scope.includes_values == @relation.includes_values
-          lock_matches = scope.lock_value == @relation.lock_value
-          preload_matches = scope.preload_values == @relation.preload_values
-          readonly_matches = scope.readonly_value == @relation.readonly_value
+        if relation
+          query_matches = scope.arel.to_sql == relation.arel.to_sql
+          eager_load_matches = scope.eager_load_values == relation.eager_load_values
+          includes_matches = scope.includes_values == relation.includes_values
+          lock_matches = scope.lock_value == relation.lock_value
+          preload_matches = scope.preload_values == relation.preload_values
+          readonly_matches = scope.readonly_value == relation.readonly_value
 
           query_matches && eager_load_matches && includes_matches && lock_matches && preload_matches && readonly_matches
         else
@@ -35,27 +33,44 @@ RSpec::Matchers.define(:have_scope) do |*name|
 
   def method_missing(method, *args, &block)
     unsupported_query_methods = %(create_with)
-    query_methods = %w(eager_load from group having includes joins limit lock offset order preload readonly reorder select where)
 
-    if query_methods.include?(method.to_s)
-      @relation ||= subject.class.all
-      @relation = @relation.send(method, *args)
+    query_methods = %i(
+      eager_load
+      from
+      group
+      having
+      includes
+      joins
+      limit
+      lock
+      offset
+      order
+      preload
+      readonly
+      reorder
+      select
+      where
+    )
+
+    if query_methods.include?(method)
+      self.relation ||= subject.class.all
+      self.relation = relation.send(method, *args)
       self
     else
       super
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{@expected.inspect}" if @expected.any?
-    "have scope #{@name}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "have scope #{attribute}#{with}"
   end
 end

data/lib/remockable/active_record/helpers.rb

@@ -1,8 +1,11 @@
+require 'active_support/concern'
+
 require 'remockable/helpers'
 
 module Remockable
   module ActiveRecord
     module Helpers
+      extend ActiveSupport::Concern
       include Remockable::Helpers
     end
   end

data/lib/remockable/active_record/validate_associated.rb

@@ -1,27 +1,25 @@
-RSpec::Matchers.define(:validate_associated) do |*attribute|
-  extend Remockable::ActiveModel::Helpers
+RSpec::Matchers.define(:validate_associated) do
+  include Remockable::ActiveModel::Helpers
 
-  @type = :associated
-  @expected = attribute.extract_options!
-  @attribute = attribute.shift
+  type :associated
 
-  valid_options %w(if message on unless)
+  valid_options %i(if message on unless)
 
   match do |actual|
-    validator = validator_for(@attribute)
+    validator = validator_for(attribute)
     validator && options_match(validator) && conditionals_match(validator)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} #{@attribute}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "validate #{type} #{attribute}#{with}"
   end
 end

data/lib/remockable/active_record/validate_uniqueness_of.rb

@@ -1,27 +1,35 @@
-RSpec::Matchers.define(:validate_uniqueness_of) do |*attribute|
-  extend Remockable::ActiveModel::Helpers
+require 'rspec/expectations'
 
-  @type = :uniqueness
-  @expected = attribute.extract_options!
-  @attribute = attribute.shift
+RSpec::Matchers.define :validate_uniqueness_of do |expected|
+  include Remockable::ActiveModel::Helpers
 
-  valid_options %w(allow_nil allow_blank case_sensitive if message scope unless)
+  type :uniqueness
+
+  valid_options %i(
+    allow_blank
+    allow_nil
+    case_sensitive
+    if
+    message
+    scope
+    unless
+  )
 
   match do |actual|
-    validator = validator_for(@attribute)
+    validator = validator_for(attribute)
     validator && options_match(validator) && conditionals_match(validator)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "Expected #{subject.class.name} to #{description}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "Did not expect #{subject.class.name} to #{description}"
   end
 
   description do
-    with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attribute}#{with}"
+    with = " with #{options.inspect}" if options.any?
+    "validate #{type} of #{attribute}#{with}"
   end
 end

data/lib/remockable/helpers.rb

@@ -1,16 +1,68 @@
+require 'active_support/concern'
+
 module Remockable
   module Helpers
-    def unsupported_options(keys)
-      @expected.keys.each do |key|
-        if keys.collect(&:to_sym).include?(key.to_sym)
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def type(type)
+        define_method :type do
+          type
+        end
+      end
+
+      def unsupported_options(keys)
+        define_method :unsupported_options do
+          keys
+        end
+      end
+
+      def valid_options(keys)
+        define_method :valid_options do
+          keys
+        end
+      end
+    end
+
+    def attribute
+      @attribute ||= expected_as_array.first
+    end
+
+    def options
+      @options ||= expected_as_array.extract_options!
+    end
+
+    def matches?(actual)
+      validate_options!
+      super
+    end
+
+    def unsupported_options
+      []
+    end
+
+    def valid_options
+      []
+    end
+
+    def validate_options!
+      check_unsupported_options!
+      check_valid_options!
+    end
+
+  private
+
+    def check_unsupported_options!
+      options.each_key do |key|
+        if unsupported_options.include?(key.to_sym)
           raise ArgumentError.new("Unsupported option #{key.inspect}")
         end
       end
     end
 
-    def valid_options(keys)
-      @expected.keys.each do |key|
-        unless keys.collect(&:to_sym).include?(key.to_sym)
+    def check_valid_options!
+      options.each_key do |key|
+        unless valid_options.include?(key.to_sym)
           raise ArgumentError.new("Unknown option #{key.inspect}")
         end
       end

data/lib/remockable/version.rb

@@ -1,3 +1,3 @@
 module Remockable
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/remockable.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activemodel', '~> 4.0'
   spec.add_dependency 'activerecord', '~> 4.0'
   spec.add_dependency 'activesupport', '~> 4.0'
-  spec.add_dependency 'rspec-core', '~> 2.0'
-  spec.add_dependency 'rspec-expectations', '~> 2.0'
-  spec.add_dependency 'rspec-mocks', '~> 2.0'
+  spec.add_dependency 'rspec-core', '~> 3.0'
+  spec.add_dependency 'rspec-expectations', '~> 3.0'
+  spec.add_dependency 'rspec-mocks', '~> 3.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'sqlite3', '~> 1.3.4'