directiverecord 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9efd9975c4ca2c83cb43138711e0700470e3b43
-  data.tar.gz: fdd9f3e1885b7c357bf63659c685d8a0f1b3f970
+  metadata.gz: fb7dc46ac479a9de38a158e0e98e6d0b1d01d187
+  data.tar.gz: ad4da8692eb11cbd14d1de27059bdda64cb77e62
 SHA512:
-  metadata.gz: 0631e86b65c613be8a629d11483ead27423658d9c93e063d78c9586ceac6bc0e23365210311bdb5291399cfa1aa543efb1ae8f470b2814b75e5886c7c23ac0e3
-  data.tar.gz: 57624b34287d89498c51b4d98f8672597c72adc0c97e5edad0c49f003f3f89090a160922892dc2a8b9787a8c28523e4c3caa643c5867e9c453043a297042ca11
+  metadata.gz: d206d14e6d042182e73b699b74fffb482e0141b87475a3aad4304b8c3b0c78404b9acfb7f408aed805e79ebb7d7e263bce01aa21056641a307a71ce3e18f87ad
+  data.tar.gz: 59392eda1abed8b78dee862ccbfec2a4ed8d50076a01a1ee7a75ad0488ad0e43ed825757c03d4a28389ad964144dc50ecb936f8ae08e989a76a80196c081c986

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.32 (October 23, 2015)
+
+* Added #qry_value and #qry_values
+* Improved detecting quotations (see http://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks)
+
 == Version 0.1.31 (August 26, 2015)
 
 * Improved the :group_by, :having and :order_by option correction

data/VERSION

@@ -1 +1 @@
-0.1.31
+0.1.32

data/lib/directive_record/gem_ext/active_record/base.rb

@@ -9,6 +9,14 @@ module ActiveRecord
       extract_connection(args).select_rows to_qry(*args)
     end
 
+    def self.qry_value(*args)
+      extract_connection(args).select_value to_qry(*args)
+    end
+
+    def self.qry_values(*args)
+      extract_connection(args).select_values to_qry(*args)
+    end
+
     def self.to_trend_qry(q1, q2, join_column_count, options)
       DirectiveRecord::Query.new(self).to_trend_sql(q1, q2, join_column_count, options)
     end

data/lib/directive_record/gem_ext/active_record/relation.rb

@@ -13,5 +13,13 @@ module ActiveRecord
       klass.qry qry_options(*args)
     end
 
+    def qry_value(*args)
+      klass.qry_value qry_options(*args)
+    end
+
+    def qry_values(*args)
+      klass.qry_values qry_options(*args)
+    end
+
   end
 end

data/lib/directive_record/query/sql.rb

@@ -257,7 +257,7 @@ SQL
 
         where, having = (options[:where] || []).partition do |statement|
           !options[:aggregated].keys.include?(statement.strip.match(regexp).to_s) &&
-          statement.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ")
+          statement.gsub(/(["'])(?:(?=(\\?))\2.)*?\1/, " ")
                    .split(/\b(and|or)\b/i).reject{|sql| %w(and or).include? sql.downcase}
                    .collect{|sql| sql = sql.strip; (sql[0] == "(" && sql[-1] == ")" ? sql[1..-1] : sql)}
                    .all? do |sql|
@@ -373,7 +373,7 @@ SQL
         [:select, :where, :group_by, :having, :order_by].inject([]) do |paths, key|
           if value = options[key]
             value = value.join " " if value.is_a?(Array)
-            paths.concat value.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ").gsub(/sub:[a-zA-Z_]+\.[a-zA-Z_\.]+/, " ").scan(/[a-zA-Z_]+\.[a-zA-Z_\.]+/).collect{|x| x.split(".")[0..-2].join "."}
+            paths.concat value.gsub(/(["'])(?:(?=(\\?))\2.)*?\1/, " ").gsub(/sub:[a-zA-Z_]+\.[a-zA-Z_\.]+/, " ").scan(/[a-zA-Z_]+\.[a-zA-Z_\.]+/).collect{|x| x.split(".")[0..-2].join "."}
           else
             paths
           end

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 31
+  TINY  = 32
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A layer on top of ActiveRecord for using paths within queries without thinking