sawa 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f39eefee142eb6f59e65b1fe0d82fd45efbedf5b
-  data.tar.gz: 2303cb3b6570dd0acbdf24e4cbe42bd8cbd8032f
+  metadata.gz: 863315e58ff876e3c62a7b83c8fa12ba9752c9c0
+  data.tar.gz: 9923f694c218df588e5e3998811c4e516323f2d5
 SHA512:
-  metadata.gz: c0465d195d08de3e741dabc4a0d8203324385aa8a05cc7825d45a7a099708fab5dd6b76e995a18fee81fdead4c88a74dc0c7361bf2155d9e3ee7ce4c9033fb88
-  data.tar.gz: 2ca23f63bd56b9e64e9ee168ebcdc4ed79a2789f36a53ad9becf6851244156aff9ac1dd9e81332cec3b14371f4ddb948d8a9ac1ef2b3b423ab4c872a3f3bffba
+  metadata.gz: f0a4a4aa27723f9b860f0b42815b131046fc1fa1b677a028506cca932ef55e39492ece0070b7d346268edaa12722043ddd9a6cd518f210ba3cee9c837956dac9
+  data.tar.gz: ff632cc8e7945133a156f3a61c6d07781de2b5a7d06845740317aca37d7e2021aae2773a33f5b852840c628cb973fd1bae21779ef0091ec613ba16d3fbf98e41

data/bin/sawa

@@ -2,6 +2,8 @@
 
 require 'sawa'
 require 'sawa/version'
+require 'optparse'
+require 'fileutils'
 
 class Sawa
   class CLI
@@ -10,6 +12,52 @@ class Sawa
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: sawa [-c] [-t] [-e] [-r library] FILE ..."
 
+	opts.separator " "
+
+        opts.separator "Examples:"
+        opts.separator "  $ mustache data.yml template.mustache"
+        opts.separator "  $ cat data.yml | mustache - template.mustache"
+        opts.separator "  $ mustache -c template.mustache"
+
+        opts.separator " "
+
+        opts.separator "See https://github.com/shouaya/sawagem"
+        opts.separator "  for more details."
+
+        opts.separator " "
+        opts.separator "Options:"
+
+	opts.on("-n", "--new FILE", "create sawa project") do |file|
+          puts exec('git clone https://github.com/shouaya/sawaapp.git ' + file)
+          exit
+        end
+
+	opts.on("-g", "--generate FILE", "generate source from file") do |file|
+          puts Sawa.new(file).generate_code
+          exit
+        end
+
+	opts.on("-s", "--server", "run rest api server") do
+	  puts "start rest api server"
+	  system('start java -cp bin;lib\sawa.jar;. com.jialu.sawa.MiniApp server mini.yml')
+          exit
+        end
+
+	opts.on("-d", "--dropdb", "drop db") do
+	  puts "drop db"
+	  system('start java -cp bin;lib\sawa.jar;. com.jialu.sawa.MiniApp db drop-all --confirm-delete-everything mini.yml')
+          exit
+        end
+
+#TODO 
+#	opts.on("-ac", "--antcompile", "ant compile java file to class") do
+#          exit
+#       end
+#	opts.on("-r", "--replace", "replace domian in build js") do
+#          exit
+#       end
+#	npm start / npm run /npm build
+
         opts.on("-v", "--version", "Print the version") do |v|
           puts "Sawa v#{Sawa::VERSION}"
           exit
@@ -32,7 +80,4 @@ end
 ARGV << '-h' if ARGV.empty? && $stdin.tty?
 
 # Process options
-Mustache::CLI.parse_options(ARGV) if $stdin.tty?
-
-# Still here - process rest of ARGF
-Mustache::CLI.process_files(ARGF)
+Sawa::CLI.parse_options(ARGV) if $stdin.tty?

data/lib/{MiniProperty.rb → sawa/MiniProperty.rb}

@@ -1,15 +1,4 @@
 class MiniProperty
-  @row
-  @sheet
-  @idx_type
-  @idx_name
-  @idx_unique
-  @idx_nullable
-  @idx_jsonignore
-  @idx_title
-  @idx_mappedBy
-  @idx_refColumn
-
   def initialize(row, sheet)
     @row = row
 	@sheet = sheet

data/lib/{MiniResource.rb → sawa/MiniResource.rb}

@@ -1,14 +1,4 @@
 class MiniResource
-  @row
-  @sheet
-  @idx_method
-  @idx_process
-  @idx_role
-  @idx_desc
-  @idx_islist
-  @idx_param
-  @idx_path
-  @idx_httpM
 
   def initialize(row, sheet)
     @row = row

data/lib/{MiniSheet.rb → sawa/MiniSheet.rb}

@@ -1,26 +1,9 @@
 require 'mustache'
 require 'spreadsheet'
-require './lib/MiniProperty.rb'
-require './lib/MiniResource.rb'
+require 'sawa/MiniProperty.rb'
+require 'sawa/MiniResource.rb'
 
 class MiniSheet < Mustache
-  @sheet
-  @config
-  @idx_path
-  @idx_title
-  @idx_method
-  @idx_process
-  @idx_role
-  @idx_type
-  @idx_name
-  @idx_unique
-  @idx_nullable
-  @idx_jsonignore
-  @idx_title
-  @idx_mappedBy
-  @idx_refColumn
-  @idx_isList
-  @idx_param
 
   def initialize(sheet, config)
     @sheet = sheet

data/lib/{MiniWork.rb → sawa/MiniWork.rb}

@@ -1,14 +1,10 @@
 # coding: UTF-8
 require 'spreadsheet'
 require 'mustache'
-require './lib/MiniSheet.rb'
+require 'sawa/MiniSheet.rb'
 
 class MiniWork < Mustache
 
-  @book
-
-  @sheets
-
   def initialize(file, config)
     @book = Spreadsheet.open(file, 'r')
 	@sheets = Hash.new()

data/lib/sawa/tpl/api.mustache

@@ -0,0 +1,40 @@
+package {{package_api}};
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+
+import javax.annotation.security.RolesAllowed;
+import {{package_model}}.{{model_name}};
+import com.jialu.sawa.vo.*;
+
+{{# api_imports}}
+{{.}}
+{{/ api_imports}}
+
+import io.dropwizard.hibernate.UnitOfWork;
+
+@Path("{{resource_path}}")
+public interface {{api_name}} {
+
+	{{# rows_path}}
+	/**
+	 * {{resource_desc}}
+	 */
+	@{{resource_httpM}}
+	@UnitOfWork
+	@Path("{{{resource_path}}}")
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	{{# resource_role}}
+	@RolesAllowed({ {{{.}}} })
+	{{/ resource_role}}
+	{{# resource_islist}}
+	public abstract OperatorResult<List<{{model_name}}>> {{resource_method}}({{{resource_param_full}}});
+	{{/ resource_islist}}
+	{{^ resource_islist}}
+	public abstract OperatorResult<{{model_name}}> {{resource_method}}({{{resource_param_full}}});
+	{{/ resource_islist}}
+	{{/ rows_path}}
+	
+}
+

data/lib/sawa/tpl/app.js.mustache

@@ -0,0 +1,73 @@
+import React, { Component } from 'react';
+import './App.css';
+import Guide from './Guide';
+import Online from './Online';
+{{# sheet_arr}}
+import {{page_name}} from './pages/{{page_name}}'
+{{/ sheet_arr}}
+import {
+  BrowserRouter as Router,
+  Route,
+  Link
+} from 'react-router-dom'
+import { Menu, Divider, Header } from 'semantic-ui-react'
+
+class App extends Component {
+  state = {webSocket: null, user:null, users: [], login:false}
+
+  handleItemClick = (e, { name }) => this.setState({ activeItem: name })
+  
+  onOpen(event) {
+	this.setState({ login:true })
+  }
+  
+  onClose(event) {
+	this.setState({ webSocket: null, users:[], login:false })
+  }
+  
+  componentWillMount(){
+	  let webSocket = new WebSocket("ws://localhost:3000/ws/");
+	  webSocket.onopen = this.onOpen.bind(this);
+	  webSocket.onclose = this.onClose.bind(this);
+	  this.setState({ webSocket: webSocket })
+  }
+  
+  onlineChange(users){
+	  this.setState({ users: users })
+  }
+  
+  onLogin(user){
+	  let webSocket = new WebSocket("ws://localhost:3000/ws/");
+	  webSocket.onopen = this.onOpen.bind(this);
+	  webSocket.onclose = this.onClose.bind(this);
+	  this.setState({ webSocket: webSocket, user: user, login:true })
+  }
+
+  render() {
+	const { activeItem } = this.state
+	if(!this.state.login) return  <Guide onLogin={this.onLogin.bind(this)} login={this.state.login}/>
+    return (
+      <Router>
+      <div className="body">
+		<Link to='/'>
+			<Header as='h1'>KPF</Header>
+		</Link>
+        <Menu>
+        {{# sheet_arr}}
+			<Menu.Item name='{{resource_path}}' active={activeItem === '{{resource_path}}'} as={Link} to='/{{resource_path}}' onClick={this.handleItemClick} >{{model_title}}</Menu.Item>
+		{{/ sheet_arr}}
+		    <Menu.Item name='online' active={activeItem === 'online'} as={Link} to='/online' onClick={this.handleItemClick} >OnLine</Menu.Item>
+        </Menu>
+	    <Divider />
+		<Route exact path="/" render={() => <Guide onLogin={this.onLogin.bind(this)} login={this.state.login}/>} />
+		{{# sheet_arr}}
+		<Route path='/{{resource_path}}' component={ {{page_name}} }/>
+		{{/ sheet_arr}}
+		<Route path='/online' render={() => <Online webSocket={this.state.webSocket} users={this.state.users} onlineChange={this.onlineChange.bind(this)}/>}/>
+	  </div>
+	  </Router>
+    );
+  }
+}
+
+export default App;

data/lib/sawa/tpl/crud.mustache

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"http://hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	
+<hibernate-mapping>	
+{{# sheet_arr}}
+
+	<query name="{{table_name}}">
+	  <![CDATA[FROM {{model_name}} e WHERE e.deleted = 0 ORDER BY e.utime DESC]]>
+	</query>
+	<query name="{{table_name}}-id">
+	  <![CDATA[FROM {{model_name}} e WHERE e.deleted = 0 and e.id = :id ORDER BY e.utime DESC]]>
+	</query>
+	<query name="{{table_name}}-cuser">
+	  <![CDATA[FROM {{model_name}} e WHERE e.deleted = 0 and e.cuser = :cuser ORDER BY e.utime DESC]]>
+	</query>
+	<query name="{{table_name}}-uuser">
+	  <![CDATA[FROM {{model_name}} e WHERE e.deleted = 0 and e.uuser = :uuser ORDER BY e.utime DESC]]>
+	</query>
+	<query name="{{table_name}}-deleted">
+	  <![CDATA[FROM {{model_name}} e WHERE e.deleted = :deleted ORDER BY e.utime DESC]]>
+	</query>
+    {{# rows_model}}
+    	{{# is_column}}
+    <query name="{{table_name}}-{{name}}">
+	  <![CDATA[FROM {{model_name}} e WHERE e.deleted = 0 and e.{{name}} = :{{name}} ORDER BY e.utime DESC]]>
+	</query>
+		{{/is_column}}
+    {{/ rows_model}}
+{{/ sheet_arr}}
+</hibernate-mapping>

data/lib/sawa/tpl/dao.mustache

@@ -0,0 +1,13 @@
+package {{package_dao}};
+
+import org.hibernate.SessionFactory;
+
+import {{package_model}}.{{model_name}};
+import com.jialu.sawa.utility.MiniDao;
+
+public class {{dao_name}} extends MiniDao<{{model_name}}> {
+
+	public {{dao_name}}(SessionFactory factory) {
+		super(factory);
+	}
+}

data/lib/sawa/tpl/model.mustache

@@ -0,0 +1,56 @@
+package {{package_model}};
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Column;
+
+import com.jialu.sawa.utility.MiniModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+{{# model_imports}}
+{{.}}
+{{/ model_imports}}
+
+/**
+ * @author tools
+ * {{model_title}}
+ */
+@Entity
+@Table(name = "{{table_name}}")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class {{model_name}} extends MiniModel{
+
+	private static final long serialVersionUID = 1L;
+	
+    {{# rows_model}}
+    /**
+	 * {{title}}
+	 */
+    {{# jsonignore}}
+	@JsonIgnore
+	{{/jsonignore}}
+    {{# has_mapped}}
+	    {{# is_onetomany}}
+	@OneToMany(mappedBy = "{{resource_name}}")
+	@JsonManagedReference("{{resource_name}}")
+	@Where(clause = "id < 0")
+		{{/is_onetomany}}
+		{{# is_manytoone}}
+	@ManyToOne
+	@JsonBackReference("{{name}}")
+	@JoinColumn(name="{{join_column}}", nullable=false, insertable = false, updatable = false)
+		{{/is_manytoone}}
+		{{# is_onetoone}}
+	@OneToOne
+	@JoinColumn(name="{{join_column}}", nullable=false, insertable = false, updatable = false)
+		{{/is_onetoone}}
+	{{/has_mapped}}
+	{{# is_column}}
+	@Column(unique = {{unique}}, nullable = {{nullable}})
+	{{/is_column}}
+	private {{{type}}} {{name}};
+		
+	{{/ rows_model}}
+}

data/lib/sawa/tpl/page.js.mustache

@@ -0,0 +1,26 @@
+import React, { Component } from 'react';
+import MiniPage from '../Page';
+class {{page_name}} extends Component {
+  
+  render() {
+    const column = [
+      {{# rows_model}}
+        {{^jsonignore}}
+          {"title":"{{title}}", "name":"{{name}}", "type":"{{type_js}}", "ref":"{{join_column}}"}, 
+        {{/jsonignore}}
+      {{/ rows_model}}
+    ]
+    
+    return (
+      <MiniPage
+        title="{{model_title}}"
+        name="{{resource_path}}" 
+        table_name="{{table_name}}" 
+        search={this.props.location.search}
+        column={column}
+      />
+    );
+  }
+}
+
+export default {{page_name}};

data/lib/sawa/tpl/property.mustache

@@ -0,0 +1,11 @@
+#{resource}.{name}={type},{nullable},{title}
+{{# sheet_arr}}
+{{table_name}}.id=java.lang.Integer,0,id
+{{table_name}}.cuser=java.lang.Integer,0,cuser
+{{table_name}}.uuser=java.lang.Integer,0,uuser
+{{# rows_model}}
+{{# is_column}}
+{{table_name}}.{{name}}={{type}},{{nullable}},{{title}}
+{{/is_column}}
+{{/ rows_model}}
+{{/ sheet_arr}}

data/lib/sawa/tpl/resource.mustache

@@ -0,0 +1,47 @@
+package {{package_resource}};
+
+import {{package_api}}.{{api_name}};
+import {{package_dao}}.{{dao_name}};
+import {{package_model}}.{{model_name}};
+import com.jialu.sawa.utility.MiniBean;
+import com.jialu.sawa.utility.MiniCrudResource;
+import com.jialu.sawa.vo.*;
+
+{{# resource_imports}}
+{{.}}
+{{/ resource_imports}}
+
+public class {{resource_name}} extends MiniCrudResource<{{model_name}}, {{dao_name}}> implements {{api_name}}{
+
+	public {{resource_name}}(MiniBean config) {
+		super(config);
+	}
+
+	@Override
+	public {{dao_name}} getDao() {
+		return config.getDao({{dao_name}}.class);
+	}
+	
+	@Override
+	public Class<{{model_name}}> getModelT() {
+		return {{model_name}}.class;
+	}
+	
+	{{# rows_path}}
+	/**
+	 * {{resource_desc}}
+	 */
+	@Override
+	{{# resource_islist}}
+	public OperatorResult<List<{{model_name}}>> {{resource_method}}({{{resource_param_type}}}) {
+		return {{resource_process}}({{{resource_param_value}}});
+	}
+	{{/ resource_islist}}
+	{{^ resource_islist}}
+	public OperatorResult<{{model_name}}> {{resource_method}}({{{resource_param_type}}}) {
+		return {{resource_process}}({{{resource_param_value}}});
+	}
+	{{/ resource_islist}}
+	{{/ rows_path}}
+	
+}

data/lib/sawa/version.rb

@@ -1,3 +1,3 @@
-module Sawa
-  VERSION = "0.0.2"
+class Sawa
+  VERSION = "0.0.3"
 end

data/lib/sawa.rb

@@ -1,5 +1,82 @@
-require "sawa/version"
+require 'fileutils'
+require 'sawa/MiniWork.rb'
+require 'yaml'
 
-module Sawa
+class Sawa
+  ROOT = Dir.pwd
+  GEMROOT = File.dirname(File.expand_path(__FILE__))
+
+  def initialize(options = {})
+    @options = options
+	@config = YAML.load_file("#{ROOT}/mini.yml")
+	@work = MiniWork.new(@options, @config)
+	@JSRC_PATH = "#{ROOT}/www/src"
+    @XML_PATH = "#{ROOT}/resources"
+    @MODEL_PATH = "#{ROOT}/src/" + @config['packageModel'].split('.').join("/")
+    @DAO_PATH = "#{ROOT}/src/" + @config['packageDao'].split('.').join("/")
+    @RES_PATH = "#{ROOT}/src/" + @config['packageResource'].split('.').join("/")
+    @API_PATH = "#{ROOT}/src/" + @config['packageApi'].split('.').join("/")
+	@TPL_PATH = "#{GEMROOT}/sawa/tpl"
+  end
+
+  def generate_code
+    #mkdir
+	FileUtils.mkdir_p @MODEL_PATH
+	FileUtils.mkdir_p @DAO_PATH
+	FileUtils.mkdir_p @RES_PATH
+	FileUtils.mkdir_p @API_PATH
+
+	#create_model
+	@work.sheets.each do |name, sheet|
+		sheet.template_file = "#{@TPL_PATH}/model.mustache"
+		str_model = sheet.render
+		File.open("#{@MODEL_PATH}/#{sheet.model_name}.java", 'w') { |file| file.write(str_model) }
+	end
+
+	#create_dao
+	@work.sheets.each do |name, sheet|
+		sheet.template_file = "#{@TPL_PATH}/dao.mustache"
+		str_dao = sheet.render
+		File.open("#{@DAO_PATH}/#{sheet.dao_name}.java", 'w') { |file| file.write(str_dao) }
+	end
+
+	#create_resource
+	@work.sheets.each do |name, sheet|
+		sheet.template_file = "#{@TPL_PATH}/resource.mustache"
+		str_resource = sheet.render
+		File.open("#{@RES_PATH}/#{sheet.resource_name}.java", 'w') { |file| file.write(str_resource) }
+	end
+
+	#create_api
+	@work.sheets.each do |name, sheet|
+		sheet.template_file = "#{@TPL_PATH}/api.mustache"
+		str_api = sheet.render
+		File.open("#{@API_PATH}/#{sheet.api_name}.java", 'w') { |file| file.write(str_api) }
+	end
+
+	#crud.xml
+	@work.template_file = "#{@TPL_PATH}/crud.mustache"
+	str_crud = @work.render
+	File.open("#{@XML_PATH}/crud.xml", 'w') { |file| file.write(str_crud) }
+
+	#property.properties
+	@work.template_file = "#{@TPL_PATH}/property.mustache"
+	str_property = @work.render
+	File.open("#{@XML_PATH}/property.properties", 'w') { |file| file.write(str_property) }
+
+	#app.js
+	@work.template_file = "#{@TPL_PATH}/app.js.mustache"
+	str_app_js = @work.render
+	File.open("#{@JSRC_PATH}/App.js", 'w') { |file| file.write(str_app_js) }
+
+	#page.js
+	@work.sheets.each do |name, sheet|
+		sheet.template_file = "#{@TPL_PATH}/page.js.mustache"
+		str_page_js = sheet.render
+		File.open("#{@JSRC_PATH}/pages/#{sheet.page_name}.js", 'w') { |file| file.write(str_page_js) }
+	end
+
+	"code generate finish"
+  end
   # Your code goes here...
 end

data/sawa.gemspec

@@ -14,20 +14,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/shouaya/sawagem"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host
-#  if spec.respond_to?(:metadata)
-#    spec.metadata['allowed_push_host'] = "http://rubygems.org"
-#  else
-#    raise "RubyGems 2.0 or newer is required to protect against " \
-#      "public gem pushes."
-#  end
-
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = %w( sawa )
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.14"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: sawa
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - shouaya
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
@@ -101,7 +101,8 @@ dependencies:
 description: '"https://github.com/shouaya/moa/blob/master/README.md"'
 email:
 - favaserver@gmail.com
-executables: []
+executables:
+- sawa
 extensions: []
 extra_rdoc_files: []
 files:
@@ -111,15 +112,22 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
 - bin/sawa
-- bin/setup
-- lib/MiniProperty.rb
-- lib/MiniResource.rb
-- lib/MiniSheet.rb
-- lib/MiniWork.rb
 - lib/sawa.rb
+- lib/sawa/MiniProperty.rb
+- lib/sawa/MiniResource.rb
+- lib/sawa/MiniSheet.rb
+- lib/sawa/MiniWork.rb
+- lib/sawa/tpl/api.mustache
+- lib/sawa/tpl/app.js.mustache
+- lib/sawa/tpl/crud.mustache
+- lib/sawa/tpl/dao.mustache
+- lib/sawa/tpl/model.mustache
+- lib/sawa/tpl/page.js.mustache
+- lib/sawa/tpl/property.mustache
+- lib/sawa/tpl/resource.mustache
 - lib/sawa/version.rb
+- sawa-0.0.2.gem
 - sawa.gemspec
 homepage: https://github.com/shouaya/sawagem
 licenses:

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "sawa"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here