marklogic 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3d4a03b6adbb3d294a968801a1401cf2007b91c
-  data.tar.gz: a2b38bc033c10eabd86d79aaa96c5333035f6ee4
+  metadata.gz: 87bd426930f793bd0a6ef2a7e77f5042f2306ccf
+  data.tar.gz: 7dee1ac42e4dc21379104adb37ca2066cf2e6c9e
 SHA512:
-  metadata.gz: 25d514df60053fbc73f35f3fe2d8df545df51f88d489869edb6104e49fc41e269b335ffd45e2c374582972c2938d878eeb689b7183f77888dab6a03af3826b39
-  data.tar.gz: 95245ba6ec0601ef0ff48c1d173ae9762d2417a198083369844be39a6f1293a0a6b5974bd6bbd5dc11ebcda4f4edb4269988db37d695b00fd9314c5e66a9cc93
+  metadata.gz: 4fa300d7932ac6e93262e4cdf74a3f73104f618a9310675d09a0315a0160080b845a9cb94c6dfd8964ea0528c86e77fcb4aaecee170a140cbc14fc91b08e3681
+  data.tar.gz: b851de036f1a96e4217723c9f5b5591668a9796c80679b85d1e171dae2772b8fcae7cdc5264b0203719114a31ee0666f3e9977b9389291e4e8b184189fd8da87

data/lib/marklogic/app_server.rb

@@ -72,7 +72,7 @@ module MarkLogic
 
     def update
       url = %Q{/manage/v2/servers/#{server_name}/properties?format=json}
-      manage_connection.put(url, JSON.generate(to_json))
+      manage_connection.put(url, ::Oj.dump(to_json, mode: :compat))
     end
 
     def to_json

data/lib/marklogic/collection.rb

@@ -28,7 +28,7 @@ module MarkLogic
       if (doc.is_a?(Array))
         docs = {}
         doc.each do |d|
-          docs[doc_uri(d)] = JSON.generate(d)
+          docs[doc_uri(d)] = ::Oj.dump(d, mode: :compat)
         end
         body = build_multipart_body(docs)
         response = @database.connection.post_multipart("/v1/documents", body)
@@ -36,7 +36,7 @@ module MarkLogic
       else
         uri = doc_uri(doc)
         url = "/v1/documents?uri=#{uri}&format=json&collection=#{collection}"
-        json = JSON.generate(doc)
+        json = ::Oj.dump(doc, mode: :compat)
         response = @database.connection.put(url, json)
         raise Exception.new("Invalid response: #{response.code.to_i}, #{response.body}\n") unless [201, 204].include? response.code.to_i
         doc[:_id] || doc[:id] || doc['_id'] || doc['id']
@@ -253,7 +253,7 @@ module MarkLogic
       tmp = ""
 
       # collection
-      metadata = JSON.generate({ collections: [ collection ]})
+      metadata = ::Oj.dump({ collections: [ collection ]}, mode: :compat)
       tmp << %Q{--#{boundary}\r\n}
       tmp << %Q{Content-Type: application/json\r\n}
       tmp << %Q{Content-Disposition: inline; category=metadata\r\n}

data/lib/marklogic/connection.rb

@@ -126,6 +126,8 @@ module MarkLogic
       @host
     end
 
+    attr_accessor :verbose
+
     def initialize(host, port, username = nil, password = nil, options = {})
       @host = host
       @port = port
@@ -133,6 +135,7 @@ module MarkLogic
       @password = password || self.class.default_password
       @request_retries = options[:request_retries] || 3
       @http = Net::HTTP::Persistent.new 'marklogic'
+      @verbose = options[:verbose] == true || false
     end
 
     def run_query(query, type = "javascript", options = {})
@@ -143,6 +146,8 @@ module MarkLogic
       headers = {
         'content-type' => 'application/x-www-form-urlencoded'
       }
+
+      logger.debug(%Q{MarkLogic (#{type}):  #{query}})
       response = request('/eval', 'post', headers, params)
 
         # :xquery => options[:query],
@@ -168,7 +173,7 @@ module MarkLogic
     end
 
     def post_json(url, params = nil, headers = {})
-      request(url, 'post', headers, ::JSON.generate(params))
+      request(url, 'post', headers, ::Oj.dump(params, mode: :compat))
     end
 
     def post_multipart(url, body = nil, headers = {}, boundary = "BOUNDARY")
@@ -319,7 +324,9 @@ module MarkLogic
         response = @http.request full_url, request
       end
 
-      # puts("#{response.code} : #{verb.upcase} => ://#{@host}:#{@port}#{url} :: #{body} #{params}")
+      if @verbose
+        logger.debug("MarkLogic:  #{response.code} : #{verb.upcase} => ://#{@host}:#{@port}#{url} :: #{body} #{params}")
+      end
 
       split_multipart(response)
       response

data/lib/marklogic/database.rb

@@ -182,7 +182,7 @@ module MarkLogic
 
     def update
       url = %Q{/manage/v2/databases/#{database_name}/properties?format=json}
-      r = manage_connection.put(url, JSON.generate(to_json))
+      r = manage_connection.put(url, ::Oj.dump(to_json, mode: :compat))
     end
 
     def reset_indexes

data/lib/marklogic/version.rb

@@ -1,3 +1,3 @@
 module MarkLogic
-  Version = "0.0.9"
+  Version = "0.0.10"
 end

data/spec/marklogic/collection_spec.rb

@@ -42,6 +42,16 @@ describe MarkLogic::Collection do
       @collection.save( {:_id => "123", :name => "John", :age => 33, :stuff => "junk"} )
       expect(@collection.count).to eq 1
     end
+
+    it "save with a Time object" do
+      expect(@collection.count).to eq 0
+      current_time = Time.now
+      @collection.save( {:_id => "123", :name => "John", :age => 33, created_at: current_time} )
+
+      tdoc = @collection.load('123')
+      expect(tdoc).to eq({"_id" => "123", "name" => "John", "age" => 33, "created_at" => current_time.as_json })
+      expect(@collection.count).to eq 1
+    end
   end
 
   describe "#save multiples" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marklogic
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Paxton Hare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent