never_wastes 0.0.4 → 0.0.5

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format=d

data/lib/never_wastes.rb

@@ -26,7 +26,7 @@ module NeverWastes
         @never_wastes_datetime_column_name = :deleted_at
         def self.soft_destroy_stamps
           stamps = {@never_wastes_boolean_column_name => true}
-          stamps[@never_wastes_datetime_column_name] = Time.now if column_names.include?(@never_wastes_datetime_column_name.to_s)
+          stamps[@never_wastes_datetime_column_name] = self.current_time if column_names.include?(@never_wastes_datetime_column_name.to_s)
           stamps
         end
 
@@ -50,8 +50,16 @@ module NeverWastes
 
         default_scope {where(:deleted => false)}
 
-        def self.with_deleted
-          unscoped
+        class << self
+          def with_deleted
+            unscoped
+          end
+
+          alias_method :delete_all!, :delete_all
+          def delete_all_softly
+            update_all(deleted: true, deleted_at: self.current_time)
+          end
+          alias_method :delete_all, :delete_all_softly
         end
 
         private
@@ -59,6 +67,10 @@ module NeverWastes
         def destroying_softly?
           @destroying_softly
         end
+
+        def self.current_time
+          default_timezone == :utc ? Time.now.utc : Time.now
+        end
       end
     end
 

data/lib/never_wastes/version.rb

@@ -1,3 +1,3 @@
 module NeverWastes
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/never_wastes.gemspec

@@ -18,7 +18,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  %w{ activesupport actionpack railties }.each do |gem|
+    s.add_dependency gem, ['>= 3.0.0']
+  end
+  s.add_development_dependency 'bundler', ['>= 1.0.0']
+  s.add_development_dependency 'sqlite3', ['>= 0']
+  %w{ activerecord activemodel }.each do |gem|
+    s.add_development_dependency gem, ['>= 3.0.0']
+  end
+  s.add_development_dependency 'rspec', ['>= 0']
+  s.add_development_dependency 'rspec-rails', ['>= 0']
+  s.add_development_dependency 'factory_girl_rails', ['>= 0']
+  s.add_development_dependency 'database_cleaner', ['>= 0']
 end

data/spec/fake_app.rb

@@ -0,0 +1,29 @@
+require 'action_controller/railtie'
+require 'factory_girl'
+require 'database_cleaner'
+
+# database
+ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+ActiveRecord::Base.establish_connection('test')
+
+#migrations
+class CreateAllTables < ActiveRecord::Migration
+  def self.up
+    create_table(:users) {|t| t.string :name; t.boolean :deleted; t.datetime :deleted_at }
+  end
+end
+
+# models
+class User < ActiveRecord::Base
+  never_wastes
+  validates_uniqueness_of :name, :scope => [:name, :deleted]
+end
+
+# factory
+FactoryGirl.define do
+  factory :user do
+    sequence(:name) {|n| "test %03d" %n }
+    deleted false
+    deleted_at "2012-03-12 17:37:19"
+  end
+end

data/spec/never_wastes_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe User do
+  describe "validation" do
+    describe "uniqueness" do
+      let!(:user) { Factory.create :user, name: "test_name", deleted: false, deleted_at: nil }
+      context "when the same name user don't already exists" do
+        subject { User.new(name: "new user name") }
+        it { should be_valid }
+      end
+
+      context "when the same name user already exists" do
+        subject { User.new(name: user.name) }
+        it { should_not be_valid }
+      end
+
+      context "when the same name user exists and is deleted" do
+        before { user.destroy }
+        subject { User.new(name: user.name) }
+        it { should be_valid }
+      end
+    end
+  end
+
+  describe 'columns' do
+    let!(:user) { Factory.create :user, name: "test_name", deleted: false, deleted_at: nil }
+    subject { user }
+
+    context 'when user is not deleted' do
+      its(:deleted) { should be_false }
+      its(:deleted_at) { should be_nil}
+    end
+
+    context 'when user is deleted' do
+      before { user.destroy }
+      its(:deleted) { should be_true }
+      its(:deleted_at) { should_not be_nil }
+    end
+  end
+
+  describe "soft delete" do
+    let!(:user) { Factory.create :user, name: "test_name", deleted: false, deleted_at: nil }
+
+    it "should be successful" do
+      expect { user.destroy }.to change(User, :count).by(-1)
+    end
+
+    it "delete user *soft*ly" do
+      expect { user.destroy }.not_to change(User.unscoped, :count)
+    end
+  end
+
+  describe "default_scope" do
+    context 'when 1 user and 1 deleted user exists' do
+      let!(:user) { Factory.create :user, name: "test_name", deleted: false, deleted_at: nil }
+      let!(:deleted_user) { Factory.create :user, deleted: true, deleted_at:Time.now }
+
+      subject { User.all }
+      it { should have(1).items }
+      it { should include(user) }
+
+      describe "able to get deleted user" do
+        subject { User.unscoped.where(deleted: true).first }
+        it { should == deleted_user }
+      end
+    end
+  end
+
+  describe ".delete_all_softly" do
+    let!(:delete_users) { (1..3).inject([]) { |result, i| result << Factory.create(:user, deleted: false, deleted_at: nil) } }
+    let!(:undelete_user) { Factory.create(:user, name: 'undeleted', deleted: false, deleted_at: nil) }
+
+    it "should be successful" do
+      expect { User.where(User.arel_table[:name].not_eq('undeleted')).delete_all_softly }.to change(User, :count).by(-3)
+    end
+
+    it "should delete users *soft*ly" do
+      expect { User.where(User.arel_table[:name].not_eq('undeleted')).delete_all_softly }.not_to change(User.unscoped, :count)
+    end
+
+    describe 'after' do
+      before do
+        User.where(User.arel_table[:name].not_eq('undeleted')).delete_all_softly
+      end
+
+      it "should find undeleted users" do
+        User.where(User.arel_table[:name].eq('undeleted')).length.should == 1
+      end
+
+      describe 'columns' do
+        context 'when user is not deleted' do
+          subject { undelete_user.reload }
+          its(:deleted) { should be_false }
+          its(:deleted_at) { should be_nil}
+        end
+
+        context 'when user is deleted' do
+          subject { delete_users.first.reload }
+          its(:deleted) { should be_true }
+          its(:deleted_at) { should_not be_nil }
+        end
+      end
+    end
+  end
+
+  describe ".delete_all!" do
+    let!(:delete_users) { (1..3).inject([]) { |result, i| result << Factory.create(:user, deleted: false, deleted_at: nil) } }
+    let!(:undelete_user) { Factory.create(:user, name: 'undeleted', deleted: false, deleted_at: nil) }
+    it "should be successful" do
+      expect { User.where(User.arel_table[:name].not_eq('undeleted')).delete_all! }.to change(User, :count).by(-3)
+    end
+
+    it "should delete users" do
+      expect { User.where(User.arel_table[:name].not_eq('undeleted')).delete_all! }.to change(User.unscoped, :count).by(-3)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rails'
+# Ensure we use 'syck' instead of 'psych' in 1.9.2
+# RubyGems >= 1.5.0 uses 'psych' on 1.9.2, but
+# Psych does not yet support YAML 1.1 merge keys.
+# Merge keys is often used in mongoid.yml
+# See: http://redmine.ruby-lang.org/issues/show/4300
+if RUBY_VERSION >= '1.9.2'
+  YAML::ENGINE.yamler = 'syck'
+end
+require 'active_record'
+require 'never_wastes'
+require 'fake_app'
+
+require 'rspec/rails'
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  config.before :all do
+#     ActiveRecord::Base.connection.execute 'CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255))' unless ActiveRecord::Base.connection.table_exists? 'users'
+    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'users'
+  end
+end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,13 @@
+DatabaseCleaner.strategy = :transaction
+
+RSpec.configure do |config|
+  config.before :suite do
+    DatabaseCleaner.clean_with :truncation
+  end
+  config.before :each do
+    DatabaseCleaner.start
+  end
+  config.after :each do
+    DatabaseCleaner.clean
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: never_wastes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,129 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
-dependencies: []
+date: 2012-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2156605780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156605780
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &2156605220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156605220
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &2156604700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156604700
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2156604180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *2156604180
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2156603620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156603620
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2156603000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *2156603000
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &2156602340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *2156602340
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156601660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156601660
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2156600780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156600780
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: &2156600260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156600260
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &2156599740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156599740
 description: It changes ActiveRecord::Base#destroy to support soft delete. Kind of
   simple acts_as_paranoid.
 email:
@@ -20,6 +141,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -27,6 +149,10 @@ files:
 - lib/never_wastes.rb
 - lib/never_wastes/version.rb
 - never_wastes.gemspec
+- spec/fake_app.rb
+- spec/never_wastes_spec.rb
+- spec/spec_helper.rb
+- spec/support/database_cleaner.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -51,4 +177,8 @@ rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: simple soft delete for ActiveRecord
-test_files: []
+test_files:
+- spec/fake_app.rb
+- spec/never_wastes_spec.rb
+- spec/spec_helper.rb
+- spec/support/database_cleaner.rb