archive_2s 0.0.3 → 0.0.4

data/lib/archive_2s/version.rb

@@ -1,3 +1,3 @@
 module Archive2s
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/archive_2s.rb

@@ -27,23 +27,7 @@ module Archive2s
       if self.archive_2s_args[:include_by_default]
         singleton.module_eval do
           def find(*args)
-            begin
-              #might as well try AR first
-              super.find(*args)
-            rescue Exception => e
-              #can only fetch archived by ids so don't attempt if there were extra args
-              if args.flatten! && args.length != args.select{|i| i == i.to_i}.length
-                raise e
-              else
-                items = self.all(:conditions => ["id IN (#{(['?'] * args.length).join(',')})", *args])
-                items += [self.find_archived(*args - items.collect(&:id))].flatten
-                if args.length == items.length
-                  items
-                else
-                  raise e
-                end
-              end
-            end
+            self.find_with_archived(*args)
           end
         end
       end
@@ -88,6 +72,26 @@ module Archive2s
         archived_models.first
       end
     end
+
+    def find_with_archived(*args)
+      begin
+        #might as well try AR first
+        super.find(*args)
+      rescue Exception => e
+        #can only fetch archived by ids so don't attempt if there were extra args
+        if args.flatten! && args.length != args.select{|i| i == i.to_i}.length
+          raise e
+        else
+          items = self.all(:conditions => ["id IN (#{(['?'] * args.length).join(',')})", *args])
+          items += [self.find_archived(*args - items.collect(&:id))].flatten
+          if args.length == items.length
+            items
+          else
+            raise e
+          end
+        end
+      end
+    end
   end
 end
 

data/spec/archive_2s_spec.rb

@@ -71,6 +71,17 @@ describe Archive2s do
     end
   end
 
+  it "find_with_archived should return archived items too" do
+    item_one = Item.create(:name => 'Item One', :description => 'foo')
+    item_two = Item.create(:name => 'Item Two', :description => 'bar')
+    ids = [item_one.id, item_two.id]
+    item_two.destroy
+    items = Item.find_with_archived(ids)
+
+    items.length.should == 2
+    items.collect(&:id).include?(ids.last).should be_true
+  end
+
   it "should archive the default to_s" do
     thing_one = Thing.create(:name => 'Thing One', :description => 'foo')
     t_to_s = thing_one.to_s
@@ -94,6 +105,10 @@ describe Archive2s do
     archived_thing.readonly?.should be_true
   end
 
+  it "should not error when no params are passed in" do
+    lambda{class Foo < ActiveRecord::Base;archive_2s;end}.should_not raise_error
+  end
+
   #reload should do nothing, not sure how to test that though
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: archive_2s
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - SmashTank Apps, LLC