sawa 0.0.4 → 0.0.5

data/lib/sawa/MiniSheet.rb

@@ -1,192 +1,192 @@
-require 'mustache'
-require 'spreadsheet'
-require 'sawa/MiniProperty.rb'
-require 'sawa/MiniResource.rb'
-
-class MiniSheet < Mustache
-
-  def initialize(sheet, config)
-    @sheet = sheet
-	@config = config
-    @idx_path = 2
-    @idx_title = 3
-    @idx_method = 1
-    @idx_process = 2
-    @idx_role = 3
-    @idx_type = 1
-    @idx_name = 2
-    @idx_unique = 3
-    @idx_nullable = 4
-    @idx_jsonignore = 5
-    @idx_mtitle = 6
-    @idx_mappedBy = 7
-    @idx_refColumn = 8
-	@idx_isList = 5
-	@idx_param = 6
-  end
-
-  def name
-    @sheet.name
-  end
-
-  def rows_model
-	get_model_rows(@sheet)
-  end
-
-  def rows_path
-	get_path_rows(@sheet)
-  end
-
-  def package_api
-	@config['packageApi']
-  end
-
-  def package_dao
-	@config['packageDao']
-  end
-
-  def package_model
-	@config['packageModel']
-  end
-
-  def package_resource
-	@config['packageResource']
-  end
-
-  def table_name
-    @sheet.name
-  end
-
-  def model_name
-    getName("model", @sheet.name)
-  end
-  
-  def resource_path
-	@sheet.row(0)[@idx_path]
-  end
-  
-  def model_title
-	@sheet.row(0)[@idx_title]
-  end
-
-  def dao_name
-	getName("dao", @sheet.name)
-  end
-
-  def resource_name
-	getName("resource", @sheet.name)
-  end
-  def page_name
-	getName("page", @sheet.name)
-  end
-  def api_name
-	getName("if", @sheet.name)
-  end
-
-  def model_property_metas
-	arr = []
-	@sheet.each do |row|
-	  if row[0] == "m" and row[@idx_jsonignore] == "1"
-	    arr.push "#{@sheet.row(0)[@idx_path]}.#{row[@idx_name]}=#{row[@idx_type]},#{row[@idx_nullable]},#{row[@idx_mtitle]}"
-	  end
-	end
-	arr
-  end
-
-  def model_imports
-    arr = []
-    @sheet.each do |row|
-	  if row[0] != "m" 
-		next
-	  end
-
-	  if row[@idx_jsonignore] == "1" and !arr.include?("import com.fasterxml.jackson.annotation.JsonIgnore;")
-		arr.push "import com.fasterxml.jackson.annotation.JsonIgnore;"
-	  end
-	  if row[@idx_mappedBy] == "1:n" and !arr.include?("import javax.persistence.OneToMany;")
-		arr.push "import javax.persistence.OneToMany;"
-	  end
-	  if row[@idx_mappedBy] == "1:n" and !arr.include?("import com.fasterxml.jackson.annotation.JsonManagedReference;")
-		arr.push "import com.fasterxml.jackson.annotation.JsonManagedReference;"
-	  end
-	  if row[@idx_mappedBy] == "1:n" and !arr.include?("import org.hibernate.annotations.Where;")
-		arr.push "import org.hibernate.annotations.Where;"
-	  end
-
-	  if row[@idx_mappedBy] == "n:1" and !arr.include?("import javax.persistence.ManyToOne;")
-		arr.push "import javax.persistence.ManyToOne;"
-	  end
-	  if row[@idx_mappedBy] == "n:1" and !arr.include?("import com.fasterxml.jackson.annotation.JsonBackReference;")
-		arr.push "import com.fasterxml.jackson.annotation.JsonBackReference;"
-	  end
-	  if row[@idx_mappedBy] == "n:1" and !arr.include?("import javax.persistence.JoinColumn;")
-		arr.push "import javax.persistence.JoinColumn;"
-	  end
-
-	  if row[@idx_mappedBy] == "1:1" and !arr.include?("import javax.persistence.OneToOne;")
-		arr.push "import javax.persistence.OneToOne;"
-	  end
-	  if row[@idx_mappedBy] == "1:1" and !arr.include?("import javax.persistence.JoinColumn;")
-		arr.push "import javax.persistence.JoinColumn;"
-	  end
-	end
-	arr
-  end
-
-  def resource_imports
-    arr = []
-	@sheet.each do |row|
-	  if row[0] != "p" 
-		next
-	  end
-	  if row[@idx_jsonignore] == "1" and !arr.include?("import java.util.List;")
-		arr.push "import java.util.List;"
-	  end
-	end
-	arr
-  end
-
-  def api_imports
-    arr = []
-	@sheet.each do |row|
-	  if row[0] != "p" 
-		next
-	  end
-	  if row[@idx_isList] == "1" and !arr.include?("import java.util.List;")
-		arr.push "import java.util.List;"
-	  end
-	  if row[@idx_param].include?("@role") and !arr.include?("import io.dropwizard.auth.Auth;")
-		arr.push "import io.dropwizard.auth.Auth;"
-	  end
-	end
-	arr
-  end
-
-  private
-  def getName(type, sheetName)
-	perfix = sheetName.split("_")
-	perfix[0].capitalize + perfix[1].capitalize + type.capitalize
-  end
-
-  private
-  def get_model_rows(sheet)
-    rows_model = []
-	sheet.each do |row|
-	  if row[0] == "m"
-	    rows_model.push(MiniProperty.new(row, self))
-	  end
-	end
-	rows_model
-  end
-
-  private
-  def get_path_rows(sheet)
-    rows_path = []
-	sheet.each do |row|
-	  if row[0] == "p"
-	    rows_path.push(MiniResource.new(row, self))
-	  end
-	end
-	rows_path
-  end
+require 'mustache'
+require 'spreadsheet'
+require 'sawa/MiniProperty.rb'
+require 'sawa/MiniResource.rb'
+
+class MiniSheet < Mustache
+
+  def initialize(sheet, config)
+    @sheet = sheet
+	@config = config
+    @idx_path = 2
+    @idx_title = 3
+    @idx_method = 1
+    @idx_process = 2
+    @idx_role = 3
+    @idx_type = 1
+    @idx_name = 2
+    @idx_unique = 3
+    @idx_nullable = 4
+    @idx_jsonignore = 5
+    @idx_mtitle = 6
+    @idx_mappedBy = 7
+    @idx_refColumn = 8
+	@idx_isList = 5
+	@idx_param = 6
+  end
+
+  def name
+    @sheet.name
+  end
+
+  def rows_model
+	get_model_rows(@sheet)
+  end
+
+  def rows_path
+	get_path_rows(@sheet)
+  end
+
+  def package_api
+	@config['packageApi']
+  end
+
+  def package_dao
+	@config['packageDao']
+  end
+
+  def package_model
+	@config['packageModel']
+  end
+
+  def package_resource
+	@config['packageResource']
+  end
+
+  def table_name
+    @sheet.name
+  end
+
+  def model_name
+    getName("model", @sheet.name)
+  end
+  
+  def resource_path
+	@sheet.row(0)[@idx_path]
+  end
+  
+  def model_title
+	@sheet.row(0)[@idx_title]
+  end
+
+  def dao_name
+	getName("dao", @sheet.name)
+  end
+
+  def resource_name
+	getName("resource", @sheet.name)
+  end
+  def page_name
+	getName("page", @sheet.name)
+  end
+  def api_name
+	getName("if", @sheet.name)
+  end
+
+  def model_property_metas
+	arr = []
+	@sheet.each do |row|
+	  if row[0] == "m" and row[@idx_jsonignore] == "1"
+	    arr.push "#{@sheet.row(0)[@idx_path]}.#{row[@idx_name]}=#{row[@idx_type]},#{row[@idx_nullable]},#{row[@idx_mtitle]}"
+	  end
+	end
+	arr
+  end
+
+  def model_imports
+    arr = []
+    @sheet.each do |row|
+	  if row[0] != "m" 
+		next
+	  end
+
+	  if row[@idx_jsonignore] == "1" and !arr.include?("import com.fasterxml.jackson.annotation.JsonIgnore;")
+		arr.push "import com.fasterxml.jackson.annotation.JsonIgnore;"
+	  end
+	  if row[@idx_mappedBy] == "1:n" and !arr.include?("import javax.persistence.OneToMany;")
+		arr.push "import javax.persistence.OneToMany;"
+	  end
+	  if row[@idx_mappedBy] == "1:n" and !arr.include?("import com.fasterxml.jackson.annotation.JsonManagedReference;")
+		arr.push "import com.fasterxml.jackson.annotation.JsonManagedReference;"
+	  end
+	  if row[@idx_mappedBy] == "1:n" and !arr.include?("import org.hibernate.annotations.Where;")
+		arr.push "import org.hibernate.annotations.Where;"
+	  end
+
+	  if row[@idx_mappedBy] == "n:1" and !arr.include?("import javax.persistence.ManyToOne;")
+		arr.push "import javax.persistence.ManyToOne;"
+	  end
+	  if row[@idx_mappedBy] == "n:1" and !arr.include?("import com.fasterxml.jackson.annotation.JsonBackReference;")
+		arr.push "import com.fasterxml.jackson.annotation.JsonBackReference;"
+	  end
+	  if row[@idx_mappedBy] == "n:1" and !arr.include?("import javax.persistence.JoinColumn;")
+		arr.push "import javax.persistence.JoinColumn;"
+	  end
+
+	  if row[@idx_mappedBy] == "1:1" and !arr.include?("import javax.persistence.OneToOne;")
+		arr.push "import javax.persistence.OneToOne;"
+	  end
+	  if row[@idx_mappedBy] == "1:1" and !arr.include?("import javax.persistence.JoinColumn;")
+		arr.push "import javax.persistence.JoinColumn;"
+	  end
+	end
+	arr
+  end
+
+  def resource_imports
+    arr = []
+	@sheet.each do |row|
+	  if row[0] != "p" 
+		next
+	  end
+	  if row[@idx_jsonignore] == "1" and !arr.include?("import java.util.List;")
+		arr.push "import java.util.List;"
+	  end
+	end
+	arr
+  end
+
+  def api_imports
+    arr = []
+	@sheet.each do |row|
+	  if row[0] != "p" 
+		next
+	  end
+	  if row[@idx_isList] == "1" and !arr.include?("import java.util.List;")
+		arr.push "import java.util.List;"
+	  end
+	  if row[@idx_param].include?("@role") and !arr.include?("import io.dropwizard.auth.Auth;")
+		arr.push "import io.dropwizard.auth.Auth;"
+	  end
+	end
+	arr
+  end
+
+  private
+  def getName(type, sheetName)
+	perfix = sheetName.split("_")
+	perfix[0].capitalize + perfix[1].capitalize + type.capitalize
+  end
+
+  private
+  def get_model_rows(sheet)
+    rows_model = []
+	sheet.each do |row|
+	  if row[0] == "m"
+	    rows_model.push(MiniProperty.new(row, self))
+	  end
+	end
+	rows_model
+  end
+
+  private
+  def get_path_rows(sheet)
+    rows_path = []
+	sheet.each do |row|
+	  if row[0] == "p"
+	    rows_path.push(MiniResource.new(row, self))
+	  end
+	end
+	rows_path
+  end
 end

data/lib/sawa/MiniWork.rb

@@ -1,32 +1,32 @@
-# coding: UTF-8
-require 'spreadsheet'
-require 'mustache'
-require 'sawa/MiniSheet.rb'
-
-class MiniWork < Mustache
-
-  def initialize(file, config)
-    @book = Spreadsheet.open(file, 'r')
-	@sheets = Hash.new()
-	@book.worksheets.each do |sheet|
-		@sheets[sheet.name] = MiniSheet.new(sheet, config)
-	end
-  end
-
-  def sheets
-	@sheets
-  end
-
-  def sheet_arr
-    arr = []
-	@sheets.each do |name, sheet|
-		arr.push(sheet)
-	end
-	arr
-  end
-
-  def sheet(name)
-	@sheets[name]
-  end
-
+# coding: UTF-8
+require 'spreadsheet'
+require 'mustache'
+require 'sawa/MiniSheet.rb'
+
+class MiniWork < Mustache
+
+  def initialize(file, config)
+    @book = Spreadsheet.open(file, 'r')
+	@sheets = Hash.new()
+	@book.worksheets.each do |sheet|
+		@sheets[sheet.name] = MiniSheet.new(sheet, config)
+	end
+  end
+
+  def sheets
+	@sheets
+  end
+
+  def sheet_arr
+    arr = []
+	@sheets.each do |name, sheet|
+		arr.push(sheet)
+	end
+	arr
+  end
+
+  def sheet(name)
+	@sheets[name]
+  end
+
 end

data/lib/sawa/tpl/api.mustache

@@ -1,40 +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}}
-	
-}
-
+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

@@ -10,7 +10,7 @@ import {
   Route,
   Link
 } from 'react-router-dom'
-import { Menu, Divider, Header } from 'semantic-ui-react'
+import { Menu, Divider, Header,Image } from 'semantic-ui-react'
 
 class App extends Component {
   state = {webSocket: null, user:null, users: [], login:false}
@@ -50,7 +50,7 @@ class App extends Component {
       <Router>
       <div className="body">
 		<Link to='/'>
-			<Header as='h1'>KPF</Header>
+			<Header><Image src='https://s3-ap-northeast-1.amazonaws.com/ms17222/whale64.png' size='tiny' wrapped verticalAlign='bottom'/><span>�N�W��-�f�[�^</span></Header>
 		</Link>
         <Menu>
         {{# sheet_arr}}
@@ -63,7 +63,6 @@ class App extends Component {
 		{{# 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>
     );

data/lib/sawa/tpl/crud.mustache

@@ -1,31 +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}}
+<?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

@@ -1,13 +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);
-	}
-}
+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);
+	}
+}