logical_model 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/typhoeus_fix/array_decoder.rb

@@ -0,0 +1,93 @@
+#
+# Typhoeus encodes arrays as hashes {'0' => v0, '1' => v1, .., 'n' => vN }
+#
+# To fix this in your rails server your should:
+# in Gemfile:
+#     gem 'logical_model', '~> 0.3.2'
+#
+# in application_controller.rb:
+#
+#    require 'typhoeus_fix/array_decoder'
+#    class ApplicationController < ActionController::Base
+#      include TyphoeusFix
+#      before_filter :decode_typhoeus_arrays
+#    end
+#
+module TyphoeusFix
+
+  def decode_typhoeus_arrays
+    deep_decode(params)
+  end
+
+  # Recursively decode Typhoeus encoded arrays
+  def deep_decode(hash)
+    return hash unless hash.is_a?(Hash)
+    hash.each_pair do |key,value|
+      if value.is_a?(Hash)
+        deep_decode(value)
+        hash[key] = value.decode_typhoeus_array
+      end
+    end
+  end
+end
+
+# Add Hash#is_typhoeus_array? method
+class Hash
+
+  # 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 }
+  # @return [TrueClass]
+  def im_an_array_typhoeus_encoded?
+    return false if self.empty?
+    self.keys.sort == (0...self.keys.size).map{|i|i.to_s}
+  end
+
+  # If the hash is an array encoded by typhoeus an array is returned
+  # else the self is returned
+  #
+  # @see im_an_array_typhoeus_encoded?
+  #
+  # @return [Array/Hash]
+  def decode_typhoeus_array
+    if self.im_an_array_typhoeus_encoded?
+      Hash[self.sort].values
+    else
+      self
+    end
+  end
+end
+
+
+
+# Rack Middleware to fix Typhoeus arrays encoding
+# TODO this middleware didn't work, when fixed use it and remove filter from ApplicationController
+=begin
+module Typhoeus
+  class ArraysDecoder
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+
+      params = env["action_dispatch.request.parameters"]
+      decode_typho_arrays(params)
+      env["action_dispatch.request.parameters"] = params
+      @app.call(env)
+    end
+
+    private
+
+    # Recursively decode Typhoeus encoded arrays
+    def decode_typho_arrays(hash)
+      return hash unless hash.is_a?(Hash)
+      hash.each_pair do |key,value|
+        if value.is_a?(Hash)
+          decode_typho_arrays(value)
+          hash[key] = value.decode_typhoeus_array
+        end
+      end
+    end
+  end
+end
+=end

data/logical_model.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "db/migrate/001_create_users.rb",
     "lib/logical_model.rb",
     "lib/safe_log.rb",
+    "lib/typhoeus_fix/array_decoder.rb",
     "logical_model.gemspec",
     "models/user.rb",
     "spec/client_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -308,6 +308,7 @@ files:
 - db/migrate/001_create_users.rb
 - lib/logical_model.rb
 - lib/safe_log.rb
+- lib/typhoeus_fix/array_decoder.rb
 - logical_model.gemspec
 - models/user.rb
 - spec/client_spec.rb
@@ -329,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 649076499
+      hash: -154505059
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: