pass options to initialize instead of call

lib/shaf/command/generate.rb

@@ -19,7 +19,7 @@ def self.options(parser, options)
 
       def call
         in_project_root do
-          Generator::Factory.create(*args).call(options)
+          Generator::Factory.create(*args, **options).call
         end
       rescue StandardError => e
         raise Command::ArgumentError, e.message

lib/shaf/generator/base.rb

@@ -5,7 +5,7 @@
 module Shaf
   module Generator
     class Base
-      attr_reader :args
+      attr_reader :args, :options
 
       class << self
         def inherited(child)
@@ -23,11 +23,12 @@ def usage(str = nil, &block)
         def options(option_parser, options); end
       end
 
-      def initialize(*args)
-        @args = args.dup
+      def initialize(*args, **options)
+        @args = args
+        @options = options
       end
 
-      def call(options = {}); end
+      def call; end
 
       def template_dir
         File.expand_path('../templates', __FILE__)

lib/shaf/generator/controller.rb

@@ -5,7 +5,7 @@ class Controller < Base
       identifier :controller
       usage 'generate controller RESOURCE_NAME [attribute:type] [..]'
 
-      def call(options = {})
+      def call
         create_controller
         create_integration_spec if options[:specs]
         add_link_to_root

lib/shaf/generator/migration.rb

@@ -11,7 +11,7 @@ class Generator < Shaf::Generator::Base
         usage { Factory.usage }
 
         def call
-          generator = args.empty? ? Empty.new : Factory.create(*args)
+          generator = args.empty? ? Empty.new(**options) : Factory.create(*args, **options)
           (target, content) = generator.call
           write_output(target, content)
         rescue StandardError => e

lib/shaf/generator/migration/base.rb

@@ -32,7 +32,7 @@ class Base
           }
         ]
 
-        attr_reader :args
+        attr_reader :args, :options
 
         class << self
           def inherited(child)
@@ -48,8 +48,9 @@ def usage(str = nil, &block)
           end
         end
 
-        def initialize(*args)
-          @args = args.dup
+        def initialize(*args, **options)
+          @args = args
+          @options = options
         end
 
         def call

lib/shaf/generator/model.rb

@@ -5,10 +5,10 @@ class Model < Base
       identifier :model
       usage 'generate model MODEL_NAME [attribute:type] [..]'
 
-      def call(options = {})
+      def call
         create_model
         create_migration
-        create_serializer(options)
+        create_serializer
       end
 
       def model_name
@@ -61,10 +61,10 @@ def create_migration
         Migration::Generator.new(*migration_args).call
       end
 
-      def create_serializer(options)
+      def create_serializer
         serializer_args = %W(serializer #{model_name})
         serializer_args += args[1..-1].map { |arg| arg.split(':').first }
-        Generator::Factory.create(*serializer_args).call(options)
+        Generator::Factory.create(*serializer_args, **options).call
       end
     end
   end

lib/shaf/generator/policy.rb

@@ -4,7 +4,7 @@ class Policy < Base
       identifier :policy
       usage 'generate policy MODEL_NAME [attribute] [..]'
 
-      def call(options = {})
+      def call
         create_policy
       end
 

lib/shaf/generator/scaffold.rb

@@ -5,14 +5,14 @@ class Scaffold < Base
       identifier :scaffold
       usage 'generate scaffold RESOURCE_NAME [attribute:type] [..]'
 
-      def call(options = {})
+      def call
         if name.empty?
           raise "Please provide a resource name when using the scaffold generator!"
         end
 
         options[:specs] = true if options[:specs].nil? 
-        Generator::Factory.create('model', *args).call(options)
-        Generator::Factory.create('controller', *controller_args).call(options)
+        Generator::Factory.create('model', *args, **options).call
+        Generator::Factory.create('controller', *controller_args, **options).call
       end
 
       def name

lib/shaf/generator/serializer.rb

@@ -4,10 +4,10 @@ class Serializer < Base
       identifier :serializer
       usage 'generate serializer MODEL_NAME [attribute] [..]'
 
-      def call(options = {})
+      def call
         create_serializer
         create_serializer_spec if options[:specs]
-        create_policy(options)
+        create_policy
       end
 
       def name
@@ -211,9 +211,9 @@ def opts
         }
       end
 
-      def create_policy(options)
+      def create_policy
         policy_args = ["policy", name, *args[1..-1]]
-        Generator::Factory.create(*policy_args).call(options)
+        Generator::Factory.create(*policy_args, **options).call
       end
     end
   end