liquigen 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05a501d34064aaf8ede92cbc04d332811c0dcb7217de086087e33d5762173f0c
-  data.tar.gz: 632a76814a1022a65ba08bcab9420e8c0ac60e1b263fbe87736d68dcb865c461
+  metadata.gz: 77e765c5a3fed036596b75bce927a3ed1b815abdbdab5e90fc3cb16488f5e789
+  data.tar.gz: d438ac018101fe443603fec30cfc4e22b20a18bf9ce9a447fb1557fdd7f9dfac
 SHA512:
-  metadata.gz: 390b18056ac67fe0a44b3f8cccb7358f34855751cdec7671b22700a01085c05f22a00bae05a66f26dcb06374b188b09454f26223e55391ead2ba51e8649f2a3b
-  data.tar.gz: a5563b6d56ca50a2e0e974b6106c798feb55afc0b7d52fc2b46851aec46ff01c9f008ccb3485151d7741fe391db090d5f640a3f19a769577d26566cf4b86d6b7
+  metadata.gz: 8e806d0c261790219380ee0ac6be34eef31f3178c2e7354bb2ceb3d19cddaeb048aff3ed870bf74374768ca77b78b7df99317455d2e0804c5d3933ddf8fe9e09
+  data.tar.gz: 7444b3942f02cc76e9afe440967e4d9b4fcd08ae2325175e112004a7d70be434086abfe2af71da7f9bf51e8abe937719d68942e5fb040093b71fd280f6517dc6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liquigen (0.1.2)
+    liquigen (0.1.3)
       activesupport (>= 4.1.11)
       gli (= 2.18.0)
 

data/README.md

@@ -174,6 +174,7 @@ Please specify your custom name and path:
 * controller_package_name=
 * entity_package_name=
 * repository_package_name=
+* repository_suffix= # If you want UserRepository, set Repository here.
 
 ## scaffold
 ```bash

data/bin/liquigen

@@ -167,17 +167,23 @@ class App
     c.switch :entity
 
     c.desc 'generating the controller'
-    c.default_value false
+    c.default_value true
     c.switch :controller
 
     c.desc 'generating the repository'
     c.default_value false
     c.switch :repository
 
+    c.desc 'generating the schema statement'
+    c.default_value true
+    c.switch :schema
+
     c.action do |_, options, args|
       Liquigen::Scaffold::Entity.new(options[:n], args).process if options[:entity]
       Liquigen::Scaffold::Controller.new(options[:n], args).process if options[:controller]
       Liquigen::Scaffold::Repository.new(options[:n], args).process if options[:repository]
+      Liquigen::Scaffold::Schema.new(options[:n], args).process if options[:schema]
+      Liquigen::Handlers::CreateTable.new(options[:n], args).process
     end
   end
 

data/lib/liquigen/scaffold/config.rb

@@ -19,6 +19,7 @@ module Liquigen::Scaffold
       contents << '# controller_package_name='
       contents << '# entity_package_name='
       contents << '# repository_package_name='
+      contents << '# repository_suffix=Repository'
       contents << ''
     end
   end

data/lib/liquigen/scaffold/controller.rb

@@ -16,15 +16,14 @@ module Liquigen::Scaffold
       [
         "package #{current_package};",
         '',
-        '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 com.dyg.backend.controller.auth.HasPermissionOrRoot;',
+        "import com.dyg.backend.entity.#{name.camelize};",
+        'import com.dyg.lib.rest.controller.RestCRUD;',
         'import lombok.Getter;',
-        'import org.springframework.beans.factory.annotation.Autowired;',
         'import org.springframework.web.bind.annotation.RequestMapping;',
         'import org.springframework.web.bind.annotation.RestController;',
+        '',
+        'import static com.dyg.lib.rest.controller.KeySpecCollection.permit;',
         ''
       ]
     end
@@ -33,23 +32,33 @@ module Liquigen::Scaffold
       [
         '@RestController',
         "@RequestMapping(\"/#{name.underscore.pluralize}\")",
-        "public class #{name.pluralize.camelize}#{file_append} implements Create, Read.Index, Read.Show, Update, Delete {"
+        '@HasPermissionOrRoot',
+        "public class #{name.pluralize.camelize}#{file_append} implements RestCRUD<#{name.camelize}> {"
       ]
     end
 
+    def permit_params
+      lines = []
+      skip_ones = %w[id created_at updated_at available]
+      props.each do |property|
+        key, value = property.to_s.split(':')
+        next if skip_ones.include?(key.underscore)
+
+        lines += ["\"#{key}\""]
+      end
+      lines
+    end
+
     def methods_lines
       [
-        'private final static Object[] PERMIT_PARAMS = {"name"};',
         '',
-        '@Autowired',
         '@Getter',
-        "private #{name.singularize.camelize}Repo entityRepository;",
+        "private final Object[] updatePermit = {#{permit_params.join(', ')}};",
         '',
-        '@Override',
-        'public Object[] createPermit() { return PERMIT_PARAMS; }',
-        '',
-        '@Override',
-        'public Object[] updatePermit() { return PERMIT_PARAMS; }'
+
+        '@Getter',
+        'private final Object[] createPermit = permit(updatePermit);',
+        ''
       ]
     end
   end

data/lib/liquigen/scaffold/entity.rb

@@ -9,10 +9,14 @@ module Liquigen::Scaffold
     def import_lines
       [
         "package #{current_package};",
-        'import lombok.Data;',
+        'import lombok.Getter;',
+        'import lombok.Setter;',
         'import lombok.experimental.Accessors;',
         '',
         'import javax.persistence.Entity;',
+        'import javax.persistence.OneToOne;',
+        'import javax.persistence.OneToMany;',
+        'import javax.persistence.ManyToMany;',
         ''
       ]
     end
@@ -20,7 +24,8 @@ module Liquigen::Scaffold
     def class_lines
       [
         "@Entity(name = \"#{name.underscore.pluralize}\")",
-        '@Data',
+        '@Getter',
+        '@Setter',
         '@Accessors(chain = true)',
         "public class #{name.singularize.camelize} extends FakeDeleteBaseEntity {"
       ]
@@ -28,14 +33,18 @@ module Liquigen::Scaffold
 
     def methods_lines
       lines = []
-      skip_ones = %w[id created_time updated_time]
-      props.map do |property|
-        key, value = property.split(':')
+      skip_ones = %w[id created_at updated_at available]
+      props.each do |property|
+        key, value = property.to_s.split(':')
         next if skip_ones.include?(key.underscore)
 
-        lines += ["private #{Liquigen::TypeMap.new(value).java_type} #{key.camelize(:lower)};",
-                  '']
+        lines += [
+          '//@OneToOne',
+          "private #{Liquigen::TypeMap.new(value).java_type} #{key.camelize(:lower)};",
+          ''
+        ]
       end
+      lines
     end
   end
 end

data/lib/liquigen/scaffold/repository.rb

@@ -5,7 +5,7 @@ module Liquigen::Scaffold
     end
 
     def file_append
-      'Repo'
+      Liquigen.repository_suffix
     end
 
     def import_lines

data/lib/liquigen/scaffold/schema.rb

@@ -0,0 +1,79 @@
+require 'liquigen/type_map'
+
+module Liquigen::Scaffold
+  class Schema < Base
+    def current_package
+      Liquigen.schema_package_name
+    end
+
+    def import_lines
+      [
+        "package #{current_package};",
+        '',
+        'import com.dyg.main.config.Constants;',
+        'import com.dyg.schemas.*;',
+        'import lombok.Getter;',
+        'import lombok.Setter;',
+        '',
+        'import java.util.Date;'
+      ]
+    end
+
+    def class_lines
+      [
+        "@Getter",
+        '@Setter',
+        "@PresentationSchema(name = \"#{name.singularize}\")",
+        "public class #{name.singularize.camelize} {"
+      ]
+    end
+
+    def methods_lines
+      lines = []
+      skip_ones = %w[id created_at updated_at]
+      lines += [
+        '@PresentationField(primary = true, i18nKey = Constants.I18nCommon.Property.ID, type = FieldType.Number)',
+        '@PresentationColumn(type = ColumnType.LinkShow, width = "50px")',
+        '@PresentationDetailField',
+        'private Long id;',
+        ''
+      ]
+      props.each do |property|
+        key, value = property.to_s.split(':')
+        next if skip_ones.include?(key.underscore)
+        next if key.casecmp('available').zero?
+
+        type = Liquigen::TypeMap.new(value).java_type
+        stype = Liquigen::TypeMap.new(value).statement_type
+
+        if (stype && !stype.size.zero?)
+          lines += ["@PresentationField(type = FieldType.#{stype})"]
+        else
+          lines += ["@PresentationField//(i18nKey = Constants.I18nCommon.Property.#{key.upcase})"]
+        end
+
+        lines += [
+          '@PresentationColumn',
+          '@PresentationFormField(rules = { @PresentationRule(required = true) })',
+          '@PresentationDetailField',
+          '//@PresentationSearchField',
+          "private #{type} #{key.camelize(:lower)};",
+          ''
+        ]
+      end
+
+      lines += [
+        '@PresentationField(type = FieldType.Datetime, i18nKey = Constants.I18nCommon.Property.CREATED_AT)',
+        '@PresentationColumn(width = "140px")',
+        '@PresentationDetailField',
+        'private Date createdAt;',
+        '',
+        '@PresentationField(type = FieldType.Datetime, i18nKey = Constants.I18nCommon.Property.UPDATED_AT)',
+        '@PresentationColumn(width = "140px")',
+        '@PresentationDetailField',
+        'private Date updatedAt;'
+      ]
+      lines
+    end
+  end
+end

data/lib/liquigen/type_map.rb

@@ -3,6 +3,7 @@ module Liquigen
     attr_accessor :rails_type
     attr_accessor :map
     attr_accessor :java_map
+    attr_accessor :state_map
 
     def set_map
       # Only for mysql
@@ -26,10 +27,22 @@ module Liquigen
         text: 'String',
         float: 'Float',
         decimal: 'BigDecimal',
-        datetime: 'Date',
+        datetime: 'Instant',
         binary: 'Object',
         boolean: 'boolean'
       }
+
+      self.state_map = {
+        integer: 'Number',
+        long: 'Number',
+        string: '',
+        text: '',
+        float: 'Number',
+        decimal: 'Number',
+        datetime: 'Datetime',
+        binary: '',
+        boolean: ''
+      }
     end
 
     def initialize(type)
@@ -44,5 +57,9 @@ module Liquigen
     def java_type
       java_map[rails_type.to_sym]
     end
+
+    def statement_type
+      state_map[rails_type.to_sym]
+    end
   end
 end

data/lib/liquigen/version.rb

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

data/lib/liquigen.rb

@@ -32,6 +32,7 @@ require 'liquigen/scaffold/base'
 require 'liquigen/scaffold/controller'
 require 'liquigen/scaffold/entity'
 require 'liquigen/scaffold/repository'
+require 'liquigen/scaffold/schema'
 
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file
@@ -45,18 +46,24 @@ module Liquigen
     attr_accessor :entity_package_name
     # default value: #{package_name}.repository
     attr_accessor :repository_package_name
+    # default value: #{package_name}.statements
+    attr_accessor :schema_package_name
     # default value: src/main/java
     attr_accessor :java_codes_root
     # default value: src/main/resources/db/migrations
     attr_accessor :migration_path
 
+    attr_accessor :repository_suffix
+
     def load_default
       self.package_name ||= 'com.package'
       self.controller_package_name ||= "#{package_name}.controller"
       self.entity_package_name ||= "#{package_name}.model"
       self.repository_package_name ||= "#{package_name}.repository"
+      self.schema_package_name ||= "#{package_name}.statements"
       self.java_codes_root ||= 'src/main/java'
       self.migration_path ||= 'src/main/resources/db/migrations'
+      self.repository_suffix ||= 'Repository'
     end
 
     def load

data/spec/liquigen/scaffold/entity_spec.rb

@@ -19,4 +19,10 @@ RSpec.describe Liquigen::Scaffold::Entity, type: :model do
   describe '#filename' do
     specify { expect(entity.file_name).to eq 'User.java' }
   end
+
+  describe '#method_lines' do
+    let(:props) { ['name:string', 'nickname:string'] }
+    let(:result) { entity.methods_lines.reject { |x| x.length.zero? } }
+    specify { expect(result.size).to eq props.size * 2 }
+  end
 end

data/spec/liquigen/scaffold/repository_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe Liquigen::Scaffold::Repository, type: :model do
 
   before do
     Liquigen.java_codes_root = 'src/main/java'
+    Liquigen.repository_suffix = 'Repository'
     allow_any_instance_of(Liquigen::Scaffold::Entity).to receive(:current_package).and_return(package)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquigen
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jeremy Cui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,7 @@ files:
 - lib/liquigen/scaffold/controller.rb
 - lib/liquigen/scaffold/entity.rb
 - lib/liquigen/scaffold/repository.rb
+- lib/liquigen/scaffold/schema.rb
 - lib/liquigen/sql.rb
 - lib/liquigen/type_map.rb
 - lib/liquigen/version.rb