typo 4.0.3 → 4.1

data/lib/email_notify.rb

@@ -3,22 +3,22 @@ class EmailNotify
     @@logger ||= RAILS_DEFAULT_LOGGER || Logger.new(STDOUT)
   end
 
-  def self.send_comment(controller, comment, user)
+  def self.send_comment(comment, user)
     return if user.email.blank?
 
     begin
-      email = NotificationMailer.create_comment(controller, comment, user)
+      email = NotificationMailer.create_comment(comment, user)
       EmailNotify.send_message(user,email)
     rescue => err
       logger.error "Unable to send comment email: #{err.inspect}"
     end
   end
 
-  def self.send_article(controller, article, user)
+  def self.send_article(article, user)
     return if user.email.blank?
 
     begin
-      email = NotificationMailer.create_article(controller, article, user)
+      email = NotificationMailer.create_article(article, user)
       EmailNotify.send_message(user,email)
     rescue => err
       logger.error "Unable to send article email: #{err.inspect}"

data/lib/generators/sidebar/sidebar_generator.rb

@@ -1,13 +1,22 @@
 class SidebarGenerator < Rails::Generator::NamedBase
+  attr_reader :plugin_path
+
+  def initialize(runtime_args, runtime_options = { })
+    super
+    @plugin_path = "vendor/plugins/#{file_name}"
+  end
+
   def manifest
     record do |m|
-      m.class_collisions class_name
+      m.directory "#{plugin_path}/lib"
+      m.directory "#{plugin_path}/test"
+      m.directory "#{plugin_path}/views"
 
-      m.template "components/plugins/sidebars/controller_template.rb",
-                 "components/plugins/sidebars/#{file_name}_controller.rb"
-      m.directory File.join('components/plugins/sidebars', file_name)
-      m.template "components/plugins/sidebars/views/content_template.rhtml",
-                 "components/plugins/sidebars/#{file_name}/content.rhtml"
+      m.template 'init.rb',       "#{plugin_path}/init.rb"
+      m.template 'sidebar.rb',    "#{plugin_path}/lib/#{file_name}.rb"
+      m.template 'unit_test.rb',  "#{plugin_path}/test/#{file_name}_test.rb"
+      m.template 'Rakefile',      "#{plugin_path}/Rakefile"
+      m.template 'content.rhtml', "#{plugin_path}/views/content.rhtml"
     end
   end
 end

data/lib/generators/sidebar/templates/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the <%= file_name %> plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the <%= file_name %> plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = '<%= class_name %>'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/generators/sidebar/templates/content.rhtml

@@ -0,0 +1,10 @@
+<h3 class='sidebar-title'><%= class_name %></h3>
+<div class='<%= file_name.sub(/_sidebar/, '') %>'-body>
+<p>Replace this text with the real sidebar view code</p>
+<p>You should be able to access <code>request</code>,
+  <code>controller</code>, <code>params</code> etc,
+  as well as local variables set from the sidebar settings. So if you've done
+  <code>setting :title, 'Whatever'</code>, you can use &lt;%= title %&gt;
+  to get at its value. The current sidebar object is accessible as
+  <code>sidebar</code>.</p>
+</div>

data/lib/generators/sidebar/templates/init.rb

@@ -0,0 +1,4 @@
+require 'sidebar'
+require '<%= file_name %>'
+
+<%= class_name %>.view_root = File.dirname(__FILE__) + '/views'

data/lib/generators/sidebar/templates/sidebar.rb

@@ -0,0 +1,16 @@
+class <%= class_name %> < Sidebar
+  # display_name "<%= class_name.underscore.humanize %>" # Default
+  description "Describe your sidebar here"
+
+  # Check the other sidebars for the sort of thing you can do with setting
+  # declarations
+
+  def parse_request(contents, params)
+    # contents is a list of the items being rendered on the current page
+    # params is the params hash for the current request
+
+    # Take a look at (eg) the amazon sidebar for examples of what gets done here
+    # If your sidebar doesn't depend on the request or the contents, you don't
+    # need to do anything here.
+  end
+end

data/lib/generators/sidebar/templates/unit_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class <%= class_name %>Test < Test::Unit::TestCase
+  def test_sidebar_is_available
+    assert Sidebar.available_sidebars.include?(<%= class_name %>)
+  end
+end

data/lib/jabber_notify.rb

@@ -1,4 +1,4 @@
-require 'jabber4r/jabber4r'
+require 'xmpp4r/client'
 
 class JabberNotify
   @@jabber = nil
@@ -12,13 +12,11 @@ class JabberNotify
 
     begin
       STDERR.puts "** Sending #{body} to #{user.jabber} via jabber."
-      message = session.new_message(user.jabber)
+      message = Jabber::Message::new(user.jabber, body)
       message.subject = subject
-      message.body = body
-      message.xhtml = html
-      message.send
+      session.send(message)
     rescue => err
-      logger.error "Attempt to use jabber failed: #{err.inspect}" if logger
+      logger.error "Attempt to use jabber failed: #{err.inspect}" if defined? logger 
     end
   end
 
@@ -31,6 +29,9 @@ class JabberNotify
       address = address + '/typo'
     end
 
-    @@jabber ||= Jabber::Session.bind(address, Blog.default.jabber_password)
+    @@jabber = Jabber::Client.new(Jabber::JID.new(address), true) 
+    @@jabber.connect 
+    @@jabber.auth(Blog.default.jabber_password) 
+    return @@jabber    
   end
 end

data/lib/memory_profiler.rb

@@ -0,0 +1,60 @@
+class MemoryProfiler
+  DEFAULTS = {:delay => 10, :string_debug => false}
+  
+  def self.start(opt={})
+    opt = DEFAULTS.dup.merge(opt)
+
+    Thread.new do
+      prev = Hash.new(0)
+      curr = Hash.new(0)
+      curr_strings = []
+      delta = Hash.new(0)
+    
+      file = File.open('log/memory_profiler.log','w')
+    
+      loop do
+        begin
+          GC.start
+          curr.clear
+          
+          curr_strings = [] if opt[:string_debug]
+          
+          ObjectSpace.each_object do |o|
+            curr[o.class] += 1 #Marshal.dump(o).size rescue 1
+            if opt[:string_debug] and o.class == String
+              curr_strings.push o
+            end
+          end
+
+          if opt[:string_debug]
+            File.open("log/memory_profiler_strings.log.#{Time.now.to_i}",'w') do |f|
+              curr_strings.sort.each do |s|
+                f.puts s
+              end
+            end
+            curr_strings.clear
+          end
+
+          delta.clear
+          (curr.keys + delta.keys).uniq.each do |k,v|
+            delta[k] = curr[k]-prev[k]
+          end
+
+          file.puts "Top 20"
+          delta.sort_by { |k,v| -v.abs }[0..19].sort_by { |k,v| -v}.each do |k,v|
+            file.printf "%+5d: %s (%d)\n", v, k.name, curr[k] unless v == 0
+          end
+          file.flush
+
+          delta.clear
+          prev.clear
+          prev.update curr
+          GC.start
+        rescue Exception => err
+          STDERR.puts "** memory_profiler error: #{err}"
+        end
+        sleep opt[:delay]
+      end
+    end
+  end
+end

data/lib/rails_patch/active_record.rb

@@ -5,32 +5,5 @@ module ActiveRecord
                 :conditions => ["#{field} = ?", value], *options)
     end
   end
-
-  # Horrible monkey patch 'til Rails fixes this
-  module ConnectionAdapters
-    class MysqlAdapter
-      def change_column(table_name, column_name, type, options ={ }) #:nodoc:
-        if options[:default].nil?
-          options[:default] =
-            select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
-        end
-        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit])}"
-        add_column_options!(change_column_sql, options)
-        execute(change_column_sql)
-      end
-    end
-
-    class SqliteAdapter
-      def change_column(table_name, column_name, type, options ={ }) #:nodoc:
-        alter_table(table_name) do |definition|
-          definition[column_name].instance_eval do
-            self.type    = type
-            self.limit   = options[:limit] if options[:limit]
-            self.default = options[:default] unless options[:default].nil?
-          end
-        end
-      end
-    end
-  end
 end
 

data/lib/route_cache.rb

@@ -0,0 +1,15 @@
+class RouteCache
+  @cache = {}
+  
+  def self.clear
+    @cacle = {}
+  end
+  
+  def self.[](key)
+    @cache[key.inspect]
+  end
+  
+  def self.[]=(key,value)
+    @cache[key.inspect]=value
+  end
+end

data/lib/sidebars/component_plugin.rb

@@ -1,5 +1,8 @@
 module Sidebars
   class Sidebars::ComponentPlugin < Sidebars::Plugin
     self.template_root = File.join RAILS_ROOT, "components"
+    class << self
+      @abstract = true
+    end
   end
 end

data/lib/sidebars/consolidated_plugin.rb

@@ -0,0 +1,26 @@
+class Sidebars::ConsolidatedPlugin < Sidebars::Plugin
+  class << self
+    @abstract = true
+
+    def fields
+      associated_class.fields
+    end
+
+    def default_config
+      fields.inject({ }) do |acc, item|
+        acc.merge(item.key => item.default)
+      end
+    end
+
+    def description
+      associated_class.description
+    end
+  end
+
+  def index
+    @sidebar   = params['sidebar']
+    @sb_config = @sidebar.config
+    @sidebar.parse_request(params)
+    render :partial => "sidebars/#{@sidebar.short_name}/content"
+  end
+end

data/lib/sidebars/plugin.rb

@@ -119,25 +119,20 @@ module Sidebars
       end
 
       def available_sidebars
-        @@available_sidebars ||= Sidebars::Plugin.subclasses.select do |sidebar|
-          sidebar.subclasses.empty?
+        Sidebars::Plugin.subclasses.select do |sidebar|
+          sidebar.concrete?
         end
       end
 
-      # The name that needs to be used when refering to the plugin's
-      # controller in render statements
-      def component_name
-        if (self.to_s=~/::([a-zA-Z]+)Controller/)
-          "plugins/sidebars/#{$1}".underscore
-        else
-          raise "I don't know who I am: #{self.to_s}"
-        end
+
+      def concrete?
+        self.to_s !~ /^Sidebars::(Co(mponent|nsolidated))?Plugin/
       end
 
       # The name that's stored in the DB.  This is the final chunk of the
       # controller name, like 'xml' or 'flickr'.
       def short_name
-        component_name.split(%r{/}).last
+        self.to_s.underscore.split(%r{/}).last
       end
 
       @@display_name_of = { }
@@ -193,7 +188,7 @@ module Sidebars
       def default_helper_module!
       end
     end
-    
+
     def index
       @sidebar=params['sidebar']
       set_config
@@ -224,7 +219,7 @@ module Sidebars
       @sidebar.config = self.class.default_config.dup.merge(@sidebar.config)
       @sidebar.config ||= (self.class.default_config)
     end
-    
+
     def sb_config(key)
       config = @sidebar.class.default_config
       config.merge!(@sidebar.config || {})

data/lib/spam_protection.rb

@@ -26,7 +26,7 @@ class SpamProtection
     reason = catch(:hit) do
       case string
         when Format::IP_ADDRESS: self.scan_ip(string)
-        when Format::HTTP_URI: self.scan_uri(URI.parse(string).host) rescue URI::InvalidURIError
+        when Format::HTTP_URI: self.scan_uris(string) rescue URI::InvalidURIError
         else self.scan_text(string)
       end
     end
@@ -45,41 +45,50 @@ class SpamProtection
   end
 
   def scan_text(string)
-    # Scan contained URLs
     uri_list = string.scan(/(http:\/\/[^\s"]+)/m).flatten
 
-    # Check for URL count limit
-    if this_blog.sp_url_limit > 0
-      throw :hit, "Hard URL Limit hit: #{uri_list.size} > #{this_blog.sp_url_limit}" if uri_list.size > this_blog.sp_url_limit
-    end
+    check_uri_count(uri_list)
+    check_against_blacklist(string)
+    scan_uris(uri_list)
 
-    uri_list.collect { |uri| URI.parse(uri).host rescue nil }.uniq.compact.each do |host|
-      scan_uri(host)
-    end
+    return false
+  end
 
+  def check_against_blacklist(text)
     # Pattern scanning
-    BlacklistPattern.find_all.each do |pattern|
+    BlacklistPattern.find(:all).each do |pattern|
       logger.info("[SP] Scanning for #{pattern.class} #{pattern.pattern}")
 
-      throw :hit, "#{pattern} matched" if pattern.matches?(string)
+      throw :hit, "#{pattern} matched" if pattern.matches?(text)
     end
+  end
 
-    return false
+  def check_uri_count(uris)
+    limit = this_blog.sp_url_limit
+    return if limit.to_i.zero?
+    if uris.size > limit
+      throw :hit, "Hard URL Limit hit: #{uris.size} > #{limit}"
+    end
   end
 
-  def scan_uri(host)
-    return scan_ip(host) if host =~ Format::IP_ADDRESS
+  def scan_uris(uris = [])
+    uris.each do |uri|
+      host = URI.parse(uri).host rescue next
+      return scan_ip(host) if host =~ Format::IP_ADDRESS
 
-    host_parts = host.split('.').reverse
-    domain = Array.new
+      host_parts = host.split('.').reverse
+      domain = Array.new
 
-    # Check for two level TLD
-    (SECOND_LEVEL.include?(host_parts[1]) ? 3:2).times do
-      domain.unshift(host_parts.shift)
-    end
+      # Check for two level TLD
+      (SECOND_LEVEL.include?(host_parts[1]) ? 3:2).times do
+        domain.unshift(host_parts.shift)
+      end
 
-    logger.info("[SP] Scanning domain #{domain.join('.')}")
-    query_rbls(HOST_RBLS, host, domain.join('.'))
+      logger.info("[SP] Scanning domain #{domain.join('.')}")
+      query_rbls(HOST_RBLS, host, domain.join('.'))
+      logger.info("[SP] Finished domain scan #{domain.join('.')}")
+      return false
+    end
   end
 
   def query_rbls(rbls, *subdomains)
@@ -87,7 +96,10 @@ class SpamProtection
       subdomains.uniq.each do |d|
         begin
           response = IPSocket.getaddress([d, rbl].join('.'))
-          throw :hit, "#{rbl} positively resolved subdomain #{d} => #{response}" if response =~ /^127\.0\.0\./
+          if response =~ /^127\.0\.0\./
+            throw :hit,
+              "#{rbl} positively resolved subdomain #{d} => #{response}"
+          end
         rescue SocketError
           # NXDOMAIN response => negative:  d is not in RBL
         end