From 994ce87bbda7cc4b0059c951b06cdd15dc26cb97 Mon Sep 17 00:00:00 2001
From: Iain Beeston <iain.beeston@gmail.com>
Date: Mon, 3 Oct 2016 14:06:11 +0100
Subject: Moved database-specific ActiveModel types into ActiveRecord

ie. DecimalWithoutScale, Text and UnsignedInteger
---
 activemodel/CHANGELOG.md                               |  4 ++++
 activemodel/lib/active_model/type.rb                   |  4 ----
 .../lib/active_model/type/decimal_without_scale.rb     | 11 -----------
 activemodel/lib/active_model/type/text.rb              | 11 -----------
 activemodel/lib/active_model/type/unsigned_integer.rb  | 15 ---------------
 activemodel/test/cases/type/unsigned_integer_test.rb   | 18 ------------------
 6 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 activemodel/lib/active_model/type/decimal_without_scale.rb
 delete mode 100644 activemodel/lib/active_model/type/text.rb
 delete mode 100644 activemodel/lib/active_model/type/unsigned_integer.rb
 delete mode 100644 activemodel/test/cases/type/unsigned_integer_test.rb

(limited to 'activemodel')

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 10f1de6706..5242014a4f 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Moved DecimalWithoutScale, Text, and UnsignedInteger from Active Model to Active Record
+
+    *Iain Beeston*
+
 *   Removed deprecated `:tokenizer` in the length validator.
 
     *Rafael Mendonça França*
diff --git a/activemodel/lib/active_model/type.rb b/activemodel/lib/active_model/type.rb
index 313f17830f..a4e5a060f7 100644
--- a/activemodel/lib/active_model/type.rb
+++ b/activemodel/lib/active_model/type.rb
@@ -7,14 +7,11 @@ require "active_model/type/boolean"
 require "active_model/type/date"
 require "active_model/type/date_time"
 require "active_model/type/decimal"
-require "active_model/type/decimal_without_scale"
 require "active_model/type/float"
 require "active_model/type/immutable_string"
 require "active_model/type/integer"
 require "active_model/type/string"
-require "active_model/type/text"
 require "active_model/type/time"
-require "active_model/type/unsigned_integer"
 
 require "active_model/type/registry"
 
@@ -53,7 +50,6 @@ module ActiveModel
     register(:immutable_string, Type::ImmutableString)
     register(:integer, Type::Integer)
     register(:string, Type::String)
-    register(:text, Type::Text)
     register(:time, Type::Time)
   end
 end
diff --git a/activemodel/lib/active_model/type/decimal_without_scale.rb b/activemodel/lib/active_model/type/decimal_without_scale.rb
deleted file mode 100644
index 985e1038ed..0000000000
--- a/activemodel/lib/active_model/type/decimal_without_scale.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "active_model/type/big_integer"
-
-module ActiveModel
-  module Type
-    class DecimalWithoutScale < BigInteger # :nodoc:
-      def type
-        :decimal
-      end
-    end
-  end
-end
diff --git a/activemodel/lib/active_model/type/text.rb b/activemodel/lib/active_model/type/text.rb
deleted file mode 100644
index 7c0d647706..0000000000
--- a/activemodel/lib/active_model/type/text.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "active_model/type/string"
-
-module ActiveModel
-  module Type
-    class Text < String # :nodoc:
-      def type
-        :text
-      end
-    end
-  end
-end
diff --git a/activemodel/lib/active_model/type/unsigned_integer.rb b/activemodel/lib/active_model/type/unsigned_integer.rb
deleted file mode 100644
index 288fa23efe..0000000000
--- a/activemodel/lib/active_model/type/unsigned_integer.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ActiveModel
-  module Type
-    class UnsignedInteger < Integer # :nodoc:
-      private
-
-        def max_value
-          super * 2
-        end
-
-        def min_value
-          0
-        end
-    end
-  end
-end
diff --git a/activemodel/test/cases/type/unsigned_integer_test.rb b/activemodel/test/cases/type/unsigned_integer_test.rb
deleted file mode 100644
index 026cb08a06..0000000000
--- a/activemodel/test/cases/type/unsigned_integer_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require "cases/helper"
-require "active_model/type"
-
-module ActiveModel
-  module Type
-    class UnsignedIntegerTest < ActiveModel::TestCase
-      test "unsigned int max value is in range" do
-        assert_equal(4294967295, UnsignedInteger.new.serialize(4294967295))
-      end
-
-      test "minus value is out of range" do
-        assert_raises(ActiveModel::RangeError) do
-          UnsignedInteger.new.serialize(-1)
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3