dm-persevere-adapter 0.28.0 → 0.29.0

data/Rakefile

@@ -14,17 +14,17 @@ begin
     gemspec.add_dependency(%q<dm-core>, [">= 0.10.1"])
     gemspec.add_dependency(%q<extlib>)
   end
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = %q{persevere}
-    gemspec.summary = %q{A ruby wrapper for persevere}
-    gemspec.description = %q{A ruby wrapper for persevere}
-    gemspec.email = ["irjudson [a] gmail [d] com"]
-    gemspec.homepage = %q{http://github.com/yogo/persevere}
-    gemspec.authors = ["Ivan R. Judson", "The Yogo Data Management Development Team" ]
-    gemspec.rdoc_options = ["--main", "persevere/README.txt"]
-    gemspec.files = ["LICENSE.txt", "persevere/History.txt", "persevere/README.txt", "Rakefile", "lib/persevere.rb"]
-    gemspec.test_files = ["spec/persevere_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]
-  end
+  # Jeweler::Tasks.new do |gemspec|
+  #    gemspec.name = %q{persevere}
+  #    gemspec.summary = %q{A ruby wrapper for persevere}
+  #    gemspec.description = %q{A ruby wrapper for persevere}
+  #    gemspec.email = ["irjudson [a] gmail [d] com"]
+  #    gemspec.homepage = %q{http://github.com/yogo/persevere}
+  #    gemspec.authors = ["Ivan R. Judson", "The Yogo Data Management Development Team" ]
+  #    gemspec.rdoc_options = ["--main", "persevere/README.txt"]
+  #    gemspec.files = ["LICENSE.txt", "persevere/History.txt", "persevere/README.txt", "Rakefile", "lib/persevere.rb"]
+  #    gemspec.test_files = ["spec/persevere_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]
+  #  end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.28.0
+0.29.0

data/lib/persevere_adapter.rb

@@ -149,8 +149,21 @@ module DataMapper
           return properties
         end
 
-        table_name = model.storage_name(name)
-        schema_hash = model.to_json_schema_compatible_hash
+        new_schema_hash = model.to_json_schema_compatible_hash
+        current_schema_hash = get_schema(new_schema_hash['id'])[0]
+        # Diff of what is there and what will be added.
+
+        new_properties = properties.map do |property|
+          prop_name = property.name.to_s
+          prop_type = property.type
+          next if prop_name == 'id' || 
+                  (current_schema_hash['properties'].has_key?(prop_name) && 
+                  new_schema_hash['properties'][prop_name.to_sym]['type'] == current_schema_hash['properties'][prop_name]['type'] )
+          property
+        end.compact
+        
+        return new_properties unless update_schema(new_schema_hash) == false
+        return nil
       end
 
       ##
@@ -464,7 +477,7 @@ module DataMapper
       def update_schema(schema_hash, project = nil)
         id = schema_hash['id']
         payload = schema_hash.reject{|key,value| key.to_sym.eql?(:id) }
-
+        payload['properties'].delete('id') if payload['properties'].has_key?('id')
 
         if project.nil?
           path = "/Class/#{id}"

data/spec/persevere_adapter_spec.rb

@@ -36,6 +36,13 @@ describe DataMapper::Adapters::PersevereAdapter do
       property :title, String
     end
     
+    class ::Nugaton
+      include DataMapper::Resource
+      
+      property :id, Serial
+      property :name, String
+    end
+    
     @test_schema_hash = {
       'id' => 'Vanilla',
       'properties' => {
@@ -186,4 +193,25 @@ describe DataMapper::Adapters::PersevereAdapter do
       Bozon.auto_migrate_down!
     end
   end
+  
+  describe 'auto updating models' do
+    before :each do
+      Nugaton.auto_migrate!
+    end
+    
+    it "should auto upgrade correctly" do
+      before_schema = @adapter.get_schema('nugaton')[0]
+      before_schema['properties'].should have_key('name')
+      before_schema['properties'].should_not have_key('big_value')
+      Nugaton.send(:property, :big_value, Integer)
+      Nugaton.auto_upgrade!
+      before_schema = @adapter.get_schema('nugaton')[0]
+      before_schema['properties'].should have_key('name')
+      before_schema['properties'].should have_key('big_value')
+    end
+    
+    after(:all) do
+      Nugaton.auto_migrate_down!
+    end
+  end
 end

metadata

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