dm-persevere-adapter 0.23.0 → 0.25.0

data/VERSION

@@ -1 +1 @@
-0.23.0
+0.25.0

data/lib/persevere.rb

@@ -94,7 +94,6 @@ class Persevere
 
   def update(path, resource, headers = {})
     json_blob = resource.to_json
-#    puts "JSON to PERSEVERE: #{json_blob}"
     response = nil
     while response.nil?
       begin
@@ -109,7 +108,6 @@ class Persevere
 
   def delete(path, headers = {})
     response = nil
-#    puts "DELETING #{path}"
     while response.nil?
       begin
         response = @persevere.send_request('DELETE', path, nil, HEADERS.merge(headers))

data/lib/persevere_adapter.rb

@@ -174,6 +174,8 @@ module DataMapper
     class PersevereAdapter < AbstractAdapter
       extend Chainable
       extend Deprecate
+      
+      RESERVED_CLASSNAMES = ['User','Transaction','Capability','File','Class']
 
       include Migrations::PersevereAdapter
 
@@ -188,7 +190,7 @@ module DataMapper
         scale     = Property::DEFAULT_SCALE_BIGDECIMAL
 
         @type_map ||= {
-          Types::Serial => { :primitive => 'string' },
+          Types::Serial => { :primitive => 'integer' },
           Types::Boolean => { :primitive => 'boolean' },
           Integer     => { :primitive => 'integer'},
           String      => { :primitive => 'string'},
@@ -426,11 +428,13 @@ module DataMapper
         else
           path = "/Class/#{project}/#{name}"
         end
-
         result = @persevere.retrieve(path)
-
         if result.code == "200"
-          return result.body
+          schemas = [JSON.parse(result.body)].flatten.select{ |schema| not RESERVED_CLASSNAMES.include?(schema['id']) }
+          schemas.each do |schema|
+            schema['properties']['id'] = { 'type' => Types::Serial}
+          end
+          return schemas.length > 1 ? schemas : schemas[0]
         else
           return false
         end
@@ -438,7 +442,6 @@ module DataMapper
 
       def put_schema(schema_hash, project = nil)
         path = "/Class/"
-
         if ! project.nil?
           if schema_hash.has_key?("id")
             if ! schema_hash['id'].index(project)
@@ -448,6 +451,7 @@ module DataMapper
             puts "You need an id key/value in the hash"
           end
         end
+        schema_hash['properties'].delete('id') if schema_hash['properties'].has_key?('id')
         result = @persevere.create(path, schema_hash)
         if result.code == '201'
           return JSON.parse(result.body)
@@ -457,7 +461,6 @@ module DataMapper
       end
 
       def update_schema(schema_hash, project = nil)
-
         id = schema_hash['id']
         payload = schema_hash.reject{|key,value| key.to_sym.eql?(:id) }
 

data/spec/persevere_adapter_spec.rb

@@ -8,6 +8,8 @@ require agg_dir / 'spec' / 'public' / 'shared' / 'aggregate_shared_spec'
 
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/persevere_adapter'
 
+require 'ruby-debug'
+
 describe DataMapper::Adapters::PersevereAdapter do
   before :all do
     # This needs to point to a valid persevere server
@@ -65,7 +67,7 @@ describe DataMapper::Adapters::PersevereAdapter 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!
@@ -90,27 +92,17 @@ describe DataMapper::Adapters::PersevereAdapter do
    
      describe '#get_schema' do
        it 'should return all of the schemas (in json) if no name is provided' do
+         # debugger
          result = @adapter.get_schema()
          result.should_not == false
-         JSON.parse(result).class.should == Array
+         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"
+         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-persevere-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -07:00
+date: 2010-01-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency