cequel 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37fbccb394100663a372dde3d9308a890091e36c
-  data.tar.gz: 2f594bf403ed6ba55ee54aa2c495c8c60fb6bb3a
+  metadata.gz: a64f78d32fbb2e223d8537d5f0cf8c7ff61ed81c
+  data.tar.gz: 50b4f001571a9aa00025e5e0b46a845dc8b70ae1
 SHA512:
-  metadata.gz: 4f9d5c21fd006ce0e5021e3d6d3e144d5f27c075b56831fc0c766a9040a294e3c30dcf9e107fdb0f9b9f8677c490882a0bd6378a2af3d83a117e98e0fc39b098
-  data.tar.gz: 6c4122980edd642cefb3056c2f8fe3c236cf3bc89db38e1328c52ed4365b386fef83a799afc9d08e82c0b5d3b5f14e9f013008b22fb27a78e3d1e75ee822b099
+  metadata.gz: 297d35f852f20151515ebba24607a7c13873f1a4930e365f75b1a9adf4352b7b14bc8a57b7e4f2348d64b2107631fff4b2f20bf5a8e385286df5143e3fff3faa
+  data.tar.gz: a12d232abd033573eaa674dd280dfee4d16a6775604ce510d23c7336190aa9572cf3cc4f23213e8bd5e41bd11a045ac7d5d44bbf579832ca78b6b0d6dddc1ad2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.6
+
+* Fixes for Type::quote
+
 ## 1.2.5
 
 * Fix `puts` behavior when passed a Record instance

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (1.2.5)
+    cequel (1.2.6)
       activemodel (>= 3.1, < 5.0)
       cql-rb (~> 1.2)
 
@@ -58,7 +58,7 @@ GEM
     psych (2.0.5)
     racc (1.4.11)
     rainbow (2.0.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)

data/lib/cequel/type.rb

@@ -85,19 +85,26 @@ module Cequel
       end
       case value
       when ::String
-        if value.encoding == Encoding::ASCII_8BIT
-          "0x#{value}"
-        else
-          "'#{value.gsub("'", "''")}'"
-        end
-      when Date, Time, ActiveSupport::TimeWithZone
-        quote(value.to_i * 1000 + value.usec / 1000)
+        quote_string(value)
+      when Time, ActiveSupport::TimeWithZone, DateTime
+        value.strftime('%s%L')
+      when Date
+        quote(Time.gm(value.year, value.month, value.day))
       when Numeric, true, false, Cql::Uuid
         value.to_s
       else
-        quote(value.to_s)
+        quote_string(value.to_s)
+      end
+    end
+
+    def self.quote_string(string)
+      if string.encoding == Encoding::ASCII_8BIT && string =~ /^[[:xdigit:]]+$/
+        "0x#{string}"
+      else
+        "'#{string.gsub("'", "''")}'"
       end
     end
+    private_class_method :quote_string
 
     #
     # The base class for all type objects. Types are singletons.

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

data/spec/examples/type_spec.rb

@@ -204,4 +204,26 @@ describe Cequel::Type do
     end
   end
 
+  describe '::quote' do
+    [
+      ["don't", "'don''t'"],
+      ["don't".force_encoding('US-ASCII'), "'don''t'"],
+      ["don't".force_encoding('ASCII-8BIT'), "'don''t'"],
+      ["3dc49a6".force_encoding('ASCII-8BIT'), "0x3dc49a6"],
+      [["one", "two"], "'one','two'"],
+      [1, '1'],
+      [1.2, '1.2'],
+      [true, 'true'],
+      [false, 'false'],
+      [Time.at(1401323181, 381000), '1401323181381'],
+      [Time.at(1401323181, 381000).in_time_zone, '1401323181381'],
+      [Date.parse('2014-05-28'), "1401235200000"],
+      [Time.at(1401323181, 381000).to_datetime, '1401323181381'],
+      [Cequel.uuid("dbf51e0e-e6c7-11e3-be60-237d76548395"),
+       "dbf51e0e-e6c7-11e3-be60-237d76548395"]
+    ].each do |input, output|
+      specify { expect(Cequel::Type.quote(input)).to eq(output) }
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Mat Brown
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel