knjrbfw 0.0.98 → 0.0.99

data/VERSION

@@ -1 +1 @@
-0.0.98
+0.0.99

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "knjrbfw"
-  s.version = "0.0.98"
+  s.version = "0.0.99"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-09-18"
+  s.date = "2012-09-30"
   s.description = "Including stuff for HTTP, SSH and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/lib/knj/arrayext.rb

@@ -13,7 +13,7 @@ module Knj::ArrayExt
     str = ""
     first = true
     
-    require "php4r"
+    require "php4r" if !Kernel.const_defined?(:Php4r)
     Php4r.foreach(args[:arr]) do |key, value|
       if first
         first = false
@@ -212,7 +212,7 @@ module Knj::ArrayExt
   def self.clone_encode(hash, encoding, args = {})
     return hash if !hash
     
-    require "php4r"
+    require "php4r" if !Kernel.const_defined?(:Php4r)
     hash = hash.clone
     Php4r.foreach(hash) do |key, val|
       if val.is_a?(String)

data/lib/knj/autoload/wref.rb

@@ -2,5 +2,5 @@ begin
   require "wref" if !Kernel.const_defined?(:Wref)
 rescue LoadError
   require "rubygems"
-  require "wref"
+  require "wref" if !Kernel.const_defined?(:Wref)
 end

data/lib/knj/errors.rb

@@ -6,6 +6,9 @@ module Knj::Errors
   #An error that specifies that the caller should retry the operation.
   class Retry < StandardError; end
   
+  #An error that specifies that the current entry should be skipped.
+  class Skip < StandardError; end
+  
   #Returns a string describing the given error. Possible arguments can be given if you want the returned string formatted as HTML.
   #
   #===Examples

data/lib/knj/gettext_threadded.rb

@@ -41,8 +41,8 @@ class Knj::Gettext_threadded
                   cont = fp.read.encode("utf-8")
                 end
                 
-                cont.scan(/msgid\s+\"(.+)\"\nmsgstr\s+\"(.+)\"\n\n/) do |match|
-                  @langs[file][match[0]] = match[1].to_s.encode("utf-8")
+                cont.scan(/msgid\s+\"(.+)\"(\r|)\nmsgstr\s+\"(.+)\"(\r|)\n(\r|)\n/) do |match|
+                  @langs[file][match[0]] = match[2].to_s.encode("utf-8")
                 end
               end
             end

data/lib/knj/knjdb/libknjdb.rb

@@ -1,6 +1,8 @@
-require "rubygems"
-require "wref" if !Kernel.const_defined?(:Wref)
-require "datet" if !Kernel.const_defined?(:Datet)
+if !Kernel.const_defined?(:Wref) or !Kernel.const_defined?(:Datet)
+  require "rubygems"
+  require "wref" if !Kernel.const_defined?(:Wref)
+  require "datet" if !Kernel.const_defined?(:Datet)
+end
 
 #A wrapper of several possible database-types.
 #

data/lib/knj/locales.rb

@@ -65,7 +65,7 @@ module Knj::Locales
   def self.number_out(num_str, dec = 2)
     lc = Knj::Locales.localeconv
     
-    require "php4r"
+    require "php4r" if !Kernel.const_defined?(:Php4r)
     return Php4r.number_format(num_str, dec, lc["decimal_point"], lc["thousands_sep"])
   end
   

data/lib/knj/objects.rb

@@ -124,9 +124,11 @@ class Knj::Objects
     raise "No object given." if !args["object"]
     raise "No signals given." if !args.key?("signal") and !args.key?("signals")
     args["block"] = block if block_given?
-    @callbacks[args["object"].to_sym] = {} if !@callbacks[args["object"]]
-    conn_id = @callbacks[args["object"].to_sym].length.to_s
-    @callbacks[args["object"].to_sym][conn_id] = args
+    object = args["object"].to_sym
+    
+    @callbacks[object] = {} if !@callbacks[object]
+    conn_id = @callbacks[object].length.to_s
+    @callbacks[object][conn_id] = args
     return conn_id
   end
   
@@ -134,11 +136,12 @@ class Knj::Objects
   def connected?(args)
     raise "No object given." if !args["object"]
     raise "No signal given." if !args.key?("signal")
+    object = args["object"].to_sym
     
-    if @callbacks.key?(args["object"].to_sym)
-      @callbacks[args["object"].to_sym].clone.each do |ckey, callback|
-        return true if callback.key?("signal") and callback["signal"] == args["signal"]
-        return true if callback.key?("signals") and callback["signals"].index(args["signal"]) != nil
+    if @callbacks.key?(object)
+      @callbacks[object].clone.each do |ckey, callback|
+        return true if callback.key?("signal") and callback["signal"].to_s == args["signal"].to_s
+        return true if callback.key?("signals") and (callback["signals"].include?(args["signal"].to_s) or callback["signals"].include?(args["signal"].to_sym))
       end
     end
     
@@ -148,7 +151,8 @@ class Knj::Objects
   #Unconnects a connect by 'object' and 'conn_id'.
   def unconnect(args)
     raise ArgumentError, "No object given." if !args["object"]
-    raise ArgumentError, "Object doesnt exist: '#{args["object"]}'." if !@callbacks.key?(args["object"].to_sym)
+    object = args["object"].to_sym
+    raise ArgumentError, "Object doesnt exist: '#{object}'." if !@callbacks.key?(object)
     
     if args["conn_id"]
       conn_ids = [args["conn_id"]]
@@ -159,8 +163,8 @@ class Knj::Objects
     end
     
     conn_ids.each do |conn_id|
-      raise Errno::ENOENT, "Conn ID doest exist: '#{conn_id}' (#{args})." if !@callbacks[args["object"].to_sym].key?(conn_id)
-      @callbacks[args["object"].to_sym].delete(conn_id)
+      raise Errno::ENOENT, "Conn ID doest exist: '#{conn_id}' (#{args})." if !@callbacks[object].key?(conn_id)
+      @callbacks[object].delete(conn_id)
     end
   end
   
@@ -172,9 +176,9 @@ class Knj::Objects
       @callbacks[classstr].clone.each do |callback_key, callback|
         docall = false
         
-        if callback.key?("signal") and args.key?("signal") and callback["signal"] == args["signal"]
+        if callback.key?("signal") and args.key?("signal") and callback["signal"].to_s == args["signal"].to_s
           docall = true
-        elsif callback["signals"] and args["signal"] and callback["signals"].include?(args["signal"])
+        elsif callback["signals"] and args["signal"] and (callback["signals"].include?(args["signal"].to_s) or callback["signals"].include?(args["signal"].to_sym))
           docall = true
         end
         
@@ -193,7 +197,7 @@ class Knj::Objects
           
           callback["block"].call(*callargs)
         elsif callback["callback"]
-          require "php4r"
+          require "php4r" if !Kernel.const_defined?(:Php4r)
           Php4r.call_user_func(callback["callback"], args)
         else
           raise "No valid callback given."

data/lib/knj/os.rb

@@ -219,7 +219,7 @@ module Knj::Os
   
   #Returns the Ruby executable that is running the current process if possible.
   def self.executed_executable
-    return ENV["rvm_ruby_string"] if ENV["rvm_ruby_string"].to_s.length > 0
+    return ENV["rvm_ruby_string"] if !ENV["rvm_ruby_string"].to_s.empty?
     
     #Try to look the executeable up by command.
     if self.os == "linux"

data/lib/knj/php_parser/tests/test.rb

@@ -1,5 +1,5 @@
 require "knj/autoload"
-require "php4r"
+require "php4r" if !Kernel.const_defined?(:Php4r)
 require "#{$knjpath}php_parser/php_parser"
 
 module Knj::Php_parser::Functions

data/lib/knj/rhodes/rhodes.rb

@@ -6,8 +6,7 @@ class Knj::Rhodes
   
   def initialize(args = {})
     require "#{$knjpath}arrayext.rb"
-    require "#{$knjpath}datet.rb"
-    require "php4r"
+    require "php4r" if !Kernel.const_defined?(:Php4r)
     require "#{$knjpath}objects.rb"
     require "#{$knjpath}datarow.rb"
     require "#{$knjpath}event_handler.rb"

data/lib/knj/rhodes/youtube_open.erb

@@ -6,7 +6,14 @@
 	</div>
 	<div data-role="content">
 		<ul data-role="listview">
-			<%if System::get_property('platform') != "APPLE"%>
+      <%if System::get_property("platform") == "APPLE"%>
+        <li>
+          <a href="javascript: knj_rhodes_html_links({'url': iphone_str})">
+            <h3><%=_"Open in built-in app. (iPhone)"%></h3>
+            <p><%=_"This will trigger the YouTube-app. on iPhone."%></p>
+          </a>
+        </li>
+      <%else%>
 				<li>
 					<a href="javascript: knj_rhodes_html_links({'url': 'vnd.youtube://<%=@params["youtube_id"]%>'})">
 						<h3><%=_"Open in built-in app. (VND)"%></h3>
@@ -15,15 +22,6 @@
 				</li>
 			<%end%>
 			
-			<%if System::get_property("platform") == "APPLE"%>
-				<li>
-					<a href="javascript: knj_rhodes_html_links({'url': iphone_str})">
-						<h3><%=_"Open in built-in app. (iPhone)"%></h3>
-						<p><%=_"This will trigger the YouTube-app. on iPhone."%></p>
-					</a>
-				</li>
-			<%end%>
-			
 			<li>
 				<a href="javascript: knj_rhodes_html_links({'url': 'http://www.youtube.com/watch?v=<%=@params["youtube_id"]%>'})">
 					<h3><%=_"Open YouTube-URL"%></h3>
@@ -38,8 +36,10 @@
 			</li>
 		</ul>
 		
-		<script>
-			var iphone_str = "[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@\"http://www.youtube.com/v/oHg5SJYRHA0&f=gdata_videos\"]]; "
-		</script>
+		<%if System::get_property("platform") == "APPLE"%>
+      <script>
+        var iphone_str = "[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@\"http://www.youtube.com/v/oHg5SJYRHA0&f=gdata_videos\"]]; "
+      </script>
+    <%end%>
 	</div>
 </div>

data/spec/cmd_parser_spec.rb

@@ -4,7 +4,7 @@ describe "Cmd_parser" do
   it "should be able to parse various strings" do
     require "knjrbfw"
     require "knj/cmd_parser"
-    require "php4r"
+    require "php4r" if !Kernel.const_defined?(:Php4r)
     
     strs = [
       "-rw-r--r--    1 admin    administ   186.3M Aug 30 18:09 b4u_synoptik_2011_08_30_17_57_32.sql.gz\n",

data/spec/web_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Web" do
   it "should be able to parse url and generate hashes" do
-    require "php4r"
+    require "php4r" if !Kernel.const_defined?(:Php4r)
     require "knj/web"
     
     url = "first=test&#{Knj::Web.urlenc("second[trala][]")}=1&#{Knj::Web.urlenc("second[trala][]")}=2&#{Knj::Web.urlenc("second[trala][]")}=3"

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.98
+  version: 0.0.99
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-18 00:00:00 Z
+date: 2012-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wref
@@ -390,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 73923719738851392
+      hash: 1102043670091375693
       segments: 
       - 0
       version: "0"