formtastic 3.1.1 → 3.1.2

data/lib/formtastic.rb

@@ -23,7 +23,7 @@ module Formtastic
   self.deprecation = Formtastic::Deprecation.new('4.0', 'Formtastic')
 
   if defined?(::Rails) && Util.deprecated_version_of_rails?
-    deprecation.warn("Support for Rails < 4.0.4 will be dropped ")
+    deprecation.warn("Support for Rails < #{Util.minimum_version_of_rails} will be dropped")
   end
 
   # @public

data/lib/formtastic/util.rb

@@ -20,33 +20,37 @@ module Formtastic
         text
       end
     end
-    
+
     def rails3?
-      rails_version >= Gem::Version.new("3.0.0") && 
-      rails_version < Gem::Version.new("4.0.0")
+      match?(rails_version, "~> 3.0")
     end
 
     def rails4?
-      rails_version >= Gem::Version.new("4.0.0") && 
-      rails_version < Gem::Version.new("5.0.0")
+      match?(rails_version, "~> 4.0")
     end
-    
+
     def rails4_0?
-      rails_version >= Gem::Version.new("4.0.0") && 
-      rails_version < Gem::Version.new("4.1.0")
+      match?(rails_version, "~> 4.0.0")
     end
 
     def rails4_1?
-      rails_version >= Gem::Version.new("4.1.0") && 
-      rails_version < Gem::Version.new("4.2.0")
+      match?(rails_version, "~> 4.1.0")
     end
-    
+
     def deprecated_version_of_rails?
-      rails_version < Gem::Version.new("4.1.0")
+      match?(rails_version, "< #{minimum_version_of_rails}")
+    end
+
+    def minimum_version_of_rails
+      "4.1.0"
     end
 
     def rails_version
-      Gem::Version.new(::Rails::VERSION::STRING)
+      ::Rails::VERSION::STRING
+    end
+
+    def match?(version, dependency)
+      Gem::Dependency.new("formtastic", dependency).match?("formtastic", version)
     end
 
   end

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

data/spec/util_spec.rb

@@ -4,60 +4,60 @@ require 'spec_helper'
 describe 'Formtastic::Util' do
 
   describe '.deprecated_version_of_rails?' do
-    
+
     subject { Formtastic::Util.deprecated_version_of_rails? }
-    
+
     context '4.0.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.0") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "4.0.0" } }
       it 'should be true' do
         expect(subject).to be_truthy
       end
     end
 
     context '4.0.3' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.3") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "4.0.3" } }
       it 'should be true' do
         expect(subject).to be_truthy
       end
     end
 
     context '4.0.4' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.4") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "4.0.4" } }
       it 'should be false' do
         expect(subject).to be_truthy
       end
     end
 
     context '4.0.5' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.5") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "4.0.5" } }
       it 'should be false' do
         expect(subject).to be_truthy
       end
     end
 
     context '4.1.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.1.1") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "4.1.0" } }
       it 'should be false' do
         expect(subject).to be_falsey
       end
     end
 
     context '4.1.1' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.1.1") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "4.1.1" } }
       it 'should be false' do
         expect(subject).to be_falsey
       end
     end
 
     context '4.2.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.1.1") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "4.2.0" } }
       it 'should be false' do
         expect(subject).to be_falsey
       end
     end
 
     context '5.0.0' do
-      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("5.0.0") } }
+      before { allow(Formtastic::Util).to receive(:rails_version) { "5.0.0" } }
       it 'should be true' do
         expect(subject).to be_falsey
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack