grape-starter 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f03aba0838fc7a1877d9628a5a0fcdd3a29eb16836c9c41b29950814c7e5e6b
-  data.tar.gz: 64b0c86ecdcca53c866f275be224efe3937eb02dca2f299e4c7d416804c2a511
+  metadata.gz: a0e8dbdcdf0bc8ec707834a2a55a2c36826c316d82a45f7f8c219e1ec4361f37
+  data.tar.gz: 21d235ca4a99f447965c8cf9a765bfaabca150f74a493ee332fb60aa137ce7fd
 SHA512:
-  metadata.gz: 68c307c7b2d86729422ff90cdde27b6a46a77c52a37b8759cbe885e6e3fa547bb7e07b04c48473cc7e7591ffc77fe8a705d7c85193f6f10f93e22d9749f3baf6
-  data.tar.gz: 78dbcdbf71393a23687be2703ac207a13ad617c04148e0813e2a49df7e3241f8a1f6d32ba3c9b3dd4865e826ee358c242c9310da424a6e32b2e7b14697f91bf2
+  metadata.gz: c54cbaf4ce481b619e621c733a6b16bd1582761a297e4380de381773c837d3a0894a472f6e45bf451ad702fa5ca8fe1d0abcf8c067f31844d5eb75532cfec7cf
+  data.tar.gz: df826306d1964ed1f2a58f87353cfb03b6f86bb084b0cb70e14639b04748d18986e5d971be420efb12919b82a28042cf8e1147e0c938eb5a52c0ef4ed44694ae

data/.github/workflows/pipeline.yml

@@ -34,5 +34,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
+    - name: create tmp dir
+      run: mkdir tmp
     - name: Run rspec
       run: bundle exec rspec

data/lib/starter/build.rb

@@ -2,13 +2,14 @@
 
 module Starter
   class Build
-    extend Builder::Names
     extend Builder::BaseFile
     extend Templates::Files
     extend Templates::Endpoints
 
     class << self
-      attr_reader :prefix, :resource, :set, :force, :entity, :destination, :orm
+      attr_reader :prefix, :resource, :entity,
+                  :set, :force, :destination, :orm,
+                  :naming
 
       #
       # public methods
@@ -27,6 +28,7 @@ module Starter
         @resource = name
         @destination = destination
         @prefix = options[:p] # can be nil
+        @naming = Starter::Builder::Names.new(@resource)
 
         FileUtils.copy_entry source, destination
 
@@ -62,8 +64,9 @@ module Starter
         @force = options[:force]
         @entity = options[:entity]
         @orm = options[:orm]
+        @naming = Starter::Builder::Names.new(@resource)
 
-        Orms.add_migration(klass_name, resource.downcase) if @orm
+        Orms.add_migration(@naming.klass_name, resource.downcase) if @orm
         save_resource
       end
 
@@ -112,7 +115,7 @@ module Starter
       #
       # creates a new file in lib folder as namespace, includind the version
       def add_namespace_with_version
-        new_lib = File.join(destination, 'lib', base_file_name)
+        new_lib = File.join(destination, 'lib', @naming.base_file_name)
         FileOps.write_file(new_lib, base_namespace_file.strip_heredoc)
       end
 
@@ -128,7 +131,7 @@ module Starter
       #
       # provides an array of endpoints for the new resource
       def endpoint_set
-        crud_set = singular? ? singular_one : crud
+        crud_set = @naming.singular? ? singular_one : crud
         return crud_set if set.blank?
 
         crud_set.each_with_object([]) { |x, memo| set.map { |y| memo << x if x.to_s.start_with?(y) } }
@@ -138,7 +141,7 @@ module Starter
       # saves all resource related files
       def save_resource
         created_files = file_list.each_with_object([]) do |new_file, memo|
-          memo << send("#{new_file}_name")
+          memo << @naming.send("#{new_file}_name")
           save_file(new_file)
         end
 
@@ -150,7 +153,7 @@ module Starter
       #
       # saves new resource files
       def save_file(new_file)
-        new_file_name = send("#{new_file}_name")
+        new_file_name = @naming.send("#{new_file}_name")
         should_raise?(new_file_name)
         FileOps.write_file(new_file_name, send(new_file.strip_heredoc))
       end

data/lib/starter/builder/base_file.rb

@@ -5,24 +5,24 @@ module Starter
     module BaseFile
       # add it in api base
       def add_mount_point
-        FileOps.call!(api_base_file_name) { |content| add_to_base(content) }
+        FileOps.call!(@naming.api_base_file_name) { |content| add_to_base(content) }
       end
 
       # adding mount point to base class
       def add_to_base(file)
         occurence = file.scan(/(\s+mount\s.*?\n)/).last.first
-        replacement = occurence + mount_point
+        replacement = occurence + @naming.mount_point
         file.sub!(occurence, replacement)
       end
 
       # removes in api base
       def remove_mount_point
-        FileOps.call!(api_base_file_name) { |content| remove_from_base(content) }
+        FileOps.call!(@naming.api_base_file_name) { |content| remove_from_base(content) }
       end
 
       # removes mount point from base class
       def remove_from_base(file)
-        file.sub!(mount_point, '')
+        file.sub!(@naming.mount_point, '')
       end
 
       # parses out the prefix from base api file

data/lib/starter/builder/names.rb

@@ -2,51 +2,41 @@
 
 module Starter
   module Builder
-    module Names
+    class Names
+      def initialize(resource)
+        @resource = resource
+      end
+
       def klass_name
         for_klass = prepare_klass
         singular? ? for_klass.classify : for_klass.classify.pluralize
       end
 
-      def lib_klass_name
-        return klass_name unless @orm
-
-        case Starter::Config.read[:orm]
-        when 'sequel'
-          extend(Starter::Builder::Sequel)
-          "#{klass_name} < #{model_klass}"
-        when 'activerecord', 'ar'
-          extend(Starter::Builder::ActiveRecord)
-          "#{klass_name} < #{model_klass}"
-        else
-          klass_name
-        end
-      end
-
       # rubocop:disable Style/StringConcatenation
       def base_file_name
         @resource.tr('/', '-').downcase + '.rb'
       end
       # rubocop:enable Style/StringConcatenation
 
+      def api_base_file_name
+        File.join(Dir.getwd, 'api', 'base.rb')
+      end
+
       def base_spec_name
         base_file_name.gsub(/.rb$/, '_spec.rb')
       end
 
+      # entry in api/base.rb
       def mount_point
         "    mount Endpoints::#{klass_name}\n"
       end
 
-      def api_base_file_name
-        File.join(Dir.getwd, 'api', 'base.rb')
-      end
-
-      # resource file
+      # endpoints file
       def api_file_name
         File.join(Dir.getwd, 'api', 'endpoints', base_file_name)
       end
 
-      # resource file
+      # entities file
       def entity_file_name
         File.join(Dir.getwd, 'api', 'entities', base_file_name)
       end
@@ -56,6 +46,22 @@ module Starter
         File.join(Dir.getwd, 'lib', 'models', base_file_name)
       end
 
+      # model entry in lib file
+      def lib_klass_name
+        return klass_name unless @orm
+
+        case Starter::Config.read[:orm]
+        when 'sequel'
+          extend(Starter::Builder::Sequel)
+          "#{klass_name} < #{model_klass}"
+        when 'activerecord', 'ar'
+          extend(Starter::Builder::ActiveRecord)
+          "#{klass_name} < #{model_klass}"
+        else
+          klass_name
+        end
+      end
+
       # resource spec
       def api_spec_name
         File.join(Dir.getwd, 'spec', 'requests', base_spec_name)
@@ -66,15 +72,15 @@ module Starter
         File.join(Dir.getwd, 'spec', 'lib', 'models', base_spec_name)
       end
 
+      def singular?
+        @resource.singularize.inspect == @resource.inspect
+      end
+
       private
 
       def prepare_klass
         @resource.tr('-', '/')
       end
-
-      def singular?
-        @resource.singularize.inspect == @resource.inspect
-      end
     end
   end
 end

data/lib/starter/templates/files.rb

@@ -10,7 +10,7 @@ module Starter
 
         module Api
           module Endpoints
-            class #{klass_name} < Grape::API
+            class #{@naming.klass_name} < Grape::API
               namespace :#{resource.downcase} do
                 #{endpoints}
               end
@@ -26,7 +26,7 @@ module Starter
 
         module Api
           module Entities
-            class #{klass_name} < Grape::Entity
+            class #{@naming.klass_name} < Grape::Entity
             end
           end
         end
@@ -38,7 +38,7 @@ module Starter
         <<-FILE.strip_heredoc
         # frozen_string_literal: true
 
-        module #{klass_name}
+        module #{@naming.klass_name}
           VERSION  = '0.1.0'
         end
         FILE
@@ -49,7 +49,7 @@ module Starter
         # frozen_string_literal: true
 
         module Models
-          class #{lib_klass_name}
+          class #{@naming.lib_klass_name}
           end
         end
         FILE
@@ -74,7 +74,7 @@ module Starter
 
         require 'spec_helper'
 
-        RSpec.describe Models::#{klass_name} do
+        RSpec.describe Models::#{@naming.klass_name} do
           pending 'write specs'
         end
         FILE

data/lib/starter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Starter
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - LeFnord
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli