soft_deletion 0.4.0 → 0.4.1

data/.travis.yml

@@ -1,5 +1,13 @@
-script: "bundle exec rake"
 rvm:
-  - ree
-  - 1.9.2
   - 1.9.3
+  - 1.8.7
+  - 2.0
+gemfile:
+  - gemfiles/rails2.gemfile
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails4.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/rails2.gemfile
+script: "rake spec"

data/Appraisals

@@ -9,3 +9,10 @@ appraise "rails3" do
   gem 'activerecord', version
   gem 'activesupport', version
 end
+
+appraise "rails4" do
+  version = "4.0.0.beta1"
+  gem 'activerecord', version
+  gem 'activesupport', version
+end
+

data/Gemfile

@@ -7,5 +7,5 @@ gem 'appraisal'
 gem 'rake'
 gem 'sqlite3'
 gem 'rspec'
-gem 'database_cleaner'
+gem 'database_cleaner', '1.0.0.RC1' # or rails 4 tests fail
 gem 'bump'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.4.0)
+    soft_deletion (0.4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -23,7 +23,7 @@ GEM
     arel (3.0.2)
     builder (3.0.0)
     bump (0.3.8)
-    database_cleaner (0.8.0)
+    database_cleaner (1.0.0.RC1)
     diff-lcs (1.1.3)
     i18n (0.6.0)
     multi_json (1.3.6)
@@ -47,7 +47,7 @@ DEPENDENCIES
   activesupport
   appraisal
   bump
-  database_cleaner
+  database_cleaner (= 1.0.0.RC1)
   rake
   rspec
   soft_deletion!

data/gemfiles/rails2.gemfile

@@ -1,12 +1,12 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"
 gem "sqlite3"
 gem "rspec"
-gem "database_cleaner"
+gem "database_cleaner", "1.0.0.RC1"
 gem "bump"
 gem "activerecord", "2.3.14"
 gem "activesupport", "2.3.14"

data/gemfiles/rails3.gemfile

@@ -1,12 +1,12 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"
 gem "sqlite3"
 gem "rspec"
-gem "database_cleaner"
+gem "database_cleaner", "1.0.0.RC1"
 gem "bump"
 gem "activerecord", "3.2.3"
 gem "activesupport", "3.2.3"

data/gemfiles/rails4.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "sqlite3"
+gem "rspec"
+gem "database_cleaner", "1.0.0.RC1"
+gem "bump"
+gem "activerecord", "4.0.0.beta1"
+gem "activesupport", "4.0.0.beta1"
+
+gemspec :path=>"../"

data/lib/soft_deletion/core.rb

@@ -23,7 +23,8 @@ module SoftDeletion
       end
 
       def with_deleted
-        with_exclusive_scope do
+        method = (ActiveRecord::VERSION::MAJOR >= 4 ? :unscoped : :with_exclusive_scope)
+        send(method) do
           yield self
         end
       end
@@ -40,11 +41,20 @@ module SoftDeletion
           models = ids_or_models
         else
           ids = ids_or_models
-          models = all(:conditions => { :id => ids })
+          models = if ActiveRecord::VERSION::MAJOR >= 4
+            where(:id => ids)
+          else
+            all(:conditions => { :id => ids })
+          end
         end
 
         transaction do
-          update_all(mark_as_soft_deleted_sql, :id => ids)
+          if ActiveRecord::VERSION::MAJOR >= 4
+            where(:id => ids).update_all(mark_as_soft_deleted_sql)
+          else
+            update_all(mark_as_soft_deleted_sql, :id => ids)
+          end
+
           models.each do |model|
             model.soft_delete_dependencies.each(&:soft_delete!)
             model.run_callbacks ActiveRecord::VERSION::MAJOR > 2 ? :soft_delete : :after_soft_delete

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/soft_deletion.gemspec

@@ -9,6 +9,9 @@ Gem::Specification.new name, SoftDeletion::VERSION do |s|
   s.homepage = "https://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
   s.license = "MIT"
-  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
-  s.cert_chain = ["gem-public_cert.pem"]
+  key = File.expand_path("~/.ssh/gem-private_key.pem")
+  if File.exist?(key)
+    s.signing_key = key
+    s.cert_chain = ["gem-public_cert.pem"]
+  end
 end

data/spec/spec_helper.rb

@@ -39,6 +39,7 @@ ActiveRecord::Base.establish_connection(
 )
 
 # create tables
+ActiveRecord::Schema.verbose = false
 ActiveRecord::Schema.define(:version => 1) do
   create_table :forums do |t|
     t.integer :category_id
@@ -149,8 +150,11 @@ class Cat1Forum < ActiveRecord::Base
   silent_set_table_name 'forums'
 
   has_soft_deletion
-  default_scope :conditions => {:category_id => 1}
-
+  if ActiveRecord::VERSION::MAJOR >= 4
+    default_scope { where(:category_id => 1) }
+  else
+    default_scope :conditions => {:category_id => 1}
+  end
 
   belongs_to :category
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   VHNmKzZNYWVud0FNa0FnSGRzd0dzSnp0T25ObkJhM0YKeTBrQ1NXbUs2RCt4
   L1NiZlM2cjdLZTA3TVJxemlKZEI5R3VFMSswY0lSdUZoOEVRK0xONkhYQ0tN
   NXBvbi9HVQp5Y3dNWGZsMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -55,6 +55,7 @@ files:
 - gem-public_cert.pem
 - gemfiles/rails2.gemfile
 - gemfiles/rails3.gemfile
+- gemfiles/rails4.gemfile
 - lib/soft_deletion.rb
 - lib/soft_deletion/core.rb
 - lib/soft_deletion/dependency.rb
@@ -78,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2665204581756557410
+      hash: 4177162783989057611
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,10 +88,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2665204581756557410
+      hash: 4177162783989057611
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.