sawa 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24db78bf9d07ca927150c578a3205c42805e3a70
-  data.tar.gz: 7e6854e7e1e52c48a35a7d4a3df54a422c354fda
+  metadata.gz: 14e926a8fce8d0ae7b074b0b3fb702ff09edee23
+  data.tar.gz: d1127987e884f681372612a8520ca0750904ed15
 SHA512:
-  metadata.gz: 25c1c360b192ec82e877c5e22be9eb0f2adef2a7ef69b16e05086ef7edb0e9059cb9f15a2a69ef562a20c885a8085f44044f8a6ae1f7a7d1aa834217f9b1e0fe
-  data.tar.gz: d9b5901fc25017069cac4a7c426d0596bb4c8ed89ee5c7961c2604d8a927258db006508b5c8a1f0a613f033e8927062c04193e2f1c89a386797ad4fec5c3bfda
+  metadata.gz: 78aeda3d19465c146b350e6954312a31fd6da6950180e7c7ce85dfa09121d1ccee273accf5e19eac8203af3abd2f5cf234813af411b31f52a1d02cb4f57b38a2
+  data.tar.gz: 5aac1a7656d657f6ea3b3c8bb45096ae9adcd1091d8bf257aa1945914b28578c7cea207509e0051cbc60631791b62e33c2864d3d532b059fa137fb4788654db8

data/lib/sawa/MiniProperty.rb

@@ -10,6 +10,7 @@ class MiniProperty
     @idx_title = 6
     @idx_mappedBy = 7
     @idx_refColumn = 8
+    @idx_searchKey = 9
   end
 
   def resource_name
@@ -76,4 +77,8 @@ class MiniProperty
   def is_onetoone
     @row[@idx_mappedBy] == "1:1"
   end
+  
+  def is_searchkey
+    @row[@idx_searchKey] == "1"
+  end
 end

data/lib/sawa/tpl/crud.mustache

@@ -22,9 +22,16 @@
 	</query>
     {{# rows_model}}
     	{{# is_column}}
+    		{{# is_searchkey}}
+	    <query name="{{table_name}}-{{name}}">
+		  <![CDATA[FROM {{model_name}} e WHERE e.deleted = 0 and e.{{name}} LIKE :{{name}} ORDER BY e.id]]>
+		</query>
+			{{/is_searchkey}}
+			{{^ is_searchkey}}
     <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_searchkey}}
 		{{/is_column}}
     {{/ rows_model}}
 {{/ sheet_arr}}

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

@@ -0,0 +1,12 @@
+const Source = {
+  {{# sheet_arr}}
+  	{{# rows_model}}
+    	{{# is_column}}
+    		{{# is_searchkey}}
+  {{resource_name}}: {name:'{{resource_name}}', query:{name: '{{table_name}}-{{name}}', limit: 10, offset: 0}, col:'{{name}}'},
+			{{/is_searchkey}}
+		{{/is_column}}
+    {{/ rows_model}}
+  {{/ sheet_arr}}
+};
+export default Source;

data/lib/sawa/version.rb

@@ -1,3 +1,3 @@
 class Sawa
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/sawa.rb

@@ -5,78 +5,82 @@ require 'yaml'
 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"
+    @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"
+    @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
+    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_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_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_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
 
-	#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) }
 
-	#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) }
 
-	#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) }
 
-	#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) }
+    #source.js
+    @work.template_file = "#{@TPL_PATH}/source.js.mustache"
+    str_source_js = @work.render
+    File.open("#{@JSRC_PATH}/Source.js", 'w') { |file| file.write(str_source_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
+    #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"
+    "code generate finish"
   end
   # Your code goes here...
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawa
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - shouaya
@@ -128,8 +128,8 @@ files:
 - lib/sawa/tpl/page.js.mustache
 - lib/sawa/tpl/property.mustache
 - lib/sawa/tpl/resource.mustache
+- lib/sawa/tpl/source.js.mustache
 - lib/sawa/version.rb
-- sawa-0.0.10.gem
 - sawa.gemspec
 homepage: https://github.com/shouaya/sawagem
 licenses: