fauna 1.1.1 → 1.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTc2NGU4ZGEyZmI5NjNmYzgyNDY5MGM4YWFhYTEwMDg4YmMyNWM5Yw==
+  data.tar.gz: !binary |-
+    MjFlMGZmNDYyZWNiMDM0ODU5MjkxNTY0NDkzYjQ4ZjA0MmM3ZmM3YQ==
+SHA512:
+  metadata.gz: !binary |-
+    Y2ZjYWVkMmU3MzY2ZmRhZTY2YjRiNWMzMDA2Yzc5NjkzODJjZTY2YzlmOThk
+    NzBkNDQ4ZDVhOWIzYjk5MGQwYjU0MjRiMGMzODllOGQyN2ZhNmFiNGQ5ZjZm
+    ZTBjZjI3ZmFhY2NkMDczMjdiM2MxN2NjNTIzMDdmZWZlM2QyMWY=
+  data.tar.gz: !binary |-
+    YTk2Njk2ODIyMGZmN2NkYjZjZDAyZGJiZWM0NWVkOTFjMGRjZmQ5ZTQ0MTE1
+    NjBkN2JkMDdjZDJkNWMzZWJhNTllODNjOWUwY2RmMjdmZmNhOWYwMDkzNWI5
+    MzhjNTczNTk1NDE3NzkwZGJhNTgzMjliMTYxODQ0ZjFhMWIwZmY=

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.2. Switch to Typhoeus HTTP client.
+
 v1.1.1 Remove last bit of ORM-ness.
 
 v1.1.0 Updates for Fauna 1.1. Remove schema configuration.

data/Manifest

@@ -4,6 +4,7 @@ LICENSE
 Manifest
 README.md
 Rakefile
+fauna-ruby.pem
 fauna.gemspec
 lib/fauna.rb
 lib/fauna/cache.rb
@@ -19,6 +20,7 @@ test/class_test.rb
 test/client_test.rb
 test/connection_test.rb
 test/database_test.rb
+test/query_test.rb
 test/readme_test.rb
 test/set_test.rb
 test/test_helper.rb

data/README.md

@@ -1,6 +1,6 @@
 # Fauna
 
-Ruby client for the [Fauna](http://fauna.org) API.
+Experimental Ruby client for [Fauna](http://fauna.org).
 
 ## Installation
 
@@ -36,7 +36,7 @@ All API requests start with an instance of `Fauna::Connection`.
 Creating a connection requires either a token, a server key, or a
 client key.
 
-Let's use a server key we got from our [Fauna Cloud console](https://fauna.org/console):
+Let's use a server key we got from our [Fauna Cloud console](https://fauna.org/account/databases):
 
 ```ruby
 server_key = 'ls8AkXLdakAAAALPAJFy3LvQAAGwDRAS_Prjy6O8VQBfQAlZzwAA'
@@ -106,6 +106,20 @@ Fauna::Client.context($fauna) do
 end
 ```
 
+Fauna resources must be created and accessed by ref, i.e.
+
+```ruby
+pig = Fauna::Resource.create 'classes/pigs'
+pig.data['name'] = 'Henwen'
+pig.save
+pig.ref # => 'classes/pigs/42471470493859841'
+
+# and later...
+
+pig = Fauna::Resource.find 'classes/pigs/42471470493859841'
+# do something with this pig...
+````
+
 ## Rails Usage
 
 Fauna provides a Rails helper that sets up a default context in
@@ -115,7 +129,7 @@ controllers, based on credentials in `config/fauna.yml`:
 development:
   email: taran@example.com
   password: secret
-  server_key: secret_key
+  secret: secret_key
 test:
   email: taran@example.com
   password: secret
@@ -131,12 +145,20 @@ Then, in `config/initializers/fauna.rb`:
 require "fauna/rails"
 ```
 
+## Running Tests
+
+You can run tests against Fauna Cloud. Set the `FAUNA_ROOT_KEY` environment variable to your CGI-escaped email and password, joined by a `:`. Then run `rake`:
+
+```bash
+export FAUNA_ROOT_KEY="test%40fauna.org:secret"
+rake
+```
+
 ## Further Reading
 
-Please see the Fauna [REST Documentation](https://fauna.org/API) for a
-complete API reference, or look in
-[`/test`](https://github.com/fauna/fauna-ruby/tree/master/test) for
-more examples.
+Please see the Fauna REST Documentation for a complete API reference,
+or look in [`/test`](https://github.com/fauna/fauna-ruby/tree/master/test)
+for more examples.
 
 ## Contributing
 

data/Rakefile

@@ -5,7 +5,10 @@ Echoe.new("fauna") do |p|
   p.project = "fauna"
   p.summary = "Official Ruby client for the Fauna API."
   p.retain_gemspec = true
-  p.dependencies = ["rest-client", "json"]
+  p.require_signed
+  p.certificate_chain = ["fauna-ruby.pem"]
+  p.licenses = ["Mozilla Public License, Version 2.0 (MPL2)"]
+  p.dependencies = ["typhoeus", "json"]
   p.development_dependencies = ["mocha", "echoe", "minitest"]
 end
 

data/fauna-ruby.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARldmFu
+MRgwFgYKCZImiZPyLGQBGRYIY2xvdWRidXIxEjAQBgoJkiaJk/IsZAEZFgJzdDAe
+Fw0xMzExMDQyMDI1MDVaFw0xNDExMDQyMDI1MDVaMD0xDTALBgNVBAMMBGV2YW4x
+GDAWBgoJkiaJk/IsZAEZFghjbG91ZGJ1cjESMBAGCgmSJomT8ixkARkWAnN0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuG4q2IdTtlc7/IJkWPnbOAFt
+ysKc3XmLHsjeSXXSPdQ1mb2cDXvyDS8TkzjrgDoJ96RR2xrh7bfkHAMJhSVMhsPM
+rnYS7fDs//X1h6fRYBjjhqGeQhCL1xrS5/I4vKb7AjgFnuUbMZ/H0+ic2Ic2zTnZ
+jttSQZ/QOlYyctrYoTzAFdPwL+dOxskOyAmAbtV/pV3owcXpChRT/tphC7u69sOk
++IjWsMwrBCbEdj/Jmh4a52QntAwPWx4Krt0zm8eV3/UjSObB3BR1pZ/i5IsSLPs1
+lwMA6ywbfxBTP59XcgAyhfV3rRQXb+vjpf7OLuOCJOUIN8GEwb5HNjFo/UVdiwID
+AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUbTCqyydn
+0Rm6nngf15KtCEMc37swGwYDVR0RBBQwEoEQZXZhbkBjbG91ZGJ1ci5zdDAbBgNV
+HRIEFDASgRBldmFuQGNsb3VkYnVyLnN0MA0GCSqGSIb3DQEBBQUAA4IBAQBggGGb
+0AoyF0QofzkPImuhN1UF6eG/RdYOHqiUovuRN/9IblyKAaZAIl1mIspfCav8EVwo
+SC6vz4OaIVpS7QdI04oLNHxhmC6C5TTBONtddDl93M+9uWVipD5uVPktcHWG+bKn
+2L1lUykQXr8ra45TqAUZ/P+Yv76U8kUsVG2HE5gl/CgB5+V1qkpn5M4CADsvSvPA
+qEATZvw+KUzzMCUiVzq+T6lDrrCt+sD3NZlvG4BD2PpQuPtDf1i61DUc+5s2Nwm2
+t4uqNF7swBWS0n40/hmn5u8pT2JVsuwam79GGhJmNfCdPCcCbgphroexRcrwdURX
+ly00Xdf1gDVBxRoR
+-----END CERTIFICATE-----

data/fauna.gemspec

@@ -1,42 +1,46 @@
 # -*- encoding: utf-8 -*-
+# stub: fauna 1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fauna"
-  s.version = "1.1.1"
+  s.version = "1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fauna, Inc."]
-  s.date = "2013-08-08"
+  s.cert_chain = ["/Users/eweaver/fauna/fauna-ruby/fauna-ruby.pem"]
+  s.date = "2013-11-04"
   s.description = "Official Ruby client for the Fauna API."
   s.email = ""
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/fauna.rb", "lib/fauna/cache.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/named_resource.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb", "lib/fauna/set.rb", "lib/fauna/util.rb", "lib/tasks/fauna.rake"]
-  s.files = ["CHANGELOG", "Gemfile", "LICENSE", "Manifest", "README.md", "Rakefile", "fauna.gemspec", "lib/fauna.rb", "lib/fauna/cache.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/named_resource.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb", "lib/fauna/set.rb", "lib/fauna/util.rb", "lib/tasks/fauna.rake", "test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
+  s.files = ["CHANGELOG", "Gemfile", "LICENSE", "Manifest", "README.md", "Rakefile", "fauna-ruby.pem", "fauna.gemspec", "lib/fauna.rb", "lib/fauna/cache.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/named_resource.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb", "lib/fauna/set.rb", "lib/fauna/util.rb", "lib/tasks/fauna.rake", "test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/query_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
   s.homepage = "http://fauna.github.com/fauna/"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fauna", "--main", "README.md"]
+  s.licenses = ["Mozilla Public License, Version 2.0 (MPL2)"]
+  s.rdoc_options = ["--line-numbers", "--title", "Fauna", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "fauna"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.1.10"
+  s.signing_key = "/Users/eweaver/cloudburst/configuration/gem_certificates/gem-private_key.pem"
   s.summary = "Official Ruby client for the Fauna API."
-  s.test_files = ["test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/query_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<typhoeus>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<typhoeus>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])

data/lib/fauna.rb

@@ -1,7 +1,8 @@
 require 'json'
 require 'logger'
 require 'uri'
-require 'restclient'
+require 'typhoeus'
+require 'cgi'
 
 if defined?(Rake)
   load "#{File.dirname(__FILE__)}/tasks/fauna.rake"

data/lib/fauna/connection.rb

@@ -20,16 +20,16 @@ module Fauna
       when 200..299
         res
       when 400
-        json = JSON.parse(res)
+        json = JSON.parse(res.body)
         raise BadRequest.new(json['error'], json['param_errors'])
       when 401
-        raise Unauthorized, JSON.parse(res)['error']
+        raise Unauthorized, JSON.parse(res.body)['error']
       when 404
-        raise NotFound, JSON.parse(res)['error']
+        raise NotFound, JSON.parse(res.body)['error']
       when 405
-        raise NotAllowed, JSON.parse(res)['error']
+        raise NotAllowed, JSON.parse(res.body)['error']
       else
-        raise NetworkError, res
+        raise NetworkError, res.body
       end
     end
 
@@ -39,22 +39,13 @@ module Fauna
       @logger = params[:logger] || nil
       @domain = params[:domain] || "rest1.fauna.org"
       @scheme = params[:scheme] || "https"
-      @port = params[:port] || 80
+      @port = params[:port] || (@scheme == "https" ? 443 : 80)
 
       if ENV["FAUNA_DEBUG"]
         @logger = Logger.new(STDERR)
         @debug = true
       end
-
-      # Check credentials from least to most privileged, in case
-      # multiple were provided
-      @credentials = if params[:secret]
-        CGI.escape(params[:secret])
-      else
-        raise TypeError
-      end
-    rescue TypeError
-      raise ArgumentError, "Invalid secret."
+      @credentials = params[:secret].to_s
     end
 
     def get(ref, query = {})
@@ -80,9 +71,9 @@ module Fauna
 
     private
 
-    def parse(response)
-      obj = response.empty? ? {} : JSON.parse(response)
-      obj.merge! "headers" => Fauna.stringify_keys(response.headers)
+    def parse(res)
+      obj = res.body.to_s.empty? ? {} : JSON.parse(res.body)
+      obj.merge!("headers" => res.headers)
       obj
     end
 
@@ -103,15 +94,12 @@ module Fauna
     end
 
     def execute(action, ref, data = nil, query = nil)
-      args = { :method => action, :url => url(ref), :headers => {} }
+      request = Typhoeus::Request.new(url(ref), :method => action)
+      request.options[:params] = query if query.is_a?(Hash)
 
-      if query && !query.empty?
-        args[:headers].merge! :params => query
-      end
-
-      if data && !data.empty?
-        args[:headers].merge! :content_type => :json
-        args.merge! :payload => data.to_json
+      if data.is_a?(Hash)
+        request.options[:headers] = { "Content-Type" => "application/json;charset=utf-8" }
+        request.options[:body] = data.to_json
       end
 
       if @logger
@@ -120,19 +108,17 @@ module Fauna
         log(4) { "Request JSON: #{JSON.pretty_generate(data)}" } if @debug && data
 
         t0, r0 = Process.times, Time.now
+        request.run
+        t1, r1 = Process.times, Time.now
 
-        RestClient::Request.execute(args) do |res, _, _|
-          t1, r1 = Process.times, Time.now
-          real = r1.to_f - r0.to_f
-          cpu = (t1.utime - t0.utime) + (t1.stime - t0.stime) + (t1.cutime - t0.cutime) + (t1.cstime - t0.cstime)
-          log(4) { ["Response headers: #{JSON.pretty_generate(res.headers)}", "Response JSON: #{res}"] } if @debug
-          log(4) { "Response (#{res.code}): API processing #{res.headers[:x_http_request_processing_time]}ms, network latency #{((real - cpu)*1000).to_i}ms, local processing #{(cpu*1000).to_i}ms" }
-
-          HANDLER.call(res)
-        end
+        real = r1.to_f - r0.to_f
+        cpu = (t1.utime - t0.utime) + (t1.stime - t0.stime) + (t1.cutime - t0.cutime) + (t1.cstime - t0.cstime)
+        log(4) { ["Response headers: #{JSON.pretty_generate(request.response.headers)}", "Response JSON: #{request.response.body}"] } if @debug
+        log(4) { "Response (#{request.response.code}): API processing #{request.response.headers["X-HTTP-Request-Processing-Time"]}ms, network latency #{((real - cpu)*1000).to_i}ms, local processing #{(cpu*1000).to_i}ms" }
       else
-        RestClient::Request.execute(args, &HANDLER)
+        request.run
       end
+      HANDLER.call(request.response)
     end
 
     def url(ref)

data/lib/fauna/rails.rb

@@ -9,7 +9,7 @@ if defined?(Rails)
 
     @silent = false
 
-    CONFIG_FILE = "#{Rails.root}/fauna.yml"
+    CONFIG_FILE = "#{Rails.root}/config/fauna.yml"
     LOCAL_CONFIG_FILE = "#{ENV["HOME"]}/.fauna.yml"
     APP_NAME = Rails.application.class.name.split("::").first.underscore
     FIXTURES_DIR = "#{Rails.root}/test/fixtures/fauna"
@@ -23,8 +23,8 @@ if defined?(Rails)
         end
 
         if !@silent
-          if credentials["server_key"]
-            STDERR.puts ">> Using Fauna server key #{credentials["server_key"].inspect} for #{APP_NAME.inspect}."
+          if credentials["secret"]
+            STDERR.puts ">> Using Fauna server key #{credentials["secret"].inspect} for #{APP_NAME.inspect}."
           else
             STDERR.puts ">> Using Fauna account #{credentials["email"].inspect} for #{APP_NAME.inspect}."
           end
@@ -32,18 +32,18 @@ if defined?(Rails)
           STDERR.puts ">> You can change this in config/fauna.yml or ~/.fauna.yml."
         end
 
-        if credentials["server_key"]
-          server_key = credentials["server_key"]
+        if credentials["secret"]
+          secret = credentials["secret"]
         else
           self.root_connection = Connection.new(
             :email => credentials["email"],
             :password => credentials["password"],
           :logger => Rails.logger)
 
-          server_key = root_connection.post("keys", "role" => "server")["resource"]["key"]
+          secret = root_connection.post("keys", "role" => "server")["resource"]["key"]
         end
 
-        self.connection = Connection.new(server_key: server_key, logger: Rails.logger)
+        self.connection = Connection.new(secret: secret, logger: Rails.logger)
       else
         if !@silent
           STDERR.puts ">> Fauna account not configured. You can add one in config/fauna.yml."

data/lib/fauna/resource.rb

@@ -54,6 +54,17 @@ module Fauna
       EventsPage.find("#{ref}/events", {}, pagination)
     end
 
+    def new_event(action, time)
+      if persisted?
+        Fauna::Event.new(
+          'resource' => ref,
+          'set' => ref,
+          'action' => action,
+          'ts' => Fauna.usecs_from_time(time)
+        )
+      end
+    end
+
     def set(name)
       CustomSet.new("#{ref}/sets/#{CGI.escape(name)}")
     end

data/lib/fauna/set.rb

@@ -60,31 +60,42 @@ module Fauna
     end
 
     def param_strings
+      if @function == 'match'
+        # Escape strings for match values
+        @params = @params[0..1] + @params[2..-1].map do |p|
+          if p.is_a?(String)
+            p.inspect
+          else
+            p
+          end
+        end
+      end
+
       @param_strings ||= @params.map do |p|
         if p.respond_to? :expr
           p.expr
         elsif p.respond_to? :ref
           p.ref
         else
-          p
+          p.to_s
         end
       end
     end
 
     def expr
-      @expr ||= "#{@function}(#{param_strings.join ','})"
+      @expr ||= "#{@function}(#{param_strings.join(',')})"
     end
 
     def ref
-      "query?q=#{expr}"
+      "queries?q=#{expr}"
     end
 
     def page(pagination = {})
-      SetPage.find('query', { 'q' => expr }, pagination)
+      SetPage.find('queries', { 'q' => expr }, pagination)
     end
 
     def events(pagination = {})
-      EventsPage.find("query", { 'q' => "events(#{expr})" }, pagination)
+      EventsPage.find('queries', { 'q' => "events(#{expr})" }, pagination)
     end
   end
 
@@ -96,34 +107,37 @@ module Fauna
     def events(pagination = {})
       query = param_strings.first
       subqueries = param_strings.drop(1).join ','
-      EventsPage.find("query", { 'q' => "each(events(#{query}),#{subqueries})" }, pagination)
+      EventsPage.find('queries', { 'q' => "each(events(#{query}),#{subqueries})" }, pagination)
     end
   end
 
   class CustomSet < Set
-    def add(resource)
-      self.class.add(self, resource)
+    def add(resource, time = nil)
+      self.class.add(self, resource, time)
     end
 
-    def remove(resource)
-      self.class.remove(self, resource)
+    def remove(resource, time = nil)
+      self.class.remove(self, resource, time)
     end
 
-    def self.add(set, resource)
+    def self.add(set, resource, time = nil)
       set = set.ref if set.respond_to? :ref
       resource = resource.ref if resource.respond_to? :ref
-      Fauna::Client.put("#{set}/#{resource}")
+      event = time ? "/events/#{Fauna.usecs_from_time(time)}/create" : ''
+      Fauna::Client.put("#{set}/#{resource}#{event}")
     end
 
-    def self.remove(set, resource)
+    def self.remove(set, resource, time = nil)
       set = set.ref if set.respond_to? :ref
       resource = resource.ref if resource.respond_to? :ref
-      Fauna::Client.delete("#{set}/#{resource}")
+      event = time ? "/events/#{Fauna.usecs_from_time(time)}/delete" : ''
+      Fauna::Client.put("#{set}/#{resource}#{event}")
     end
   end
 
   class SetPage < Fauna::Resource
     include Enumerable
+    undef :count
 
     def refs
       @refs ||= struct['resources']
@@ -143,6 +157,7 @@ module Fauna
 
   class EventsPage < Fauna::Resource
     include Enumerable
+    undef :count
 
     def events
       @events ||= struct['events'].map { |e| Event.new(e) }
@@ -165,6 +180,18 @@ module Fauna
       @attrs = attrs
     end
 
+    def ref
+      "#{resource}/events/#{@attrs['ts']}/#{action}"
+    end
+
+    def event_ref
+      if set == resource
+        "#{resource}/events/#{@attrs['ts']}/#{action}"
+      else
+        "#{set}/#{resource}/events/#{@attrs['ts']}/#{action}"
+      end
+    end
+
     def ts
       Fauna.time_from_usecs(@attrs['ts'])
     end
@@ -180,5 +207,17 @@ module Fauna
     def action
       @attrs['action']
     end
+
+    def save
+      Fauna::Client.put(event_ref) if editable?
+    end
+
+    def delete
+      Fauna::Client.delete(event_ref) if editable?
+    end
+
+    def editable?
+      ['create', 'delete'].include? action
+    end
   end
 end

data/lib/fauna/util.rb

@@ -1,14 +1,4 @@
 module Fauna
-  def self.stringify_keys!(hash)
-    hash.keys.each do |k|
-      hash[k.to_s] = hash.delete k
-    end
-  end
-
-  def self.stringify_keys(hash)
-    stringify_keys!(hash.dup)
-  end
-
   def self.time_from_usecs(microseconds)
     Time.at(microseconds/1_000_000, microseconds % 1_000_000)
   end

data/test/class_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class InstanceTest < MiniTest::Unit::TestCase
+class ClassTest < MiniTest::Unit::TestCase
 
   def setup
     super
@@ -42,13 +42,6 @@ class InstanceTest < MiniTest::Unit::TestCase
     assert pig1.persisted?
   end
 
-  def test_find_by_constraint
-    pig = Fauna::Resource.create 'classes/pigs', :constraints => { :name => "the pig" }
-    pig1 = Fauna::Resource.find('classes/pigs/constraints/name/the%20pig')
-    assert_equal pig.ref, pig1.ref
-    assert pig1.persisted?
-  end
-
   def test_delete
     pig = Fauna::Resource.create 'classes/pigs'
     pig.delete
@@ -62,23 +55,4 @@ class InstanceTest < MiniTest::Unit::TestCase
     pig = Fauna::Resource.new 'classes/pigs'
     assert_nil pig.ts
   end
-
-  def test_ts_assignment
-    time = Time.at(0)
-    pig = Fauna::Resource.create 'classes/pigs'
-    pig.ts = time
-
-    Fauna::Client.context(@server_connection) do
-      pig2 = Fauna::Resource.find(pig.ref)
-      assert(time != pig2.ts)
-    end
-
-    pig.save
-
-    Fauna::Client.context(@server_connection) do
-      pig3 = Fauna::Resource.find(pig.ref)
-      # Waiting on server support for timestamp overrides
-      # assert_equal time, pig3.ts
-    end
-  end
 end

data/test/connection_test.rb

@@ -34,4 +34,18 @@ class ConnectionTest < MiniTest::Unit::TestCase
       @server_connection.get(user['ref'])
     end
   end
+
+  # def test_retry
+  #   class << RestClient::Request
+  #     alias __execute__ execute
+  #   end
+
+  #   class << RestClient::Request
+  #     def execute(*args, &block)
+  #       alias execute __execute__
+  #       raise RestClient::ServerBrokeConnection
+  #     end
+  #   end
+  #   @server_connection.get("users/instances")
+  # end
 end

data/test/database_test.rb

@@ -10,26 +10,28 @@ class DatabaseTest < MiniTest::Unit::TestCase
     end
   end
 
-  def test_create
-    assert_raises(Fauna::Connection::Unauthorized) do
-      @model.save
+  def test_get
+    assert_raises(Fauna::Connection::NotFound) do
+      Fauna::Resource.find("databases/fauna-ruby-test")
+    end
+    Fauna::Client.context(@root_connection) do
+      Fauna::Resource.find("databases/fauna-ruby-test")
+      Fauna::Resource.find("databases/fauna-ruby-test2")
     end
   end
 
-  def test_self
-    database = Fauna::Resource.find('databases/self')
-    assert_equal "databases/fauna-ruby-test", database.ref
-
-    assert_raises(Fauna::Connection::BadRequest) do
-      Fauna::Client.context(@root_connection) do
-        Fauna::Resource.find('databases/self')
-      end
+  def test_create
+    assert_raises(Fauna::Connection::NotFound) do
+      @model.save
+    end
+    Fauna::Client.context(@root_connection) do
+      @model.save
     end
   end
 
   def test_destroy
-    assert_raises(Fauna::Connection::Unauthorized) do
-      Fauna::Resource.find('databases/self').delete
+    assert_raises(Fauna::Connection::NotFound) do
+      @model.delete
     end
     Fauna::Client.context(@root_connection) do
       @model.delete

data/test/query_test.rb

@@ -0,0 +1,44 @@
+require File.expand_path('../test_helper', __FILE__)
+
+# TODO use association_test classes
+
+class QueryTest < MiniTest::Unit::TestCase
+
+  def setup
+    super
+    @model = Fauna::Resource.create 'classes/message_boards'
+    @posts_set = @model.set 'posts'
+    @posts = []
+    @comments = []
+
+    3.times do |i|
+      post = Fauna::Resource.create(
+        'classes/posts',
+        { :data =>
+          { :topic => "The Horned King" } })
+      @posts << post
+      @posts_set.add(post)
+      3.times do |j|
+        comment = Fauna::Resource.create(
+          'classes/comments',
+          { :data =>
+            { :text => "Do not show the Horned King the whereabouts of the Black Cauldron!" } })
+        @comments << comment
+        Fauna::CustomSet.new("#{post.ref}/sets/comments").add(comment)
+      end
+    end
+  end
+
+  def test_join
+    query = Fauna::Set.join @posts_set, '_/sets/comments'
+    assert_equal 9, query.page.size
+    @comments.flatten.each do |comment|
+      assert query.page.include? comment.ref
+    end
+  end
+
+  def test_match
+    query = Fauna::Set.match 'classes/posts', 'data.topic', 'The Horned King'
+    assert query.page.size > 1
+  end
+end

data/test/set_test.rb

@@ -14,6 +14,7 @@ class SetTest < MiniTest::Unit::TestCase
     page = @posts.page
     assert_equal "#{@model.ref}/sets/posts", page.ref
     assert_equal 0, page.refs.size
+    assert_equal 0, page.count
   end
 
   def test_pagination
@@ -25,6 +26,7 @@ class SetTest < MiniTest::Unit::TestCase
 
     page1 = @posts.page(:size => 2)
     assert_equal 2, page1.refs.size
+    assert_equal 5, page1.count
     page2 = @posts.page(:size => 2, :before => page1.before)
     assert_equal 2, page2.refs.size
     page3 = @posts.page(:size => 2, :before => page2.before)
@@ -36,6 +38,7 @@ class SetTest < MiniTest::Unit::TestCase
     assert_equal 2, page5.refs.size
     page6 = @posts.page(:size => 2, :after => page5.after)
     assert_equal 1, page6.refs.size
+    assert_equal 5, page6.count
   end
 
   def test_any
@@ -66,29 +69,4 @@ class SetTest < MiniTest::Unit::TestCase
     @posts.add(post)
     assert_equal [post.ref], @posts.page.refs
   end
-
-  def test_event_set_query
-    posts = (1..3).map do |i|
-      Fauna::Resource.create('classes/posts').tap do |p|
-        @posts.add(p)
-      end
-    end
-
-    comments = posts.map do |p|
-      (1..3).map do |i|
-        Fauna::Resource.create('classes/comments').tap do |c|
-          comments = Fauna::CustomSet.new("#{p.ref}/sets/comments")
-          comments.add(c)
-        end
-      end
-    end
-
-    q = Fauna::Set.join(@posts, 'sets/comments')
-
-    assert_equal 9, q.page.size
-
-    comments.flatten.each do |c|
-      assert q.page.include?(c.ref)
-    end
-  end
 end

data/test/test_helper.rb

@@ -7,16 +7,16 @@ require "fauna"
 require "securerandom"
 require "mocha/setup"
 
-FAUNA_ROOTKEY = ENV["FAUNA_ROOTKEY"]
+FAUNA_ROOT_KEY = ENV["FAUNA_ROOT_KEY"]
 FAUNA_DOMAIN = ENV["FAUNA_DOMAIN"]
 FAUNA_SCHEME = ENV["FAUNA_SCHEME"]
 FAUNA_PORT = ENV["FAUNA_PORT"]
 
-if !(FAUNA_ROOTKEY && FAUNA_DOMAIN && FAUNA_SCHEME && FAUNA_PORT)
-  raise "FAUNA_ROOTKEY, FAUNA_DOMAIN, FAUNA_SCHEME and FAUNA_PORT must be defined in your environment to run tests."
+if !FAUNA_ROOT_KEY
+  raise "FAUNA_ROOT_KEY must be defined in your environment to run tests."
 end
 
-ROOT_CONNECTION = Fauna::Connection.new(:secret => FAUNA_ROOTKEY, :domain => FAUNA_DOMAIN, :scheme => FAUNA_SCHEME, :port => FAUNA_PORT)
+ROOT_CONNECTION = Fauna::Connection.new(:secret => FAUNA_ROOT_KEY, :domain => FAUNA_DOMAIN, :scheme => FAUNA_SCHEME, :port => FAUNA_PORT)
 
 Fauna::Client.context(ROOT_CONNECTION) do
   Fauna::Resource.new('databases', :name => "fauna-ruby-test").delete rescue nil
@@ -38,6 +38,11 @@ Fauna::Client.context(SERVER_CONNECTION) do
   Fauna::Resource.create 'classes', :name => 'message_boards'
   Fauna::Resource.create 'classes', :name => 'posts'
   Fauna::Resource.create 'classes', :name => 'comments'
+
+  # Fixture for readme_test
+  pig = Fauna::Resource.new('classes/pigs/42471470493859841')
+  pig.ref = 'classes/pigs/42471470493859841'
+  pig.save
 end
 
 # test harness

metadata

@@ -1,20 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: fauna
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: '1.2'
 platform: ruby
 authors:
 - Fauna, Inc.
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhRENDQWxDZ0F3SUJB
+  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSbGRt
+  RnUKTVJnd0ZnWUtDWkltaVpQeUxHUUJHUllJWTJ4dmRXUmlkWEl4RWpBUUJn
+  b0praWFKay9Jc1pBRVpGZ0p6ZERBZQpGdzB4TXpFeE1EUXlNREkxTURWYUZ3
+  MHhOREV4TURReU1ESTFNRFZhTUQweERUQUxCZ05WQkFNTUJHVjJZVzR4CkdE
+  QVdCZ29Ka2lhSmsvSXNaQUVaRmdoamJHOTFaR0oxY2pFU01CQUdDZ21TSm9t
+  VDhpeGtBUmtXQW5OME1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
+  QU1JSUJDZ0tDQVFFQXVHNHEySWRUdGxjNy9JSmtXUG5iT0FGdAp5c0tjM1ht
+  TEhzamVTWFhTUGRRMW1iMmNEWHZ5RFM4VGt6anJnRG9KOTZSUjJ4cmg3YmZr
+  SEFNSmhTVk1oc1BNCnJuWVM3ZkRzLy9YMWg2ZlJZQmpqaHFHZVFoQ0wxeHJT
+  NS9JNHZLYjdBamdGbnVVYk1aL0gwK2ljMkljMnpUbloKanR0U1FaL1FPbFl5
+  Y3RyWW9UekFGZFB3TCtkT3hza095QW1BYnRWL3BWM293Y1hwQ2hSVC90cGhD
+  N3U2OXNPaworSWpXc013ckJDYkVkai9KbWg0YTUyUW50QXdQV3g0S3J0MHpt
+  OGVWMy9ValNPYkIzQlIxcFovaTVJc1NMUHMxCmx3TUE2eXdiZnhCVFA1OVhj
+  Z0F5aGZWM3JSUVhiK3ZqcGY3T0x1T0NKT1VJTjhHRXdiNUhOakZvL1VWZGl3
+  SUQKQVFBQm8zTXdjVEFKQmdOVkhSTUVBakFBTUFzR0ExVWREd1FFQXdJRXNE
+  QWRCZ05WSFE0RUZnUVViVENxeXlkbgowUm02bm5nZjE1S3RDRU1jMzdzd0d3
+  WURWUjBSQkJRd0VvRVFaWFpoYmtCamJHOTFaR0oxY2k1emREQWJCZ05WCkhS
+  SUVGREFTZ1JCbGRtRnVRR05zYjNWa1luVnlMbk4wTUEwR0NTcUdTSWIzRFFF
+  QkJRVUFBNElCQVFCZ2dHR2IKMEFveUYwUW9memtQSW11aE4xVUY2ZUcvUmRZ
+  T0hxaVVvdnVSTi85SWJseUtBYVpBSWwxbUlzcGZDYXY4RVZ3bwpTQzZ2ejRP
+  YUlWcFM3UWRJMDRvTE5IeGhtQzZDNVRUQk9OdGRkRGw5M00rOXVXVmlwRDV1
+  VlBrdGNIV0crYktuCjJMMWxVeWtRWHI4cmE0NVRxQVVaL1ArWXY3NlU4a1Vz
+  VkcySEU1Z2wvQ2dCNStWMXFrcG41TTRDQURzdlN2UEEKcUVBVFp2dytLVXp6
+  TUNVaVZ6cStUNmxEcnJDdCtzRDNOWmx2RzRCRDJQcFF1UHREZjFpNjFEVWMr
+  NXMyTndtMgp0NHVxTkY3c3dCV1MwbjQwL2htbjV1OHBUMkpWc3V3YW03OUdH
+  aEptTmZDZFBDY0NiZ3Bocm9leFJjcndkVVJYCmx5MDBYZGYxZ0RWQnhSb1IK
+  LS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: echoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -116,6 +134,7 @@ files:
 - Manifest
 - README.md
 - Rakefile
+- fauna-ruby.pem
 - fauna.gemspec
 - lib/fauna.rb
 - lib/fauna/cache.rb
@@ -131,15 +150,17 @@ files:
 - test/client_test.rb
 - test/connection_test.rb
 - test/database_test.rb
+- test/query_test.rb
 - test/readme_test.rb
 - test/set_test.rb
 - test/test_helper.rb
 homepage: http://fauna.github.com/fauna/
-licenses: []
+licenses:
+- Mozilla Public License, Version 2.0 (MPL2)
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
-- --inline-source
 - --title
 - Fauna
 - --main
@@ -147,28 +168,27 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: fauna
-rubygems_version: 1.8.23
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Official Ruby client for the Fauna API.
 test_files:
 - test/class_test.rb
 - test/client_test.rb
 - test/connection_test.rb
 - test/database_test.rb
+- test/query_test.rb
 - test/readme_test.rb
 - test/set_test.rb
 - test/test_helper.rb