simply_stored 0.2.0 → 0.2.1

data/README.md

@@ -186,6 +186,9 @@ Both the CouchDB backend and the SimpleDB backend have support for S3 attachment
     log.save
     # => true
     
+    log.data_size
+    # => 11238132
+    
 This will create an item on S3 in the specified bucket. The item will use the ID of the log object as the key and the body will be the data attribute. This way you can store big files outside of CouchDB or SimpleDB.    
     
 

data/lib/simply_stored/couch/belongs_to.rb

@@ -42,7 +42,7 @@ module SimplyStored
           :type => "custom",
           :include_docs => true
             
-        property name, :class => SimplyStored::Couch::BelongsTo::Property
+        properties << SimplyStored::Couch::BelongsTo::Property.new(self, name)
       end
 
       class Property #:nodoc:

data/lib/simply_stored/couch/has_many.rb

@@ -2,7 +2,7 @@ module SimplyStored
   module Couch
     module HasMany
       def has_many(name, options = {})
-        property name, options.merge(:class => SimplyStored::Couch::HasMany::Property)
+        properties << SimplyStored::Couch::HasMany::Property.new(self, name, options)
       end
 
       def define_has_many_getter(name)

data/lib/simply_stored/couch/has_one.rb

@@ -2,7 +2,7 @@ module SimplyStored
   module Couch
     module HasOne
       def has_one(name, options = {})
-        property name, options.merge(:class => SimplyStored::Couch::HasOne::Property)
+        properties << SimplyStored::Couch::HasOne::Property.new(self, name, options)
       end
       
       def define_has_one_setter(name)

data/lib/simply_stored/storage.rb

@@ -21,6 +21,7 @@ module SimplyStored
       end
     
       def save(validate = true)
+        update_attachment_sizes
         if ret = super(validate)
           save_attachments
         end
@@ -28,6 +29,7 @@ module SimplyStored
       end
       
       def save!(*args)
+        update_attachment_sizes
         super
         save_attachments
       end
@@ -64,6 +66,17 @@ module SimplyStored
           end
         end
       end
+      
+      def update_attachment_sizes
+        if @_s3_attachments
+          @_s3_attachments.each do |name, attachment|
+            if attachment[:dirty]
+              value = attachment[:value].is_a?(String) ? attachment[:value] : attachment[:value].to_json
+              send("#{name}_size=", (value.size rescue nil))
+            end
+          end
+        end
+      end
     
       def s3_attachment_key(name)
         "#{self.class.name.tableize}/#{name}/#{id}"
@@ -76,11 +89,20 @@ module SimplyStored
         require 's3/right_s3'
         require 's3/right_s3_interface'
         
+        name = name.to_sym
+        
         self.class.instance_eval do
           attr_accessor :_s3_options
         end
         
-        name = name.to_sym
+        self.class_eval do
+          if respond_to?(:property)
+            property "#{name}_size"
+          else
+            simpledb_integer "#{name}_size"
+          end
+        end
+        
         raise ArgumentError, "No bucket name specified for attachment #{name}" if options[:bucket].blank?
         options = {
           :permissions => 'private', 

data/test/simply_stored_couch_test.rb

@@ -10,7 +10,7 @@ class CouchTest < Test::Unit::TestCase
     
     context "design documents" do
       should "delete all" do
-        db = "http://localhost:5984/#{CouchPotato::Config.database_name}"
+        db = "http://127.0.0.1:5984/#{CouchPotato::Config.database_name}"
         assert_equal 0, SimplyStored::Couch.delete_all_design_documents(db)
         user = User.create
         Post.create(:user => user)
@@ -148,7 +148,8 @@ class CouchTest < Test::Unit::TestCase
         end
         
         should "allow to order the results" do
-          assert_equal User.find(:all).reverse, User.find(:all, :order => :desc)
+          assert_not_equal User.find(:all).map(&:id), User.find(:all, :order => :desc).map(&:id)
+          assert_equal User.find(:all).map(&:id).reverse, User.find(:all, :order => :desc).map(&:id)
         end
       end
 
@@ -1429,6 +1430,33 @@ class CouchTest < Test::Unit::TestCase
           @bucket.expects(:put).with(anything, '["one log entry","and another one"]', {}, anything)
           @log_item.save
         end
+        
+        context "when noting the size of the attachment" do
+          should "store on upload" do
+            @log_item.log_data = 'abc'
+            @bucket.expects(:put)
+            assert @log_item.save
+            assert_equal 3, @log_item.log_data_size
+          end
+        
+          should "update the size if the attachment gets updated" do
+            @log_item.log_data = 'abc'
+            @bucket.stubs(:put)
+            assert @log_item.save
+            assert_equal 3, @log_item.log_data_size
+          
+            @log_item.log_data = 'example'
+            assert @log_item.save
+            assert_equal 7, @log_item.log_data_size
+          end
+          
+          should "store the size of json attachments" do
+            @log_item.log_data = ['abc']
+            @bucket.stubs(:put)
+            assert @log_item.save
+            assert_equal ['abc'].to_json.size, @log_item.log_data_size
+          end
+        end
       end
     
       context "when fetching the data" do

metadata

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