micro_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d34ac6588812baff48c14c12b1ab5dac85de8ce875a633b10ed557fd207319
-  data.tar.gz: '0924c15c703900c1fb9f90387bd1af51da634ca1d52bc4eae3436b93080cc954'
+  metadata.gz: 931fe90b19dce2b382d2bf2a9aaa8c8387d8e473cd12ce31a9f9c7faa74cd10b
+  data.tar.gz: '091df9223364158ce18f3adaf343e8ee42c62df40b0e2745af75e8d1e132d7be'
 SHA512:
-  metadata.gz: e792082eb0e8dddfd11db78b6f8ffe85219851d7599fb1c1c0035803ae9de121985cab7a5f61b79ff568a0a0597b94b772a8c8fe1140f08ade427acc8260c0be
-  data.tar.gz: 523a47666b6ab4affed06d1fd0e3c30b52e7a0c9409d246ddc8f811b893a65fb219a51b874db5830ee3c397e530d511e39eff49641562b0be8b4a08edb37c162
+  metadata.gz: c1fb1c1fa9ec7b39e6f37ce75493e0d0ebc5693d107d93cedf259771d444b0b11aca0e850eafa00ad5ae2caa72b9245d92a7314c6f95df3366009250545243b5
+  data.tar.gz: 452621f6f949ccaa271e62952ea28708841d1e589fff4268fbd223c5fae47486eee3bf741b42db0995a67cae650522e0a04b07dc541cd57611183ea1325fa438

data/lib/generators/micro_api/install/install_generator.rb

@@ -30,8 +30,13 @@ module MicroApi
 
     desc "This generator add row in application.rb file"
     def generate_micro_api_application
-      application 'config.active_record.default_timezone = :utc' if defined?(ActiveRecord)
-      application 'config.time_zone = "CET"'
+      application_list = ["\n"]
+      application_list << "config.active_record.default_timezone = :utc" if defined?(ActiveRecord)
+      application_list << "config.time_zone = 'CET'"
+
+      inject_into_file 'config/application.rb', before: /\n  end$/ do
+        application_list.join("\n    ").gsub("    \n", "\n")
+      end
     end
 
     desc "This generator creates an initializer file at config/initializers"
@@ -40,10 +45,24 @@ module MicroApi
       template "staging.rb", "#{Rails.root}/config/environments/staging.rb"
     end
 
-    desc "This generator add row in routes.rb file"
-    def generate_micro_api_route
-      route "mount MicroApi::Engine, at: MicroApi.routes_path, as: '#{MicroApi.routes_path}'"
-      route "match '*path', to: 'micro_api/static#no_route_matches', via: :all"
+    desc "This generator add 'api namespace' rows in routes.rb file"
+    def generate_micro_api_route_api_namespace
+      inject_into_file 'config/routes.rb', before: "  # Defines the root path route" do
+        "  namespace :api, defaults: { format: :json } do\n  end\n\n"
+      end
+    end
+
+    desc "This generator add final rows in routes.rb file"
+    def generate_micro_api_route_last
+      routes_list = [
+        "\n",
+        "mount MicroApi::Engine, at: MicroApi.routes_path, as: '#{MicroApi.routes_path}'",
+        "match '*path', to: 'micro_api/static#no_route_matches', via: :all"
+      ]
+
+      inject_into_file 'config/routes.rb', before: /\nend$/ do
+        routes_list.join("\n  ").gsub("  \n", "\n")
+      end
     end
   end
 end

data/lib/micro_api/engine.rb

@@ -1,8 +1,34 @@
+require 'lograge'
+
 module MicroApi
   class Engine < ::Rails::Engine
     isolate_namespace MicroApi
     config.generators.api_only = true
 
+    initializer "micro_api.lograge.init" do |app|
+      app.configure do
+        config.lograge.enabled = true
+        config.lograge.base_controller_class = "ActionController::API"
+        config.lograge.formatter = Lograge::Formatters::Json.new
+        config.colorize_logging = false
+        config.lograge.logger = ActiveSupport::Logger.new($stdout)
+
+        config.lograge.ignore_custom = lambda do |event|
+          event.payload[:path] == "#{MicroApi.routes_path}/healthz" && event.payload[:request].remote_ip =~ /^10\./
+        end
+        config.lograge.custom_payload do |controller|
+          {
+            level: :info,
+            log_type: :rails,
+            request_id: controller.request.request_id,
+            host: controller.request.host,
+            remote_ip: controller.request.remote_ip,
+            image_tag: ENV['IMAGE_TAG']
+          }
+        end
+      end
+    end
+
     config.generators do |g|
       g.test_framework :rspec,
         controller_specs: true,

data/lib/micro_api/version.rb

@@ -1,3 +1,3 @@
 module MicroApi
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/dummy/config/application.rb

@@ -38,6 +38,6 @@ module Dummy
 
     config.hosts << "www.example.com"
 
-    config.time_zone = "CET"
+    config.time_zone = 'CET'
   end
 end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,14 @@
 Rails.application.routes.draw do
+  # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
+
+  namespace :api, defaults: { format: :json } do
+  end
+
+  # Defines the root path route ("/")
+  # root "articles#index"
+
   # mount MicroApi::Engine => "/micro_api"
+
   mount MicroApi::Engine, at: MicroApi.routes_path, as: '/mse'
   match '*path', to: 'micro_api/static#no_route_matches', via: :all
 end

data/spec/requests/micro_api/static_healthz_spec.rb

@@ -4,6 +4,12 @@ RSpec.describe "Statics" do
   describe "GET /healthz" do
     before { @route = get("#{MicroApi.routes_path}/healthz") }
 
+    it "returns http success", type: :request do
+      expect(response).to have_http_status(:success)
+      expect(response.header['Content-Type']).to include 'application/json'
+      expect(json).to have_key('status')
+    end
+
     it "routes /micro_api/version to the static controller", type: :routing do
       expect(@route).to route_to(
         controller: 'micro_api/static',
@@ -11,10 +17,5 @@ RSpec.describe "Statics" do
         format: :json
       )
     end
-    it "returns http success", type: :request do
-      expect(response).to have_http_status(:success)
-      expect(response.header['Content-Type']).to include 'application/json'
-      expect(json).to have_key('status')
-    end
   end
 end

metadata

@@ -1,31 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: micro_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ''
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-25 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.48'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.48'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: lograge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -107,8 +121,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/log/development.log
-- spec/dummy/tmp/development_secret.txt
 - spec/generator/micro_api/installs_generator_spec.rb
 - spec/rails_helper.rb
 - spec/requests/micro_api/static_healthz_spec.rb
@@ -125,7 +137,7 @@ metadata:
   homepage_uri: https://github.com/lelered/micro_api
   source_code_uri: https://github.com/lelered/micro_api
   changelog_uri: https://github.com/lelered/micro_api/blob/main/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -140,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Engine plugin for Ruby on Rails applications
 test_files:
@@ -163,8 +175,6 @@ test_files:
 - spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/log/development.log
-- spec/dummy/tmp/development_secret.txt
 - spec/generator/micro_api/installs_generator_spec.rb
 - spec/rails_helper.rb
 - spec/requests/micro_api/static_healthz_spec.rb