fauna 2.0.0 → 2.1.0

data/spec/query_spec.rb

@@ -10,8 +10,7 @@ RSpec.describe Fauna::Query do
       create ref('indexes'), name: 'query_by_y', source: @test_class, terms: [{ path: 'data.y' }]
     end
 
-    wait_for_active(index_x[:ref])
-    wait_for_active(index_y[:ref])
+    wait_for_index(index_x[:ref], index_y[:ref])
 
     @test_by_x = index_x[:ref]
     @test_by_y = index_y[:ref]
@@ -41,15 +40,37 @@ RSpec.describe Fauna::Query do
   end
 
   describe Fauna::Query::Expr do
-    it 'converts to string' do
-      expr = Fauna::Query::Expr.new(
-        add: Fauna::Query::Expr.new(
-          [1, Fauna::Query::Expr.new(divide: Fauna::Query::Expr.new([4, 2]))]
+    describe '#to_s' do
+      it 'converts to string' do
+        expr = Fauna::Query::Expr.new(
+          add: Fauna::Query::Expr.new(
+            [1, Fauna::Query::Expr.new(divide: Fauna::Query::Expr.new([4, 2]))]
+          )
         )
-      )
-      as_string = 'Expr({:add=>Expr([1, Expr({:divide=>Expr([4, 2])})])})'
+        as_string = 'Expr({:add=>Expr([1, Expr({:divide=>Expr([4, 2])})])})'
 
-      expect(expr.to_s).to eq(as_string)
+        expect(expr.to_s).to eq(as_string)
+      end
+    end
+
+    describe '#==' do
+      it 'equals identical expression' do
+        expr1 = Fauna::Query::Expr.new(add: Fauna::Query::Expr.new([1, 2]))
+        expr2 = Fauna::Query::Expr.new(add: Fauna::Query::Expr.new([1, 2]))
+
+        expect(expr1).to eq(expr2)
+      end
+
+      it 'does not equal different expression' do
+        expr1 = Fauna::Query::Expr.new(add: Fauna::Query::Expr.new([1, 2]))
+        expr2 = Fauna::Query::Expr.new(
+          add: Fauna::Query::Expr.new(
+            [1, Fauna::Query::Expr.new(divide: Fauna::Query::Expr.new([4, 2]))]
+          )
+        )
+
+        expect(expr1).not_to eq(expr2)
+      end
     end
   end
 
@@ -84,9 +105,14 @@ RSpec.describe Fauna::Query do
   end
 
   describe '#ref' do
-    it 'creates a ref' do
-      ref = random_ref
-      expect(Fauna::Query.ref(ref)).to eq(Fauna::Ref.new(ref))
+    it 'returns a ref from a string' do
+      str = random_ref_string
+      expect(Fauna::Query.ref(str)).to eq(Fauna::Ref.new(str))
+    end
+
+    it 'constructs a ref' do
+      expect(client.query { ref(@test_class, '123') }).to eq(Fauna::Ref.new('classes/query_test/123'))
+      expect(client.query { ref(@test_class, next_id) }.value).to match(%r{^classes/query_test/\d+$})
     end
   end
 
@@ -424,7 +450,7 @@ RSpec.describe Fauna::Query do
       over_z = client.query do
         create ref('indexes'), name: 'query_over_z', source: @test_class, values: [{ path: 'data.z' }]
       end
-      wait_for_active(over_z[:ref])
+      wait_for_index(over_z[:ref])
       @test_over_z = over_z[:ref]
 
       @refs = []
@@ -470,6 +496,17 @@ RSpec.describe Fauna::Query do
         expect(get_set_data(set)).to eq(@assoc_refs)
       end
     end
+
+    context 'with index' do
+      it 'performs join' do
+        source = Fauna::Query.match(@test_by_x, @x_value)
+        expect(get_set_data(source)).to eq(@join_refs)
+
+        # Get associated refs
+        set = Fauna::Query.expr { join(source, @test_by_y) }
+        expect(get_set_data(set)).to eq(@assoc_refs)
+      end
+    end
   end
 
   describe 'authentication' do
@@ -550,6 +587,12 @@ RSpec.describe Fauna::Query do
     end
   end
 
+  describe '#next_id' do
+    it 'gets a new id' do
+      expect(client.query { next_id }).to be_a(String)
+    end
+  end
+
   describe '#equals' do
     it 'performs equals' do
       expect(client.query { equals(1, 1, 1) }).to be(true)

data/spec/ref_spec.rb

@@ -8,32 +8,12 @@ RSpec.describe Fauna::Ref do
       name = random_string
       expect(Fauna::Ref.new("classes/#{name}").value).to eq("classes/#{name}")
     end
-
-    it 'creates from arguments' do
-      name = random_string
-      id = random_number
-
-      expect(Fauna::Ref.new('classes', name).value).to eq("classes/#{name}")
-      expect(Fauna::Ref.new('classes', name, id).value).to eq("classes/#{name}/#{id}")
-    end
-
-    it 'creates from other refs' do
-      ref = Fauna::Ref.new('classes')
-      name = random_string
-      id = random_number
-
-      class_ref = Fauna::Ref.new(ref, name)
-
-      expect(class_ref.value).to eq("classes/#{name}")
-      expect(Fauna::Ref.new(class_ref, id).value).to eq("classes/#{name}/#{id}")
-      expect(Fauna::Ref.new(ref, name, id).value).to eq("classes/#{name}/#{id}")
-    end
   end
 
   describe '#id' do
     context 'with multiple elements' do
       it 'returns id portion' do
-        expect(Fauna::Ref.new('classes', 'test').id).to eq('test')
+        expect(Fauna::Ref.new('classes/test').id).to eq('test')
       end
     end
 
@@ -45,13 +25,19 @@ RSpec.describe Fauna::Ref do
   end
 
   describe '#to_class' do
-    context 'with multiple elements' do
+    context 'with three elements' do
       it 'returns class portion' do
-        expect(Fauna::Ref.new('classes', 'test').to_class).to eq(Fauna::Ref.new('classes'))
+        expect(Fauna::Ref.new('classes/test/1234').to_class).to eq(Fauna::Ref.new('classes/test'))
       end
     end
 
-    context 'with single element' do
+    context 'with two elements' do
+      it 'returns class portion' do
+        expect(Fauna::Ref.new('classes/test').to_class).to eq(Fauna::Ref.new('classes'))
+      end
+    end
+
+    context 'with one element' do
       it 'returns class portion' do
         expect(Fauna::Ref.new('classes').to_class).to eq(Fauna::Ref.new('classes'))
       end

data/spec/setref_spec.rb

@@ -1,20 +1,20 @@
 RSpec.describe Fauna::SetRef do
   describe '#==' do
     it 'equals same set' do
-      data = { match: random_ref, terms: random_string }
+      data = { match: random_ref_string, terms: random_string }
       set = Fauna::SetRef.new(data)
 
       expect(set).to eq(Fauna::SetRef.new(data))
     end
 
     it 'does not equal different set' do
-      set = Fauna::SetRef.new(match: random_ref, terms: random_string)
+      set = Fauna::SetRef.new(match: random_ref_string, terms: random_string)
 
-      expect(set).not_to eq(Fauna::SetRef.new(match: random_ref, terms: random_string))
+      expect(set).not_to eq(Fauna::SetRef.new(match: random_ref_string, terms: random_string))
     end
 
     it 'does not equal other type' do
-      data = { match: random_ref, terms: random_string }
+      data = { match: random_ref_string, terms: random_string }
       set = Fauna::SetRef.new(data)
 
       expect(set).not_to eq(data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fauna
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Fauna, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,29 +58,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: 0.8.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.10
-description: Ruby client for the Fauna distributed database.
+        version: 0.8.13
+description: Ruby driver for FaunaDB.
 email: priority@faunadb.com
 executables: []
 extensions: []
@@ -102,6 +102,7 @@ files:
 - lib/fauna/errors.rb
 - lib/fauna/json.rb
 - lib/fauna/objects.rb
+- lib/fauna/page.rb
 - lib/fauna/query.rb
 - lib/fauna/request_result.rb
 - lib/fauna/util.rb
@@ -112,6 +113,7 @@ files:
 - spec/errors_spec.rb
 - spec/fauna_helper.rb
 - spec/json_spec.rb
+- spec/page_spec.rb
 - spec/query_spec.rb
 - spec/ref_spec.rb
 - spec/setref_spec.rb
@@ -145,11 +147,12 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: FaunaDB Ruby client
+summary: FaunaDB Ruby driver
 test_files:
 - spec/util_spec.rb
 - spec/context_spec.rb
 - spec/client_logger_spec.rb
+- spec/page_spec.rb
 - spec/query_spec.rb
 - spec/fauna_helper.rb
 - spec/client_spec.rb