parametric 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5dfee33e2a3f175505899e0238390e2795e0a862469b851a3a550aef152e8be
-  data.tar.gz: c1225c196aeb662384da471dd31b62ea8e072a90049eecb609976dfa21eec1d6
+  metadata.gz: ac256ff264b098720b8104c163e3f63e34b1caf4bd72bfa037451f4748b4982a
+  data.tar.gz: 9e4f467c327b68fdc24b9da3068f784c75df95b9e642d804eaf5d1e743ad635c
 SHA512:
-  metadata.gz: 2645e19eda4c75f82f8620fa16cce48fad7b60a14d1749e78a3de05411b55f1daf2ae9e41149467ccd1ccecd613178972d8283ead6a8becdf0c35bae1d4a7123
-  data.tar.gz: 84ecd165ff1355b17f5596f7f7c47a1b2965a2a7c50e6211801400f019aa8d318847ebf68ecbbf2c6c75da6cd8f3bb257707f9e69a4d9b5500ddf82c52733ff2
+  metadata.gz: 91b8cea04a00f942e1fd6f1fd20a70b60903e3b959c434d489ad0431154700f176f7905ebe19957d11b9741617da22dac24dc9d05b8ee6abb90914537ea268c5
+  data.tar.gz: b2e705e5a45f5b795f19a4c222684375109389cfd8407e1875aea8da9ab82e52a66621a7906d9045d792d9c7ff4d8bd76d5af39ef02488fc63ff7c290fc2c9ba

data/README.md

@@ -742,6 +742,34 @@ class CreateUserForm
 end
 ```
 
+## Multiple schema definitions
+
+Form objects can optionally define more than one schema by giving them names:
+
+```ruby
+class UpdateUserForm
+  include Parametric::DSL
+
+  # a schema named :query
+  # for example for query parameters
+  schema(:query) do
+    field(:user_id).type(:integer).present
+  end
+
+  # a schema for PUT body parameters
+  schema(:payload) do
+    field(:name).present
+    field(:age).present
+  end
+end
+```
+
+Named schemas are inherited and can be extended and given options in the same way as the nameless version.
+
+Named schemas can be retrieved by name, ie. `UpdateUserForm.schema(:query)`.
+
+If no name given, `.schema` uses `:schema` as default schema name.
+
 ## Expanding fields dynamically
 
 Sometimes you don't know the exact field names but you want to allow arbitrary fields depending on a given pattern.

data/lib/parametric/dsl.rb

@@ -22,26 +22,37 @@ module Parametric
     #
     #   foo.params # => {title: "A title", age: 20}
     #
+    DEFAULT_SCHEMA_NAME = :schema
+
     def self.included(base)
       base.extend(ClassMethods)
-      base.schema = Parametric::Schema.new
+      base.schemas = {DEFAULT_SCHEMA_NAME => Parametric::Schema.new}
     end
 
     module ClassMethods
       def schema=(sc)
-        @schema = sc
+        @schemas[DEFAULT_SCHEMA_NAME] = sc
+      end
+
+      def schemas=(sc)
+        @schemas = sc
       end
 
       def inherited(subclass)
-        subclass.schema = @schema.merge(Parametric::Schema.new)
+        subclass.schemas = @schemas.each_with_object({}) do |(key, sc), hash|
+          hash[key] = sc.merge(Parametric::Schema.new)
+        end
       end
 
-      def schema(options = {}, &block)
-        return @schema unless options.any? || block_given?
+      def schema(*args, &block)
+        options = args.last.is_a?(Hash) ? args.last : {}
+        key = args.first.is_a?(Symbol) ? args.first : DEFAULT_SCHEMA_NAME
+        current_schema = @schemas.fetch(key) { Parametric::Schema.new }
+        return current_schema unless options.any? || block_given?
 
         new_schema = Parametric::Schema.new(options, &block)
-        @schema = @schema.merge(new_schema)
-        after_define_schema(@schema)
+        @schemas[key] = current_schema ? current_schema.merge(new_schema) : new_schema
+        after_define_schema(@schemas[key])
       end
 
       def after_define_schema(sc)

data/lib/parametric/version.rb

@@ -1,3 +1,3 @@
 module Parametric
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/dsl_spec.rb

@@ -5,6 +5,10 @@ describe "classes including DSL module" do
   class Parent
     include Parametric::DSL
 
+    schema :extras, search_type: :string do |opts|
+      field(:search).policy(opts[:search_type])
+    end
+
     schema(age_type: :integer) do |opts|
       field(:title).policy(:string)
       field(:age).policy(opts[:age_type])
@@ -12,12 +16,18 @@ describe "classes including DSL module" do
   end
 
   class Child < Parent
+    schema :extras do
+      field(:query).type(:string)
+    end
+
     schema(age_type: :string) do
       field(:description).policy(:string)
     end
   end
 
   class GrandChild < Child
+    schema :extras, search_type: :integer
+
     schema(age_type: :integer)
   end
 
@@ -42,6 +52,16 @@ describe "classes including DSL module" do
       expect(child_output[:title]).to eq "A title"
       expect(child_output[:age]).to eq "38"
       expect(child_output[:description]).to eq "A description"
+
+      # named schema
+      parent_output = Parent.schema(:extras).resolve(search: 10, query: 'foo').output
+      child_output = Child.schema(:extras).resolve(search: 10, query: 'foo').output
+
+      expect(parent_output.keys).to match_array([:search])
+      expect(parent_output[:search]).to eq "10"
+      expect(child_output.keys).to match_array([:search, :query])
+      expect(child_output[:search]).to eq "10"
+      expect(child_output[:query]).to eq "foo"
     end
 
     it "inherits options" do
@@ -51,6 +71,11 @@ describe "classes including DSL module" do
       expect(grand_child_output[:title]).to eq "A title"
       expect(grand_child_output[:age]).to eq 38
       expect(grand_child_output[:description]).to eq "A description"
+
+      # named schema
+      grand_child_output = GrandChild.schema(:extras).resolve(search: "100", query: "bar").output
+      expect(grand_child_output.keys).to match_array([:search, :query])
+      expect(grand_child_output[:search]).to eq 100
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parametric
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler