knitkit 2.1.15 → 3.0.0

data/lib/knitkit/engine.rb

@@ -17,6 +17,7 @@ module Knitkit
       include Knitkit::Extensions::ActiveRecord::ActsAsPublishable
       include Knitkit::Extensions::ActiveRecord::ThemeSupport::HasManyThemes
       include Knitkit::Extensions::ActiveRecord::ActsAsDocument
+      include Knitkit::Extensions::ActiveRecord::ActsAsCommentable
     end
 
     ActiveSupport.on_load(:action_controller) do

data/lib/knitkit/extensions.rb

@@ -10,9 +10,13 @@ require 'knitkit/extensions/railties/theme_support/theme_file_resolver'
 require 'knitkit/extensions/active_record/acts_as_publishable'
 require 'knitkit/extensions/active_record/theme_support/has_many_themes'
 require 'knitkit/extensions/active_record/acts_as_document'
+require 'knitkit/extensions/active_record/acts_as_commentable'
 
 #active_controller extensions
 require 'knitkit/extensions/action_controller/theme_support/acts_as_themed_controller'
 
 #action_mailer extensions
 require 'knitkit/extensions/action_mailer/theme_support/acts_as_themed_mailer'
+
+#willpaginate
+require 'knitkit/extensions/will_paginate/link_renderer'

data/lib/knitkit/extensions/active_record/acts_as_commentable.rb

@@ -0,0 +1,33 @@
+module Knitkit
+  module Extensions
+    module ActiveRecord
+      module ActsAsCommentable
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+
+          def acts_as_commentable
+            has_many :comments, :as => :commented_record, :dependent => :destroy
+
+            extend ActsAsCommentable::SingletonMethods
+            include ActsAsCommentable::InstanceMethods
+          end
+
+        end
+
+        module SingletonMethods
+        end
+
+        module InstanceMethods
+
+          def add_comment(options={})
+            self.comments.create(options)
+          end
+
+        end
+      end # ActsAsCommentable
+    end # ActiveRecord
+  end # Extensions
+end # Knitkit

data/lib/knitkit/extensions/active_record/acts_as_document.rb

@@ -21,18 +21,6 @@ module Knitkit
 
             #from Document / FileAssets
             [:add_file, :files].each { |m| delegate m, :to => :document }
-
-            #from relational_dynamic_attributes
-            [
-            :add_dynamic_attribute,
-            :update_or_create_dynamic_attribute,
-            :update_first_dynamic_attribute_value_of_type,
-            :get_dynamic_attributes,
-            :get_dynamic_value_of_type,
-            :get_dynamic_attribute_of_type,
-            :has_dynamic_attribute_of_type?,
-            :destroy_dynamic_attribute_of_type
-            ].each { |m| delegate m, :to => :document }
           end
 
         end

data/lib/knitkit/extensions/active_record/acts_as_publishable.rb

@@ -9,7 +9,7 @@ module Knitkit
         module ClassMethods
 
           def can_be_published
-            after_destroy :destroy_published_elements
+            after_destroy :delete_published_elements
 
             extend ActsAsPublishable::SingletonMethods
             include ActsAsPublishable::InstanceMethods
@@ -25,15 +25,12 @@ module Knitkit
             site.publish_element(comment, self, version, current_user)
           end
 
-          def destroy_published_elements
-            published_elements = PublishedElement.where('published_element_record_id = ? and (published_element_record_type = ? or published_element_record_type = ?)', self.id, self.class.to_s, self.class.superclass.to_s)
-            published_elements.each do |published_element|
-              published_element.destroy
-            end
+          def delete_published_elements
+            PublishedElement.delete_all("published_element_record_id = '#{id}' and (published_element_record_type = '#{self.class.to_s}' or published_element_record_type = '#{self.class.superclass.to_s}')")
           end
         end
 
-      end#ActsAsPublishable
-    end#ActiveRecord
-  end#Extensions
-end#Knitkit
+      end #ActsAsPublishable
+    end #ActiveRecord
+  end #Extensions
+end #Knitkit

data/lib/knitkit/extensions/compass_ae/widgets/base.rb

@@ -5,13 +5,11 @@
 
     website.themes.active.map{ |theme| {:path => theme.path.to_s, :url => theme.url.to_s}}.each do |theme|
       path = File.join(theme[:path],'widgets',self.widget_name,'views')
-      paths << path unless paths.include?(path)
+      paths.unshift(path) unless paths.include?(path)
     end if website
- 
-    paths.reverse!
+
     ActionView::Base.new(paths).render(:template => view, :locals => locals)
   end
-
 end
 
 ::ErpApp::Widgets::Base.class_eval do

data/lib/knitkit/extensions/compass_ae/widgets/widget_proxy_controller.rb

@@ -19,10 +19,13 @@ ErpApp::WidgetProxyController.class_eval do
     return if result.nil?
 
     if result.is_a?(Hash)
-      render result
+      if !result[:send_file] and !result[:send_data] and !result[:redirect_to]
+        render result
+      end
     else
       render :inline => result
     end
+
   end
 
   protected

data/lib/knitkit/extensions/railties/action_view/helpers/blog_helper.rb

@@ -23,35 +23,38 @@ module Knitkit
 
             def blog_rss_links(link_title='RSS Feed')
               if params[:action] == 'tag'
-                return link_to link_title, main_app.blog_tag_url(params[:section_id], params[:tag_id], :rss), :target => '_blank'
+                link_to link_title, main_app.blog_tag_url(params[:section_id], params[:tag_id], :rss), :target => '_blank'
               else
-                return link_to link_title, main_app.blogs_url(params[:section_id], :rss), :target => '_blank'
+                link_to link_title, main_app.blogs_url(params[:section_id], :rss), :target => '_blank'
               end
             end
 
             def blog_recent_approved_comments
               if @published_content.content.comments.recent.approved.empty?
-                return 'No Comments'
+                'No Comments'
               else
                 html = ''
 
                 @published_content.content.comments.recent.approved.each do |comment|
-                  html += render :partial => 'comment', :locals => {:comment => comment}
+                  html += (render :partial => 'comment', :locals => {:comment => comment})
                 end
 
-                return raw html
+                raw html
               end
             end
 
             def blog_pagination(css_class, params)
-              return will_paginate @contents, :class => css_class, :params => {
-                  :section_id => params[:section_id],
-                  :per_page => params[:per_page],
-                  :format => params[:format],
-                  :only_path => true,
-                  :use_route => params[:use_route],
-                  :scope => main_app
-              }
+              will_paginate @contents,
+                            :renderer => Knitkit::Extensions::WillPaginate::LinkRenderer,
+                            :class => css_class,
+                            :params => {
+                                :section_id => params[:section_id],
+                                :per_page => 1,
+                                :format => params[:format],
+                                :only_path => true,
+                                :use_route => params[:use_route],
+                                :scope => main_app
+                            }
             end
 
           end #BlogHelper

data/lib/knitkit/extensions/railties/action_view/helpers/content_helper.rb

@@ -6,13 +6,15 @@ module Knitkit
           module ContentHelper
 
             def setup_inline_editing
-                if can_inline_edit?
-                  raw "<script type='text/javascript'>
-                      jQuery(document).ready(function() {
-                          Knitkit.InlineEditing.setup(#{@website.id});
+              if can_inline_edit?
+                raw "<script type='text/javascript'>
+                     jQuery(document).ready(function() {
+                         new OnDemandLoadByAjax().load('/javascripts/erp_app/ckeditor/ckeditor.js', function(){
+                            Knitkit.InlineEditing.setup(#{@website.id});
+                          });
                       });
                     </script>"
-                end
+              end
             end
 
             def render_editable_content(content_version, additional_css_classes=[])
@@ -41,8 +43,8 @@ module Knitkit
               html = ''
 
               section_contents = WebsiteSectionContent.includes(:content).
-                                 where(:website_section_id => @website_section.id, :content_area => name.to_s).
-                                 order(:position).all
+                  where(:website_section_id => @website_section.id, :content_area => name.to_s).
+                  order(:position).all
               published_contents = []
               section_contents.each do |sc|
                 content_version = Content.get_published_version(@active_publication, sc.content) unless @active_publication.nil?
@@ -63,7 +65,7 @@ module Knitkit
             end
 
             private
-            
+
             def can_inline_edit?
               result = false
               unless (current_user.nil? or current_user === false)

data/lib/knitkit/extensions/railties/theme_support/asset_tag_helper.rb

@@ -9,11 +9,17 @@ require 'action_view/helpers/asset_tag_helper'
 module ActionView
   module Helpers
     module AssetTagHelper
+
       def theme_javascript_path(theme, source)
         theme = controller.website.themes.find_by_theme_id(theme) unless theme.is_a?(Theme)
-        file = theme.files.where('name = ? and directory = ?', source, "#{theme.url}/javascripts").first
+
+        name, directory = name_and_path_from_source(source, "#{theme.url}/javascripts")
+
+        file = theme.files.where('name = ? and directory = ?', name, directory).first
+
         file.nil? ? '' : file.data.url
       end
+
       alias_method :theme_path_to_javascript, :theme_javascript_path
 
       def theme_javascript_include_tag(theme_id, *sources)
@@ -21,61 +27,53 @@ module ActionView
         return("could not find theme with the id #{theme_id}") unless theme
 
         options = sources.extract_options!.stringify_keys
-        cache   = options.delete("cache")
+        cache = options.delete("cache")
         recursive = options.delete("recursive")
 
-        # this caching appears to be deprecated, commenting out
-        # if ActionController::Base.perform_caching && cache
-        #   joined_javascript_name = (cache == true ? "all" : cache) + ".js"
-        #   joined_javascript_path = File.join(theme.path + '/javascripts', joined_javascript_name)
-
-        #   paths = theme_compute_javascript_paths(theme, sources, recursive)
-        #   theme_write_asset_file_contents(theme, joined_javascript_path, paths) unless File.exists?(joined_javascript_path)
-        #   raw theme_javascript_src_tag(theme, joined_javascript_name, options)
-        # else
-          sources = theme_expand_javascript_sources(theme, sources, recursive).collect do |source|
-            theme_javascript_src_tag(theme, source, options)
-          end.join("\n")
-          raw sources
+        sources = theme_expand_javascript_sources(theme, sources, recursive).collect do |source|
+          theme_javascript_src_tag(theme, source, options)
+        end.join("\n")
+        raw sources
         #end
       end
 
       def theme_stylesheet_path(theme, source)
         theme = controller.website.themes.find_by_theme_id(theme) unless theme.is_a?(Theme)
-        file = theme.files.where('name = ? and directory = ?', source, "#{theme.url}/stylesheets").first
+
+        name, directory = name_and_path_from_source(source, "#{theme.url}/stylesheets")
+
+        file = theme.files.where('name = ? and directory = ?', name, directory).first
+
         file.nil? ? '' : file.data.url
       end
+
       alias_method :theme_path_to_stylesheet, :theme_stylesheet_path
 
       def theme_stylesheet_link_tag(theme_id, *sources)
         theme = controller.website.themes.find_by_theme_id(theme_id)
         return("could not find theme with the id #{theme_id}") unless theme
-        
+
         options = sources.extract_options!.stringify_keys
-        cache   = options.delete("cache")
+        cache = options.delete("cache")
         recursive = options.delete("recursive")
-    
-        # this caching appears to be deprecated, commenting out
-        # if ActionController::Base.perform_caching && cache
-        #   joined_stylesheet_name = (cache == true ? "all" : cache) + ".css"
-        #   joined_stylesheet_path = File.join(theme.path + '/stylesheets', joined_stylesheet_name)
-          
-        #   paths = theme_compute_stylesheet_paths(theme, sources, recursive)
-        #   theme_write_asset_file_contents(theme, joined_stylesheet_path, paths) unless File.exists?(joined_stylesheet_path)
-        #   raw theme_stylesheet_tag(theme, joined_stylesheet_name, options)
-        # else
-          sources = theme_expand_stylesheet_sources(theme, sources, recursive).collect do |source|
-            theme_stylesheet_tag(theme, source, options)
-          end.join("\n")
-          raw sources
+
+        sources = theme_expand_stylesheet_sources(theme, sources, recursive).collect do |source|
+          theme_stylesheet_tag(theme, source, options)
+        end.join("\n")
+        raw sources
         #end
       end
 
       def theme_image_path(theme, source)
         theme = controller.website.themes.find_by_theme_id(theme) unless theme.is_a?(Theme)
-        file = theme.files.where('name = ? and directory = ?', source, "#{theme.url}/images").first
+
+        name, directory = name_and_path_from_source(source, "#{theme.url}/images")
+
+        file = theme.files.where('name = ? and directory = ?', name, directory).first
+
         file.nil? ? '' : file.data.url
       end
+
       alias_method :theme_path_to_image, :theme_image_path # aliased to avoid conflicts with an image_path named route
 
       def theme_image_tag(theme_id, source, options = {})
@@ -92,109 +90,126 @@ module ActionView
 
         if mouseover = options.delete(:mouseover)
           options[:onmouseover] = "this.src='#{theme_image_path(theme, mouseover)}'"
-          options[:onmouseout]  = "this.src='#{theme_image_path(theme, options[:src])}'"
+          options[:onmouseout] = "this.src='#{theme_image_path(theme, options[:src])}'"
         end
 
         tag("img", options)
       end
 
       private
-        def theme_compute_public_path(theme, source, dir, ext = nil, include_host = true)
-          has_request = controller.respond_to?(:request)
+      def theme_compute_public_path(theme, source, dir, ext = nil, include_host = true)
+        has_request = controller.respond_to?(:request)
 
-          if ext && (File.extname(source).blank? || File.exist?(File.join(theme.path, dir, "#{source}.#{ext}")))
-            source += ".#{ext}"
-          end
+        if ext && (File.extname(source).blank? || File.exist?(File.join(theme.path, dir, "#{source}.#{ext}")))
+          source += ".#{ext}"
+        end
 
-          unless source =~ %r{^[-a-z]+://}
-            source = "/#{dir}/#{source}" unless source[0] == ?/
+        unless source =~ %r{^[-a-z]+://}
+          source = "/#{dir}/#{source}" unless source[0] == ?/
 
-            source = theme_rewrite_asset_path(theme, source)
+          source = theme_rewrite_asset_path(theme, source)
 
-            if has_request && include_host
-              unless source =~ %r{^#{ActionController::Base.config.relative_url_root}/}
-                source = "#{ActionController::Base.config.relative_url_root}#{source}"
-              end
+          if has_request && include_host
+            unless source =~ %r{^#{ActionController::Base.config.relative_url_root}/}
+              source = "#{ActionController::Base.config.relative_url_root}#{source}"
             end
           end
-
-          source
         end
 
-        def theme_rails_asset_id(theme, source)
-          if asset_id = ENV["RAILS_ASSET_ID"]
-            asset_id
-          else
-            path = File.join(theme.path, source)
-            asset_id = File.exist?(path) ? File.mtime(path).to_i.to_s : ''
-            asset_id
-          end
-        end
+        source
+      end
 
-        def theme_rewrite_asset_path(theme, source)
-          asset_id = theme_rails_asset_id(theme, source)
-          if asset_id.blank?
-            source
-          else
-            source + "?#{asset_id}"
-          end
+      def theme_rails_asset_id(theme, source)
+        if asset_id = ENV["RAILS_ASSET_ID"]
+          asset_id
+        else
+          path = File.join(theme.path, source)
+          asset_id = File.exist?(path) ? File.mtime(path).to_i.to_s : ''
+          asset_id
         end
+      end
 
-        def theme_javascript_src_tag(theme, source, options)
-          options = { "type" => Mime::JS, "src" => theme_path_to_javascript(theme, source) }.merge(options)
-          content_tag("script", "", options)
+      def theme_rewrite_asset_path(theme, source)
+        asset_id = theme_rails_asset_id(theme, source)
+        if asset_id.blank?
+          source
+        else
+          source + "?#{asset_id}"
         end
+      end
 
-        def theme_stylesheet_tag(theme, source, options)
-          options = { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen",
-                      "href" => html_escape(theme_path_to_stylesheet(theme, source)) }.merge(options)
-          tag("link", options, false, false)
-        end
+      def theme_javascript_src_tag(theme, source, options)
+        options = {"type" => Mime::JS, "src" => theme_path_to_javascript(theme, source)}.merge(options)
+        content_tag("script", "", options)
+      end
 
-        def theme_compute_javascript_paths(theme, *args)
-          theme_expand_javascript_sources(theme, *args).collect do |source|
-            theme_compute_public_path(theme, source, theme.url + '/javascripts', 'js', false)
-          end
-        end
+      def theme_stylesheet_tag(theme, source, options)
+        options = {"rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen",
+                   "href" => html_escape(theme_path_to_stylesheet(theme, source))}.merge(options)
+        tag("link", options, false, false)
+      end
 
-        def theme_compute_stylesheet_paths(theme, *args)
-          theme_expand_stylesheet_sources(theme, *args).collect do |source|
-            theme_compute_public_path(theme, source, theme.url + '/stylesheets', 'css', false)
-          end
+      def theme_compute_javascript_paths(theme, *args)
+        theme_expand_javascript_sources(theme, *args).collect do |source|
+          theme_compute_public_path(theme, source, theme.url + '/javascripts', 'js', false)
         end
+      end
 
-        def theme_expand_javascript_sources(theme, sources, recursive = false)
-          if sources.include?(:all)
-            all_javascript_files = collect_asset_files(theme.path + '/javascripts', ('**' if recursive), '*.js').uniq
-          else
-            sources.flatten
-          end
+      def theme_compute_stylesheet_paths(theme, *args)
+        theme_expand_stylesheet_sources(theme, *args).collect do |source|
+          theme_compute_public_path(theme, source, theme.url + '/stylesheets', 'css', false)
         end
+      end
 
-        def theme_expand_stylesheet_sources(theme, sources, recursive)
-          if sources.first == :all
-            collect_asset_files(theme.path + '/stylesheets', ('**' if recursive), '*.css')
-          else
-            sources.flatten
-          end
+      def theme_expand_javascript_sources(theme, sources, recursive = false)
+        if sources.include?(:all)
+          all_javascript_files = collect_asset_files(theme.path + '/javascripts', ('**' if recursive), '*.js').uniq
+        else
+          sources.flatten
         end
+      end
 
-        def theme_write_asset_file_contents(theme, joined_asset_path, asset_paths)
-          FileUtils.mkdir_p(File.dirname(joined_asset_path))
-          File.open(joined_asset_path, "w+") do |cache|
-            cache.write(theme_join_asset_file_contents(theme, asset_paths))
-          end
-          mt = asset_paths.map { |p| File.mtime(theme_asset_file_path(theme, p)) }.max
-          File.utime(mt, mt, joined_asset_path)
+      def theme_expand_stylesheet_sources(theme, sources, recursive)
+        if sources.first == :all
+          collect_asset_files(theme.path + '/stylesheets', ('**' if recursive), '*.css')
+        else
+          sources.flatten
         end
+      end
 
-        def theme_join_asset_file_contents(theme, paths)
-          paths.collect { |path| File.read(theme_asset_file_path(theme, path)) }.join("\n\n")
+      def theme_write_asset_file_contents(theme, joined_asset_path, asset_paths)
+        FileUtils.mkdir_p(File.dirname(joined_asset_path))
+        File.open(joined_asset_path, "w+") do |cache|
+          cache.write(theme_join_asset_file_contents(theme, asset_paths))
         end
+        mt = asset_paths.map { |p| File.mtime(theme_asset_file_path(theme, p)) }.max
+        File.utime(mt, mt, joined_asset_path)
+      end
 
-        def theme_asset_file_path(theme, path)
-          File.join(Theme.root_dir, path.split('?').first)
-        end
-    end
-  end
-end
+      def theme_join_asset_file_contents(theme, paths)
+        paths.collect { |path| File.read(theme_asset_file_path(theme, path)) }.join("\n\n")
+      end
+
+      def theme_asset_file_path(theme, path)
+        File.join(Theme.root_dir, path.split('?').first)
+      end
+
+      def name_and_path_from_source(source, base_directory)
+        path = source.split('/')
+        name = path.last
+
+        directory = if path.length > 1
+                      #remove last element
+                      path.pop
+
+                      "#{base_directory}/#{path.join('/')}"
+                    else
+                      base_directory
+                    end
+
+        return name, directory
+      end
+
+    end # AssetTagHelper
+  end # Helpers
+end # ActionView