ruby_extensions 1.0.8 → 1.0.11

data/lib/m_logger.rb

@@ -1,55 +0,0 @@
-class Logger
-   
-  %W[error debug fatal info warn].each do |level|
-    class_eval %{
-      alias_method :old_#{level}, :#{level}
-      
-      def #{level}(progname = nil, &block)
-        old_#{level}(format_progname(progname), &block)
-      end
-    }
-  end
-  
-  j = 5
-  5.times do |i|
-    lbs = ""
-    ast = ""
-    j.times { lbs << "\n"}
-    (j * 5).times { ast << "*"}
-    class_eval %{
-      def debug_#{i+1}(progname = nil, &block)
-        progname = format_progname(progname)
-        mess = "\n#{ast}#{lbs}\#{progname}#{lbs}#{ast}"
-        debug(mess, &block)
-      end
-    }
-    j = j - 1
-  end
-   
-  def format_message(severity, timestamp, progname, msg)
-    # Check for characters at the start of the message string indicating special formatting
-    # Make the typical case as efficient as possible
-    if not msg[0..1] == '$@'
-      pid = (defined?(ENABLE_PIDS_IN_LOGS) and ENABLE_PIDS_IN_LOGS) ? "(#{$$}) " : ''
-      return "#{pid}[#{severity}]\t#{timestamp}\t#{msg}\n" 
-    end
-    format = msg[2..2]
-    msg = msg[3..-1]
-    # Original format
-    if format == 'O'
-      return "#{timestamp}\t[#{severity}]\t#{msg}\n" 
-    elsif format == 'S'
-      return "#{msg}\n" 
-    end 
-    
-  end
-
-  private
-  def format_progname(progname)
-    unless progname.nil?
-      progname = "#{progname.to_s}\n#{progname.backtrace.join("\n\t")}\n" if progname.is_a? Exception
-    end
-    progname
-  end
-   
-end

data/lib/m_object.rb

@@ -10,7 +10,12 @@ class Object
     e = "---Ending at #{e_time}---"
     puts e
     logger.info e unless logger.nil?
-    x = "Running time #{e_time - s_time} seconds."
+    secs = e_time - s_time
+    if secs < 60
+      x = "Running time #{secs} seconds."
+    else
+      x = "Running time roughly #{secs/60} minutes [#{secs} seconds]"
+    end
     x += " [MESSAGE]: #{message}" unless message.blank?
     puts x
     logger.info x unless logger.nil?

data/lib/m_string.rb

@@ -1,13 +1,22 @@
+require 'digest'
 class String
   
   def linkify(enabled = true, options = {}, &block)
     text = self.dup
-    m = text.match(/(\".*?\":\S*)/)
+    m = text.match(/\"([^"]+)\"\:([^:]+\:\S+)/)
     until m.nil?
-      y = m.to_s.strip
-      t = y.match(/\"(.*)\"/).captures
-      url = y.match(/\":(.*)/).captures
-      break if t.to_s == "" or url.to_s == ""
+      y = m.to_s
+      t = m[1]
+      url = m[2]
+
+      # The code below handles punctuation or p tags being mistakenly added to the url when the link is at the end of a sentence or body
+      url_punct_match = /\W*[&nbsp;]*[\<\/p\>]*$/.match(url)
+      punct = ''
+      if url_punct_match && url_punct_match[0] != ""
+        url.chomp!(url_punct_match[0])
+        punct = url_punct_match[0] unless url_punct_match == "="
+      end
+
       if block_given?
         if enabled
           ret = yield t, url, options
@@ -17,12 +26,12 @@ class String
         end
       else
         if enabled
-          text.gsub!(y, "<a href=\"#{url}\" #{options.join("%s=\"%s\"", " ")}>#{t}</a>")
+          text.gsub!(y, "<a href=\"#{url}\" #{options.join("%s=\"%s\"", " ")}>#{t}</a>#{punct}")# punct places punctuation back into proper place
         else
           text.gsub!(y, t.to_s)
         end
       end
-      m = text.match(/\s(\".*?\":\S*)/)
+      m = text.match(/\"([^"]+)\"\:([^:]+\:\S+)/)
     end
     return text
   end
@@ -139,7 +148,22 @@ class String
   def breakify(every = 30)
     every = 1 if every < 1
     text = self
-    brokentxt = text.gsub(/\S{#{every},}/) { |longword| longword.scan(/.{1,#{every}}/).join("<wbr/>") }
+    textile_regex = /\"([^\"]+)\":([^:]*:[\/\/]{0,1}[^ ]*)/
+    long_regex = /\S{#{every},}/
+    brokentxt = text.gsub(long_regex) do |longword|
+      if longword =~ textile_regex #if the longword is a textile link...ignore and recheck for the link text only
+        textile_link = textile_regex.match(longword)[0]
+        link_text = textile_regex.match(longword)[1]
+        longword = link_text
+        if longword =~ long_regex #link text is long...allow break
+          textile_link.scan(/.{1,#{every}}/).join("<wbr/>")
+        else
+          textile_link #the url is what triggered the match...so leave it alone
+        end
+      else
+        longword.scan(/.{1,#{every}}/).join("<wbr/>") #no textile link matched
+      end
+    end
     #text = %Q[<span style='word-wrap:break-word;wbr:after{content:"\\00200B"}'>#{brokentxt}</span>]
     #brokentxt.gsub("<wbr/>", "<br />")
     brokentxt.gsub("<wbr/>", " ")

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: ruby_extensions
 package: ruby_extensions
 project: magrathea
-version: 1.0.8
+version: 1.0.11

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.11
 platform: ruby
 authors: 
 - markbates
@@ -35,7 +35,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-29 00:00:00 -05:00
+date: 2008-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: []