javy_tool 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7cd41262da792826ff19b19ac3f8ba03d2ed3074
-  data.tar.gz: 0fb375d009db7e7090e5ddcc61e1f02953e14e11
+SHA256:
+  metadata.gz: 0ac9cd0089059b9f4f8fd700234f22f459eaef30608b2e812c8bfb0fcf6941f5
+  data.tar.gz: 154e244838aa290c18219aa4edb0e356e2ac254ca8ce0402acae17a628d6e6e9
 SHA512:
-  metadata.gz: cccf9e365db4d4de826c5efb458e93fb0db93ec713124a4882715f2e682e73419a44bd2d61eabb6d3a30f5a9dfad3865e7e1c51c31ca8489cfc16f4042050a04
-  data.tar.gz: 8c9376ae07121fee8c9ff21562597c16a7a86699114bd8bc3d82b0734843d5a138c4f48f1ffc80739c17d5c24dfe6d427b30f0467888824e1287b302c3c39cd8
+  metadata.gz: cd3ff14eb1f6164dd6fda936655dac282bb5071a23e1fe1b959dbd5ec6ac27d571cf5a3656ed9148812581421e21ca0c7b88eefa6d16206b46906c34a2b4ec34
+  data.tar.gz: b5b10a02788385a9e24feb34f4bd387f827af666aa15fba49f67c82d2d8823a193766805df240294ef85f431df6833493f7c6520f6a94b3bfcbda0b340c536e8

data/lib/javy_tool/breadcrumb.rb

@@ -8,7 +8,8 @@ module JavyTool
       protected
 
       def set_breadcrumbs
-        @breadcrumbs = ["#{I18n.t("common.index_icon")}<a href='/'>#{I18n.t("common.home")}</a>".html_safe]
+        #Rails.logger.info I18n.locale
+        @breadcrumbs = ["#{I18n.t('common.index_icon')}#{view_context.link_to(I18n.t('common.home'), root_path)}".html_safe]
       end
 
       def drop_breadcrumb(title=nil, url=nil)
@@ -52,12 +53,13 @@ module JavyTool
 
 
       # display the flash messages using foundation
-      def notice_message
+      def notice_message(cls: 'alert-box')
         flash_messages = []
         flash.each do |type, message|
+          next if message.nil?
           type = :info if type == :notice
           type = :alert if type == :error
-          text = content_tag(:div, message.html_safe, class: "alert-box #{type}")
+          text = content_tag(:div, message.html_safe, class: "#{cls} #{type}")
           flash_messages << text if message
         end
         flash_messages.join("\n").html_safe
@@ -148,12 +150,13 @@ module JavyTool
       #  });
       #
       #
-      def link_to_add_fields(name, f, association,new_object=nil)
+      def link_to_add_fields(name, f, association,new_object=nil,options={})
         new_object ||= f.object.class.reflect_on_association(association).klass.new()
         fields = f.fields_for(association, new_object, child_index: "new_#{association}") do |builder|
           render(association.to_s.singularize + "_fields", :f => builder)
         end
-        link_to(name,"#",class: "add_fields",data: {association: association,content: escape_javascript(fields.html_safe)})
+        options.merge!(data: {association: association,content: escape_javascript(fields.html_safe)},class: "add_fields")
+        link_to(name,"#",options)
       end
 
 

data/lib/javy_tool/construct_query.rb

@@ -6,7 +6,7 @@ module JavyTool
       #model_class: 查询的类名，字符串类型
       #param: 查询参数,为空的话默认用model_class参数的underscore版本
       #返回数组 [普通条件，like条件]
-      def construct_condition(model_class,like_ary: [],param: nil,gt:[],lt:[])
+      def construct_condition(model_class,like_ary: [],left_like:[],right_like:[],param: nil,gt:[],lt:[])
         model_class = model_class.to_s
         _class = model_class.classify.constantize
         param =  param || model_class.underscore
@@ -18,19 +18,21 @@ module JavyTool
           con_hash = params[param].select{|_,value|value.present?}
           if con_hash.present?
             _like_con = con_hash.extract!(*(like_ary.collect{|item| item.to_s} & con_hash.keys)).map{|k,v| ["#{k} like ?","%#{v}%"] } if like_ary.present?
+            _left_like_con = con_hash.extract!(*(left_like.collect{|item| item.to_s} & con_hash.keys)).map{|k,v| ["#{k} like ?","#{v}%"] } if left_like.present?
+            _right_like_con = con_hash.extract!(*(right_like.collect{|item| item.to_s} & con_hash.keys)).map{|k,v| ["#{k} like ?","#{v}%"] } if right_like.present?
 
             if gt.present?
-              gt.collect!{|item|item.to_s}
+              gt.collect!(&:to_s)
               gt = (gt + gt.map{|item| "gt_#{item}"}) & con_hash.keys
-              _gt_con=con_hash.extract!(*gt).tap{|t|Rails.logger.info(t.inspect)}.map{|k,v| ["#{k.sub(/^gt_/,'')} >= ?",v] }
+              _gt_con=con_hash.extract!(*gt).map{|k,v| ["#{k.sub(/^gt_/,'')} >= ?",v] }
             end
             if lt.present?
-              lt.collect!{|item|item.to_s}
+              lt.collect!(&:to_s)
               lt = (lt + lt.map{|item| "lt_#{item}"}) & con_hash.keys
-              _lt_con= con_hash.extract!(*lt).tap{|t|Rails.logger.info(t.inspect)}.map{|k,v| ["#{k.sub(/^lt_/,'')} <= ?",v] }
+              _lt_con= con_hash.extract!(*lt).map{|k,v| ["#{k.sub(/^lt_/,'')} <= ?",v] }
             end
 
-            all_ary_con = ((_like_con || [])+(_gt_con||[])+(_lt_con||[])).transpose
+            all_ary_con = ((_left_like_con || [])+(_right_like_con || [])+(_like_con || [])+(_gt_con||[])+(_lt_con||[])).transpose
             all_ary_con = [all_ary_con.first.join(" and "),all_ary_con.last].flatten if all_ary_con.present?
             #适用于查询字段为空的情况
             con_hash.each{|k,v|con_hash[k] = nil if v == 'null'}

data/lib/javy_tool/custom_error.rb

@@ -0,0 +1,22 @@
+module JavyTool
+  module CustomError
+    class Error < StandardError; end
+
+    class AccessDenied < Error
+      attr_reader :action, :subject
+      attr_writer :default_message
+
+      def initialize(message = nil, action = nil, subject = nil)
+        @message = message
+        @action = action
+        @subject = subject
+        @default_message = I18n.t(:"custom_error.default", :default => "Access this page error.")
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+  end
+end
+

data/lib/javy_tool/version.rb

@@ -1,3 +1,3 @@
 module JavyTool
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/javy_tool.rb

@@ -5,6 +5,7 @@ module JavyTool
   autoload :Breadcrumb, "javy_tool/breadcrumb"
   autoload :Csv, "javy_tool/csv"
   autoload :ConstructQuery, "javy_tool/construct_query"
+  autoload :CustomError, "javy_tool/custom_error"
   mattr_accessor :tool_config
   mattr_accessor :upload_path
   @@upload_path = "/tmp"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: javy_tool
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - javy_liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies: []
 description: pack some used methods
 email:
@@ -27,6 +27,7 @@ files:
 - lib/javy_tool/breadcrumb.rb
 - lib/javy_tool/construct_query.rb
 - lib/javy_tool/csv.rb
+- lib/javy_tool/custom_error.rb
 - lib/javy_tool/utils.rb
 - lib/javy_tool/version.rb
 homepage: https://github.com/javyliu/javy_tool
@@ -48,10 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: some methods ofen used in my projects
 test_files: []
-has_rdoc: