grapethor 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34bea2dd1529d4854da3b0977935ff239c022fc159eaaf1316564ebcb78c54e8
-  data.tar.gz: 20ddda30a361cdbc7e1e7299a748533233e77c8236ecb055da51cda74a8d108d
+  metadata.gz: e9187bde9ed9fb9f465935964e21b543d3a8d48cd026a1637f27db3c64c9a447
+  data.tar.gz: a559bbc74c883c306c2518ceeed6d507051f78dc21cf8110ed9e2266fa2a1de2
 SHA512:
-  metadata.gz: 0bed46f98d9963e015120741eb68d8be17baa78162390b442b2c04c5a3aef22af1928ab7ea16ad319994643aa040c1edd5cda28e91bdf65ee5d3dcffa8bff0a0
-  data.tar.gz: 6de3392a82a03732209e68261abee6140d9152a1ec2880dedf17c0bedac18b67d76eb928c4987f010ce1b5824d5043953ab18299ca5c0c2aaf6378011d678c29
+  metadata.gz: b3673e24a176dba4fe366f12e382b42fed8f1f02dd978876866e501e66c20112bff2915f4699c5c2bdf338df8a6f4a82fbc68b24f3cfac556496ac41ec148b0c
+  data.tar.gz: 1bf283d3d109bc4739ae5c677fbd062e2e20b039ee7fe494e9a41c61234b85a18aa61e1e822880e76e0f984f30ee960688d89f370bc949865421e58ff388d986

data/CHANGELOG.md

@@ -7,6 +7,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [0.2.3] - 2020-03-08
+### Added
++ add 'puma' to server options
+
+### Fixed
++ fix --path option for CLI
++ fix class descriptions for tests
+
+
 ## [0.2.2] - 2020-02-29
 ### Fixed
 + update rake requirement from ~> 10.0 to ~> 13.0
@@ -23,5 +32,5 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 
 ## [0.1.0] - 2019-04-10
-###Added
+### Added
 + migrate source code from rawongithub/graperator gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grapethor (0.2.2)
+    grapethor (0.2.3)
       activesupport (~> 5.2)
       thor (~> 1.0.1)
 

data/README.md

@@ -50,7 +50,7 @@ Options:
                                    # Possible values: activerecord
   -s, [--server=SERVER]            # Preconfigure web server
                                    # Default: thin
-                                   # Possible values: thin
+                                   # Possible values: thin, puma
   -t, [--test=TEST]                # Use specific test framework
                                    # Default: minitest
                                    # Possible values: minitest, rspec

data/lib/grapethor/generators/api.rb

@@ -64,15 +64,20 @@ module Grapethor
     end
 
     def app_name
-      @app_name ||= YAML.load(File.read(CONFIG_FILENAME))['app_name']
+      @app_name ||= config_filename(app_path)['app_name']
     end
 
     def app_prefix
-      @app_prefix ||= YAML.load(File.read(CONFIG_FILENAME))['app_prefix']
+      @app_prefix ||= config_filename(app_path)['app_prefix']
     end
 
     def app_swagger?
-      @app_swagger||= YAML.load(File.read(CONFIG_FILENAME))['app_swagger']
+      @app_swagger ||= config_filename(app_path)['app_swagger']
     end
+
+    def app_test_framework
+      @app_test_framework ||= config_filename(@app_path)['app_test_framework']
+    end
+
   end
 end

data/lib/grapethor/generators/endpoint.rb

@@ -164,5 +164,28 @@ module Grapethor
     def end_resource_plural
       end_resource.pluralize
     end
+
+
+    def app_test_framework
+      @app_test_framework ||= config_filename(@app_path)['app_test_framework']
+    end
+
+    def app_orm
+      @app_orm ||= config_filename(@app_path)['app_orm']
+    end
+
+
+    def param_to_type(param)
+      ATTRS_MAP.dig(app_orm.to_sym, param.to_sym, :type) || 'Unknown'
+    end
+
+    def sample_value(param, path=false)
+      val = ATTRS_MAP.dig(app_orm.to_sym, param.to_sym, :sample)
+      if path && val.respond_to?(:tr!)
+        val.tr!("'", "")
+      end
+      val || 'unknown'
+    end
+
   end
 end

data/lib/grapethor/generators/new.rb

@@ -58,7 +58,7 @@ module Grapethor
     class_option :server,    aliases: '-s',
                              type: :string,
                              default: 'thin',
-                             enum: %w[thin],
+                             enum: %w[thin puma],
                              desc: 'Preconfigure web server'
 
     class_option :test,      aliases: '-t',

data/lib/grapethor/generators/resource.rb

@@ -78,16 +78,43 @@ module Grapethor
       Dir.exist?("#{app_path}/api/#{api_version}")
     end
 
+
     def res_migration
       "#{Time.now.strftime("%Y%m%d%H%M%S")}_create_#{res_name.pluralize}"
     end
 
+
     def res_name_plural
       res_name.pluralize
     end
 
+
     def app_prefix
-      @app_prefix ||= YAML.load(File.read(CONFIG_FILENAME))['app_prefix']
+      @app_prefix ||= config_filename(@app_path)['app_prefix']
+    end
+
+
+    def app_test_framework
+      @app_test_framework ||= config_filename(@app_path)['app_test_framework']
+    end
+
+
+    def app_orm
+      @app_orm ||= config_filename(@app_path)['app_orm']
+    end
+
+
+    def param_to_type(param)
+      ATTRS_MAP.dig(app_orm.to_sym, param.to_sym, :type) || 'Unknown'
+    end
+
+
+    def sample_value(param, path=false)
+      val = ATTRS_MAP.dig(app_orm.to_sym, param.to_sym, :sample)
+      if path && val.respond_to?(:tr!)
+        val.tr!("'", "")
+      end
+      val || 'unknown'
     end
 
   end

data/lib/grapethor/utils/utils.rb

@@ -87,22 +87,12 @@ module Grapethor
     end
 
 
-    def param_to_type(param)
-      ATTRS_MAP.dig(app_orm.to_sym, param.to_sym, :type) || 'Unknown'
-    end
-
-
-    def sample_value(param, path=false)
-      val = ATTRS_MAP.dig(app_orm.to_sym, param.to_sym, :sample)
-      if path && val.respond_to?(:tr!)
-        val.tr!("'", "")
+    def config_filename(app_path)
+      begin
+        YAML.load(File.read(File.join(app_path, CONFIG_FILENAME)))
+      rescue Errno::ENOENT, Errno::EACCES
+        say "\n ERROR: Config file not found. Try grapethor command with -p, [--path=PATH] option."
       end
-      val || 'unknown'
-    end
-
-
-    def app_test_framework
-      YAML.load(File.read(CONFIG_FILENAME))['app_test_framework']
     end
 
 
@@ -110,9 +100,5 @@ module Grapethor
       TEST_FRAMEWORK_DIRNAME[app_test_framework.to_sym]
     end
 
-
-    def app_orm
-      YAML.load(File.read(CONFIG_FILENAME))['app_orm']
-    end
   end
 end

data/lib/grapethor/version.rb

@@ -1,3 +1,3 @@
 module Grapethor
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grapethor
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rafal Wrzochol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor