subroutine 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f40979839b106e9e9c4d4714815f29c32cc2bd
-  data.tar.gz: 5f7724cd96e176c19ed230ca410fcb7ed55d577f
+  metadata.gz: 212d37192891dfad2e6fced663590d50f37302ee
+  data.tar.gz: 2ded356bfcfe49f9b697aba9784325fe2ce4426a
 SHA512:
-  metadata.gz: 670db3c5d3b73bc2791b1c38bf1eabd117d319df84fa5f392daf44698d4b759b8bfd20b465efaf06aafb966618fa0ae679a4fa3ffa39b67aad0a9daeec032ccc
-  data.tar.gz: e76615aaed90eaeafd518c32865bdf9338c40e80c90332a0eca932d510bd80e271d95b69fe43b56e37fd0a229348d9ba74f8660acf009f6f5ea0ee3440243c5b
+  metadata.gz: b4dc8ba20210de9eb5d2260f5cc98f95fe6a9c74e9a0ee625434a683a1773273efdc5461e2356238ca63bd7457c9554748f35fecad40a2153b665b81953ac5d1
+  data.tar.gz: cf30411572f31668031cc96ac76cb0ce4edb6132b22f9990a38023d32e312b53468179a31dea8604e25e54e0ac69189a7df13f338559c000d8980bb4aada2a2e

data/README.md

@@ -154,9 +154,26 @@ class MyOp < ::Subroutine::Op
 end
 ```
 
+Since ops can use other ops, sometimes it's nice to explicitly state the inputs are valid. To "inherit" all the inputs from another op, simply use `inputs_from`.
+
+```ruby
+class MyOp < ::Subroutine::Op
+  string :token
+  inputs_from MyOtherOp
+
+  protected
+
+  def perform
+    verify_token!
+    MyOtherOp.submit! params.except(:token)
+  end
+
+end
+```
+
 #### Validations
 
-Since Ops inlcude ActiveModel::Model, validations can be used just like any other ActiveModel object.
+Since Ops include ActiveModel::Model, validations can be used just like any other ActiveModel object.
 
 ```ruby
 class MyOp < ::Subroutine::Op

data/lib/subroutine/op.rb

@@ -96,15 +96,12 @@ module Subroutine
 
           def #{field_name}=(v)
             config = #{field_name}_config
-            @#{field_name} = type_caster.cast(v, config[:type])
+            v = type_caster.cast(v, config[:type])
+            @params["#{field_name}"] = v
           end
 
           def #{field_name}
-            return @#{field_name} if defined?(@#{field_name})
-            config = #{field_name}_config
-            deflt = config[:default]
-            deflt = deflt.call if deflt.respond_to?(:call)
-            type_caster.cast(deflt, config[:type])
+            @params["#{field_name}"]
           end
 
           def #{field_name}_config
@@ -137,7 +134,7 @@ module Subroutine
 
     def initialize(inputs = {})
       @original_params  = inputs.with_indifferent_access
-      @params           = {}
+      @params = sanitize_params(@original_params)
     end
 
     def errors
@@ -154,10 +151,6 @@ module Subroutine
     # the action which should be invoked upon form submission (from the controller)
     def submit
       observe_submission do
-        @params = filter_params(@original_params)
-
-        set_accessors(@params)
-
         validate_and_perform
       end
 
@@ -173,15 +166,6 @@ 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
@@ -247,15 +231,19 @@ module Subroutine
 
     # if you want to use strong parameters or something in your form object you can do so here.
     # by default we just slice the inputs to the defined fields
-    def filter_params(inputs)
-      inputs.slice(*_fields.keys)
-    end
-
-
-    def set_accessors(inputs)
-      inputs.each do |key, value|
-        send("#{key}=", value) if respond_to?("#{key}=")
+    def sanitize_params(inputs)
+      out = {}.with_indifferent_access
+      self._fields.each_pair do |field, config|
+        if inputs.has_key?(field)
+          out[field] = type_caster.cast(inputs[field], config[:type])
+        elsif config[:default]
+          deflt = config[:default]
+          deflt = deflt.call if deflt.respond_to?(:call)
+          out[field] = type_caster.cast(deflt, config[:type])
+        end
       end
+
+      out
     end
 
   end

data/lib/subroutine/type_caster.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'time'
+require 'bigdecimal'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/array/wrap'
@@ -10,7 +11,8 @@ module Subroutine
 
     TYPES = {
       :integer => [:int, :integer, :epoch],
-      :number => [:number, :float, :decimal],
+      :number => [:number, :float],
+      :decimal => [:decimal, :big_decimal],
       :string => [:string, :text],
       :boolean => [:bool, :boolean],
       :iso_date => [:iso_date],
@@ -29,7 +31,10 @@ module Subroutine
       when *TYPES[:integer]
         cast_number(value).try(:to_i)
       when *TYPES[:number]
-        cast_number(value)
+        cast_number(value).try(:to_f)
+      when *TYPES[:decimal]
+        d = cast_number(value)
+        d ? BigDecimal(d.to_s) : nil
       when *TYPES[:string]
         cast_string(value)
       when *TYPES[:boolean]
@@ -57,7 +62,7 @@ module Subroutine
     def cast_number(value)
       val = cast_string(value).strip
       return nil if val.blank?
-      val.to_f
+      val
     end
 
     def cast_string(value)

data/lib/subroutine/version.rb

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

data/test/subroutine/base_test.rb

@@ -144,5 +144,29 @@ module Subroutine
       assert_equal [], op.errors[:whatever]
     end
 
+    def test_it_sets_the_params_immediately_and_includes_defaults
+      op = ::AdminSignupOp.new(email: "foo")
+      assert_equal({
+        "priveleges" => "min",
+        "email" => "foo"
+      }, op.params)
+    end
+
+    def test_it_overrides_defaults_with_nils
+      op = ::AdminSignupOp.new(email: "foo", priveleges: nil)
+      assert_equal({
+        "priveleges" => nil,
+        "email" => "foo"
+      }, op.params)
+    end
+
+    def test_it_casts_params_on_the_way_in
+      op = ::TypeCastOp.new(integer_input: "25")
+      assert_equal(25, op.params["integer_input"])
+
+      op.decimal_input = "25.3"
+      assert_equal(BigDecimal("25.3"), op.params["decimal_input"])
+    end
+
   end
 end

data/test/subroutine/type_caster_test.rb

@@ -115,8 +115,8 @@ module Subroutine
       op.object_input = {foo: 'bar'}
       assert_equal({'foo' => 'bar'}, op.object_input)
 
-      op.object_input = {"foo" => {:bar => :baz}}
-      assert_equal({"foo" => {:bar => :baz}}, op.object_input)
+      op.object_input = {"foo" => {"bar" => :baz}}
+      assert_equal({"foo" => {"bar" => :baz}}, op.object_input)
     end
 
     def test_array_inputs
@@ -132,8 +132,8 @@ module Subroutine
       op.array_input = ['foo']
       assert_equal ['foo'], op.array_input
 
-      op.array_input = {:bar => true}
-      assert_equal [{:bar => true}], op.array_input
+      op.array_input = {"bar" => true}
+      assert_equal [{"bar" => true}], op.array_input
     end
 
     def test_date_inputs

data/test/support/ops.rb

@@ -98,6 +98,7 @@ class TypeCastOp < ::Subroutine::Op
 
   integer :integer_input
   number :number_input
+  decimal :decimal_input
   string :string_input
   boolean :boolean_input
   date :date_input

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An interface for creating feature-driven operations.
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Feature-driven operation objects.