simply_stored 0.1.8 → 0.1.12

data/lib/simply_stored/couch/belongs_to.rb

@@ -46,6 +46,7 @@ module SimplyStored
           owner_clazz.class_eval do
             attr_reader "#{name}_id"
             attr_accessor "#{name}_id_was"
+            property "#{name}_id"
             
             define_method name do |*args|
               options = args.last.is_a?(Hash) ? args.last : {}
@@ -54,13 +55,13 @@ module SimplyStored
               with_deleted = options[:with_deleted] || false
               
               return instance_variable_get("@#{name}") unless instance_variable_get("@#{name}").nil? or forced_reload
-              instance_variable_set("@#{name}", send("#{name}_id") ? Object.const_get(item_class_name).find(send("#{name}_id"), :with_deleted => with_deleted) : nil)
+              instance_variable_set("@#{name}", send("#{name}_id").present? ? Object.const_get(item_class_name).find(send("#{name}_id"), :with_deleted => with_deleted) : nil)
             end
           
             define_method "#{name}=" do |value|
               klass = self.class.get_class_from_name(name)
               raise ArgumentError, "expected #{klass} got #{value.class}" unless value.nil? || value.is_a?(klass)
-              
+
               instance_variable_set("@#{name}", value)
               if value.nil?
                 instance_variable_set("@#{name}_id", nil)

data/lib/simply_stored/storage.rb

@@ -26,8 +26,24 @@ module SimplyStored
         end
         ret
       end
+      
+      def save!(*args)
+        super
+        save_attachments
+      end
+      
+      def delete(*args)
+        delete_attachments
+        super
+      end
+      
+      def destroy(*args)
+        delete_attachments
+        super
+      end
     
       def save_attachments
+        return unless id.present?
         if @_s3_attachments
           @_s3_attachments.each do |name, attachment|
             if attachment[:dirty]
@@ -38,6 +54,16 @@ module SimplyStored
           end
         end
       end
+      
+      def delete_attachments
+        return unless id.present?
+        (@_s3_attachments || {}).each do |name, attachment|
+          if _s3_options[name][:after_delete] == :delete
+            key = s3_bucket(name).key(s3_attachment_key(name), true)
+            key.delete
+          end
+        end
+      end
     
       def s3_attachment_key(name)
         "#{self.class.name.tableize}/#{name}/#{id}"
@@ -60,7 +86,8 @@ module SimplyStored
           :permissions => 'private', 
           :ssl => true, 
           :location => :us, # use :eu for European buckets
-          :ca_file => nil # point to CA file for SSL certificate verification
+          :ca_file => nil, # point to CA file for SSL certificate verification
+          :after_delete => :nothing # or :delete to delete the item on S3 after it is deleted in the DB
         }.update(options)
         self._s3_options ||= {}
         self._s3_options[name] = options

data/test/simply_stored_couch_test.rb

@@ -329,6 +329,15 @@ class CouchTest < Test::Unit::TestCase
           assert_equal user.id, post.user_id
         end
         
+        should "set also the foreign key id to nil if setting the referencing object to nil" do
+          user = User.create(:title => "Mr.")
+          post = Post.create(:user => user)
+          post.user = nil
+          post.save!
+          assert_nil post.reload.user
+          assert_nil post.reload.user_id
+        end
+        
         should "fetch the object from the database when requested through the getter" do
           user = User.create(:title => "Mr.")
           post = Post.create(:user => user)
@@ -427,6 +436,15 @@ class CouchTest < Test::Unit::TestCase
           post.save!
           assert !post.user_changed?
         end
+        
+        should "handle a foreign_key of '' as nil" do
+          post = Post.create
+          post.user_id = ''
+          
+          assert_nothing_raised do
+            assert_nil post.user
+          end
+        end
       end
       
       context "with has_many" do
@@ -1040,6 +1058,25 @@ class CouchTest < Test::Unit::TestCase
         assert_equal "Hostess Masteress", user.name
       end
       
+      should "remove attributes that are no longer in the database" do
+        user = User.create(:title => "Mr.", :name => "Host Master")
+        assert_not_nil user.name
+        same_user_in_different_thread = User.find(user.id)
+        same_user_in_different_thread.name = nil
+        same_user_in_different_thread.save!
+        assert_nil user.reload.name
+      end
+      
+      should "also remove foreign key attributes that are no longer in the database" do
+        user = User.create(:title => "Mr.", :name => "Host Master")
+        post = Post.create(:user => user)
+        assert_not_nil post.user_id
+        same_post_in_different_thread = Post.find(post.id)
+        same_post_in_different_thread.user = nil
+        same_post_in_different_thread.save!
+        assert_nil post.reload.user_id
+      end
+      
       should "not be dirty after reloading" do
         user = User.create(:title => "Mr.", :name => "Host Master")
         user2 = User.find(user.id)
@@ -1109,6 +1146,12 @@ class CouchTest < Test::Unit::TestCase
           @bucket.expects(:put).with(anything, "Yay! It logged!", {}, anything)
           @log_item.save
         end
+        
+        should "also upload on save!" do
+          @log_item.log_data = "Yay! It logged!"
+          @bucket.expects(:put).with(anything, "Yay! It logged!", {}, anything)
+          @log_item.save!
+        end
       
         should "use the specified bucket" do
           @log_item.log_data = "Yay! It logged!"
@@ -1261,6 +1304,27 @@ class CouchTest < Test::Unit::TestCase
           assert_equal "Yay!", @log_item.log_data
         end
       end
+      
+      context "when deleting" do
+        setup do
+          CouchLogItem._s3_options[:log_data][:after_delete] = :nothing
+          @log_item.log_data = 'Yatzzee'
+          @log_item.save
+        end
+        
+        should "do nothing to S3" do
+          @bucket.expects(:key).never
+          @log_item.delete
+        end
+        
+        should "also delete on S3 if configured so" do
+          CouchLogItem._s3_options[:log_data][:after_delete] = :delete
+          s3_key = mock(:delete => true)
+          @bucket.expects(:key).with(@log_item.s3_attachment_key('log_data'), true).returns(s3_key)
+          @log_item.delete
+        end
+        
+      end
     end
     
     context "when using soft deletable" do

data/test/simply_stored_simpledb_test.rb

@@ -1170,6 +1170,7 @@ class SimplyStoredTest < Test::Unit::TestCase
       context "with s3 interaction" do
         setup do
           LogItem.instance_variable_set(:@_s3_connection, nil)
+          LogItem._s3_options[:log_data][:ca_file] = nil
           
           bucket = stub(:bckt) do
             stubs(:put).returns(true)
@@ -1189,7 +1190,7 @@ class SimplyStoredTest < Test::Unit::TestCase
         context "when saving the attachment" do
           should "fetch the collection" do
             @log_item.log_data = "Yay! It logged!"
-            RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true).returns(@s3)
+            RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true, :ca_file => nil).returns(@s3)
             @log_item.save
           end
         
@@ -1198,7 +1199,7 @@ class SimplyStoredTest < Test::Unit::TestCase
             @bucket.expects(:put).with(anything, "Yay! It logged!", {}, anything)
             @log_item.save
           end
-        
+                  
           should "use the specified bucket" do
             @log_item.log_data = "Yay! It logged!"
             LogItem._s3_options[:log_data][:bucket] = 'mybucket'
@@ -1211,7 +1212,17 @@ class SimplyStoredTest < Test::Unit::TestCase
             LogItem._s3_options[:log_data][:bucket] = 'mybucket'
             
             @s3.expects(:bucket).with('mybucket').returns(nil)
-            @s3.expects(:bucket).with('mybucket', true, 'private').returns(@bucket)
+            @s3.expects(:bucket).with('mybucket', true, 'private', :location => nil).returns(@bucket)
+            @log_item.save
+          end
+          
+          should "accept :us location option but not set it in RightAWS::S3" do
+            @log_item.log_data = "Yay! log me"
+            LogItem._s3_options[:log_data][:bucket] = 'mybucket'
+            LogItem._s3_options[:log_data][:location] = :us
+
+            @s3.expects(:bucket).with('mybucket').returns(nil)
+            @s3.expects(:bucket).with('mybucket', true, 'private', :location => nil).returns(@bucket)
             @log_item.save
           end
           
@@ -1220,7 +1231,7 @@ class SimplyStoredTest < Test::Unit::TestCase
             LogItem._s3_options[:log_data][:bucket] = 'mybucket'
             
             @s3.expects(:bucket).with('mybucket').returns(nil)
-            @s3.expects(:bucket).with('mybucket', true, 'private').raises(RightAws::AwsError, 'BucketAlreadyExists: The requested bucket name is not available. The bucket namespace is shared by all users of the system. Please select a different name and try again')
+            @s3.expects(:bucket).with('mybucket', true, 'private', :location => nil).raises(RightAws::AwsError, 'BucketAlreadyExists: The requested bucket name is not available. The bucket namespace is shared by all users of the system. Please select a different name and try again')
             
             assert_raise(ArgumentError) do
               @log_item.save
@@ -1295,6 +1306,8 @@ class SimplyStoredTest < Test::Unit::TestCase
           end
         
           should "add a short-lived access key for private attachments" do
+            @log_item._s3_options[:log_data][:bucket] = 'bucket-for-monsieur'
+            @log_item._s3_options[:log_data][:location] = :us
             @log_item._s3_options[:log_data][:permissions] = 'private'
             @log_item.save
             assert @log_item.log_data_url.include?("https://bucket-for-monsieur.s3.amazonaws.com:443/#{@log_item.s3_attachment_key(:log_data)}")
@@ -1329,6 +1342,28 @@ class SimplyStoredTest < Test::Unit::TestCase
             assert_equal "Yay!", @log_item.log_data
           end
         end
+        
+        context "when deleting" do
+          setup do
+            LogItem._s3_options[:log_data][:after_delete] = :nothing
+            @log_item.log_data = 'Yatzzee'
+            @log_item.save
+          end
+
+          should "do nothing to S3" do
+            @bucket.expects(:key).never
+            @log_item.delete
+          end
+
+          should "also delete on S3 if configured so" do
+            LogItem._s3_options[:log_data][:after_delete] = :delete
+            s3_key = mock(:delete => true)
+            @bucket.expects(:key).with(@log_item.s3_attachment_key('log_data'), true).returns(s3_key)
+            @log_item.delete
+          end
+
+        end
+        
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.12
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +01:00
+date: 2010-01-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency