subroutine 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cd32153de5f8bf76c3a0c0ad71bd48d195cf0c3
-  data.tar.gz: 7b5045cedc5c4e544e179ab3d3f45e64e9607a28
+  metadata.gz: 481c515ae237b913f46e2d14a675158516d83ab2
+  data.tar.gz: d57eb792cba74077af2c4dcbc4f500a941931808
 SHA512:
-  metadata.gz: 91b76020520dc64668f1d8494cbc44daa98bdc116a597eae5b7aaabe135b25d3918cfbbdeb0696c4bd073ecf4b23527e8876a02a7f676d34c27a01821c4a6ab7
-  data.tar.gz: 13454289c41dc9e69dd0a3d2cbb2e42f9ac211a46bc80ac2129db1adc2070b47218b2dd29962d752ccbd940473c93fe0f8dd6ad8e950642f4d428f4ba734ba64
+  metadata.gz: 7deb258fb423207af9997ca3900554492c0038ea891f81e0af696b367c4a6953ec58405977115ce42a07ac56cc34a689860b0ac56524b139a7560356e42a07fb
+  data.tar.gz: 32b8ca20632f2bcaba78b1fac42478d0589ccdc3c04eb4a08eb4eba018215610ce23c2fc1667fcd89494e2edfad69268cfcc7538d8fbae458e3b7d8cd507868b

data/README.md

@@ -122,7 +122,7 @@ end
 ```
 ## Op Implementation
 
-Ops have some fluff, but not much. The `Subroutine::Op` class entire purpose in life is to validate user input and execute
+Ops have some fluff, but not much. The `Subroutine::Op` class' entire purpose in life is to validate user input and execute
 a series of operations. To enable this we filter input params, type cast params (if desired), and execute validations. Only
 after these things are complete will the `Op` perform it's operation.
 
@@ -152,6 +152,7 @@ class MyOp < ::Subroutine::Op
   date :dob
   boolean :tos, :default => false
 end
+```
 
 #### Validations
 
@@ -222,8 +223,8 @@ Notice we do not declare `perform` as a public method. This is to ensure the "pu
 
 Reporting errors is very important in Subroutine Ops since these can be used as form objects. Errors can be reported a couple different ways:
 
-1) `errors.add(:key, :error)` That is, the way you add errors to an ActiveModel object. Then either return false from your op OR raise an error like `raise ::Subroutine::Failure.new(this)`.
-2) `inherit_errors(error_object_or_activemodel_object)` Same as `errors.add`, but it iterates an existing error hash and inherits the errors. As part of this iteration,
+1. `errors.add(:key, :error)` That is, the way you add errors to an ActiveModel object. Then either return false from your op OR raise an error like `raise ::Subroutine::Failure.new(this)`.
+2. `inherit_errors(error_object_or_activemodel_object)` Same as `errors.add`, but it iterates an existing error hash and inherits the errors. As part of this iteration,
 it checks whether the key in the provided error_object matches a field (or aka of a field) in our op. If there is a match, the error will be placed on
 that field, but if there is not, the error will be placed on `:base`. Again, after adding the errors to our op, we must return `false` from the perform method or raise a Subroutine::Failure.
 

data/lib/subroutine/op.rb

@@ -151,6 +151,15 @@ module Subroutine
 
     protected
 
+    # ensure that our type caster has the opportunity to cast each key
+    def params
+      out = {}
+      @params.keys.each do |k|
+        out[k] = send(k)
+      end
+      out
+    end
+
     def type_caster
       @type_caster ||= ::Subroutine::TypeCaster.new
     end

data/lib/subroutine/type_caster.rb

@@ -101,13 +101,25 @@ module Subroutine
     end
 
     def _cast_hash(value)
+      return _cast_action_controller_query_params(value) if is_action_controller_query_params?(value)
       return value if value.is_a?(Hash)
       return {} if value.blank?
+      return value.to_hash if value.respond_to?(:to_hash)
       return value.to_h if value.respond_to?(:to_h)
       return ::Hash[value.to_a] if value.respond_to?(:to_a)
       {}
     end
 
+    def _cast_action_controller_query_params(value)
+      value = value.to_hash
+      value.each_pair{|k,v| value[k] = _cast_action_controller_query_params(v) if is_action_controller_query_params?(v) }
+      value
+    end
+
+    def is_action_controller_query_params?(value)
+      value.class.name == "ActionController::Parameters"
+    end
+
     def cast_array(value)
       return [] if value.blank?
       ::Array.wrap(value)

data/lib/subroutine/version.rb

@@ -2,7 +2,7 @@ module Subroutine
 
   MAJOR = 0
   MINOR = 1
-  PATCH = 1
+  PATCH = 2
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel