knjrbfw 0.0.22 → 0.0.23

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/lib/knj/objects.rb

@@ -574,19 +574,7 @@ class Knj::Objects
     end
     
     classname = classname.to_sym
-    
-    #if !@objects.key?(classname)
-      #raise "Could not find object class in cache: #{classname}."
-    #elsif !@objects[classname].key?(object.id.to_i)
-      #errstr = ""
-      #errstr << "Could not unset object from cache.\n"
-      #errstr << "Class: #{object.class.name}.\n"
-      #errstr << "ID: #{object.id}.\n"
-      #errstr << "Could not find object ID in cache."
-      #raise errstr
-    #else
-      @objects[classname].delete(object.id.to_i)
-    #end
+    @objects[classname].delete(object.id.to_i)
   end
   
   def unset_class(classname)

data/lib/knj/wref.rb

@@ -28,6 +28,7 @@ class Knj::Wref
   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
@@ -59,7 +60,7 @@ class Knj::Wref
 end
 
 class Knj::Wref_map
-  def initialize(args = {})
+  def initialize(args = nil)
     @map = {}
   end
   
@@ -93,19 +94,6 @@ class Knj::Wref_map
     end
   end
   
-  #Make it hash-compatible.
-  def key?(key)
-    return @map.key?(key)
-  end
-  
-  def length
-    return @map.length
-  end
-  
-  alias has_key? key?
-  alias [] get
-  alias []= set
-  
   #The same as 'get' but returns nil instead of WeakRef-error. This can be used to avoid writing lots of code.
   def get!(id)
     begin
@@ -139,4 +127,30 @@ class Knj::Wref_map
       return false
     end
   end
+  
+  #Returns true if the given key exists in the hash.
+  def key?(key)
+    return @map.key?(key)
+  end
+  
+  #Returns the length of the hash. This may not be true since invalid objects is also counted.
+  def length
+    return @map.length
+  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
+  end
+  
+  #Deletes a key in the hash.
+  def delete(key)
+    @map.delete(key)
+  end
+  
+  #Make it hash-compatible.
+  alias has_key? key?
+  alias [] get
+  alias []= set
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9288920 !ruby/object:Gem::Requirement
+  requirement: &19017160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *9288920
+  version_requirements: *19017160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9287320 !ruby/object:Gem::Requirement
+  requirement: &19015640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9287320
+  version_requirements: *19015640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9286040 !ruby/object:Gem::Requirement
+  requirement: &19014340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *9286040
+  version_requirements: *19014340
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &9283160 !ruby/object:Gem::Requirement
+  requirement: &19011420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9283160
+  version_requirements: *19011420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &9274360 !ruby/object:Gem::Requirement
+  requirement: &18984160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9274360
+  version_requirements: *18984160
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &9272380 !ruby/object:Gem::Requirement
+  requirement: &18981880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9272380
+  version_requirements: *18981880
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -340,7 +340,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4024232458880246262
+      hash: -4483091133869871339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: