chore: add rails4 support

Appraisals

@@ -1,3 +1,7 @@
-appraise 'activesupport3.2' do
-  gem 'activesupport', '~> 3.2.0'
+appraise 'rails3.2' do
+  gem 'rails', '~> 3.2.0'
+end
+
+appraise 'rails4.0' do
+  gem 'rails', '~> 4.0.0'
 end

lib/treasury/fields/base.rb

@@ -446,7 +446,7 @@ def self.accessing_field
 
       def data_changed(changed_objects)
         @changed_objects = changed_objects
-        run_callbacks(:data_changed, :after)
+        run_callbacks :data_changed
       end
 
       # Public: Рабочее соединение с БД для данной очереди.

spec/lib/treasury/fields/base_spec.rb

@@ -7,9 +7,7 @@ module FieldCallback
     set_callback :data_changed, :after, :data_changed_callback
   end
 
-  module InstanceMethods
-    def data_changed_callback; end
-  end
+  def data_changed_callback; end
 end
 
 class TreasuryFieldsBase < Treasury::Fields::Base
@@ -23,7 +21,7 @@ class TreasuryFieldsBase < Treasury::Fields::Base
     let(:chaged_objects) { [1, 2, 3] }
 
     it 'run callbacks' do
-      expect(subject).to receive(:run_callbacks).with(:data_changed, :after)
+      expect(subject).to receive(:run_callbacks).with(:data_changed)
       subject.send(:data_changed, chaged_objects)
     end
 

spec/lib/treasury/processors/base_spec.rb

@@ -130,7 +130,7 @@ def form_value(value)
     end
 
     it 'должен вызывать метод API pgq_next_batch и транслировать родительское исключение, если не обработано' do
-      allow(ActiveRecord::Base).to receive(:pgq_next_batch).and_raise(ActiveRecord::StatementInvalid)
+      allow(ActiveRecord::Base).to receive(:pgq_next_batch).and_raise(ActiveRecord::StatementInvalid.new(''))
       expect { subject.send(:get_batch) }.to raise_error(ActiveRecord::StatementInvalid)
     end
   end

spec/models/field_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-describe Treasury::Models::Field do
+describe Treasury::Models::Field, type: :model do
   context 'when check db structure' do
     it { is_expected.to have_db_column(:title).of_type(:string).with_options(limit: 128, null: false) }
     it { is_expected.to have_db_column(:group).of_type(:string).with_options(limit: 128, null: false) }

spec/models/queue_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-describe Treasury::Models::Queue do
+describe Treasury::Models::Queue, type: :model do
   context 'when check db structure' do
     it { is_expected.to have_db_column(:name).of_type(:string).with_options(limit: 128, null: false) }
     it { is_expected.to have_db_column(:table_name).of_type(:string).with_options(limit: 256, null: true) }

spec/spec_helper.rb

@@ -9,7 +9,7 @@
 require 'pry-byebug'
 
 SimpleCov.start do
-  minimum_coverage 73.5
+  minimum_coverage 73
 end
 
 Combustion.initialize! :action_mailer, :active_record
@@ -32,3 +32,13 @@
   config.before(:each) { Treasury.configuration.redis.flushall }
   config.after(:each) { Treasury.configuration.redis.flushall }
 end
+
+if Rails::VERSION::MAJOR >= 4
+  Shoulda::Matchers.configure do |config|
+    config.integrate do |with|
+      with.test_framework :rspec
+
+      with.library :rails
+    end
+  end
+end