gluttonberg-core 2.5.5 → 2.5.6

data/app/models/gluttonberg/setting.rb

@@ -2,6 +2,7 @@ module Gluttonberg
  class Setting  < ActiveRecord::Base
    self.table_name = "gb_settings"
    after_save  :update_settings_in_config
+
    before_destroy :destroy_cache
    attr_accessible :name, :value, :values_list, :help, :category, :row , :delete_able , :enabled
     def self.generate_or_update_settings(settings={})
@@ -40,24 +41,29 @@ module Gluttonberg
         :s3_access_key => ["" , 15 , "S3 Access Key"],
         :s3_server_url => ["" , 16 , "S3 Server URL"],
         :s3_bucket => ["" , 17 , "S3 Bucket Name"],
-        :audio_assets => ["" , 18 , "Audio settings" , "Enable;Disable"]
+        :audio_assets => ["" , 18 , "Audio settings" , "Enable;Disable"],
+        :comment_blacklist => ["" , 19 , "When a comment contains any of these words in its comment, Author Name, Author website, Author e-mail, it will be marked as spam. It will match inside words, so \"able\" will match \"comparable\". Please separate words with a comma."],
+        :comment_email_as_spam => ["Yes" , 20 , "Do you want to mark those comments as spam which only contains emails and urls?" , "Yes;No" ],
+        :comment_number_of_emails_allowed => ["2" , 21 , "How many email addresses should a comment include to be marked as spam?" ],
+        :comment_number_of_urls_allowed => ["2" , 21 , "How many URLs should a comment include to be marked as spam?" ]
       }
       self.generate_or_update_settings(settings)
     end
 
+    def self.has_deletable_settings?
+      self.where(:delete_able => true).count > 0
+    end
+
     def dropdown_required?
       !values_list.blank?
     end
 
-
     def parsed_values_list_for_dropdown
       unless values_list.blank?
         values_list.split(";")
       end
     end
 
-
-
     def self.get_setting(key)
       if Gluttonberg::Setting.table_exists?
         data  = nil
@@ -80,7 +86,7 @@ module Gluttonberg
 
     def self.update_settings(settings={})
       settings.each do |key , val |
-        obj = self.first(:name=> key)
+        obj = self.where(:name=> key).first
         obj.value = val
         obj.save!
       end

data/app/views/gluttonberg/admin/asset_library/assets/_browser_root.html.haml

@@ -1,3 +1,17 @@
+:css
+  .tab-content > .active, .pill-content > .active{
+    padding: 10px;
+  }
+
+  .tab-content > .active .thumbnails .span3{
+    width: 150px;
+  }
+  .tab-content > .active .thumbnails .span3 .thumbnail img{
+    min-height: 25px;
+  }
+  .tab-content > .active .thumbnails .thumbnail{
+    overflow-x: hidden;
+  }
 = image_tag("/assets/gb_spinner.gif" , :id => "progress_ajax_upload" , :style => "display:none")
 
 %ul.nav.nav-tabs#asset_tabs
@@ -20,11 +34,12 @@
       %ul.assetList
         %li
     - else
-      = render :partial => "gluttonberg/admin/shared/asset_panel.html" , :locals => {:assets => @assets}
+      = render :partial => "gluttonberg/admin/shared/asset_panel" , :locals => {:assets => @assets}  , :formats => [:html]
 
   #collections.tab-pane
     - unless @collections.empty?
       .accordion#accordion_for_collections
+        - first_open = false
         - for collection in @collections
           - unless @category.blank? || @category.asset_type_ids.blank?
             - assets = collection.assets.where({:asset_type_id => @category.asset_type_ids })
@@ -35,9 +50,11 @@
               .accordion-heading
                 %a{ :class=>"accordion-toggle no-ajax" , "data-toggle" => "collapse" , "data-parent" => "#accordion_for_collections" , "data-target" => "#collection-#{collection.id}", "href" => "#collection-#{collection.id}"}
                   = "#{collection.name} ( #{pluralize(assets.length,'asset')} )"
-              .accordion-body{:id => "collection-#{collection.id}" , :class => "collapse  in"}
+              .accordion-body{:id => "collection-#{collection.id}" , :class => "collapse #{first_open ? '' : 'in' } " }
                 .accordion-inner
                   = render :partial => "gluttonberg/admin/shared/asset_panel.html" , :locals => {:assets => assets}
+                  .clear
+              - first_open = true
 
   #upload.tab-pane
     - @asset  = Gluttonberg::Asset.new
@@ -57,4 +74,4 @@
     #search_tab_results
 
 :javascript
-  $(".collapse").collapse({parent: "#accordion_for_collections"})
+  //$(".collapse").collapse({parent: "#accordion_for_collections"})

data/app/views/gluttonberg/admin/asset_library/assets/search.json.haml

@@ -1,2 +1,2 @@
 - @assets = @search_assets
-= { :name => "Search results for '#{params[:asset_query]}'" , :backURL  => admin_asset_browser_url+"?no_frame=false", :markup   => asset_panel(@search_assets , params[:category] , "search" ) }.to_json.html_safe   
+= { :name => "Search results for '#{params[:asset_query]}'" , :backURL  => admin_asset_browser_url+"?no_frame=false", :markup   => asset_panel(@search_assets , params[:category] , "search" ) }.to_json.html_safe

data/app/views/gluttonberg/admin/content/comments/index.html.haml

@@ -1,5 +1,4 @@
 - @page_title = "Comments"
-- @page_title = "#{link_to @blog.name, admin_blog_articles_path(@blog)} > #{@article.title} Comments".html_safe
 
 .row-fluid
   = render :partial => "/gluttonberg/admin/content/main/sidebar"
@@ -9,6 +8,14 @@
         %h1
           = @page_title
       .subnav
+        - if action_name != "index"
+          = sub_nav do
+            = nav_link("Pending (#{Gluttonberg::Comment.pending_comments_count})", admin_pending_comments_path)
+            = nav_link("Approved (#{Gluttonberg::Comment.approved_comments_count})", admin_approved_comments_path)
+            = nav_link("Rejected (#{Gluttonberg::Comment.rejected_comments_count})", admin_rejected_comments_path)
+            = nav_link("Spam (#{Gluttonberg::Comment.spam_comments_count})", admin_spam_comments_path)
+
+
       - if @comments.empty?
         %p.empty No Comments
       - else
@@ -26,15 +33,34 @@
           %tbody
             - @comments.each do |comment|
               %tr
-                %td{:style => "width:10%;"}
+                %td{:style => "width:15%;"}
                   = comment.author_name
-                %td{:style => "width:40%;"}
+                %td{:style => "width:50%;"}
                   = simple_format(comment.body)
-                %td{:style => "width:17%;"}
+                %td{:style => "width:10%;"}
                   = comment.created_at
-                %td.controls{:style => "width:35%;"}
-                  - if comment.moderation_required && can?(:moderate , Gluttonberg::Comment)
-                    = link_to("Approve", moderation_admin_blog_article_comment_path(@blog, @article, comment, :moderation => "approve"), :class => "btn")
-                    = link_to( "Disapprove", moderation_admin_blog_article_comment_path(@blog, @article, comment, :moderation => "disapprove") , :class => "btn")
-                    = link_to("Delete", delete_admin_blog_article_comment_path(@blog, @article, comment), :class => "btn btn-danger")
-        = will_paginate(@comments)
+                %td.controls{:style => "width:20%;"}
+                  .btn-group
+                    %a{ :class => "btn dropdown-toggle" , "data-toggle" => "dropdown" , :href => "#"}
+                      Actions
+                      %span.caret
+                    %ul.dropdown-menu
+
+                      - if comment.moderation_required && can?(:moderate , Gluttonberg::Comment)
+                        %li= link_to("Approve", admin_comment_moderation_path(comment, :moderation => "approve"), :class => "")
+                        %li= link_to( "Reject", admin_comment_moderation_path(comment, :moderation => "disapprove") , :class => "")
+                        %li= link_to( "Block comments from this author", admin_block_comment_author_path(comment) , :class => "")
+                      - elsif can?(:moderate , Gluttonberg::Comment)
+                        - if comment.approved == true
+                          %li= link_to( "Reject", admin_comment_moderation_path(comment, :moderation => "disapprove") , :class => "")
+                        - else
+                          %li= link_to("Approve", admin_comment_moderation_path(comment, :moderation => "approve"), :class => "")
+                      %li.divider
+                      %li.danger= link_to("Delete", admin_comment_delete_path(comment), :class => "")
+        = will_paginate(@comments)
+
+        - if action_name == "pending"
+          %p
+            If you have recently updated spam settings then please click on following link for re-assessing all pending comments with new spam settings.
+
+          = link_to "Detect spam in all pending comments" , admin_spam_detection_for_all_pending_comments_path , :class => "btn btn-info"

data/app/views/gluttonberg/admin/content/main/_sidebar.html.haml

@@ -5,12 +5,15 @@
         Content
       %li
         = active_link_to("Pages", admin_pages_path, :title => "Pages", :class => "pages")
-      - if Gluttonberg::Blog.table_exists?  
+      - if Gluttonberg::Blog.table_exists?
         %li
           = active_link_to("Blogs", admin_blogs_path, :title => "Blogs", :class => "blog")
+        %li
+          = active_link_to("Comments", admin_pending_comments_path, :title => "Comments", :class => "comments", :active => /^\/admin\/comments/)
+
       - if Rails.configuration.enable_gallery == true
-        %li  
-          = active_link_to("Photo Galleries", admin_galleries_path, :title => "Photo galleries", :class => "gallery")  
+        %li
+          = active_link_to("Photo Galleries", admin_galleries_path, :title => "Photo galleries", :class => "gallery")
       - for entry in Gluttonberg::Components.nav_entries
         -if entry[3].blank? || entry[3]==false || (entry[3]==true && session.user.is_super_admin)
           %li

data/app/views/gluttonberg/admin/main/index.html.haml

@@ -22,13 +22,13 @@
             %p
               %strong Discussion
             %p
-              = "#{Gluttonberg::Comment.count} Comments"
+              = link_to "#{Gluttonberg::Comment.all_pending.count} Pending" , admin_pending_comments_path
             %p
-              = "#{Gluttonberg::Comment.all_approved.count} Approved"
+              = link_to "#{Gluttonberg::Comment.all_approved.count} Approved" , admin_approved_comments_path
             %p
-              = "#{Gluttonberg::Comment.all_pending.count} Pending"
+              = link_to "#{Gluttonberg::Comment.all_rejected.count} Rejected" , admin_rejected_comments_path
             %p
-              = "#{Gluttonberg::Comment.all_rejected.count} Spam"
+              = link_to "#{Gluttonberg::Comment.all_spam.count} Spam" , admin_spam_comments_path
   .span9
     %h1
       = website_title

data/app/views/gluttonberg/admin/settings/generic_settings/index.html.haml

@@ -18,7 +18,8 @@
           %tr
             %th Name
             %th Value (Click to edit)
-            %th.controls Controls
+            - if Gluttonberg::Setting.has_deletable_settings?
+              %th.controls Controls
         %tbody
           - i = 1
           %tr{ :class => ""}
@@ -26,15 +27,17 @@
               Select Home Page
             %td.second_column
               = select_tag :home , options_from_collection_for_select(@pages, "id", "name" , selected = @current_home_page_id.to_s )  ,  { :include_blank => true , :class => "home_page_setting_dropdown"  , :rel => admin_page_update_home_path(1)  }
-
-            %td.controls
               = image_tag("/assets/gb_spinner.gif" , :id => "progress_home_page" , :style => "display:none")
           - for setting in @settings
             - i += 1
             %tr{ :class => "#{cycle("even", "odd")}"}
-              %td.first_column{ :style => 'width:20%' }
+              %td.first_column{ :style => 'width:220px' }
                 = setting.user_friendly_name
               %td.second_column
+                - unless setting.help.blank?
+                  %i{ :style => "font-size: 90%;" }= setting.help
+                  %span{:style => "height: 10px; display: block;"}
+
                 - if setting.dropdown_required?
                   = select_tag(:value , options_for_select( setting.parsed_values_list_for_dropdown , setting.value  ) , { :include_blank => true , :data_id => setting.id  , :rel => admin_generic_setting_path( setting) , :class => "setting_dropdown"   })
                 - elsif setting.name == "fb_icon"
@@ -46,8 +49,9 @@
                   = gb_editable_field setting, :value , :update_url => admin_generic_setting_path( setting)
 
                 = image_tag("/assets/gb_spinner.gif" , :id => "progress_#{setting.id}" , :style => "display:none")
-              %td.controls
-                - if setting.delete_able
-                  = link_to 'Delete', delete_admin_generic_setting_path(setting)
+              - if Gluttonberg::Setting.has_deletable_settings?
+                %td.controls
+                  - if setting.delete_able
+                    = link_to 'Delete', delete_admin_generic_setting_path(setting)
 
 

data/config/routes.rb

@@ -22,6 +22,16 @@ Rails.application.routes.draw do
         end
 
         get "pages_list_for_tinymce" => "pages#pages_list_for_tinymce" , :as => :pages_list_for_tinymce
+        get "/comments/spam_detection_for_all_pending" => "comments#spam_detection_for_all_pending" , :as => :spam_detection_for_all_pending_comments
+        get "/comments/pending" => "comments#pending" , :as => :pending_comments
+        get "/comments/spam" => "comments#spam" , :as => :spam_comments
+        get "/comments/approved" => "comments#approved" , :as => :approved_comments
+        get "/comments/rejected" => "comments#rejected" , :as => :rejected_comments
+        get "/comments/moderation/:id" => "comments#moderation" , :as => :comment_moderation
+        get "/comments/delete/:id" => "comments#delete" , :as => :comment_delete
+        delete "/comments/destroy/:id" => "comments#destroy" , :as => :comment_destroy
+        get "/comments/block_comment_author/:id" => "comments#block_comment_author" , :as => :block_comment_author
+
         resources :blogs do
           get 'delete', :on => :member
           resources :articles do

data/db/migrate/20130201025800_spam_flag_for_comments.rb

@@ -0,0 +1,6 @@
+class SpamFlagForComments < ActiveRecord::Migration
+  def change
+    add_column :gb_comments , :spam , :boolean , :default =>  false
+    add_column :gb_comments , :spam_score , :float
+  end
+end

data/lib/engine.rb

@@ -20,9 +20,10 @@ module Gluttonberg
     config.identify_locale = :prefix
     config.host_name = "localhost:3000"
     config.user_roles = [] # User model always concat following two roles ["superadmin" , "admin"]
-    config.honeypot_field_name = "gluttonberg_honeypot"
+    config.honeypot_field_name = "our_newly_weekly_series"
     config.custom_css_for_cms = false
     config.custom_js_for_cms = false
+    config.asset_storage = :filesystem
     #engines which depends on gluttonberg-core can
     #use this to provide additional processor for assets
     #in first stage I am going to use it with Tv
@@ -87,7 +88,7 @@ module Gluttonberg
     end
 
     initializer "setup gluttonberg asset library" do |app|
-      Gluttonberg::Library.setup
+      #Gluttonberg::Library.setup
       require "acts-as-taggable-on"
       if ::ActsAsTaggableOn::Tag.attribute_names.include?("slug") == true
         ::ActsAsTaggableOn::Tag.send(:include , Gluttonberg::Content::SlugManagement)

data/lib/generators/gluttonberg/installer/installer_generator.rb

@@ -1,13 +1,13 @@
 require 'rails/generators'
-require 'rails/generators/migration'    
+require 'rails/generators/migration'
 
 class Gluttonberg::InstallerGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-  
+
   def self.source_root
     @source_root ||= File.join(File.dirname(__FILE__), 'templates')
   end
-  
+
   def self.next_migration_number(dirname)
     if ActiveRecord::Base.timestamped_migrations
       Time.now.utc.strftime("%Y%m%d%H%M%S")
@@ -15,76 +15,77 @@ class Gluttonberg::InstallerGenerator < Rails::Generators::Base
       "%.3d" % (current_migration_number(dirname) + 1)
     end
   end
-  
+
   def create_delayed_job_script_file
     template 'delayed_job_script', 'script/delayed_job'
     chmod 'script/delayed_job', 0755
   end
-  
+
   def create_migration_file
     migration_template 'gluttonberg_migration.rb', 'db/migrate/gluttonberg_migration.rb'
+    rake("gluttonberg_engine:install:migrations")
   end
-  
+
   def create_page_descriptions_file
     copy_file 'page_descriptions.rb', 'config/page_descriptions.rb'
   end
-  
+
   def create_sitemaprb_file
     copy_file 'sitemap.rb', 'config/sitemap.rb'
   end
-  
+
   def create_default_public_layout
     #create pages folder
     path = File.join(Rails.root, "app", "views" , "pages" )
     FileUtils.mkdir(path) unless File.exists?(path)
     #copy layout into host app
-    template "public.html.haml", File.join('app/views/layouts', "public.html.haml")    
+    template "public.html.haml", File.join('app/views/layouts', "public.html.haml")
   end
-  
+
   def run_migration
     rake("db:migrate")
   end
-  
+
   def bootstrap_data
     rake("gluttonberg:library:bootstrap")
     rake("gluttonberg:generate_default_locale")
     rake("gluttonberg:generate_or_update_default_settings")
   end
-  
+
   def localization_config
-    
+
     application %{
      # Gluttonberg Related config
-     
-     
-     # config.cms_based_public_css = false   
-     # config.custom_js_for_cms = false 
-     config.localize = false  
+
+
+     # config.cms_based_public_css = false
+     # config.custom_js_for_cms = false
+     config.localize = false
      # By Default gluttonberg applications are localized. If you do not want localized application then uncomment following line.
-     
-     # By default membership system is disabled. uncommenting following line make it enabled. 
+
+     # By default membership system is disabled. uncommenting following line make it enabled.
      # if email_verification is true then newly registered members have to verify their email address
      # config.enable_members = {:email_verification => true}
-    
-     # By default photo gallery is not visible in backend. 
-     # config.enable_gallery = true  
-       
+
+     # By default photo gallery is not visible in backend.
+     # config.enable_gallery = true
+
      # You can customize your thumbnails. For geometry values please read ImageMagick documentation
-     config.thumbnails = { 
-       :jwysiwyg_image => {:label => "Thumb for jwysiwyg", :filename => "_jwysiwyg_image", :geometry => "250x200"} 
+     config.thumbnails = {
+       :jwysiwyg_image => {:label => "Thumb for jwysiwyg", :filename => "_jwysiwyg_image", :geometry => "250x200"}
      }
-     
-      
+
+
     }
-    
+
   end
-  
+
   def add_memory_store_config_in_production
     data = []
     file_path = File.join(Rails.root, "config", "environments" , "production.rb" )
     file = File.new(file_path)
 
-    file.each_line do |line| 
+    file.each_line do |line|
       data << line
     end
 
@@ -100,6 +101,6 @@ class Gluttonberg::InstallerGenerator < Rails::Generators::Base
     file.puts(data.join(""))
     file.close
   end
-    
+
 end
 

data/lib/gluttonberg/content/block.rb

@@ -83,6 +83,8 @@ module Gluttonberg
           localized_model.attr_accessible :text, :parent, :page_localization
           localized_model.is_versioned
 
+          localized_model.clean_html([:text])
+
         end
 
         # Does this class have an associated localization class.

data/lib/gluttonberg/content/clean_html.rb

@@ -1,33 +1,35 @@
 module Gluttonberg
   module Content
-    
+
     module CleanHtml
-      
+
       def self.setup
         ::ActiveRecord::Base.send :include, Gluttonberg::Content::CleanHtml
       end
-      
+
       def self.included(klass)
         klass.class_eval do
           extend  ClassMethods
-          include InstanceMethods
-          before_validation :clean_all_html_content
-          
-          cattr_accessor :html_columns_list
         end
       end
-      
+
       module ClassMethods
         def clean_html(cols)
-          self.html_columns_list = cols 
+          class_eval <<-EOV
+            include InstanceMethods
+            before_validation :clean_all_html_content
+            cattr_accessor :html_columns_list
+            self.html_columns_list = cols
+
+          EOV
         end
-        
+
         def clean_tags(str)
           if !str.blank? && str.instance_of?(String)
             str = self.removeStyle(str)
             str = self.removeMetaTag(str)
             str = removeEmptyTag(str)
-          end  
+          end
           str
         end
 
@@ -58,17 +60,17 @@ module Gluttonberg
           str
         end
       end
-      
+
       module InstanceMethods
         def clean_all_html_content
           unless self.class.html_columns_list.blank?
             self.class.html_columns_list.each do |field|
               write_attribute(field , self.class.clean_tags(read_attribute(field)) )
             end
-          end  
+          end
         end
       end
-      
+
     end
   end
 end