baseapi 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c43cc198f8095f49cc275feb31170f0af5f72c1
-  data.tar.gz: 4a0ae6530a6150ae894be6424a956381fae09b86
+  metadata.gz: ef45b44ae0098c0c40a9e073515b5a3679ae5622
+  data.tar.gz: eed6e1caf5fce76b7bc20df167c75a1bfe46fb48
 SHA512:
-  metadata.gz: fdae87d0508923b64d14e9f77562f38304c9b76ddf630715406d37609bb8f831f6473e83064f27b876f7924abdfd4ba16ba434804dbcee91738c6fc2984d8f7b
-  data.tar.gz: 7ff5f9e7aecd8be6fdff8679b3637744bbc0abcfe76924689782e33bcf5c5b2b446b8d6b5dc41b07b630a29952cd2eecba54f91abbbec39341b96e82680eb685
+  metadata.gz: 4c7cb5e7a57770324319d81853e74008cb9863a82e2425ea0410c6046faece2e3b4ecc8e7b7e805160a50556dbc1a1638b0c17eff289b9a8ff07204f9480507f
+  data.tar.gz: cec57dc2393488280ad6e7bf5d7d8e7da8f513687499683150c902a5885ccadf51bbf5c714b993c54568f464ad397a681eb5eeb86584cd512ce765b01553c8cb

data/README.md

@@ -117,6 +117,28 @@ Of course the other is also possible (v0.1.7~)
 
     GET   /users.json?name=!hoge
 
+Specify the null name (v0.1.7~)
+
+    GET   /users.json?name=null
+
+Specify the not null name (v0.1.7~)
+
+    GET   /users.json?name=!null
+
+Specify the empty string and null name (v0.1.8~)
+
+    GET   /users.json?name=empty
+
+Specify the not empty string and null name (v0.1.8~)
+
+    GET   /users.json?name=!empty
+
+Specify search for simply string 'empty' (v0.1.8~)
+
+It can also be in double quotes "empty"
+
+    GET   /users.json?name='empty'
+
 Specify the belongs to company name
 
 Note that this is a single

data/lib/baseapi/active_record/base_extension.rb

@@ -29,7 +29,7 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
     # @option   String                operator  'or' or 'and'
     def column_match(models, column, values, operator:'or')
       column_call(models, column, values, ->(column, value){
-        "#{getPrefix(value)} #{models.name.pluralize.underscore}.#{column} #{getOperator(value)} #{getValue(value, "'")}"
+        "#{getPrefix(value)} #{models.name.pluralize.underscore}.#{column} #{getOperator(value)} #{getValue("#{models.name.pluralize.underscore}.#{column}", value, "'")}"
       }, operator:operator)
     end
 
@@ -40,7 +40,7 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
     # @option   String                operator  'or' or 'and'
     def column_like(models, column, values, operator:'or')
       column_call(models, column, values, ->(column, value){
-        "#{getPrefix(value)} #{models.name.pluralize.underscore}.#{column} like #{getValue(value, "%", "'")}"
+        "#{getPrefix(value)} #{models.name.pluralize.underscore}.#{column} #{getOperator(value, 'like')} #{getValue("#{models.name.pluralize.underscore}.#{column}", value, "%", "'")}"
       }, operator:operator)
     end
 
@@ -79,7 +79,7 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
     # @option   String                operator  'or' or 'and'
     def relation_match(models, table, hash, operator:'or')
       relation_call(models, table, hash, ->(table, column, value){
-        "#{getPrefix(value)} #{table}.#{column} #{getOperator(value)} #{getValue(value, "'")}"
+        "#{getPrefix(value)} #{table}.#{column} #{getOperator(value)} #{getValue("#{table}.#{column}", value, "'")}"
       }, operator:operator)
     end
 
@@ -90,7 +90,7 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
     # @option   String                operator  'or' or 'and'
     def relation_like(models, table, hash, operator:'or')
       relation_call(models, table, hash, ->(table, column, value){
-        "#{getPrefix(value)} #{table}.#{column} like #{getValue(value, "%", "'")}"
+        "#{getPrefix(value)} #{table}.#{column} #{getOperator(value, 'like')} #{getValue("#{table}.#{column}", value, "%", "'")}"
       }, operator:operator)
     end
 
@@ -120,19 +120,26 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
     # return = or IS
     # @param  String  value
     # @return String  operator
-    def getOperator(value)
-      (value.gsub('!', '').upcase == 'NULL') ? 'IS' : '='
+    def getOperator(value, default = '=')
+      ['NULL', 'EMPTY'].include?(value.gsub('!', '').upcase) ? 'IS' : default
     end
 
     # slice '!' value
+    # @param  String  column
     # @param  String  value
     # @param  String  wraps ' or %
-    # @return String  value
-    def getValue(value, *wraps)
+    # @return String  value or sql
+    def getValue(column, value, *wraps)
+      original = value.clone
       value.slice!(0) if value[0] == '!'
       if value.upcase == 'NULL'
         value = 'NULL'
+      elsif value.upcase == 'EMPTY'
+        prefix = getPrefix(original)
+        operator = prefix == 'NOT' ? 'AND' : 'OR'
+        value = "NULL #{operator} #{prefix} #{column} = ''"
       else
+        value = getNaturalValue(value)
         wraps.each do |wrap|
           value = "#{wrap}#{value}#{wrap}"
         end
@@ -140,6 +147,16 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
       return value
     end
 
+    # removal of the enclosing
+    # @param  String        value
+    # @return String        value
+    def getNaturalValue(value)
+      if ((/^[\'].+?[\']$/ =~ value) != nil) and ((/^[\"].+?[\"]$/ =~ value) != nil)
+        value.gsub!(/^[\'\"]/, '').gsub!(/[\'\"]$/, '')
+      end
+      value
+    end
+
 
     # get relation tables
     # @param  String  relate        'belongs_to','hasmany'..

data/lib/baseapi/version.rb

@@ -1,3 +1,3 @@
 module Baseapi
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baseapi
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Moriyuki Arakawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler