liquigen 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3465ea76498398ccb3c75912d1f39d01dbeb3b523ba85edc1daf46c99efe2438
-  data.tar.gz: c4a3a66c49607b36e82c4591ea3117bbd53f4c6c0b3a27d6a04dbc01ddf13eba
+  metadata.gz: 05a501d34064aaf8ede92cbc04d332811c0dcb7217de086087e33d5762173f0c
+  data.tar.gz: 632a76814a1022a65ba08bcab9420e8c0ac60e1b263fbe87736d68dcb865c461
 SHA512:
-  metadata.gz: 280a3ad4df7b201c517b7bc48b30b19e28d3df8dcd09480496e8a12af243a41c34de65c6a99e6c98b52ff58b6f39db5564dda716cab77b1636728eb9aa73c9ac
-  data.tar.gz: 61595784281f2f3fca336bf521a43bb554fbee72648bf7fd31a232886a465e8acdfccaf77e40441aa6421c4b5fbec5cef2947ec2b565ba8bbc1038fd8e915992
+  metadata.gz: 390b18056ac67fe0a44b3f8cccb7358f34855751cdec7671b22700a01085c05f22a00bae05a66f26dcb06374b188b09454f26223e55391ead2ba51e8649f2a3b
+  data.tar.gz: a5563b6d56ca50a2e0e974b6106c798feb55afc0b7d52fc2b46851aec46ff01c9f008ccb3485151d7741fe391db090d5f640a3f19a769577d26566cf4b86d6b7

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    liquigen (0.1.0)
-      activesupport
+    liquigen (0.1.2)
+      activesupport (>= 4.1.11)
       gli (= 2.18.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -24,7 +24,7 @@ GEM
     builder (3.2.3)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     contracts (0.16.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)
@@ -46,13 +46,12 @@ GEM
     ffi (1.9.25)
     gherkin (5.1.0)
     gli (2.18.0)
-    i18n (1.1.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_test (0.1.2)
     rake (10.5.0)
-    rdoc (6.0.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -75,10 +74,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  aruba (~> 0)
   liquigen!
   rake (~> 10.0)
-  rdoc
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -188,6 +188,7 @@ liquigen scaffold -t table --controller --repository id:integer name:string emai
 spring:
   liquibase:
     change-log: classpath:/db/changelog-master.yaml
+    relativeToChangelogFile: true
 ```
 * Edit your changelog-master.yaml file.
 ```yaml

data/lib/liquigen/scaffold/base.rb

@@ -19,6 +19,7 @@ module Liquigen::Scaffold
       lines += []
       lines += methods_lines
       lines += ['}']
+      lines += ['']
 
       File.open(file, 'w') do |f|
         f.write lines.join("\n")

data/lib/liquigen/scaffold/controller.rb

@@ -16,8 +16,12 @@ module Liquigen::Scaffold
       [
         "package #{current_package};",
         '',
-        "import #{Liquigen.entity_package_name}.#{name.singularize.camelize};",
-        "import #{Liquigen.repository_package_name}.#{name.camelize}Repository;",
+        'import com.dyg.lib.rest.controller.Create;',
+        'import com.dyg.lib.rest.controller.Delete;',
+        'import com.dyg.lib.rest.controller.Read;',
+        'import com.dyg.lib.rest.controller.Update;',
+        "import #{Liquigen.repository_package_name}.#{name.singularize.camelize}Repo;",
+        'import lombok.Getter;',
         'import org.springframework.beans.factory.annotation.Autowired;',
         'import org.springframework.web.bind.annotation.RequestMapping;',
         'import org.springframework.web.bind.annotation.RestController;',
@@ -29,16 +33,23 @@ module Liquigen::Scaffold
       [
         '@RestController',
         "@RequestMapping(\"/#{name.underscore.pluralize}\")",
-        "public class #{name.pluralize.camelize}#{file_append} extends ControllerBase<#{name.singularize.camelize}, #{name.singularize.camelize}Repository> {"
+        "public class #{name.pluralize.camelize}#{file_append} implements Create, Read.Index, Read.Show, Update, Delete {"
       ]
     end
 
     def methods_lines
       [
+        'private final static Object[] PERMIT_PARAMS = {"name"};',
+        '',
         '@Autowired',
-        "public #{name.pluralize.camelize}#{file_append}(#{name.singularize.camelize}Repository repository) {",
-        'this.repository = repository;',
-        '}'
+        '@Getter',
+        "private #{name.singularize.camelize}Repo entityRepository;",
+        '',
+        '@Override',
+        'public Object[] createPermit() { return PERMIT_PARAMS; }',
+        '',
+        '@Override',
+        'public Object[] updatePermit() { return PERMIT_PARAMS; }'
       ]
     end
   end

data/lib/liquigen/scaffold/entity.rb

@@ -9,25 +9,20 @@ module Liquigen::Scaffold
     def import_lines
       [
         "package #{current_package};",
-        'import com.fasterxml.jackson.annotation.*;',
-        'import com.fasterxml.jackson.databind.annotation.JsonDeserialize;',
-        'import lombok.Getter;',
-        'import lombok.Setter;',
+        'import lombok.Data;',
         'import lombok.experimental.Accessors;',
-        'import javax.persistence.*;',
-        'import java.util.List;',
+        '',
+        'import javax.persistence.Entity;',
         ''
       ]
     end
 
     def class_lines
       [
-        '@Entity',
-        '@Getter',
-        '@Setter',
+        "@Entity(name = \"#{name.underscore.pluralize}\")",
+        '@Data',
         '@Accessors(chain = true)',
-        "@Table(name = \"#{name.underscore.pluralize}\")",
-        "public class #{name.singularize.camelize} extends ModelBase {"
+        "public class #{name.singularize.camelize} extends FakeDeleteBaseEntity {"
       ]
     end
 
@@ -38,12 +33,8 @@ module Liquigen::Scaffold
         key, value = property.split(':')
         next if skip_ones.include?(key.underscore)
 
-        lines += [
-                    '@Column(nullable = false)',
-                    '@JsonProperty',
-                    "private #{Liquigen::TypeMap.new(value).java_type} #{key.camelize};",
-                    ''
-                  ]
+        lines += ["private #{Liquigen::TypeMap.new(value).java_type} #{key.camelize(:lower)};",
+                  '']
       end
     end
   end

data/lib/liquigen/scaffold/repository.rb

@@ -5,22 +5,21 @@ module Liquigen::Scaffold
     end
 
     def file_append
-      'Repository'
+      'Repo'
     end
 
     def import_lines
       [
         "package #{current_package};",
-        "import #{Liquigen.entity_package_name}.#{name.singularize.camelize};",
-        'import org.springframework.stereotype.Repository;',
+        'import com.dyg.lib.rest.repository.EntityRepository;',
+        "import com.dyg.main.entity.#{name.singularize.camelize};",
         ''
       ]
     end
 
     def class_lines
       [
-        '@Repository',
-        "public interface #{name.singularize.camelize}#{file_append} extends IRepository<#{name.singularize.camelize}, Long> {"
+        "public interface #{name.singularize.camelize}#{file_append} extends EntityRepository<#{name.singularize.camelize}, Long> {"
       ]
     end
 

data/lib/liquigen/type_map.rb

@@ -16,7 +16,7 @@ module Liquigen
         decimal: 'decimal',
         datetime: 'datetime',
         binary: 'blob',
-        boolean: 'tinyint(1)'
+        boolean: 'boolean'
       }
 
       self.java_map = {

data/lib/liquigen/version.rb

@@ -1,3 +1,3 @@
 module Liquigen
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/liquigen.gemspec

@@ -20,7 +20,6 @@ spec = Gem::Specification.new do |s|
 
   s.add_development_dependency 'aruba', '~> 0'
   s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rdoc', '~> 0'
   s.add_development_dependency 'rspec', '~> 3.0'
 
   s.add_runtime_dependency 'gli', '2.18.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquigen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jeremy Cui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement