knjrbfw 0.0.23 → 0.0.24

data/lib/knj/wref.rb

@@ -1,40 +1,55 @@
-require "weakref"
-
-#A weak-reference that wont bite you in the ass like the one in Ruby 1.9.
+#A simple weak-reference framework with mapping. Only handles the referencing of objects.
 class Knj::Wref
-  attr_reader :class_name, :id, :map, :map_id, :spawned
-  
-  #Yields debug-output for every weak-ref that is alive.
-  def self.debug_wrefs
-    ObjectSpace.each_object(Knj::Wref) do |wref|
-      begin
-        obj = wref.get
-      rescue WeakRef::RefError
-        yield("str" => "Dead wref: #{wref.class_name} (#{wref.id})", "alive" => false, "wref" => wref)
-        next
-      end
-      
-      yield("str" => "Alive wref: #{wref.class_name} (#{wref.id})", "alive" => true, "wref" => wref, "obj" => obj)
-    end
-  end
+  attr_reader :class_name, :id
   
   def initialize(obj)
-    @weakref = WeakRef.new(obj)
-    @class_name = obj.class.name.to_sym
     @id = obj.__id__
+    
+    if RUBY_ENGINE == "jruby"
+      @weakref = java.lang.ref.WeakReference.new(obj)
+    else
+      @class_name = obj.class.name.to_sym
+      
+      if obj.respond_to?("__object_unique_id__")
+        @unique_id = obj.__object_unique_id__
+      end
+    end
   end
   
-  #Returns the object that this weak reference holds or throws WeakRef::RefError.
+  #Returns the object that this weak reference holds or throws Knj::Wref::Recycled.
   def get
-    obj = @weakref.__getobj__ if @weakref
-    
-    #The class-check is because ID's can be reused in Ruby 1.9 which breaks the normal WeakRef-implementation.
-    if !@weakref or @class_name != obj.class.name.to_sym or @id != obj.__id__
-      self.destroy
-      raise WeakRef::RefError
+    begin
+      raise Knj::Wref::Recycled if !@class_name or !@id
+      
+      if RUBY_ENGINE == "jruby"
+        obj = @weakref.get
+        
+        if obj == nil
+          raise Knj::Wref::Recycled
+        else
+          return obj
+        end
+      else
+        obj = ObjectSpace._id2ref(@id)
+      end
+      
+      #Some times this class-name will be nil for some reason - knj
+      obj_class_name = obj.class.name
+      
+      if !obj_class_name or @class_name != obj_class_name.to_sym or @id != obj.__id__
+        raise Knj::Wref::Recycled
+      end
+      
+      if @unique_id
+        if !obj.respond_to?("__object_unique_id__") or obj.__object_unique_id__ != @unique_id
+          raise Knj::Wref::Recycled
+        end
+      end
+      
+      return obj
+    rescue RangeError, TypeError
+      raise Knj::Wref::Recycled
     end
-    
-    return obj
   end
   
   #Returns true if the reference is still alive.
@@ -42,18 +57,11 @@ class Knj::Wref
     begin
       self.get
       return true
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       return false
     end
   end
   
-  #Removes all data from this object.
-  def destroy
-    @weakref = nil
-    @class_name = nil
-    @id = nil
-  end
-  
   #Make Wref compatible with the normal WeakRef.
   alias weakref_alive? alive?
   alias __getobj__ get
@@ -62,34 +70,36 @@ end
 class Knj::Wref_map
   def initialize(args = nil)
     @map = {}
-  end
-  
-  #Unsets everything to free up memory.
-  def destroy
-    @map.clear
-    @map = nil
+    @ids = {}
+    @mutex = Mutex.new
   end
   
   #Sets a new object in the map with a given ID.
   def set(id, obj)
-    @map[id] = Knj::Wref.new(obj)
+    wref = Knj::Wref.new(obj)
+    
+    @mutex.synchronize do
+      @map[id] = wref
+      @ids[obj.__id__] = id
+    end
+    
+    #JRuby cant handle this atm... Dunno why...
+    if RUBY_ENGINE != "jruby"
+      ObjectSpace.define_finalizer(obj, self.method("delete_by_id"))
+    end
+    
     return nil
   end
   
   #Returns a object by ID or raises a RefError.
   def get(id)
-    raise WeakRef::RefError if !@map.key?(id)
-    
     begin
-      return @map[id].get
-    rescue WeakRef::RefError => e
-      begin
-        @map[id].destroy
-      rescue NoMethodError
-        #happens if the object already got destroyed by another thread - ignore.
+      @mutex.synchronize do
+        raise Knj::Wref::Recycled if !@map.key?(id)
+        return @map[id].get
       end
-      
-      @map.delete(id)
+    rescue Knj::Wref::Recycled => e
+      self.delete(id)
       raise e
     end
   end
@@ -98,17 +108,22 @@ class Knj::Wref_map
   def get!(id)
     begin
       return self.get(id)
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       return nil
     end
   end
   
-  #Scans the whole map and removes dead references.
+  #Scans the whole map and removes dead references. After the implementation of automatic clean-up by using ObjectSpace.define_finalizer, there should be no reason to call this method.
   def clean
-    @map.keys.each do |key|
+    keys = nil
+    @mutex.synchronize do
+      keys = @map.keys
+    end
+    
+    keys.each do |key|
       begin
         self.get(key) #this will remove the key if the object no longer exists.
-      rescue WeakRef::RefError
+      rescue Knj::Wref::Recycled
         #ignore.
       end
     end
@@ -118,39 +133,63 @@ class Knj::Wref_map
   
   #Returns true if a given key exists and the object it holds is alive.
   def valid?(key)
-    return false if !@map.key?(key)
-    
-    begin
-      @map[key].get
-      return true
-    rescue WeakRef::RefError
-      return false
+    @mutex.synchronize do
+      return false if !@map.key?(key)
+      
+      begin
+        @map[key].get
+        return true
+      rescue Knj::Wref::Recycled
+        return false
+      end
     end
   end
   
   #Returns true if the given key exists in the hash.
   def key?(key)
-    return @map.key?(key)
+    @mutex.synchronize do
+      return @map.key?(key)
+    end
   end
   
   #Returns the length of the hash. This may not be true since invalid objects is also counted.
   def length
-    return @map.length
+    @mutex.synchronize do
+      return @map.length
+    end
   end
   
   #Cleans the hash and returns the length. This is slower but more accurate than the ordinary length that just returns the hash-length.
   def length_valid
     self.clean
-    return @map.length
+    
+    @mutex.synchronize do
+      return @map.length
+    end
   end
   
   #Deletes a key in the hash.
   def delete(key)
-    @map.delete(key)
+    @mutex.synchronize do
+      wref = @map[key]
+      @ids.delete(wref.id) if wref
+      @map.delete(key)
+    end
+  end
+  
+  #This method is supposed to remove objects when finalizer is called by ObjectSpace.
+  def delete_by_id(object_id)
+    @mutex.synchronize do
+      id = @ids[object_id]
+      @map.delete(id)
+      @ids.delete(object_id)
+    end
   end
   
   #Make it hash-compatible.
   alias has_key? key?
   alias [] get
   alias []= set
-end
+end
+
+class Knj::Wref::Recycled < RuntimeError; end

data/spec/datet_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Datet" do
+  it "should be able to make ago-strings" do
+    require "knj/datet"
+    
+    time = Time.at(Time.now.to_i - 5)
+    datet = Knj::Datet.in(time)
+    res = datet.ago_str
+    raise "Expected '5 seconds ago' but got: '#{res}'." if res != "5 seconds ago"
+    
+    
+    time = Time.at(Time.now.to_i - 1800)
+    datet = Knj::Datet.in(time)
+    res = datet.ago_str
+    raise "Expected '30 minutes ago' but got: '#{res}'." if res != "30 minutes ago"
+    
+    
+    time = Time.at(Time.now.to_i - 60)
+    datet = Knj::Datet.in(time)
+    res = datet.ago_str
+    raise "Expected '1 minute ago' but got: '#{res}'." if res != "1 minute ago"
+    
+    
+    time = Time.at(Time.now.to_i - 48 * 3600)
+    datet = Knj::Datet.in(time)
+    res = datet.ago_str
+    raise "Expected '48 hours ago' but got: '#{res}'." if res != "48 hours ago"
+  end
+end

data/spec/http2_spec.rb

@@ -1,6 +1,29 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Http2" do
+  it "should be able to recursively parse post-data-hashes." do
+    require "knj/http2"
+    
+    res = Knj::Http2.post_convert_data(
+      "test1" => "test2"
+    )
+    raise "Expected 'test1=test2' but got: '#{res}'." if res != "test1=test2"
+    
+    res = Knj::Http2.post_convert_data(
+      "test1" => [1, 2, 3]
+    )
+    raise "Expected 'test1=1%3D12%3D23%3D3' but got: '#{res}'." if res != "test1=1%3D12%3D23%3D3"
+    
+    res = Knj::Http2.post_convert_data(
+      "test1" => {
+        "order" => {
+          [:Bnet_profile, "profile_id"] => 5
+        }
+      }
+    )
+    raise "Expected 'test1=order%3D1%25253DBnet_profile2%25253Dprofile_id%253D5' but got: '#{res}'." if res != "test1=order%3D1%25253DBnet_profile2%25253Dprofile_id%253D5"
+  end
+  
   it "should be able to do multipart-requests." do
     require "knj/http2"
     require "knj/php"

data/spec/php_spec.rb

@@ -49,6 +49,9 @@ describe "Php" do
     
     res = Knj::Php.substr("test_kasper", 1, 3)
     raise "substr should have returned 'est' but didnt: '#{res}'." if res != "est"
+    
+    res = Knj::Php.substr("test_kasper", 0, -3)
+    raise "substr should have returned 'test_kas' but didnt: '#{res}'." if res != "test_kas"
   end
   
   it "parse_str" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 +01:00
+date: 2012-04-26 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19017160 !ruby/object:Gem::Requirement
+  requirement: &21050060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *19017160
+  version_requirements: *21050060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19015640 !ruby/object:Gem::Requirement
+  requirement: &21049480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19015640
+  version_requirements: *21049480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19014340 !ruby/object:Gem::Requirement
+  requirement: &21048860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *19014340
+  version_requirements: *21048860
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19011420 !ruby/object:Gem::Requirement
+  requirement: &21035140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19011420
+  version_requirements: *21035140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &18984160 !ruby/object:Gem::Requirement
+  requirement: &21034540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18984160
+  version_requirements: *21034540
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &18981880 !ruby/object:Gem::Requirement
+  requirement: &21033380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18981880
+  version_requirements: *21033380
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -242,6 +242,7 @@ files:
 - lib/knj/knjdb/libknjdb_row.rb
 - lib/knj/knjdb/libknjdb_sqlite3_ironruby.rb
 - lib/knj/knjdb/revision.rb
+- lib/knj/kvm.rb
 - lib/knj/libqt.rb
 - lib/knj/libqt_window.rb
 - lib/knj/locale_strings.rb
@@ -249,6 +250,7 @@ files:
 - lib/knj/maemo/fremantle-calendar/fremantle-calendar.rb
 - lib/knj/mail.rb
 - lib/knj/mailobj.rb
+- lib/knj/memory_analyzer.rb
 - lib/knj/mount.rb
 - lib/knj/mutexcl.rb
 - lib/knj/notify.rb
@@ -269,11 +271,11 @@ files:
 - lib/knj/process_meta.rb
 - lib/knj/rand.rb
 - lib/knj/retry.rb
-- lib/knj/rhodes/delegate.rb
 - lib/knj/rhodes/mutex.rb
 - lib/knj/rhodes/rhodes.js
 - lib/knj/rhodes/rhodes.rb
-- lib/knj/rhodes/weakref.rb
+- lib/knj/rhodes/youtube_embed.erb
+- lib/knj/rhodes/youtube_open.erb
 - lib/knj/rsvgbin.rb
 - lib/knj/scripts/degulesider.rb
 - lib/knj/scripts/filesearch.rb
@@ -313,6 +315,7 @@ files:
 - lib/knjrbfw.rb
 - spec/amixer_spec.rb
 - spec/cmd_parser_spec.rb
+- spec/datet_spec.rb
 - spec/db_spec.rb
 - spec/db_spec_encoding_test_file.txt
 - spec/http2_spec.rb
@@ -340,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4483091133869871339
+      hash: -24942371531002618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: