apique 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2abc44aee04063bac64d15d2fded5de9af1f76cf
-  data.tar.gz: 7052d6f9a055809dcb3552191a548d3fb60a8b2d
+  metadata.gz: b4fb201ba3e1237c4c5779dfe00ae621ffd80a8e
+  data.tar.gz: fa83c66d37985ca2320896c9580e475b5da114af
 SHA512:
-  metadata.gz: 5129c3710bc99de5fc2e01cee6b38fbf01b3ddcec925f1ed0d1e406c57f0a0bfff316805caa2a8deb92bfbf2ebb1e4c5739b62c4adddbe965244555022e91f4d
-  data.tar.gz: 48fc61433beb3a60d23a28604d2ff554fd8b45dfc0c6a275ba047ca64773b39218e4381af5a690960d6bdae6ec50eee4357ce51a99dadb9899747ee3fe8f3b02
+  metadata.gz: 27c95836792aedd0513525c83f36388482914a48228b6b94b58083354916c96e7c55dec8b7e4ec66f3792a650f8b2325e85018d10a6c3ce44973e2ab46adab00
+  data.tar.gz: 3c0a09ecabdf43d6e51734fa1692eda2936bb5e70ad60d571fddf721873451ee53cedfe8fec08afb0fda6a6538747c4fa318834eacbced4ee7ae57e8d6d52ac7

data/lib/apique/filterable.rb

@@ -127,17 +127,27 @@ module Apique::Filterable
     end
   end
   
+  if ActiveRecord::VERSION::MAJOR >= 5 and ActiveRecord::VERSION::MINOR >= 1
+    def text_type_class?(type_class)
+      type_class <= ActiveModel::Type::String
+    end
+  else
+    def text_type_class?(type_class)
+      [ActiveModel::Type::String, ActiveModel::Type::Text].find {|k| type_class <= k}
+    end
+  end
+  
   def get_cast_type(field)
-    type = get_cast_type_class(field)
-    if [ActiveModel::Type::String, ActiveModel::Type::Text].find {|k| type <= k}
+    type_class = get_cast_type_class(field)
+    if text_type_class?(type_class)
       :text
-    elsif type <= ActiveModel::Type::Integer
+    elsif type_class <= ActiveModel::Type::Integer
       :integer
-    elsif type <= ActiveModel::Type::Boolean
+    elsif type_class <= ActiveModel::Type::Boolean
       :boolean
-    elsif type <= ActiveModel::Type::DateTime
+    elsif type_class <= ActiveModel::Type::DateTime
       :datetime
-    elsif type <= ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid
+    elsif type_class <= ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid
       :uuid
     end
   end

data/lib/apique/version.rb

@@ -1,3 +1,3 @@
 module Apique
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apique
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rails CRUD API replacement