cloudwow-not_relational 0.1.7 → 0.1.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 7
 :major: 0
 :minor: 1
+:patch: 8

data/lib/not_relational/domain_model.rb

@@ -30,7 +30,13 @@ module NotRelational
             end
             @attribute_values[attribute_name]=value
           else
-            @attribute_values[attribute_name]=nil unless @attribute_values.has_key?(attribute_name)
+            unless @attribute_values.has_key?(attribute_name)
+              if description.is_collection
+                @attribute_values[attribute_name]=[]
+              else
+                @attribute_values[attribute_name]=nil unless @attribute_values.has_key?(attribute_name)
+              end
+            end 
           end
 
 
@@ -522,16 +528,17 @@ module NotRelational
       class_eval <<-XXDONE
 	def #{accesser_attribute_name}
 
-            if !@accessor_cache.has_key? :#{accesser_attribute_name}
+            #{}if !@accessor_cache.has_key? :#{accesser_attribute_name}
               h={}
               pkey=DomainModel::arrayify(self.primary_key)
               #{reflecting_array_code}.each do |key|
                 h[key]=pkey.shift
               end
               result= #{module_name+domain_class.to_s}.find_by_index(h,#{order})
-                @accessor_cache[:#{accesser_attribute_name}]=result || []
-            end
-            return @accessor_cache[:#{accesser_attribute_name}] 
+              return result
+             #{}   @accessor_cache[:#{accesser_attribute_name}]=result || []
+            #{}end
+            #return @accessor_cache[:#{accesser_attribute_name}]
 	end
       XXDONE
       # end

data/lib/not_relational/sdb_formatter.rb

@@ -48,7 +48,7 @@ module SdbFormatter
     
     def format_date(value)
         return nil if value==nil 
-        return value.to_f.to_s
+        return format("%.4f",value.to_f)
     end
      def format_boolean(value)
         

data/lib/not_relational/sdb_monkey_patch.rb

@@ -21,7 +21,7 @@ module AwsSdb
       params['MaxNumberOfItems'] =
         max.to_s unless max.nil? || max.to_i == 0
       doc = call(:get, params)
-      results = {}
+      results = []
       REXML::XPath.each(doc, '//Item') do |item|
         item_attributes={}
          item_name = REXML::XPath.first(item, './Name/text()').to_s
@@ -33,7 +33,7 @@ module AwsSdb
             value = REXML::XPath.first(attr, './Value/text()').to_s
             item_attributes[key]= value
         end
-         results[item_name]=item_attributes
+         results<<[item_name,item_attributes]
        
       end
       return results, REXML::XPath.first(doc, '//NextToken/text()').to_s

data/lib/not_relational/sdb_repository.rb

@@ -112,12 +112,14 @@ module NotRelational
         page_size=max- sdb_result.length
         page_size=page_size> MAX_PAGE_SIZE ? MAX_PAGE_SIZE : page_size
         partial_results,token=sdb_query_with_attributes(table_name,the_query,page_size,token)
-        sdb_result.merge!( partial_results)
+        sdb_result.concat( partial_results)
       end
 
       result=[]
-      sdb_result.each{|primary_key,sdb_row|
-        attributes =parse_attributes(attribute_descriptions,sdb_row)
+      sdb_result.each{|sdb_row|
+        primary_key=sdb_row[0]
+        sdb_attributes =sdb_row[1]
+        attributes =parse_attributes(attribute_descriptions,sdb_attributes)
         if attributes
           result<<attributes
         end
@@ -201,7 +203,7 @@ def get_text(table_name,primary_key,clob_name)
     end
 
     def pause
-      sleep(2)
+      sleep(3)
     end
 
     def  clear

data/test/unit_tests/collection_test.rb

@@ -0,0 +1,52 @@
+
+require 'rubygems'
+require 'test/unit'
+$:.push(File.dirname(__FILE__) +'/../../test/models')
+$:.push(File.dirname(__FILE__) +'/../../lib/not_relational')
+require File.dirname(__FILE__) +'/../../lib/not_relational/domain_model.rb'
+require File.dirname(__FILE__) +'/../../lib/not_relational/attribute_range.rb'
+
+require File.dirname(__FILE__) +'/../../lib/not_relational/memory_repository.rb'
+require File.dirname(__FILE__) +'/../../test/models/node.rb'
+require File.dirname(__FILE__) +'/../../test/models/user.rb'
+require File.dirname(__FILE__) +'/../../test/models/place.rb'
+require File.dirname(__FILE__) +'/../../test/models/album.rb'
+require File.dirname(__FILE__) +'/../../test/models/media_item.rb'
+require File.dirname(__FILE__) +'/../../test/models/media_file.rb'
+require File.dirname(__FILE__) +'/../../test/models/tag.rb'
+require File.dirname(__FILE__) +'/../../test/models/rating.rb'
+require File.dirname(__FILE__) +'/../../test/models/comment.rb'
+require File.dirname(__FILE__) +'/../../test/models/blurb.rb'
+
+ENV['NOT_RELATIONAL_ENV']='testing'
+
+ class CollectionTest < Test::Unit::TestCase
+  def set_up
+      Mediaitem.find(:all).each do |node|
+      node.destroy
+    end
+  end
+   def test_collections
+      items=[]
+    (0..5).each do |i|
+      item=Mediaitem.new
+      item.created_time=Time.now+i*100
+      metadata=[]
+      (0..5).each do |j|
+         metadata<<"#{i} #{j}"
+      end
+      item.metadata=metadata
+      item.save
+      
+      items<<item
+    end
+
+     items.each do |item|
+       found_item=Mediaitem.find(item.id)
+       assert_not_nil(found_item)
+       assert_not_nil(found_item.metadata)
+       assert_equal(6,found_item.metadata.length)
+      
+     end
+   end
+ end

data/test/unit_tests/group_test.rb

@@ -60,16 +60,18 @@ class GroupTest < Test::Unit::TestCase
   end
 
   def test_members
-    NotRelational::RepositoryFactory.instance.pause()
     GroupTest.set_up
     
-   
+      NotRelational::RepositoryFactory.instance.pause()
+ 
      joe=User.new()
     joe.login='joe'
     joe.save
    
     group=Group.create_group("tkuuhestgroup", "my group short desc", "description long desc", "tags my test", true, 'joe')
-found=group.members
+      NotRelational::RepositoryFactory.instance.pause()
+
+    found=group.members
      assert(found!=nil)
     assert_equal(1,found.length)
     assert_equal('joe',found[0].login)
@@ -200,10 +202,12 @@ found=group.members
     GroupTest.set_up
     group=Group.create_group("tqweqwrestgroup", "my group short desc", "description long desc", "tags my my test", true, 'joe')
     album1=Album.create_group_album('joe',group.id,'title','description',false)
+    album1.created_time_utc=Time.now.gmtime-50
+    album1.save!
     album2=Album.create_group_album('dave',group.id,'title2','description2',false)
     album2.created_time_utc=Time.now.gmtime+50
     album2.save
-         
+    NotRelational::RepositoryFactory::instance.pause
     albums=group.albums
     
       assert_equal(2,albums.length)

data/test/unit_tests/mediaitem_test.rb

@@ -1,4 +1,3 @@
-
 require 'rubygems'
 require 'test/unit'
 $:.push(File.dirname(__FILE__) +'/../../test/models')
@@ -373,12 +372,12 @@ class MediaItemTest < Test::Unit::TestCase
 
       assert(!item.rated_by_user?('david'))
 
-      tag=Rating.new
-      tag.rating=3
-      tag.user_name='david'
-      tag.mediaitem_id=item.id
-      tag.save
-      NotRelational::RepositoryFactory.instance.pause(3)
+        r = Rating.new
+      r.rating=3
+      r.user_name='david'
+      r.mediaitem_id=item.id
+      r.save
+      NotRelational::RepositoryFactory.instance.pause
       assert(item.rated_by_user?('david'))
 
     end

data/test/unit_tests/node_test.rb

@@ -58,8 +58,11 @@ class NodeTest < Test::Unit::TestCase
       node= Node.fill_new_node('david', "#{i}", 'hello world')
       node.clicks=i
       node.save
-    end  
-    found=Node.find(:all,:conditions=>{:clicks=>NotRelational::AttributeRange.new(:greater_than=>3)})
+    end
+    NotRelational::RepositoryFactory.instance.pause();
+    found=Node.find(
+        :all,
+        :conditions=>{:clicks=>NotRelational::AttributeRange.new(:greater_than=>3)})
     assert_equal(2,found.length)
   end
   def test_recent
@@ -73,9 +76,9 @@ class NodeTest < Test::Unit::TestCase
       node.save
             
       nodes<<node
-      NotRelational::RepositoryFactory.instance.pause()
+      
     end
-          
+          NotRelational::RepositoryFactory.instance.pause()
             
     recent=Node.recent('en',2)    
     assert_equal(2,recent.length)

data/test/unit_tests/place_test.rb

@@ -149,7 +149,7 @@ class PlaceTest < Test::Unit::TestCase
        
         node_album.connect_mediaitem(mediaitem2)
         node_album2.connect_mediaitem(mediaitem3)
-        
+        NotRelational::RepositoryFactory.instance.pause()
         found=node.mediaitems
         assert(found!=nil)         
         assert_equal(2,found.length)

data/test/utils/whack_domains.rb

@@ -28,5 +28,5 @@ $sdb=AwsSdb::Service.new(
 
 
    end
-    delete_domain(test_config['base_domain_name'])
+ #   delete_domain(test_config['base_domain_name'])
   create_domain(test_config['base_domain_name'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudwow-not_relational
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - cloudwow
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: []