knjrbfw 0.0.32 → 0.0.33

data/spec/web_spec.rb

@@ -13,4 +13,65 @@ describe "Web" do
     raise "'trala' in 'second' wasnt a hash or contained invalid amount of elements." if !res["second"]["trala"].is_a?(Hash) or res["second"]["trala"].length != 3
     raise "'trala' in 'second' didnt contain the right elements." if res["second"]["trala"]["0"] != "1" or res["second"]["trala"]["1"] != "2" or res["second"]["trala"]["2"] != "3"
   end
+  
+  #Moved from "knjrbfw_spec.rb".
+  it "should be able to use alert and back." do
+    Knj::Web.alert("Trala")
+    
+    begin
+      Knj::Web.back
+      raise "It should have called exit which it didnt."
+    rescue SystemExit
+      #ignore.
+    end
+    
+    begin
+      Knj::Web.redirect("?show=test")
+      raise "It should have called exit which it didnt."
+    rescue SystemExit
+      #ignore.
+    end
+  end
+  
+  it "should be able to properly parse 'Set-Cookie' headers." do
+    data = Knj::Web.parse_set_cookies("TestCookie=TestValue+; Expires=Fri, 05 Aug 2011 10:58:17 GMT; Path=\n")
+    
+    raise "No data returned?" if !data or !data.respond_to?(:length)
+    raise "Wrong number of cookies returned: '#{data.length}'." if data.length != 1
+    
+    raise "Unexpected name: '#{data[0]["name"]}'." if data[0]["name"] != "TestCookie"
+    raise "Unexpected value: '#{data[0]["value"]}'." if data[0]["value"] != "TestValue "
+    raise "Unexpected path: '#{data[0]["path"]}'." if data[0]["path"] != ""
+    raise "Unexpected expire:' #{data[0]["expire"]}'." if data[0]["expires"] != "Fri, 05 Aug 2011 10:58:17 GMT"
+  end
+  
+  it "should be able to execute various forms of Web.input methods." do
+    html = Knj::Web.inputs([{
+      :title => "Test 1",
+      :name => :textest1,
+      :type => :text,
+      :default => "hmm",
+      :value => "trala"
+    },{
+      :title => "Test 2",
+      :name => :chetest2,
+      :type => :checkbox,
+      :default => true
+    },{
+      :title => "Test 4",
+      :name => :textest4,
+      :type => :textarea,
+      :height => 300,
+      :default => "Hmm",
+      :value => "Trala"
+    },{
+      :title => "Test 5",
+      :name => :filetest5,
+      :type => :file
+    },{
+      :title => "Test 6",
+      :type => :info,
+      :value => "Argh"
+    }])
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,12 +10,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-06 00:00:00 +02:00
+date: 2012-05-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: wref
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: tsafe
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -23,10 +45,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,10 +56,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +67,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,10 +78,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -67,10 +89,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rmagick
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,7 +100,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id008
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -92,6 +114,7 @@ files:
 - .document
 - .rspec
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -122,6 +145,7 @@ files:
 - lib/knj/autoload/sqlite3.rb
 - lib/knj/autoload/tmail.rb
 - lib/knj/autoload/tzinfo.rb
+- lib/knj/autoload/wref.rb
 - lib/knj/autoload/xmlsimple.rb
 - lib/knj/autoload/zip.rb
 - lib/knj/cmd_gen.rb
@@ -314,7 +338,6 @@ files:
 - lib/knj/win.rb
 - lib/knj/win_registry.rb
 - lib/knj/win_tightvnc.rb
-- lib/knj/wref.rb
 - lib/knj/x11vnc.rb
 - lib/knj/youtube.rb
 - lib/knjrbfw.rb
@@ -325,6 +348,7 @@ files:
 - spec/db_spec_encoding_test_file.txt
 - spec/http2_spec.rb
 - spec/knjrbfw_spec.rb
+- spec/objects_spec.rb
 - spec/php_spec.rb
 - spec/process_meta_spec.rb
 - spec/process_spec.rb
@@ -332,7 +356,6 @@ files:
 - spec/strings_spec.rb
 - spec/threadsafe_spec.rb
 - spec/web_spec.rb
-- spec/wref_spec.rb
 - testfiles/image.jpg
 has_rdoc: true
 homepage: http://github.com/kaspernj/knjrbfw
@@ -348,7 +371,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -468641823555202698
+      hash: 2685186522234907408
       segments: 
       - 0
       version: "0"

data/lib/knj/wref.rb

@@ -1,251 +0,0 @@
-#A simple weak-reference framework with mapping. Only handles the referencing of objects.
-#===Examples
-# user_obj = ob.get(:User, 1)
-# weak_ref = Knj::Wref(user_obj)
-# user_obj = nil
-# sleep 0.5
-# GC.start
-#
-# begin
-#   user_obj = weak_ref.get
-#   print "The user still exists in memory and has ID #{user.id}."
-# rescue Knj::Wref::Recycled
-#   print "The user has been removed from memory."
-# end
-class Knj::Wref
-  #Returns the classname of the object.
-  attr_reader :class_name
-  
-  #Returns the object-ID which is used to look up the ObjectSpace (if not running JRuby).
-  attr_reader :id
-  
-  #Initializes various variables.
-  def initialize(obj)
-    @id = obj.__id__
-    
-    if RUBY_ENGINE == "jruby"
-      require "java"
-      @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 raises Knj::Wref::Recycled.
-  # begin
-  #   obj = wref.get
-  #   print "Object still exists in memory."
-  # rescue Knj::Wref::Recycled
-  #   print "Object has been garbage-collected."
-  # end
-  def get
-    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
-  end
-  
-  #Returns true if the reference is still alive.
-  # print "The object still exists in memory." if wref.alive?
-  def alive?
-    begin
-      self.get
-      return true
-    rescue Knj::Wref::Recycled
-      return false
-    end
-  end
-  
-  #Makes Wref compatible with the normal WeakRef.
-  alias weakref_alive? alive?
-  alias __getobj__ get
-end
-
-#A weak hash-map.
-#===Examples
-# map = Knj::Wref_map.new
-# map[1] = obj
-# obj = nil
-# 
-# sleep 0.5
-# 
-# begin
-#   obj = map[1]
-#   print "Object still exists in memory."
-# rescue Knj::Wref::Recycled
-#   print "Object has been garbage-collected."
-# end
-#
-# obj = map.get!(1)
-# print "Object still exists in memory." if obj
-class Knj::Wref_map
-  def initialize(args = nil)
-    @map = {}
-    @ids = {}
-    @mutex = Mutex.new
-  end
-  
-  #Sets a new object in the map with a given ID.
-  def set(id, 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.
-  #===Examples
-  # begin
-  #   obj = map[1]
-  #   print "Object still exists in memory."
-  # rescue Knj::Wref::Recycled
-  #   print "Object has been garbage-collected."
-  # end
-  def get(id)
-    begin
-      @mutex.synchronize do
-        raise Knj::Wref::Recycled if !@map.key?(id)
-        return @map[id].get
-      end
-    rescue Knj::Wref::Recycled => e
-      self.delete(id)
-      raise e
-    end
-  end
-  
-  #The same as 'get' but returns nil instead of WeakRef-error. This can be used to avoid writing lots of code.
-  #===Examples
-  # obj = map.get!(1)
-  # print "Object still exists in memory." if obj
-  def get!(id)
-    begin
-      return self.get(id)
-    rescue Knj::Wref::Recycled
-      return nil
-    end
-  end
-  
-  #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
-    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 Knj::Wref::Recycled
-        #ignore.
-      end
-    end
-    
-    return nil
-  end
-  
-  #Returns true if a given key exists and the object it holds is alive.
-  def valid?(key)
-    @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.
-  #===Examples
-  # print "Key exists but we dont know if the value has been garbage-collected." if map.key?(1)
-  def 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
-    @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
-    
-    @mutex.synchronize do
-      return @map.length
-    end
-  end
-  
-  #Deletes a key in the hash.
-  def 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
-
-#This error is raised when an object in a wref has been garbage-collected.
-class Knj::Wref::Recycled < RuntimeError; end

data/spec/wref_spec.rb

@@ -1,10 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Wref" do
-  it "should load by using autoload" do
-    require "knjrbfw"
-    
-    #Autoload wref-map.
-    Knj::Wref_map
-  end
-end