acts_as_archive 0.2.2 → 0.2.3

data/README.markdown

@@ -101,4 +101,19 @@ end
 </pre>
 
 Call <code>ActsAsArchive.update</code> upon adding new indexes
-(see <a href="#create_archive_tables">_Create archive tables_</a>).
+(see <a href="#create_archive_tables">_Create archive tables_</a>).
+
+Delete records without archiving
+--------------------------------
+
+To destroy a record without archiving:
+
+<pre>
+article.destroy!
+</pre>
+
+To delete multiple records without archiving:
+
+<pre>
+Article.delete_all!(["id in (?)", [1,2,3]])
+</pre>

data/lib/acts_as_archive/base/destroy.rb

@@ -28,6 +28,10 @@ module ActsAsArchive
             insert_cols << 'deleted_at'
             select_cols << "'#{Time.now.utc.to_s(:db)}'"
           end
+
+          insert_cols.map! { |col| connection.quote_column_name(col) }
+          select_cols.map! { |col| col =~ /^\'/ ? col : connection.quote_column_name(col) }
+
           connection.execute(%{
             INSERT INTO archived_#{table_name} (#{insert_cols.join(', ')})
               SELECT #{select_cols.join(', ')}

data/lib/acts_as_archive/base/restore.rb

@@ -14,6 +14,7 @@ module ActsAsArchive
         def copy_from_archive(conditions)
           add_conditions!(where = '', conditions)
           col_names = column_names - [ 'deleted_at' ]
+          col_names.map! { |col| connection.quote_column_name(col) }
           connection.execute(%{
             INSERT INTO #{table_name} (#{col_names.join(', ')})
               SELECT #{col_names.join(', ')}

data/require.rb

@@ -17,7 +17,7 @@ Require do
     name 'acts_as_archive'
     homepage "http://github.com/winton/#{name}"
     summary "Don't delete your records, move them to a different table"
-    version '0.2.2'
+    version '0.2.3'
   end
   
   lib do

data/spec/acts_as_archive/base/destroy_spec.rb

@@ -20,6 +20,20 @@ describe ActsAsArchive::Base::Destroy do
     end
     
   end
+
+  describe 'destroy!' do
+
+    before(:all) do
+      create_records
+      @article = Article.first
+    end
+
+    it "should really destroy a records" do
+      @article.destroy!
+      Article::Archive.count.should == 0
+    end
+
+  end
   
   describe 'delete_all' do
     
@@ -100,4 +114,4 @@ describe ActsAsArchive::Base::Destroy do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -43,7 +43,7 @@ def create_records(klass=Article, values={})
       end
     end
     connection.execute(%{
-      INSERT INTO #{table} (#{cols.collect { |c| "#{c}" }.join(', ')})
+      INSERT INTO #{table} (#{cols.collect { |c| "#{connection.quote_column_name(c)}" }.join(', ')})
         VALUES (#{vals.join(', ')})
     })
     klass.find(x)
@@ -69,6 +69,7 @@ def establish_test_db
   connection.create_table(:articles) do |t|
     t.string :title
     t.string :body
+    t.boolean :read # break mysql w/o quotation
   end
   # Load the model
   load "#{SPEC}/db/models/article.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_archive
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 -08:00
+date: 2010-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,6 @@ files:
 - lib/acts_as_archive/migration.rb
 - lib/acts_as_archive.rb
 - MIT-LICENSE
-- pkg/acts_as_archive-0.2.1.gem
 - rails/init.rb
 - Rakefile
 - README.markdown