grapethor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164d641128293c332e80fac404ec38bf342b56ace1aabb0bb3d6c0712cabde5d
-  data.tar.gz: a4515860d094c657a841e9c0c2d567bfd1c638514fecca774b40e851adfd7f86
+  metadata.gz: c7c7bfe6c0b3508813bab9aea15e96b0a1f339c5886a481ecd50b90ea59cd2f4
+  data.tar.gz: 2344f087f0b824e8d88a247e44162c2a74f62405ccd43c7bbcb6601f9c1e3260
 SHA512:
-  metadata.gz: 4062d5ce2cb8efab981226c6341d174354b0761be551c88e768144a179deb66c7ca20540972dcc969617b90d3dc9986f21a1fb37eace453a03f1c6bd6f2672dd
-  data.tar.gz: 82533b288cb77cb834ca36f8c3e96bda71f1e7ff611a3be522ca64e8d46d84be08227205cfcadb2c8413870688dc9359b8847d83b89f8df931524369b7f9597f
+  metadata.gz: b85c34d5ae4c5e74952c4aa7571b21e2e6817398f09e6cdb911b83089b770bf0c6c5030d258a6a5c2f87125b450080fe255180fab839f5bc1b3ca7ce2d874516
+  data.tar.gz: 5797c222847696c98bd67e1bd9418a2a36fd9043564c20b19834eff2a07d654d46528c3915e4e33255479e1b24193976277046e728362cce44e970056e7e03f2

data/CHANGELOG.md

@@ -7,6 +7,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [0.2.1] - 2020-01-16
+### Fixed
++ fix resource generator and utils tests
+
+
+## [0.2.0] - 2019-04-17
+### Changed
++ improve support for resource generator options
+
 
 ## [0.1.0] - 2019-04-10
 ###Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grapethor (0.2.0)
+    grapethor (0.2.1)
       activesupport (~> 5.2)
       thor (~> 0.20)
 

data/README.md

@@ -115,7 +115,7 @@ Multiple RESOURCES may be created for single API version
 
 Note: ':id' request path parameter is implicitly used as primary key. There is no need to include it with '-a' option.
 
-Model attribute types available specific ORM:
+Model attribute types available for specific ORM:
 
 - activerecord: `bigint, binary, boolean, date, datetime, decimal, float, integer, numeric, string, text, time`
 

data/lib/grapethor/generators/resource.rb

@@ -85,5 +85,10 @@ module Grapethor
     def res_name_plural
       res_name.pluralize
     end
+
+    def app_prefix
+      @app_prefix ||= YAML.load(File.read(CONFIG_FILENAME))['app_prefix']
+    end
+
   end
 end

data/lib/grapethor/templates/resource/api/%api_version%/%res_name_plural%.rb.tt

@@ -50,9 +50,9 @@ module API<%= api_version %>
       desc 'Creates new <%= res_name %>'
 <% unless res_attrs.empty? -%>
       params do
-  <% res_attrs.each do |name, type| -%>
+<% res_attrs.each do |name, type| -%>
         requires :<%= name %>, type: <%= param_to_type(type) %>
-  <% end -%>
+<% end -%>
       end
 <% end -%>
       post do

data/lib/grapethor/templates/resource_minitest/test/api/%api_version%/%res_name_plural%_test.rb.tt

@@ -21,7 +21,7 @@ class API<%= api_version %><%= res_name.classify.pluralize %>Test < TestCase
 
 
   def test_get_all_<%= res_name.pluralize %>
-    get '/<%= api_version %>/<%= res_name.pluralize %>'
+    get '/<%= app_prefix %>/<%= api_version %>/<%= res_name.pluralize %>'
 
     assert_equal 200, last_response.status
     assert_equal @all_<%= res_name.pluralize %>.to_json, last_response.body
@@ -29,14 +29,14 @@ class API<%= api_version %><%= res_name.classify.pluralize %>Test < TestCase
 
 
   def test_get_<%= res_name %>
-    get "/<%= api_version %>/<%= res_name.pluralize %>/#{@<%= res_name %>1.id}"
+    get "/<%= app_prefix %>/<%= api_version %>/<%= res_name.pluralize %>/#{@<%= res_name %>1.id}"
 
     assert_equal 200, last_response.status
     assert_equal @<%= res_name %>1.to_json, last_response.body
   end
 
   def test_get_<%= res_name %>_by_id_not_found
-    get "/<%= api_version %>/<%= res_name.pluralize %>/1000"
+    get "/<%= app_prefix %>/<%= api_version %>/<%= res_name.pluralize %>/1000"
 
     assert_equal 404, last_response.status
     assert_equal @not_found_response.to_json, last_response.body
@@ -50,7 +50,7 @@ class API<%= api_version %><%= res_name.classify.pluralize %>Test < TestCase
 <% end -%>
     }
     <%= res_name %>_count = <%= res_name.classify %>.count
-    post '/<%= api_version %>/<%= res_name.pluralize %>', body, { 'Content-Type' => 'application/json' }
+    post '/<%= app_prefix %>/<%= api_version %>/<%= res_name.pluralize %>', body, { 'Content-Type' => 'application/json' }
 
     assert_equal 201, last_response.status
     assert_equal <%= res_name %>_count + 1, <%= res_name.classify %>.count
@@ -63,7 +63,7 @@ class API<%= api_version %><%= res_name.classify.pluralize %>Test < TestCase
       <%= name %>: <%= sample_value(type) %>,
 <% end -%>
     }
-    put "/<%= api_version %>/<%= res_name.pluralize %>/#{@<%= res_name %>1.id}", body, { 'Content-Type' => 'application/json' }
+    put "/<%= app_prefix %>/<%= api_version %>/<%= res_name.pluralize %>/#{@<%= res_name %>1.id}", body, { 'Content-Type' => 'application/json' }
 
     assert_equal 204, last_response.status
 <% res_attrs.each do |name, type| -%>
@@ -74,7 +74,7 @@ class API<%= api_version %><%= res_name.classify.pluralize %>Test < TestCase
 
   def test_delete_<%= res_name %>
     <%= res_name %>_count = <%= res_name.classify %>.count
-    delete "/<%= api_version %>/<%= res_name.pluralize %>/#{@<%= res_name %>1.id}"
+    delete "/<%= app_prefix %>/<%= api_version %>/<%= res_name.pluralize %>/#{@<%= res_name %>1.id}"
 
     assert_equal 204, last_response.status
     assert_equal <%= res_name %>_count - 1, <%= res_name.classify %>.count

data/lib/grapethor/utils/utils.rb

@@ -1,4 +1,5 @@
 require 'bigdecimal'
+require 'date'
 
 module Grapethor
   module Utils
@@ -21,11 +22,11 @@ module Grapethor
         },
         date: {
           type: 'Date',
-          sample: "'<%= Date.today %>'"
+          sample: Date.today
         },
         datetime: {
           type: 'DateTime',
-          sample: "'<%= DateTime.now %>'"
+          sample: DateTime.now
         },
         decimal: {
           type: 'BigDecimal',
@@ -45,19 +46,86 @@ module Grapethor
         },
         string: {
           type: 'String',
-          sample: "'MyString'"
+          sample: 'MyString'
         },
         text: {
           type: 'String',
-          sample: "'MyText'"
+          sample: "MyText"
         },
         time: {
           type: 'Time',
-          sample: "'<%= Time.now %>'"
+          sample: Time.now
         }
+      },
+      mongoid: {
+        # Array: {
+        #   type:,
+        #   sample:
+        # },
+        BigDecimal: {
+          type: 'BigDecimal',
+          sample: BigDecimal(123.45, 2)
+        },
+        # BSON::ObjectId: {
+        #   type:,
+        #   sample:
+        # },
+        Boolean: {
+          type: 'Boolean',
+          sample: true
+        },
+        Date: {
+          type: 'Date',
+          sample: Date.today
+        },
+        DateTime: {
+          type: 'DateTime',
+          sample: DateTime.now
+        },
+        Float: {
+          type: 'Float',
+          sample: 123.45
+        },
+        # Hash: {
+        #   type:,
+        #   sample:
+        # },
+        Integer: {
+          type: 'Integer',
+          sample: 123
+        },
+        # Moped::BSON::Binary: {
+        #   type:,
+        #   sample:
+        # },
+        # Range: {
+        #   type:,
+        #   sample:
+        # },
+        # Regexp: {
+        #   type:,
+        #   sample:
+        # },
+        String: {
+          type: 'String',
+          sample: 'MyString'
+        },
+        Symbol: {
+          type: 'Symbol',
+          sample: :mysymbol
+        },
+        Time: {
+          type: 'Time',
+          sample: Time.now
+        }
+        # TimeWithZone: {
+        #   type: 'Time',
+        #   sample:
+        # },
       }
     }
 
+
     TEST_FRAMEWORK_DIRNAME = {
       minitest: 'test',
       rspec: 'spec'

data/lib/grapethor/version.rb

@@ -1,3 +1,3 @@
 module Grapethor
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grapethor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Rafal Wrzochol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor