qwer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b40b603e5c2a2da893b6cc89b246cde193b9f14
-  data.tar.gz: b9fc369245768b2e85578aade0a668af175befe7
+  metadata.gz: 9a049889a8c127dd590b21203a34431749253774
+  data.tar.gz: fc0d9ee35aeed5287c9d2224562d25c83fa02738
 SHA512:
-  metadata.gz: 3a685c749ce8a4d801029f562fd9b57cf35d27d8a0966b34eb6d0cd53babd521128d5023dd7da7dcd43d478ddfe8d989bb63275ec4122f0fafc675fc6dfffbe0
-  data.tar.gz: 2112b5091646bafa76133a9c7a6717a477d06eb3a95ae33a6f2f5c7b0b9b6012bb7c8011a0b0e92ba6d5193c5c97a01d568e969958c011a163f9c70318c0fcc8
+  metadata.gz: eab2bb0b69143658380a3ccf3863a49e3939826d0d42e0164667eaad9da8cf092c1fad10c0cc9c246784cb2bdf940b22011814ed8512ba81c861703e24342707
+  data.tar.gz: 2c905049ad978b2b8b32db7a691d1e1295a31a0e58ea209ca65b7ed384616e98d952ac1324e2d0a535da3aa4b18ba0ba2fee264a7367e5ecf583b2bf9808fa22

data/.idea/qwer.iml

@@ -138,6 +138,7 @@
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.13.6, rbenv: 2.3.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.4, rbenv: 2.3.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.3.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="enum_help (v0.0.16, rbenv: 2.3.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.3.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.3.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="kaminari (v1.0.0, rbenv: 2.3.1) [gem]" level="application" />

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/README.md

@@ -1,8 +1,6 @@
 # Qwer
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/qwer`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+qwer一招带走你的index
 
 ## Installation
 
@@ -22,7 +20,47 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+- 在`index.html`适当的位置添加代码
+
+```
+    model = Qwer::Tmodel.new('users', 10, 1)   
+    
+
+    第一个参数：　当前业务
+    第二个参数：　每页显示数量
+    第三个参数：  当前页数
+```
+
+- 调用方法table_seach,创建查询项
+```
+    model.table_seach({
+                          action: '/users',         ## 提交地址（默认为当前业务）
+                          method: 'get',            ## 请求方式（默认为get）
+                          form_class: 'form-inline text-right',     ## 表单样式：　默认（pjax-form）
+                          'charset': 'UTF-8',       ## 编码（默认字符集UTF-8）
+                          new: '/companies/new'     ## 新建按钮指向地址（可选,不传则没有新建按钮）
+                      }, {
+                          'q[name_cont]': '名称',    ## 查询项name及其显示名称
+                      })
+```
+
+- 调用方法table_data,创建数据表
+```
+ model.table_data({        car_no: '车牌号',
+                          'driver.name': '司机',
+                          status_i18n: '状态',
+                         }, {
+                             edit: {name: '编辑', css: 'label label-success'},
+                             del: {name: '删除', css: 'label label-danger'},
+                             business: '<a class="label label-success" data-confirm="我的id是??" href="/companies/??/edit">其他</a>'
+                         }, @cars )
+
+第一个参数：  Hash  |  数据表字段  | 格式：　{字段或方法名：　‘显示表头’, ...}
+第二个参数：  Hash  |  数据操作项  | 格式：　{'预设操作按钮编辑（edit）和删除(del)': {name和css属性}}
+第三个参数：  数据表数据 
+```
+
+
 
 ## Development
 
@@ -32,7 +70,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/qwer. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Canmel/qwer. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/qwer/translater.rb

@@ -1,31 +1,31 @@
 module Qwer
   class Translater
-    def self.table_search(form_params, data_params)
-      html_str = "<form class='pjax-form' id='' action='#{form_params[:action]}' accept-charset='#{form_params[:charset] ||= 'UTF-8' }' method='#{form_params[:method]}'>
-        <input name='utf8' type='hidden' value='✓'>"
-
-      data_params.reject { |key, value| html_str += "<label class='control-label'>#{value}：</label><input class='form-control' type='search' name='#{key}' id='q_#{key}'>" }
-
-      html_str += "<a class='btn btn-success green' href='#{form_params[:new]}'>新增</a>" if form_params[:new]
-      html_str += "<button type='submit' class='btn btn-info' data-toggle='modal' data-target='#search_model'>查询</button> </form>"
+    def self.table_search(form_params, data_params, model)
+      html_str = "<form class='#{form_params[:form_class] ||= 'pjax-form'}' id='' action='#{form_params[:action] ||= model}' accept-charset='#{form_params[:charset] ||= 'UTF-8' }' method='#{form_params[:method] ||= 'get'}'>"
+      html_str << "<input name='utf8' type='hidden' value='✓'>"
+      data_params.reject { |key, value| html_str << "<div class='form-group'><label class='control-label'>#{value}：</label><input class='form-control' type='search' name='#{key}' id='q_#{key}'></div>" }
+      html_str << "<a class='btn btn-success green' href='#{form_params[:new]}'>新增</a>" if form_params[:new]
+      html_str << "<button type='submit' class='btn btn-info' data-toggle='modal' data-target='#search_model'>查询</button>"
+      html_str << "</form>"
     end
 
-    def self.table_data(table_head, dname, datas, *args)
+    def self.table_data(table_head, dname, opt, datas, *args)
       html_str = "<table class='table table-striped table-hover' id='editable-sample'><thead><tr><th>#</th>"
-      table_head.reject { |key, value| html_str += "<th>#{value}</th>" }
-      html_str += "<th>操作</th></tr></thead><tbody>"
+      table_head.reject { |key, value| html_str << "<th>#{value}</th>" }
+      html_str << "<th>操作</th></tr></thead><tbody>"
       datas.each_with_index do |data, index|
         tr_html = "<tr>"
-        tr_html += "<td>#{sequence index}</td>"
-        table_head.reject { |key, value| tr_html += "<td>#{data["#{key}"]}</td>" }
-        tr_html += "<td>
-                      <a class='label label-success' href='/#{dname}/#{data.id.to_s}/edit'>编辑</a>
-                      <a data-confirm='确认要删除这条数据吗?' class='label label-danger' rel='nofollow' data-method='delete' href='/#{dname}/#{data.id.to_s}'>删除</a>
-                    </td>"
-        tr_html += "</tr>"
-        html_str += tr_html
+        tr_html << "<td>#{sequence index}</td>"
+        # 数据内容
+        table_head.reject { |key, value| tr_html << "<td>#{send_keys data, key}</td>" }
+        # 操作
+        tr_html << "<td>"
+        opt.reject { |key, value| tr_html << opt_btns(key, value, dname, data) }
+        tr_html << "</td>"
+        tr_html << "</tr>"
+        html_str << tr_html
       end
-      html_str += "</tbody></table>"
+      html_str << "</tbody></table>"
     end
 
     private
@@ -33,5 +33,32 @@ module Qwer
     def self.sequence(index)
       (@page.to_i - 1) * @page_size.to_i + index + 1
     end
+
+    def self.edit?(opt)
+      opt == "edit"
+
+    end
+
+    def self.delete?(opt)
+      opt == "del"
+    end
+
+    def self.send_keys data, key
+      keys = key.to_s.split '.'
+      keys.each do |item|
+        data = data.send item if data.present?
+      end
+      data
+    end
+
+    def self.opt_btns key, value, dname, data
+      if edit? key.to_s
+        return "<a class='#{value[:css] ||= 'label label-success'}' href='/#{dname}/#{data.id.to_s}/edit'>#{value[:name] ||= '编辑'}</a>"
+      elsif delete? key.to_s
+        return "<a data-confirm='确认要删除这条数据吗?' class='#{value[:css] ||= 'label label-danger'}' rel='nofollow' data-method='delete' href='/#{dname}/#{data.id.to_s}'>#{ value[:name] ||= '删除'}</a>"
+      else
+        return value.gsub('??', '??'=>data.id) if value["??"].present?
+      end
+    end
   end
 end

data/lib/qwer/version.rb

@@ -1,3 +1,3 @@
 module Qwer
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/qwer.gemspec

@@ -34,5 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.5.0"
   spec.add_development_dependency "kaminari", "~> 1.0.0"
+  spec.add_development_dependency "enum_help", "~> 0.0.16"
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - lidejian@skio.cn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: enum_help
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.16
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.16
 description: "'this is my first gem'"
 email:
 - lidejian
@@ -79,6 +93,7 @@ files:
 - ".idea/modules.xml"
 - ".idea/qwer.iml"
 - ".idea/vcs.xml"
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -90,6 +105,7 @@ files:
 - lib/qwer/layout_helper.rb
 - lib/qwer/translater.rb
 - lib/qwer/version.rb
+- lib/temp/test.png
 - qwer-0.1.1.gem
 - qwer.gemspec
 homepage: https://www.baidu.com