dry_generators_rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83dce3a1768ef657b9feab5680b32c33041e380b40bfe87ab3b59f814705661d
-  data.tar.gz: 6c8ccb76d8cdd7058f32e2fa52af30663ae455025437fd0246906000741e90ac
+  metadata.gz: d85b4609b83ce411b59c8dc93e7fff04df610795980a97958aa9c687896bb055
+  data.tar.gz: 8d2a07defac4fe612c29706b89323d6e6050b16b46513734f6e73612bf314b44
 SHA512:
-  metadata.gz: 479fcad4c31a7a9f685e16be697640b2e002ef3a632f2db39e81f519ebea15852cd66cf1bbef341d6a32c5e1f822f9e3182609940818bea4582418e737f59cee
-  data.tar.gz: ae494ad3d792f64f152ee55f0f48ce4514ea68d28bf16edce498d29a599877efc428181d87536ef2f6ff360d6b30002c8b8fb104408e66a2c2b02b75d87454a8
+  metadata.gz: 1861d68963bd25bd1ebb031fe9d755027b7750b81a1fdc074ee91d2a37ada58386c05a0302fe351834cc6bbea6afad90181539f8ab6d3937cf459d10a656c255
+  data.tar.gz: ee2556816624e1fd0d254d4df0cb373b56860306dab368d8e0482887a698a653e113f54fba4da3d136198bec234841578469a5207ce589ecbc8b86a299ea04f9

data/lib/dry_generators_rails/version.rb

@@ -1,3 +1,3 @@
 module DryGeneratorsRails
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/generators/dry/validation/USAGE

@@ -1,8 +1,19 @@
 Description:
     Generates a dry-validation contract
 
+    Accepts an Array of params.
+
+    A single param name defaults to an optional string [email]
+    A name name and type will be optional [age:integer]
+    A type must be specified to make it required [age:integer:required]
+    Any number of params can be supplied [age:integer:required, alive:boolean]
+
 Example:
     rails generate validation Thing
+    rails generate validation Thing --params email
+    rails generate validation Thing --params age:integer
+    rails generate validation Thing --params age:integer:required
+    rails generate validation Thing --params age:integer:required alive:boolean
 
     This will create:
         app/dry/validations/thing.rb

data/lib/generators/dry/validation/templates/validation_template.erb

@@ -0,0 +1,13 @@
+module Validations
+  class <%= file_name.camelize %> < Dry::Validation::Contract
+    params do
+      <% @fields.each do |field| %>
+        <% if field[:required] %>
+          <%= "required(:#{field[:name]}).value(:#{field[:type]})" %>
+        <% else %>
+          <%= "optional(:#{field[:name]}).value(:#{field[:type]})" %>
+        <% end %>
+      <% end %>
+    end
+ end
+end

data/lib/generators/dry/validation/validation_generator.rb

@@ -4,6 +4,7 @@ module Dry
   module Generators
     class ValidationGenerator < Base
       source_root File.expand_path('templates', __dir__)
+      class_option :params, type: :array, default: []
 
       def check_requirements
         raise 'NAME must be provided' unless file_name.present?
@@ -12,18 +13,36 @@ module Dry
       def set_instance_variables
         @name = file_name.underscore
         @class_name = "#{@name.camelize}"
+        @fields = []
+      end
+
+      # [:name, :type, :required]
+      def process_params
+        options['params'].each do |field|
+          fields = field.split(':')
+          required = false
+          type = 'string'
+
+          if fields.length == 3
+            required = true
+            fields.pop
+          end
+
+          type = fields.pop if fields.length == 2
+          @fields << { name: fields.first, type: type, required: required }
+        end
       end
 
       def copy_validator
         path = File.join(VALIDATIONS_PATH, "#{@name}.rb")
-        template 'validation_template.rb', path
+        template 'validation_template.erb', path
       end
 
       def copy_spec
         if Dir.exist? File.join(Rails.root, 'spec')
           spec_path =  File.join(SPEC_PATH, 'validations')
           path = File.join(spec_path, "#{@name}_spec.rb")
-          template 'validation_spec_template.rb', path
+          template 'validation_spec_template.erb', path
         end
       end
 
@@ -31,7 +50,7 @@ module Dry
         if Dir.exist? File.join(Rails.root, 'test')
           test_path =  File.join(TEST_PATH, 'validations')
           path = File.join(test_path, "#{@name}_test.rb")
-          template 'validation_test_template.rb', path
+          template 'validation_test_template.erb', path
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry_generators_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - John Turknett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,9 +111,9 @@ files:
 - lib/generators/dry/struct/templates/struct_template.rb
 - lib/generators/dry/struct/templates/struct_test_template.rb
 - lib/generators/dry/validation/USAGE
-- lib/generators/dry/validation/templates/validation_spec_template.rb
-- lib/generators/dry/validation/templates/validation_template.rb
-- lib/generators/dry/validation/templates/validation_test_template.rb
+- lib/generators/dry/validation/templates/validation_spec_template.erb
+- lib/generators/dry/validation/templates/validation_template.erb
+- lib/generators/dry/validation/templates/validation_test_template.erb
 - lib/generators/dry/validation/validation_generator.rb
 - lib/tasks/dry_generators_rails_tasks.rake
 homepage: https://github.com/johnTurknett/dry_generators_rails

data/lib/generators/dry/validation/templates/validation_template.rb

@@ -1,9 +0,0 @@
-module Validations
-  class <%= file_name.camelize %> < Dry::Validation::Contract
-    params do
-      # required(:age).filled(:integer)
-    end
-
-    # rule(:age) { key.failure("must be greater than 18") if value < 18 }
-  end
-end