dm-persevere-adapter 0.18.0 → 0.21.0

data/spec/persevere_adapter_spec.rb

@@ -2,25 +2,28 @@ require File.dirname(__FILE__) + '/spec_helper'
 gem 'rspec'
 require 'spec'
 
-require 'ruby-debug'
 require DataMapper.root / 'lib' / 'dm-core' / 'spec' / 'adapter_shared_spec'
+agg_dir = path_to("dm-aggregates", "0.10.2")[0]
+require agg_dir / 'spec' / 'public' / 'shared' / 'aggregate_shared_spec'
+
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/persevere_adapter'
 
 describe DataMapper::Adapters::PersevereAdapter do
   before :all do
     # This needs to point to a valid persevere server
     @adapter = DataMapper.setup(:default, { :adapter => 'persevere', :host => 'localhost', :port => '8080' })
+    @repository = DataMapper.repository(@adapter.name)
 
-    class Bozon
+    class ::Bozon
       include DataMapper::Resource
-
+    
       # Persevere only does id's as strings.  
       property :id, String, :serial => true
       property :author, String
       property :created_at, DateTime
       property :title, String
     end
-
+    
     @test_schema_hash = {
       'id' => 'Vanilla',
       'properties' => {
@@ -29,7 +32,7 @@ describe DataMapper::Adapters::PersevereAdapter do
         'data' => { 'type' => 'string'}
       }
     }
-
+    
     @test_schema_hash_alt = {
       'id' => 'test1/Vanilla',
       'properties' => {
@@ -45,7 +48,7 @@ describe DataMapper::Adapters::PersevereAdapter do
         'newdata' => { 'type' => 'any'}
       }
     }
-
+    
     @test_schema_hash_alt_mod = {
       'id' => 'test1/Vanilla',
       'properties' => {
@@ -54,95 +57,140 @@ describe DataMapper::Adapters::PersevereAdapter do
       }
     }
   end
-
-  describe 'migrations' do
-    it 'should create the Bozon storage' do
-      Bozon.auto_migrate!
-      Bozon.auto_migrate_down!
-    end
-    
-    it "should destroy Create then Remove the Bozon Storage" do
-      @adapter.get_schema(Bozon.storage_name).should == false
-      Bozon.auto_migrate_up!
-      @adapter.get_schema(Bozon.storage_name).should_not == false
-      Bozon.auto_migrate_down!
-      @adapter.get_schema(Bozon.storage_name).should == false
-    end
-  end
-
-  it_should_behave_like 'An Adapter Foo'
-
-  describe '#put_schema' do
-     it 'should create the json schema for the hash' do
-       @adapter.put_schema(@test_schema_hash).should_not == false
-     end 
   
-     it 'should create the json schema for the hash under the specified project' do
-       @adapter.put_schema(@test_schema_hash, "test").should_not == false
+   it_should_behave_like 'An Adapter'
+   
+   describe 'migrations' do
+     it 'should create the Bozon storage' do
+       Bozon.auto_migrate!
+       Bozon.auto_migrate_down!
+     end
+   
+     it "should destroy Create then Remove the Bozon Storage" do
+       @adapter.get_schema(Bozon.storage_name).should == false
+       Bozon.auto_migrate_up!
+       @adapter.get_schema(Bozon.storage_name).should_not == false
+       Bozon.auto_migrate_down!
+       @adapter.get_schema(Bozon.storage_name).should == false
+     end
+   
+     describe '#put_schema' do
+       it 'should create the json schema for the hash' do
+         @adapter.put_schema(@test_schema_hash).should_not == false
+       end 
+   
+       it 'should create the json schema for the hash under the specified project' do
+         @adapter.put_schema(@test_schema_hash, "test").should_not == false
+       end
+   
+       it 'should create the json schema for the hash under the specified project' do
+         @adapter.put_schema(@test_schema_hash_alt).should_not == false
+       end 
+     end
+   
+     describe '#get_schema' do
+       it 'should return all of the schemas (in json) if no name is provided' do
+         result = @adapter.get_schema()
+         result.should_not == false
+         JSON.parse(result).class.should == Array
+       end 
+   
+       it 'should return the json schema of the class specified' do
+         result = @adapter.get_schema("Object")
+         result.should_not == false
+         JSON.parse(result)["id"].should == "Object"
+       end
+   
+       # I don't think we need these tests.
+       # it 'should return all of the schemas (in json) for a project if no name is provided' do
+       #   result = @adapter.get_schema(nil, "Class")
+       #   debugger
+       #   result
+       # end 
+       #   
+       # it 'should return all of the schemas (in json) if no name is provided' do
+       #   @adapter.get_schema("Object", "Class")
+       # end 
+     end
+   
+     describe '#update_schema' do
+       it 'should update a previously existing schema' do
+         result = @adapter.update_schema(@test_schema_hash_mod)
+         result.should_not == false
+   
+         @test_schema_hash_mod['id'].should match(JSON.parse(result)['id'])
+       end
+   
+       it 'should update a previously created schema under the specified project' do
+         result = @adapter.update_schema(@test_schema_hash_mod, "test")
+         result.should_not == false
+         @test_schema_hash_mod['id'].should match(JSON.parse(result)['id'])
+       end
+   
+       it 'should update a previously created schema under the specified project' do
+         result = @adapter.update_schema(@test_schema_hash_alt_mod)
+         result.should_not == false
+         @test_schema_hash_alt_mod['id'].should match(JSON.parse(result)['id'])
+       end
+     end
+   
+     describe '#delete_schema' do
+       it 'should delete the specified schema' do
+         @adapter.delete_schema(@test_schema_hash).should == true
+       end
+   
+       it 'should delete the specified schema in the specified project' do
+         @adapter.delete_schema(@test_schema_hash, "test").should == true
+       end
+   
+       it 'should delete the specified schema in the specified project' do
+         @adapter.delete_schema(@test_schema_hash_alt).should == true
+       end
      end
-  
-     it 'should create the json schema for the hash under the specified project' do
-       @adapter.put_schema(@test_schema_hash_alt).should_not == false
-     end 
    end
 
-  describe '#get_schema' do
-    it 'should return all of the schemas (in json) if no name is provided' do
-      result = @adapter.get_schema()
-      result.should_not == false
-      JSON.parse(result).class.should == Array
-    end 
-  
-    it 'should return the json schema of the class specified' do
-      result = @adapter.get_schema("Object")
-      result.should_not == false
-      JSON.parse(result)["id"].should == "Object"
+  describe 'aggregates' do
+    it_should_behave_like 'It Has Setup Resources'
+    before :all do
+      @dragons   = Dragon.all
+      @countries = Country.all
     end
-  
-    # I don't think we need these tests.
-    # it 'should return all of the schemas (in json) for a project if no name is provided' do
-    #   result = @adapter.get_schema(nil, "Class")
-    #   debugger
-    #   result
-    # end 
-    #   
-    # it 'should return all of the schemas (in json) if no name is provided' do
-    #   @adapter.get_schema("Object", "Class")
-    # end 
+    it_should_behave_like 'An Aggregatable Class'
   end
 
-  describe '#update_schema' do
-    it 'should update a previously existing schema' do
-      result = @adapter.update_schema(@test_schema_hash_mod)
-      result.should_not == false
-
-      @test_schema_hash_mod['id'].should match(JSON.parse(result)['id'])
+  describe 'limiting and offsets' do
+    before(:all) do
+      Bozon.auto_migrate!
+      (0..99).each{|i| Bozon.create!(:author => i, :title => i)}
     end
-      
-    it 'should update a previously created schema under the specified project' do
-      result = @adapter.update_schema(@test_schema_hash_mod, "test")
-      result.should_not == false
-      @test_schema_hash_mod['id'].should match(JSON.parse(result)['id'])
+    
+    it "should limit" do
+      result = Bozon.all(:limit => 2)
+      result.length.should == 2
     end
-      
-    it 'should update a previously created schema under the specified project' do
-      result = @adapter.update_schema(@test_schema_hash_alt_mod)
-      result.should_not == false
-      @test_schema_hash_alt_mod['id'].should match(JSON.parse(result)['id'])
+    
+    after(:all) do
+      Bozon.auto_migrate_down!
     end
   end
-
-  describe '#delete_schema' do
-    it 'should delete the specified schema' do
-      @adapter.delete_schema(@test_schema_hash).should == true
-    end
-  
-    it 'should delete the specified schema in the specified project' do
-      @adapter.delete_schema(@test_schema_hash, "test").should == true
-    end
   
-    it 'should delete the specified schema in the specified project' do
-      @adapter.delete_schema(@test_schema_hash_alt).should == true
-    end
+  describe "is reflective" do
+    it "should be able to fetch json model descriptions" # do
+    #       @return_hash = @test_schema_hash.clone
+    #       @return_hash['prototype'] = {}
+    #       @adapter.fetch_models.should_not include(@return_hash)
+    #       @adapter.put_schema(@test_schema_hash)
+    #       models = @adapter.fetch_models
+    #       models.should include(@return_hash)
+    #       @adapter.delete_schema(@test_schema_hash)
+    #     end
+    
+    it "should reflect existing schemas into DM models with reflect!" # do
+    #       @adapter.put_schema(@test_schema_hash)
+    #       @adapter.reflect!
+    #       Vanilla.should_not be_nil
+    #     end
   end
+  
+  
 end

data/spec/persevere_spec.rb

@@ -11,9 +11,9 @@ describe Persevere do
     @blobObj = {
       'id' => 'Yogo',
       'properties' => {
-        'cid' => {'type' => 'string' },
-        'parent' => { 'type' => 'string'},
-        'data' => { 'type' => 'string'}
+        'cid' => {'type' => 'string', 'optional' => true },
+        'parent' => { 'type' => 'string', 'optional' => true},
+        'data' => { 'type' => 'string', 'optional' => true}
       }
     }
     
@@ -29,90 +29,164 @@ describe Persevere do
     @mockObj = {
       'id' => 'Yogo',
       'properties' => {
-        'cid' => {'type' => 'string' },
-        'parent' => { 'type' => 'string'},
-        'data' => { 'type' => 'string'}
+        'cid' => {'type' => 'string', 'optional' => true },
+        'parent' => { 'type' => 'string', 'optional' => true},
+        'data' => { 'type' => 'string', 'optional' => true}
       },
       'prototype' => {}
     }
+    
+    @object = {
+      'cid' => '123',
+      'parent' => 'none',
+      'data' => 'A Chunk Of Data'
+    }
+    
   end
   
-  #
+  
   # Test POST to create a new class
-  #
+  
   describe '#post' do
-    it 'should create a new object in persevere' do
-      result = @p.create('/Class/', @blobObj)
-      result.code.should == "201"
-      JSON.parse(result.body).should == @mockObj
-    end
-    
-    it 'should not allow posting with a bad object' do
-      result = @p.create('/Class/', @corruptObj)
-      result.code.should == "500"
-      result.body.should == "\"Can not modify queries\""
-    end
-    
-    it 'should not allow posting to an existing object/id/path' do
-      result = @p.create('/Class/', @blobObj)
-      result.code.should == "201"
-      JSON.parse(result.body).should == @blobObj
-      # This shouldn't be a 201, it should say something mean.
+     it 'should create a new object in persevere' do
+       result = @p.create('/Class/', @blobObj)
+       result.code.should == "201"
+       JSON.parse(result.body).should == @mockObj
+     end
+     
+     it 'should not allow posting with a bad object' do
+       result = @p.create('/Class/', @corruptObj)
+       result.code.should == "500"
+       result.body.should == "\"Can not modify queries\""
+     end
+     
+     it 'should not allow posting to an existing object/id/path' do
+       result = @p.create('/Class/', @blobObj)
+       result.code.should == "201"
+       JSON.parse(result.body).should == @blobObj
+       # This shouldn't be a 201, it should say something mean.
+     end
+   end
+  
+   #
+   # Test GET to retrieve the list of classes from Persvr
+   #
+   describe '#get' do
+     it 'should retrieve the previously created object from persevere' do
+       result = @p.retrieve('/Class/Yogo')
+       result.code.should == "200"
+       JSON.parse(result.body).should == @blobObj
+     end
+     
+     it 'should 404 on a non-existent object' do
+       result = @p.retrieve('/Class/GetNotThere')
+       result.code.should == "404"
+       result.message.should == "Not Found"
+     end
+   end
+  
+   #
+   # Test PUT to modify an existing class
+   #
+   describe '#put' do
+     it 'should modify the previously created object in persevere' do
+       @blobObj['properties']['tstAttribute'] = { 'type' => 'string' }
+       result = @p.update('/Class/Yogo', @blobObj)
+       result.code.should == "200"
+       JSON.parse(result.body).should == @blobObj
+     end
+     
+     it 'should fail to modify a non-existent item' do
+       result = @p.update('/Class/NonExistent', @blobObj)
+       result.code.should == "500"
+       result.body.should == "\"id does not match location\""
+       @p.delete('/Class/NonExistent') # A bug(?) in Persevere makes a broken NonExistent class.
+       # This should be a 404 and not throw a persevere server exception
+     end
+   end
+  
+   #
+   # Test DELETE to remove the previously created and modified class
+   #
+   describe '#delete' do
+     it 'should remove the previously created and modified object from persevere' do
+       result = @p.delete('/Class/Yogo')
+       result.code.should == "204"
+       @p.retrieve('/Class/Yogo').code.should == "404"
+     end
+     
+     it 'should fail to delete a non-existent item' do
+       result = @p.delete('/Class/NotThere')
+       result.code.should == "404"
+       result.message.should == "Not Found"
+       result.body.should == "\"Class/NotThere not found\""
+     end
+   end
+   
+   describe "POSTing objects" do
+     before(:all) do
+       @p.create('/Class/', @blobObj)
+     end
+     
+     it "should not allow nil fields to be posted" do
+       obj_with_nil = @object.merge({'cid' => nil})
+       result = @p.create('/Yogo', obj_with_nil)
+       result.code.should == "201"
+       JSON.parse(result.body).reject{|key,value| key == 'id' }.should == 
+          obj_with_nil.reject{|key,value| value.nil?}
+     end
+     
+     after(:all) do
+       @p.delete('/Class/Yogo')
+     end
+   end
+  
+  describe "GETting limits and offsets" do
+    before(:all) do
+      @p.create('/Class/', @blobObj)
+      (0..99).each do |i|
+        @p.create('/Yogo/', @object.merge({'cid' => "#{i}"}))
+      end
     end
-  end
 
-  #
-  # Test GET to retrieve the list of classes from Persvr
-  #
-  describe '#get' do
-    it 'should retrieve the previously created object from persevere' do
-      result = @p.retrieve('/Class/Yogo')
+    it "should only retrieve all objects" do
+      result = @p.retrieve('/Yogo/')
       result.code.should == "200"
-      JSON.parse(result.body).should == @blobObj
+      JSON.parse(result.body).length.should == 100
     end
     
-    it 'should 404 on a non-existent object' do
-      result = @p.retrieve('/Class/GetNotThere')
-      result.code.should == "404"
-      result.message.should == "Not Found"
-    end
-  end
-
-  #
-  # Test PUT to modify an existing class
-  #
-  describe '#put' do
-    it 'should modify the previously created object in persevere' do
-      @blobObj['properties']['tstAttribute'] = { 'type' => 'string' }
-      result = @p.update('/Class/Yogo', @blobObj)
+    it "should retrieve the first objects" do
+      result = @p.retrieve('/Yogo/1')
       result.code.should == "200"
-      JSON.parse(result.body).should == @blobObj
+      JSON.parse(result.body)['id'].should == '1'
     end
     
-    it 'should fail to modify a non-existent item' do
-      result = @p.update('/Class/NonExistent', @blobObj)
-      result.code.should == "500"
-      result.body.should == "\"id does not match location\""
-      @p.delete('/Class/NonExistent') # A bug(?) in Persevere makes a broken NonExistent class.
-      # This should be a 404 and not throw a persevere server exception
+    it "should retrieve a 10 of the objects" do
+        result = @p.retrieve('/Yogo/', {'Range' => "items=1-10"})
+        result.code.should == '206'
+        JSON.parse(result.body).length.should == 10
     end
-  end
-
-  #
-  # Test DELETE to remove the previously created and modified class
-  #
-  describe '#delete' do
-    it 'should remove the previously created and modified object from persevere' do
-      result = @p.delete('/Class/Yogo')
-      result.code.should == "204"
-      @p.retrieve('/Class/Yogo').code.should == "404"
+    
+    it "should return the first 2 objects" do
+      result = @p.retrieve('/Yogo/', {'Range' => "items=0-1"})
+      result.code.should == '206'
+      json = JSON.parse(result.body)
+      json.length.should == 2
+      json[0]['id'].should == '1'
+      json[1]['id'].should == '2'
+    end
+    
+    it "should return 21 and up objects" do
+      result = @p.retrieve('/Yogo/', {'Range' => 'items=20-'})
+      result.code.should == '206'
+      json = JSON.parse(result.body)
+      json.length.should == 80
+      json[0]['id'].should == '21'
+      json[-1]['id'].should == '100'      
     end
     
-    it 'should fail to delete a non-existent item' do
-      result = @p.delete('/Class/NotThere')
-      result.code.should == "404"
-      result.message.should == "Not Found"
-      result.body.should == "\"Class/NotThere not found\""
+    after(:all) do
+      @p.delete('/Class/Yogo')
     end
   end
 end