imagine_cms 3.0.0.beta2 → 3.0.0.beta3

data/README.rdoc

@@ -23,14 +23,17 @@ be a good time to get on board.
 
 Here's what's coming up:
 
-* Imagine 3.0: 90% restored functionality, can function on existing sites with no database changes
-* Imagine 3.1: 100% restored functionality, may require a few simple migrations
-* Imagine 4.0: Refactoring & rewriting of the worst parts (substitutions); move away from ERB templating, to something like Liquid; switch to a cross-browser editor; switch to jquery
+Current status: Original functionality 25% restored
 
-(Imagine 1.x and 2.x version numbers have already been used internally, might as well start at 3.0.)
+* Imagine 3.0 (Rails 3.2): 90% restored functionality, can function on existing sites with no database changes
+* Imagine 3.1 (Rails 3.2): 100% restored functionality, may require a few simple migrations
+* Imagine 4.0 (Rails 4.0): Refactoring & rewriting of the worst parts (substitutions); move away from ERB templating, to something like Liquid; switch to a cross-browser editor; switch to jQuery
+
+(Imagine 1.x and 2.x version numbers have already been used internally, so might as well start at 3.0.)
 
 Dependencies:
 * Rails 3.2
 * acts_as_tree
 * acts_as_versioned
 * mini_magick
+* net-dns

data/app/controllers/cms/content_controller.rb

@@ -35,7 +35,7 @@ module Cms # :nodoc:
         if e.message =~ /string contains null byte/
           # do nothing
         else
-          throw e
+          raise e
         end
       end
       
@@ -73,7 +73,7 @@ module Cms # :nodoc:
     helper_method :template_exists?
     
     def url_for_current
-      url_for
+      request.fullpath
     end
     helper_method :url_for_current
     

data/app/helpers/cms_application_helper.rb

@@ -76,13 +76,13 @@ module CmsApplicationHelper
   #
   # NOTE: @error and @notice are deprecated, use flash.now[:error] and flash.now[:notice] instead.
   def flash_message(message = 'Please review the following messages:')
-    output = ''
+    output = ''.html_safe
     if (flash[:error] || @error || '') != ''
-      output << "<p>#{message}</p>"
-      output << "<p class=\"error\">#{flash[:error] || @error}</p>"
+      output << content_tag('p') { message }
+      output << content_tag('p', :class => 'error') { flash[:error] || @error }
     end
     if (flash[:notice] || @notice || '') != ''
-      output << "<p class=\"notice\">#{flash[:notice] || @notice}</p>"
+      output << content_tag('p', :class => 'notice') { flash[:notice] || @notice }
     end
     output
   end
@@ -426,7 +426,7 @@ EOF
   def copyright_year(year)
     year_str, this_year = year.to_s, Time.now.year.to_s
     year_str << "&ndash;#{this_year}" if ((year_str.to_i.to_s == year_str) and (year_str.to_i != this_year.to_i))
-    year_str
+    year_str.html_safe
   end
   
 end

data/imagine_cms.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["aaron@biggerbird.com"]
   s.homepage    = "https://github.com/anamba/imagine_cms"
   s.summary     = %q{Imagine Content Management System for Rails}
-  s.description = %q{Imagine Content Management System for Rails}
+  s.description = %q{Don't use this for now. See README for details.}
 
   s.rubyforge_project = "imagine_cms"
 
@@ -19,9 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "rails",               "~> 3.2.0"
-  
-  s.add_dependency "acts_as_tree",        "~> 0.1.1"
-  s.add_dependency "acts_as_versioned",   "~> 0.6.0"
-  s.add_dependency "mini_magick" #,         "~> 3.4"
+  s.add_dependency "rails",               "~> 3.2.3"
+  s.add_dependency "mini_magick",         "~> 3.4"
+  s.add_dependency "net-dns",             "~> 0.6.1"
 end

data/lib/extensions/action_controller.rb

@@ -0,0 +1,28 @@
+module ActionControllerExtensions
+  module ClassMethods
+  end
+  
+  module InstanceMethods
+    # Determines whether the input string is a valid email address per RFC specification
+    def valid_email_address?(addr, perform_mx_lookup = false)
+      valid = true
+      valid = valid && addr.to_s =~ /\A([\w\d]+(?:[\w\d\!\#\$\%\&\*\+\-\/\=\?\^\`\{\|\}\~\.]*[\w\d]+)*)@((?:[\w\d]+\.)+[\w]{2,})\z/
+      user, host = $1, $2
+      
+      # blacklist
+      # return false if ContactEmailBlacklist.include?(addr.to_s.strip)
+      
+      if perform_mx_lookup
+        begin
+          # require 'net/dns'
+          res = Net::DNS::Resolver.new
+          valid = valid && res.mx(host).size > 0
+        rescue Exception => e
+          logger.error(e)
+        end
+      end
+      
+      valid
+    end
+  end
+end

data/lib/extensions/array.rb

@@ -0,0 +1,11 @@
+require 'active_support/core_ext/string/output_safety'
+require 'active_support/core_ext/module/aliasing.rb'
+
+class Array
+  def safe_join(sep = $,)
+    sep ||= "".html_safe
+    sep = ERB::Util.html_escape(sep)
+    
+    map { |i| ERB::Util.html_escape(i) }.join(sep).html_safe
+  end
+end

data/lib/imagine_cms.rb

@@ -14,3 +14,11 @@ end
 
 # Require our engine
 require "imagine_cms/engine"
+
+
+# Require vendored gems
+# $:.push File.expand_path("../../vendor/gems", __FILE__)
+# $:.push File.expand_path("../../vendor/gems/acts_as_tree/lib", __FILE__)
+# require "acts_as_tree/init"
+# $:.push File.expand_path("../../vendor/gems/acts_as_versioned/lib", __FILE__)
+# require "acts_as_versioned/init"

data/lib/imagine_cms/engine.rb

@@ -3,17 +3,32 @@ module ImagineCms
   class Engine < Rails::Engine
     engine_name "imagine_cms"
     
-    # initialize "imagine_cms.load_app_instance_data" do |app|
-    #   ImagineCms.setup do |config|
-        config.app_root = app.root
-    #   end
-    # end
+    config.app_root = root
+    middleware.use ::ActionDispatch::Static, "#{root}/public"
     
-    # initialize "imagine_cms.load_static_assets" do |app|
-      # app.middleware.use ::ActionDispatch::Static, "#{root}/public"
-      middleware.use ::ActionDispatch::Static, "#{root}/public"
-    # end
+    #
+    # load unusual gems
+    #
+    require 'net/dns'
     
+    #
+    # load provided classes
+    #
+    require 'hash_object'
+    require 'hash_wrapper'
+    
+    #
+    # load extensions
+    #
+    require 'extensions/array'
+    
+    ActiveSupport.on_load(:action_controller) do
+      require 'extensions/action_controller'
+      extend ActionControllerExtensions::ClassMethods
+      include ActionControllerExtensions::InstanceMethods
+      # before_filter :create_settings_object, :set_default_session_values, :check_ssl_requirement, :expire_session_data
+      # after_filter :compress_output    
+    end
   end
   
 end

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta2"
+  VERSION = "3.0.0.beta3"
 end

data/vendor/gems/acts_as_tree/README

@@ -0,0 +1,26 @@
+acts_as_tree
+============
+
+Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
+association. This requires that you have a foreign key column, which by default is called +parent_id+.
+
+  class Category < ActiveRecord::Base
+    acts_as_tree :order => "name"
+  end
+
+  Example:
+  root
+   \_ child1
+        \_ subchild1
+        \_ subchild2
+
+  root      = Category.create("name" => "root")
+  child1    = root.children.create("name" => "child1")
+  subchild1 = child1.children.create("name" => "subchild1")
+
+  root.parent   # => nil
+  child1.parent # => root
+  root.children # => [child1]
+  root.children.first.children.first # => subchild1
+
+Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license  

data/vendor/gems/acts_as_tree/Rakefile

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

data/vendor/gems/acts_as_tree/init.rb

@@ -0,0 +1 @@
+ActiveRecord::Base.send :include, ActiveRecord::Acts::Tree

data/vendor/gems/acts_as_tree/lib/active_record/acts/tree.rb

@@ -0,0 +1,96 @@
+module ActiveRecord
+  module Acts
+    module Tree
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      # Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
+      # association. This requires that you have a foreign key column, which by default is called +parent_id+.
+      #
+      #   class Category < ActiveRecord::Base
+      #     acts_as_tree :order => "name"
+      #   end
+      #
+      #   Example:
+      #   root
+      #    \_ child1
+      #         \_ subchild1
+      #         \_ subchild2
+      #
+      #   root      = Category.create("name" => "root")
+      #   child1    = root.children.create("name" => "child1")
+      #   subchild1 = child1.children.create("name" => "subchild1")
+      #
+      #   root.parent   # => nil
+      #   child1.parent # => root
+      #   root.children # => [child1]
+      #   root.children.first.children.first # => subchild1
+      #
+      # In addition to the parent and children associations, the following instance methods are added to the class
+      # after calling <tt>acts_as_tree</tt>:
+      # * <tt>siblings</tt> - Returns all the children of the parent, excluding the current node (<tt>[subchild2]</tt> when called on <tt>subchild1</tt>)
+      # * <tt>self_and_siblings</tt> - Returns all the children of the parent, including the current node (<tt>[subchild1, subchild2]</tt> when called on <tt>subchild1</tt>)
+      # * <tt>ancestors</tt> - Returns all the ancestors of the current node (<tt>[child1, root]</tt> when called on <tt>subchild2</tt>)
+      # * <tt>root</tt> - Returns the root of the current node (<tt>root</tt> when called on <tt>subchild2</tt>)
+      module ClassMethods
+        # Configuration options are:
+        #
+        # * <tt>foreign_key</tt> - specifies the column name to use for tracking of the tree (default: +parent_id+)
+        # * <tt>order</tt> - makes it possible to sort the children according to this SQL snippet.
+        # * <tt>counter_cache</tt> - keeps a count in a +children_count+ column if set to +true+ (default: +false+).
+        def acts_as_tree(options = {})
+          configuration = { :foreign_key => "parent_id", :order => nil, :counter_cache => nil }
+          configuration.update(options) if options.is_a?(Hash)
+
+          belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache]
+          has_many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => :destroy
+
+          class_eval <<-EOV
+            include ActiveRecord::Acts::Tree::InstanceMethods
+
+            def self.roots
+              find(:all, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
+            end
+
+            def self.root
+              find(:first, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
+            end
+          EOV
+        end
+      end
+
+      module InstanceMethods
+        # Returns list of ancestors, starting from parent until root.
+        #
+        #   subchild1.ancestors # => [child1, root]
+        def ancestors
+          node, nodes = self, []
+          nodes << node = node.parent while node.parent
+          nodes
+        end
+
+        # Returns the root node of the tree.
+        def root
+          node = self
+          node = node.parent while node.parent
+          node
+        end
+
+        # Returns all siblings of the current node.
+        #
+        #   subchild1.siblings # => [subchild2]
+        def siblings
+          self_and_siblings - [self]
+        end
+
+        # Returns all siblings and a reference to the current node.
+        #
+        #   subchild1.self_and_siblings # => [subchild1, subchild2]
+        def self_and_siblings
+          parent ? parent.children : self.class.roots
+        end
+      end
+    end
+  end
+end

data/vendor/gems/acts_as_tree/test/acts_as_tree_test.rb

@@ -0,0 +1,219 @@
+require 'test/unit'
+
+require 'rubygems'
+require 'active_record'
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require File.dirname(__FILE__) + '/../init'
+
+class Test::Unit::TestCase
+  def assert_queries(num = 1)
+    $query_count = 0
+    yield
+  ensure
+    assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
+  end
+
+  def assert_no_queries(&block)
+    assert_queries(0, &block)
+  end
+end
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+
+# AR keeps printing annoying schema statements
+$stdout = StringIO.new
+
+def setup_db
+  ActiveRecord::Base.logger
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :mixins do |t|
+      t.column :type, :string
+      t.column :parent_id, :integer
+    end
+  end
+end
+
+def teardown_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+class Mixin < ActiveRecord::Base
+end
+
+class TreeMixin < Mixin 
+  acts_as_tree :foreign_key => "parent_id", :order => "id"
+end
+
+class TreeMixinWithoutOrder < Mixin
+  acts_as_tree :foreign_key => "parent_id"
+end
+
+class RecursivelyCascadedTreeMixin < Mixin
+  acts_as_tree :foreign_key => "parent_id"
+  has_one :first_child, :class_name => 'RecursivelyCascadedTreeMixin', :foreign_key => :parent_id
+end
+
+class TreeTest < Test::Unit::TestCase
+  
+  def setup
+    setup_db
+    @root1 = TreeMixin.create!
+    @root_child1 = TreeMixin.create! :parent_id => @root1.id
+    @child1_child = TreeMixin.create! :parent_id => @root_child1.id
+    @root_child2 = TreeMixin.create! :parent_id => @root1.id
+    @root2 = TreeMixin.create!
+    @root3 = TreeMixin.create!
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_children
+    assert_equal @root1.children, [@root_child1, @root_child2]
+    assert_equal @root_child1.children, [@child1_child]
+    assert_equal @child1_child.children, []
+    assert_equal @root_child2.children, []
+  end
+
+  def test_parent
+    assert_equal @root_child1.parent, @root1
+    assert_equal @root_child1.parent, @root_child2.parent
+    assert_nil @root1.parent
+  end
+
+  def test_delete
+    assert_equal 6, TreeMixin.count
+    @root1.destroy
+    assert_equal 2, TreeMixin.count
+    @root2.destroy
+    @root3.destroy
+    assert_equal 0, TreeMixin.count
+  end
+
+  def test_insert
+    @extra = @root1.children.create
+
+    assert @extra
+
+    assert_equal @extra.parent, @root1
+
+    assert_equal 3, @root1.children.size
+    assert @root1.children.include?(@extra)
+    assert @root1.children.include?(@root_child1)
+    assert @root1.children.include?(@root_child2)
+  end
+
+  def test_ancestors
+    assert_equal [], @root1.ancestors
+    assert_equal [@root1], @root_child1.ancestors
+    assert_equal [@root_child1, @root1], @child1_child.ancestors
+    assert_equal [@root1], @root_child2.ancestors
+    assert_equal [], @root2.ancestors
+    assert_equal [], @root3.ancestors
+  end
+
+  def test_root
+    assert_equal @root1, TreeMixin.root
+    assert_equal @root1, @root1.root
+    assert_equal @root1, @root_child1.root
+    assert_equal @root1, @child1_child.root
+    assert_equal @root1, @root_child2.root
+    assert_equal @root2, @root2.root
+    assert_equal @root3, @root3.root
+  end
+
+  def test_roots
+    assert_equal [@root1, @root2, @root3], TreeMixin.roots
+  end
+
+  def test_siblings
+    assert_equal [@root2, @root3], @root1.siblings
+    assert_equal [@root_child2], @root_child1.siblings
+    assert_equal [], @child1_child.siblings
+    assert_equal [@root_child1], @root_child2.siblings
+    assert_equal [@root1, @root3], @root2.siblings
+    assert_equal [@root1, @root2], @root3.siblings
+  end
+
+  def test_self_and_siblings
+    assert_equal [@root1, @root2, @root3], @root1.self_and_siblings
+    assert_equal [@root_child1, @root_child2], @root_child1.self_and_siblings
+    assert_equal [@child1_child], @child1_child.self_and_siblings
+    assert_equal [@root_child1, @root_child2], @root_child2.self_and_siblings
+    assert_equal [@root1, @root2, @root3], @root2.self_and_siblings
+    assert_equal [@root1, @root2, @root3], @root3.self_and_siblings
+  end           
+end
+
+class TreeTestWithEagerLoading < Test::Unit::TestCase
+  
+  def setup 
+    teardown_db
+    setup_db
+    @root1 = TreeMixin.create!
+    @root_child1 = TreeMixin.create! :parent_id => @root1.id
+    @child1_child = TreeMixin.create! :parent_id => @root_child1.id
+    @root_child2 = TreeMixin.create! :parent_id => @root1.id
+    @root2 = TreeMixin.create!
+    @root3 = TreeMixin.create!
+    
+    @rc1 = RecursivelyCascadedTreeMixin.create!
+    @rc2 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc1.id 
+    @rc3 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc2.id
+    @rc4 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc3.id
+  end
+
+  def teardown
+    teardown_db
+  end
+    
+  def test_eager_association_loading
+    roots = TreeMixin.find(:all, :include => :children, :conditions => "mixins.parent_id IS NULL", :order => "mixins.id")
+    assert_equal [@root1, @root2, @root3], roots                     
+    assert_no_queries do
+      assert_equal 2, roots[0].children.size
+      assert_equal 0, roots[1].children.size
+      assert_equal 0, roots[2].children.size
+    end   
+  end
+  
+  def test_eager_association_loading_with_recursive_cascading_three_levels_has_many
+    root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :children => { :children => :children } }, :order => 'mixins.id')
+    assert_equal @rc4, assert_no_queries { root_node.children.first.children.first.children.first }
+  end
+  
+  def test_eager_association_loading_with_recursive_cascading_three_levels_has_one
+    root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :first_child => { :first_child => :first_child } }, :order => 'mixins.id')
+    assert_equal @rc4, assert_no_queries { root_node.first_child.first_child.first_child }
+  end
+  
+  def test_eager_association_loading_with_recursive_cascading_three_levels_belongs_to
+    leaf_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :parent => { :parent => :parent } }, :order => 'mixins.id DESC')
+    assert_equal @rc1, assert_no_queries { leaf_node.parent.parent.parent }
+  end 
+end
+
+class TreeTestWithoutOrder < Test::Unit::TestCase
+  
+  def setup                               
+    setup_db
+    @root1 = TreeMixinWithoutOrder.create!
+    @root2 = TreeMixinWithoutOrder.create!
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_root
+    assert [@root1, @root2].include?(TreeMixinWithoutOrder.root)
+  end
+  
+  def test_roots
+    assert_equal [], [@root1, @root2] - TreeMixinWithoutOrder.roots
+  end
+end