red-api 0.1.6 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53151d9692ecd31e415aa6c4387158e6da25fed70a4cc7f99a352efb93d7ab04
-  data.tar.gz: 28215493dd8a9875435176dd4a7848db788d375c2f716d714bf09f8fb1d7c6b7
+  metadata.gz: d3137705ce3933690cf5048fc78576d68a7638499f8a9cdb18c59e83a7010fec
+  data.tar.gz: c01ba2e7a05de477e32e5441677b10f5f488fcd515d81897de746a358fe1fdd4
 SHA512:
-  metadata.gz: 1dc400ed3600883b143b7be98621626b3d2cb9c501e0b4e6d0ff4275b91d6d3f9abc8cf478391539a75299d1d8b11702ed9387b830b2d7daa338cefbe1badcd7
-  data.tar.gz: be49041456dea4b2e2d5460333cc6755877a7b2ed006e285db24e289d4a4903e5e3d984b7990feeeaad8533b375e9b2902417971592ff73aad5e1a46bb394d48
+  metadata.gz: 48f9ed3cfc7b046bd5aab5b642322e42e86120905f474d76651aae224bad5fb1147024d445e23743de6bec8c66fee46b92bc29c33bbe700dfc20e070c7f2d87d
+  data.tar.gz: 74bb4846dab7e79cec7bc43da97f0d64bd4b0013fd18ff29ec328ac6adb657d25f01f1608867c61045694111e741e4b3ef13feaa93ef1e0b886adf318bf84e40

data/lib/generators/endpoint/USAGE

@@ -1,8 +1,18 @@
 Description:
-    Adds an endpoint api call to your generated API service with optional method params (not to be confused with the api endpoint params)
+    Adds an endpoint api call to your generated API service with optional endpoint method and endpoint helper method parameters
 
+    --include-helper-params:
+      Will copy the --method-params given to your endpoint helper method to use in your endpoint URI path
+      
 Example:
-    rails generate endpoint ServiceName EndpointName /endpoint/#{param1}/#{param2} --method_params param1 param2
+    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
 
     This will create:
-        app/services/ServiceName/api_call/endpoint_name.rb
+        app/services/ServiceName/version/api_call/endpoint_name.rb
+
+    This will modify:
+        app/services/ServiceName/version/api_endpoints.rb
+        app/services/ServiceName/version/endpoint_helpers.rb

data/lib/generators/endpoint/endpoint_generator.rb

@@ -1,46 +1,80 @@
 class EndpointGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('templates', __dir__)
 
+  argument :api_version, type: :string
   argument :endpoint_name, type: :string
-  argument :endpoint, type: :string
-  class_option :method, type: :string, default: :get
-  class_option :method_params, type: :array
 
+  class_option :endpoint, type: :string, default: '/'
+  class_option :method, type: :string, default: 'get'
+  class_option :endpoint_params, type: :array
+  class_option :include_helper_params
+  
   def create_api_call
-    @api_name = endpoint_name
-    @endpoint = endpoint
-    @endpoint = @endpoint[1..] if @endpoint.first == '/'
+    @api_service = file_name.underscore
+    @api_version = api_version
+    @endpoint_name = endpoint_name
+    @endpoint = options[: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 unless @endpoint.first == '/'
+    @endpoint = @api_version.downcase + @endpoint
     @method = options[:method].to_sym
 
-    if options[:method_params].present?
-      @method_params = options[:method_params][0..-2].each_with_object('') do |p, str|
-        str << p << ', '
-      end
-      @method_params << options[:method_params].last
-    end
+    create_endpoint_params if options[:endpoint_params].present?
+    create_helper_params if options[:include_helper_params].present?
 
-    @api_service = file_name.underscore
-    service_dir_path = "app/services/#{@api_service}/"
+    spec_file_name = @endpoint_name.underscore + '_spec.rb';
+    spec_dir = 'spec/services/'
+    spec_api_dir = spec_dir + @api_service.underscore + '/'
+    service_version_dir = spec_api_dir + @api_version.downcase + '/'
 
-    template 'api_call.erb', service_dir_path + "api_calls/#{@api_name.underscore}.rb"
+    Dir.mkdir spec_dir unless File.exist?(spec_dir)
+    Dir.mkdir spec_api_dir unless File.exist?(spec_api_dir)
+    Dir.mkdir service_version_dir unless File.exist?(service_version_dir)
 
-    temp = ERB.new <<-'EOF'
+    spec_file_path = service_version_dir + spec_file_name
 
-  def <%= @api_name.underscore%>_endpoint<%="(#{@method_params})" if @method_params.present?%>
-    <%= "\"#{@endpoint}\".freeze" if @endpoint.present? %>
-  end
-    EOF
+    template 'endpoint_spec.erb', spec_file_path
+
+    service_dir_path = "app/services/#{@api_service}/"
+    service_api_version_path = service_dir_path + @api_version + '/'
+
+    template 'api_call.erb', service_api_version_path + "api_calls/#{@endpoint_name.underscore}.rb"
+
+    api_call_file = ERB.new load_template('endpoint_helper.erb')
     
-    inject_into_file service_dir_path + 'endpoint_helpers.rb', after: "  # API Endpoint Helpers\n" do
-      temp.result(binding)
+    inject_into_file service_api_version_path + 'endpoint_helpers.rb', after: "  # API Endpoint Helpers\n" do
+      api_call_file.result(binding)
+    end
+
+    mixin = ERB.new load_template('mixin.erb')
+
+    inject_into_file service_api_version_path + 'api_endpoints.rb', after: "  # API call modules\n" do
+      mixin.result(binding)
     end
+  end
+
+  private
 
-    temp = ERB.new <<-'EOF'
-  extend <%= @api_name.camelize%>
-    EOF
+  def load_template(template_file)
+    template_path = File.join(File.dirname(__FILE__), 'templates/' + template_file)
+    File.read(template_path)
+  end
+
+  def create_helper_params
+    @helper_params = @endpoint_params
+  end
 
-    inject_into_file service_dir_path + 'api_endpoints.rb', after: "  # API call modules\n" do
-      temp.result(binding)
+  def create_endpoint_params
+    @endpoint_params = options[:endpoint_params][0..-2].each_with_object('') do |p, str|
+      str << p.underscore << ', '
     end
+    @endpoint_params << options[:endpoint_params].last
   end
 end

data/lib/generators/endpoint/templates/api_call.erb

@@ -1,5 +1,5 @@
-module <%= @api_name.camelize%>
-  def <%= @api_name.underscore%><%="(#{@method_params})" if @method_params.present?%>
-    request :<%= @method%>, <%= @api_name.underscore%>_endpoint<%="(#{@method_params})" if @method_params.present?%>, params: {}
+module <%= @endpoint_name.camelize%>
+  def <%= @endpoint_name.underscore%><%="(#{@endpoint_params})" if @endpoint_params%>
+    request :<%= @method%>, <%= @endpoint_name.underscore%>_endpoint<%="(#{@helper_params})" if @helper_params%>, params: {}
   end
 end

data/lib/generators/endpoint/templates/endpoint_helper.erb

@@ -0,0 +1,4 @@
+
+  def <%= @endpoint_name.underscore%>_endpoint<%="(#{@helper_params})" if @helper_params%>
+    <%= "\"#{@endpoint}\".freeze" if @endpoint %>
+  end

data/lib/generators/endpoint/templates/endpoint_spec.erb

@@ -0,0 +1,11 @@
+require 'rails_helper'
+
+RSpec.describe <%=@endpoint_reference%> do
+  describe '<%=@endpoint_name.underscore%>' do
+    it 'returns expected data when successful' do
+      skip 'Write tests for <%=@endpoint_name.underscore%>'
+      <%='# Define endpoint parameters here' if @endpoint_params%>
+      response = <%=@full_endpoint_reference%><%="(#{@endpoint_params})" if @endpoint_params%>
+    end
+  end
+end

data/lib/generators/endpoint/templates/mixin.erb

@@ -0,0 +1 @@
+  extend <%= @endpoint_name.camelize%>

data/lib/generators/service/USAGE

@@ -2,7 +2,14 @@ Description:
     Generates the framework for a basic API service your app consumes
 
 Example:
-    rails generate service ServiceName https://service/api/endpoint/ --key api_key env_key_name
+    rails generate service ServiceName version https://service/api/endpoint/ --key api_key env_key_name
+
+Simple Form:
+    rails generate service ServiceName V1 https://service/api/endpoint/
 
     This will create:
-        app/services/ServiceName
+        app/services/ServiceName/version
+        app/services/ServiceName/version/api_calls/
+        app/services/ServiceName/version/api_endpoints.rb
+        app/services/ServiceName/version/client.rb
+        app/services/ServiceName/version/endpoint_helpers.rb

data/lib/generators/service/service_generator.rb

@@ -1,21 +1,29 @@
 class ServiceGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('templates', __dir__)
 
-  argument :api_endpoint, type: :string
+  argument :version, type: :string
+  class_option :api_endpoint, type: :string, default: 'https://'
   class_option :key, type: :array
 
   def create_api_service
     @api_name = file_name
-    @api_endpoint = api_endpoint
+    @api_version = version
+    @api_endpoint = options[:api_endpoint]
     @env_var_opts = options[:key]
-    raise 'Need to define the name of your API service with --api' unless @api_name.present?
 
-    @api_dir_name = @api_name.underscore
+    raise ArgumentError, 'Need to give the API version' unless @api_version.present?
+
+    @full_api_reference = @api_name.camelize + '::' + @api_version.upcase
+    @api_endpoint = @api_endpoint + '/' unless @api_endpoint.last == '/'
 
     root_dir = "app/services/"
     Dir.mkdir root_dir unless File.exist?(root_dir)
 
-    service_dir_path = "#{root_dir}#{@api_dir_name}/"
+    api_path = root_dir + @api_name.underscore + '/'
+
+    Dir.mkdir api_path unless File.exist?(api_path)
+
+    service_dir_path = api_path + @api_version.downcase + '/'
 
     Dir.mkdir service_dir_path unless File.exist?(service_dir_path)
     Dir.mkdir "#{service_dir_path}/api_calls" unless File.exist?("#{service_dir_path}/api_calls")

data/lib/generators/service/templates/api_endpoints.erb

@@ -1,5 +1,5 @@
-Dir[Rails.root.join('app/services/<%= @api_dir_name%>/api_calls/*.rb')].each { |api_call| require api_call }
+Dir[Rails.root.join('app/services/<%= @api_name.underscore%>/<%=@api_version.downcase%>/api_calls/*.rb')].sort.each { |api_call| require api_call }
 
-class <%= @api_name.camelize%>::ApiEndpoints < <%= @api_name.camelize%>::Client
+class <%=@full_api_reference%>::ApiEndpoints < <%= @full_api_reference%>::Client
   # API call modules
-end
+end

data/lib/generators/service/templates/client.erb

@@ -1,6 +1,6 @@
 require_relative 'endpoint_helpers'
 
-class <%= @api_name.camelize%>::Client
+class <%=@full_api_reference%>::Client
   extend EndpointHelpers
 
   def self.client(params)

data/lib/generators/service/templates/endpoint_helpers.erb

@@ -1,7 +1,7 @@
 module EndpointHelpers
   def api_endpoint
     # The http API endpoint for this service
-    <%= "'#{@api_endpoint}'.freeze" if @api_endpoint.present? %>
+    <%= "'#{@api_endpoint}'.freeze" %>
   end
 
   # API Endpoint Helpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-api
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.2
 platform: ruby
 authors:
 - Richard DeSilvey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: Generate API service and endpoints for API consumption
 email:
 - rdesilvey@gmail.com
@@ -63,6 +77,9 @@ files:
 - lib/generators/endpoint/USAGE
 - lib/generators/endpoint/endpoint_generator.rb
 - lib/generators/endpoint/templates/api_call.erb
+- lib/generators/endpoint/templates/endpoint_helper.erb
+- lib/generators/endpoint/templates/endpoint_spec.erb
+- lib/generators/endpoint/templates/mixin.erb
 - lib/generators/service/USAGE
 - lib/generators/service/service_generator.rb
 - lib/generators/service/templates/api_endpoints.erb