red-api 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b953b6b0eb60428808e5e4e96bee115704ccb947e181d1ca00273607ee741a78
-  data.tar.gz: c4658cbf00f844f698f46ab5a3c0e68816d67f82af29971a76914b8337a5d7a7
+  metadata.gz: d3137705ce3933690cf5048fc78576d68a7638499f8a9cdb18c59e83a7010fec
+  data.tar.gz: c01ba2e7a05de477e32e5441677b10f5f488fcd515d81897de746a358fe1fdd4
 SHA512:
-  metadata.gz: f075a31f36be34e96985768565d8e3a49c1644c5c3562b5290374d9cf8ec714a3b0d1d1a01db2af96f9cd84dff08307d8eafa615d984b7c1068444face8f6cc8
-  data.tar.gz: 3d6a8aaba3eb5448c479258d45ff3a0c9e9c1dfa136570c7923908c2915a5e8db5e2e25e0d29fa951d108d0837833d16bd051d7eec97df46cd10ca0cf396b222
+  metadata.gz: 48f9ed3cfc7b046bd5aab5b642322e42e86120905f474d76651aae224bad5fb1147024d445e23743de6bec8c66fee46b92bc29c33bbe700dfc20e070c7f2d87d
+  data.tar.gz: 74bb4846dab7e79cec7bc43da97f0d64bd4b0013fd18ff29ec328ac6adb657d25f01f1608867c61045694111e741e4b3ef13feaa93ef1e0b886adf318bf84e40

data/lib/generators/endpoint/USAGE

@@ -5,7 +5,7 @@ Description:
       Will copy the --method-params given to your endpoint helper method to use in your endpoint URI path
       
 Example:
-    rails generate endpoint ServiceName version EndpointName /endpoint/#{param1}/#{param2} --method-params param1 param2 --include-helper-params
+    rails generate endpoint ServiceName version EndpointName --endpoint /endpoint/#{param1}/#{param2} --endpoint-params param1 param2 --include-helper-params
     
     Simple Form:
       rails generate endpoint ServiceName V1 EndpointName /endpoint

data/lib/generators/endpoint/endpoint_generator.rb

@@ -3,8 +3,8 @@ class EndpointGenerator < Rails::Generators::NamedBase
 
   argument :api_version, type: :string
   argument :endpoint_name, type: :string
-  argument :endpoint, type: :string
 
+  class_option :endpoint, type: :string, default: '/'
   class_option :method, type: :string, default: 'get'
   class_option :endpoint_params, type: :array
   class_option :include_helper_params
@@ -13,15 +13,17 @@ class EndpointGenerator < Rails::Generators::NamedBase
     @api_service = file_name.underscore
     @api_version = api_version
     @endpoint_name = endpoint_name
-    @endpoint = endpoint
+    @endpoint = options[:endpoint]
 
-    raise ArgumentError 'Endpoint name required' unless @endpoint_name
-    raise ArgumentError 'Endpoint is required' unless @endpoint
+    raise ArgumentError, 'Endpoint name required' unless @endpoint_name
+    raise ArgumentError, 'Version is required, e.g. V1' unless @api_version
+    raise ArgumentError, 'Version should not be included in your endpoint, generator will build it for you' if @endpoint.downcase.include?(@api_version.downcase)
 
     @endpoint_reference = @api_service.camelize + '::' + @api_version.camelize + '::ApiEndpoints'
     @full_endpoint_reference = @endpoint_reference + '.' + @endpoint_name.underscore
 
-    @endpoint = @endpoint[1..] unless @endpoint.first != '/'
+    @endpoint = '/' + @endpoint unless @endpoint.first == '/'
+    @endpoint = @api_version.downcase + @endpoint
     @method = options[:method].to_sym
 
     create_endpoint_params if options[:endpoint_params].present?

data/lib/generators/service/service_generator.rb

@@ -2,17 +2,16 @@ class ServiceGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('templates', __dir__)
 
   argument :version, type: :string
-  argument :api_endpoint, type: :string
+  class_option :api_endpoint, type: :string, default: 'https://'
   class_option :key, type: :array
 
   def create_api_service
     @api_name = file_name
     @api_version = version
-    @api_endpoint = api_endpoint
+    @api_endpoint = options[:api_endpoint]
     @env_var_opts = options[:key]
 
     raise ArgumentError, 'Need to give the API version' unless @api_version.present?
-    raise ArgumentError, 'Need to give the API endpoint URI e.g. https://api/' unless @api_endpoint.present?
 
     @full_api_reference = @api_name.camelize + '::' + @api_version.upcase
     @api_endpoint = @api_endpoint + '/' unless @api_endpoint.last == '/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red-api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Richard DeSilvey