logical_model 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176560a6cb04db15ecda58cd4953b2da3bba11b9c818442403a3ecd992bd2845
-  data.tar.gz: 6c73c16eed5d6e1410282fc73712999205c6cd641f0fe79d8c05b6d6b2f376ef
+  metadata.gz: 2c54ee15e0413bd22ec9565523d2c9717913acc6475dbb65c0a130fb8b74cb1b
+  data.tar.gz: e74b18396a817b26aef40359788048e5a58c78c71cd43c2ad0de44cca6626b6c
 SHA512:
-  metadata.gz: ff8a1ff4475c5ce986bbfde5c25c581ca3de60dc5b3197d20356837b471ff1a2cfc7abe892583f8cb977e3110640ae01c8d41792befd1111458b8b736af1e4f9
-  data.tar.gz: f19c2f0af954729b33c3969434aa8d64d0c633bb999742636e41b217f667eff1f5752de81ab877e47d7829cab9e0e27f675b71bbd2a07c0f17df121b5c22fe54
+  metadata.gz: 92209ab1bf6f806bf873cba8baa7e56753e0ddf68d7fcec333760e622b180f868dbdfaa47beae8b7b535aa39dc7b8ed23b6882e1a02147c671480063d144377a
+  data.tar.gz: 28693c7d61c83359dd9fbfe6b9056f74a86f4aeac28bc4913656bfb78404243db76d5dc45050326a6a32a77ee8c34ea85ca3217e41b0c84972ecbf61ba14701d

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.6

data/lib/logical_model/rest_actions.rb

@@ -236,11 +236,9 @@ class LogicalModel
             # this paginate is will_paginate's Array pagination
             collection = Kaminari.paginate_array(
                 result_set[:collection],
-                {
-                    :total_count=>result_set[:total],
-                    :limit => options[:per_page],
-                    :offset => options[:per_page] * ([options[:page], 1].max - 1)
-                }
+                  limit: options[:per_page],
+                  offset: options[:per_page] * ([options[:page], 1].max - 1),
+                  total_count: result_set[:total]
             )
 
             yield collection

data/lib/typhoeus_fix/array_decoder.rb

@@ -33,9 +33,9 @@ module TyphoeusFix
   #
   # @return [Hash] Hash with properly decoded nested arrays.
   def decode!(hash)
-    return hash unless hash.is_a?(Hash)
+    return hash unless is_hash?(hash)
     hash.each_pair do |key,value|
-      if value.is_a?(Hash)
+      if is_hash?(value)
         decode!(value)
         hash[key] = convert(value)
       end
@@ -49,6 +49,10 @@ module TyphoeusFix
 
   private
 
+  def is_hash?(hash)
+    hash.is_a?(Hash) || hash.is_a?(HashWithIndifferentAccess) || hash.is_a?(ActionController::Parameters)
+  end
+
   # Checks if Hash is an Array encoded as a Hash.
   # Specifically will check for the Hash to have this
   # form: {'0' => v0, '1' => v1, .., 'n' => vN }
@@ -74,6 +78,7 @@ module TyphoeusFix
   # @return [Arraya/Hash]
   def convert(hash)
     if encoded?(hash)
+      hash = hash.to_unsafe_h if hash.respond_to?(:to_unsafe_h)
       Hash[hash.sort_by{|k,v|k.to_i}].values
     else
       hash

data/logical_model.gemspec

@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.7.3"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Dwayne Macgowan
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: LogicalModel allows to use a resource as a model.