simply_stored 0.5.0 → 0.5.1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =============
 
+0.5.1
+
+- Fix nullifying soft deleted objects when they are not deleted
+
 0.5.0
 
 - Add support for has_and_belongs_to_many relations:

data/Gemfile.lock

@@ -0,0 +1,39 @@
+GEM
+  specs:
+    activesupport (2.3.11)
+    couch_potato (0.2.31.2)
+      couchrest (>= 0.24)
+      json
+    couchrest (1.0.1)
+      json (>= 1.4.6)
+      mime-types (>= 1.15)
+      rest-client (>= 1.5.1)
+    json (1.4.6)
+    mattmatt-validatable (1.8.4)
+    mime-types (1.16)
+    mocha (0.9.8)
+      rake
+    rake (0.8.7)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    right_aws (2.0.0)
+      right_http_connection (>= 1.2.1)
+    right_http_connection (1.2.4)
+    shoulda (2.10.3)
+    shoulda-addons (0.2.2)
+    uuidtools (2.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (= 2.3.11)
+  couch_potato (= 0.2.31.2)
+  couchrest (= 1.0.1)
+  mattmatt-validatable (= 1.8.4)
+  mocha
+  rest-client (= 1.6.1)
+  right_aws
+  shoulda
+  shoulda-addons
+  uuidtools

data/lib/simply_stored/couch/finders.rb

@@ -42,7 +42,7 @@ module SimplyStored
       end
 
       def last(*args)
-        find(:first, :order => :desc, *args)
+        find(:first, {:order => :desc}, *args)
       end
 
       def count(options = {})

data/lib/simply_stored/instance_methods.rb

@@ -159,7 +159,7 @@ module SimplyStored
                 # skip
               else 
                 # nullify
-                unless dependent.class.soft_deleting_enabled?
+                unless dependent.class.soft_deleting_enabled? && dependent.deleted?
                   dependent.send("#{self.class.foreign_property}=", nil)
                   dependent.save(false)
                 end

data/lib/simply_stored.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/simply_stored/storage')
 require File.expand_path(File.dirname(__FILE__) + '/simply_stored/class_methods_base')
 
 module SimplyStored
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
   class Error < RuntimeError; end
   class RecordNotFound < RuntimeError; end
 end

data/test/active_model_compatibility_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 begin
   require 'active_model'

data/test/belongs_to_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class BelongsToTest < Test::Unit::TestCase

data/test/conflict_handling_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class ConflictHandlingTest < Test::Unit::TestCase

data/test/finder_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class FinderTest < Test::Unit::TestCase

data/test/has_and_belongs_to_many_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class HasAndBelongsToManyTest < Test::Unit::TestCase

data/test/has_many_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class HasManyTest < Test::Unit::TestCase

data/test/has_one_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class HasOneTest < Test::Unit::TestCase

data/test/instance_lifecycle_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class InstanceLifecycleTest < Test::Unit::TestCase

data/test/mass_assignment_protection_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class MassAssignmentProtectionTest < Test::Unit::TestCase

data/test/s3_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class S3Test < Test::Unit::TestCase

data/test/soft_deletable_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class SoftDeletableTest < Test::Unit::TestCase
@@ -171,10 +171,19 @@ class SoftDeletableTest < Test::Unit::TestCase
           assert_nil @rash.hemorrhoid_id
         end
         
-        should "not nullify dependents if they are soft-deletable" do
+        should "nullify dependents if they are soft-deletable and deleted" do
           small_rash = SmallRash.create(:hemorrhoid => @hemorrhoid)
           @hemorrhoid.reload
           @hemorrhoid.destroy
+          assert @hemorrhoid.deleted?
+          small_rash = SmallRash.find(small_rash.id)
+          assert_nil small_rash.hemorrhoid_id
+        end
+
+        should "not nullify dependents if they are soft-deletable and not deleted" do
+          small_rash = SmallRash.create(:hemorrhoid => @hemorrhoid)
+          @hemorrhoid.reload
+          assert !@hemorrhoid.deleted?
           small_rash = SmallRash.find(small_rash.id)
           assert_not_nil small_rash.hemorrhoid_id
           assert_equal @hemorrhoid.id, small_rash.hemorrhoid_id

data/test/test_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'test/unit'
+require 'bundler/setup'
+require 'active_support/testing/assertions'
 require 'shoulda'
 require 'mocha'
-require 'active_support'
-require 'active_support/testing/assertions'
 $:.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 puts File.expand_path(File.dirname(__FILE__) + "/lib")
 require 'simply_stored'

data/test/validations_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class ValidationsTest < Test::Unit::TestCase

data/test/views_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
 class CustomViewUser

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +01:00
+date: 2011-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - CHANGELOG.md
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - lib/simply_stored.rb