knjrbfw 0.0.68 → 0.0.69

data/Gemfile.lock

@@ -24,6 +24,7 @@ GEM
     wref (0.0.5)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/VERSION

@@ -1 +1 @@
-0.0.68
+0.0.69

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.68"
+  s.version = "0.0.69"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-26}
+  s.date = %q{2012-07-27}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -265,7 +265,6 @@ Gem::Specification.new do |s|
     "spec/process_spec.rb",
     "spec/spec_helper.rb",
     "spec/strings_spec.rb",
-    "spec/threadsafe_spec.rb",
     "spec/web_spec.rb",
     "testfiles/image.jpg"
   ]

data/lib/knj/datarow.rb

@@ -48,7 +48,6 @@ class Knj::Datarow
   #   ]
   # end
   def self.depending_data
-    @depending_data = [] if !@depending_data
     return @depending_data
   end
   
@@ -67,10 +66,13 @@ class Knj::Datarow
   #   ]
   # end
   def self.autodelete_data
-    @autodelete_data = [] if !@autodelete_data
     return @autodelete_data
   end
   
+  def self.autozero_data
+    return @autozero_data
+  end
+  
   #This helps various parts of the framework determine if this is a datarow class without requiring it.
   #===Examples
   # print "This is a knj-object." if obj.respond_to?("is_knj?")
@@ -111,7 +113,7 @@ class Knj::Datarow
               colname = hval
             when :method
               methodname = hval
-            when :depends, :autodelete, :where
+            when :depends, :autodelete, :autozero, :where
               #ignore
             else
               raise "Invalid key for 'has_many': '#{hkey}'."
@@ -121,14 +123,24 @@ class Knj::Datarow
         colname = "#{self.name.to_s.split("::").last.to_s.downcase}_id".to_sym if colname.to_s.empty?
         
         if val[:depends]
-          self.depending_data << {
+          @depending_data = [] if !@depending_data
+          @depending_data << {
             :colname => colname,
             :classname => classname
           }
         end
         
         if val[:autodelete]
-          self.autodelete_data << {
+          @autodelete_data = [] if !@autodelete_data
+          @autodelete_data << {
+            :colname => colname,
+            :classname => classname
+          }
+        end
+        
+        if val[:autozero]
+          @autozero_data = [] if !@autozero_data
+          @autozero_data << {
             :colname => colname,
             :classname => classname
           }

data/lib/knj/objects.rb

@@ -793,17 +793,29 @@ class Knj::Objects
     
     if @args[:datarow]
       #If autodelete is set by 'has_many'-method, go through it and delete the various objects first.
-      object.class.autodelete_data.each do |adel_data|
-        self.list(adel_data[:classname], {adel_data[:colname].to_s => object.id}) do |obj_del|
-          self.delete(obj_del, args)
+      if autodelete_data = object.class.autodelete_data
+        autodelete_data.each do |adel_data|
+          self.list(adel_data[:classname], {adel_data[:colname].to_s => object.id}) do |obj_del|
+            self.delete(obj_del, args)
+          end
         end
       end
       
       #If depend is set by 'has_many'-method, check if any objects exists and raise error if so.
-      object.class.depending_data.each do |dep_data|
-        obj = self.get_by(dep_data[:classname], {dep_data[:colname].to_s => object.id})
-        if obj
-          raise "Cannot delete <#{object.class.name}:#{object.id}> because <#{obj.class.name}:#{obj.id}> depends on it."
+      if dep_datas = object.class.depending_data
+        dep_datas.each do |dep_data|
+          if obj = self.get_by(dep_data[:classname], {dep_data[:colname].to_s => object.id})
+            raise "Cannot delete <#{object.class.name}:#{object.id}> because <#{obj.class.name}:#{obj.id}> depends on it."
+          end
+        end
+      end
+      
+      #If autozero is set by 'has_many'-method, check if any objects exists and set the ID to zero.
+      if autozero_datas = object.class.autozero_data
+        autozero_datas.each do |zero_data|
+          self.list(zero_data[:classname], {zero_data[:colname].to_s => object.id}) do |obj_zero|
+            obj_zero[zero_data[:colname].to_sym] = 0
+          end
         end
       end
       

data/lib/knj/process.rb

@@ -199,7 +199,7 @@ class Knj::Process
             buffer_done = false
             
             begin
-              buffer_answers = Knj::Threadsafe.std_array #JRuby needs the threadsafety.
+              buffer_answers = Tsafe.std_array #JRuby needs the threadsafety.
               buffer_thread = Knj::Thread.new do
                 loop do
                   arr = buffer_answers.shift(200)

data/spec/objects_spec.rb

@@ -174,6 +174,16 @@ describe "Objects" do
       ]
     })
     
+    $db.tables.create("Timelog", {
+      "columns" => [
+        {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+        {"name" => "person_id", "type" => "int"}
+      ],
+      "indexes" => [
+        "person_id"
+      ]
+    })
+    
     table = $db.tables["Project"]
     
     indexes = table.indexes
@@ -212,11 +222,19 @@ describe "Objects" do
     class Person < Knj::Datarow
       has_one [:Project]
       
+      has_many [
+        {:class => :Timelog, :autozero => true}
+      ]
+      
       def html
         return self[:name]
       end
     end
     
+    class Timelog < Knj::Datarow
+      
+    end
+    
     $ob = Knj::Objects.new(:db => $db, :datarow => true, :require => false)
     
     $ob.add(:Person, {
@@ -334,6 +352,27 @@ describe "Objects" do
     raise "Expected persons count to be 0 but it wasnt: #{persons.map{|e| e.data} }" if persons.length > 0
   end
   
+  it "should do autozero when deleting objects" do
+    person1 = $ob.add(:Person, {
+      :name => "Kasper"
+    })
+    person2 = $ob.add(:Person, {
+      :name => "Charlotte"
+    })
+    
+    timelog1 = $ob.add(:Timelog, {
+      :person_id => person1.id
+    })
+    timelog2 = $ob.add(:Timelog, {
+      :person_id => person2.id
+    })
+    
+    $ob.delete(person1)
+    
+    raise "Expected timelog1's person-ID to be zero but it wasnt: '#{timelog1[:person_id]}'." if timelog1[:person_id].to_i != 0
+    raise "Expected timelog2's person-ID to be #{person2.id} but it wasnt: '#{timelog2[:person_id]}'." if timelog2[:person_id].to_i != person2.id.to_i
+  end
+  
   it "should delete the temp database again." do
     db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.68
+  version: 0.0.69
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 +02:00
+date: 2012-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -370,7 +370,6 @@ files:
 - spec/process_spec.rb
 - spec/spec_helper.rb
 - spec/strings_spec.rb
-- spec/threadsafe_spec.rb
 - spec/web_spec.rb
 - testfiles/image.jpg
 has_rdoc: true
@@ -387,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3521471445860246373
+      hash: -3747368515681482900
       segments: 
       - 0
       version: "0"

data/spec/threadsafe_spec.rb

@@ -1,57 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Threadsafe" do
-  it "should be able to spawn threadsafe proxy-objects" do
-    require "knjrbfw"
-    
-    arr = Knj::Threadsafe::Proxy.new(:obj => {})
-    
-    0.upto(5) do |i|
-      arr[i] = i
-    end
-    
-    Knj::Thread.new do
-      arr.each do |key, val|
-        res = key + val
-        sleep 0.1
-      end
-    end
-    
-    5.upto(10) do |i|
-      arr[i] = i
-      sleep 0.1
-    end
-  end
-  
-  it "should be able to spawn special classes" do
-    require "knjrbfw"
-    
-    #Create new synchronized hash.
-    arr = Knj::Threadsafe::Synced_hash.new
-    
-    #Make sure we get the right results.
-    arr[1] = 2
-    
-    res = arr[1]
-    raise "Expected 2 but got '#{res}'." if res != 2
-    
-    #Set some values to test with.
-    0.upto(5) do |i|
-      arr[i] = i
-    end
-    
-    #Try to call through each through a thread and then also try to set new values, which normally would crash the hash.
-    Knj::Thread.new do
-      arr.each do |key, val|
-        res = key + val
-        sleep 0.1
-      end
-    end
-    
-    #This should not crash it, since they should wait for each other.
-    5.upto(10) do |i|
-      arr[i] = i
-      sleep 0.1
-    end
-  end
-end