gluttonberg-core 2.6.4 → 3.0.0

data/lib/gluttonberg/mixin_manager.rb

@@ -0,0 +1,19 @@
+module Gluttonberg
+  module MixinManager
+    def self.load_mixins(klass)
+      mixins = Rails.configuration.model_mixins[klass.name]
+      unless mixins.blank?
+        mixins.each do |mixin|
+          klass.send(:include, mixin)
+        end
+      end
+    end
+
+    def self.register_mixin(klass_name, mixin)
+      mixins = Rails.configuration.model_mixins[klass_name]
+      mixins = [] if mixins.blank?
+      mixins.push(mixin)
+      Rails.configuration.model_mixins[klass_name] = mixins
+    end
+  end
+end

data/lib/gluttonberg/page_description.rb

@@ -1,12 +1,12 @@
 module Gluttonberg
-  # This defines a DSL for for creating page descriptions. Page descriptions 
+  # This defines a DSL for for creating page descriptions. Page descriptions
   # are used to declare the page archetypes in an installation.
-  # 
+  #
   # * Name & description
   # * Sections
   #   - Html
   #   - Plain text
-  #   - Image  
+  #   - Image
   # * Redirections
   # * Rewrites to controllers
   #
@@ -16,24 +16,27 @@ module Gluttonberg
     @@_categorised_descriptions = {}
     @@_description_names = {}
     @@_home_page    = nil
-    
-    
+
+
     attr_accessor :options
-    
+
     def initialize(name)
       @position = 0
       @options = {
         :name       => name,
         :home       => false,
-        :domain       => nil, 
+        :domain       => :default,
         :behaviour  => :default,
         :layout     => "public",
-        :view       => "default"
+        :view       => "default",
+        :page_options => {},
+        :group => nil,
+        :contributor_access => false
       }
       @sections = {}
       @@_descriptions[name] = self
     end
-    
+
     %w(label view layout limit description).each do |opt|
       class_eval %{
         def #{opt}(opt_value)
@@ -41,7 +44,7 @@ module Gluttonberg
         end
       }
     end
-    
+
     # This is a destructive method which removes all page definitions. Mainly
     # used for testing and debugging.
     def self.clear!
@@ -50,38 +53,35 @@ module Gluttonberg
       @@_description_names.clear
       @@_home_page = nil
     end
-    
+
     # This just loads the page_descriptions.rb file from the config dir.
-    #
     # The specified file should contain the various page descriptions.
     def self.setup
       path = File.join(Rails.root, "config", "page_descriptions.rb")
-      require path if File.exists?(path)
+      eval(File.read(path)) if File.exists?(path)
     end
-    
+
     def self.add(&blk)
       class_eval(&blk)
     end
-    
+
     # Define a page. This can be called directly, but is generally used inside
     # of an #add block.
     def self.page(name, &blk)
       new(name).instance_eval(&blk)
     end
-    
+
     # Returns the definition for a specific page description.
     def self.[](name)
-      # puts @@_descriptions
-      # puts @@_descriptions[name.to_s.downcase.to_sym].options
-      @@_descriptions[name.to_s.downcase.to_sym]
+      self.all[name.to_s.downcase.to_sym]
     end
-    
+
     # Returns the full list of page descriptions as a hash, keyed to each
     # description’s name.
     def self.all
       @@_descriptions
     end
-    
+
     # Returns all the descriptions with the matching behaviour in an array.
     def self.behaviour(name)
       @@_categorised_descriptions[name] ||= @@_descriptions.inject([]) do |memo, desc|
@@ -89,30 +89,30 @@ module Gluttonberg
         memo
       end
     end
-    
-    # Collects all the names of the descriptions which have the specified 
+
+    # Collects all the names of the descriptions which have the specified
     # behaviour.
     def self.names_for(name)
       @@_description_names[name] ||= self.behaviour(name).collect {|d| d[:name]}
     end
-    
+
     # Returns the value the specified option — label, description etc.
     def [](opt)
       @options[opt]
     end
-    
+
     # Returns the collection of sections defined for a page description.
     def sections
       @sections
     end
-    
+
     def contains_section?(sec_name , type_name)
       @sections.each do |name, section|
         return true if sec_name.to_s == name.to_s && section[:type].to_s == type_name.to_s
       end
       false
     end
-    
+
     # Set a description as the home page.
     def home(bool)
       @options[:home] = bool
@@ -124,34 +124,59 @@ module Gluttonberg
         @options.delete(:limit)
       end
     end
-    
+
+    def self.find_home_page_description_for_domain?(domain_name)
+      page_desc = PageDescription.all.find{|key , val|  val.home_for_domain?(domain_name) }
+      page_desc = page_desc.last unless page_desc.blank?
+      page_desc
+    end
+
     # Set a description as the home page.
     def domain(domain_name)
       @options[:domain] = domain_name
     end
-    
+
     # Sugar for defining a section.
     def section(name, &blk)
       new_section = Section.new(name , @position)
-      #new_section.position = @position
       new_section.instance_eval(&blk)
       @sections[name] = new_section
       @position += 1
     end
-    
+
+    def remove_section(name)
+      @sections.delete(name)
+    end
+
     def top_level_page?
-       @options[:name] == :top_level_page
+       name == :top_level_page
     end
-    
+
     def name
        @options[:name]
     end
-    
+
     def redirection_required?
-      @options[:behaviour] == :rewrite
+      @options[:behaviour] == :redirect
+    end
+
+    def page_options(opts = {})
+      @options[:page_options] = opts
+    end
+
+    def group(grp)
+      @options[:group] = grp
+    end
+
+    def contributor_access(access)
+      @options[:contributor_access] = access
     end
-    
-    # Configures the page to act as a rewrite to named route. This doesn’t 
+
+    def contributor_access?
+      @options[:contributor_access]
+    end
+
+    # Configures the page to act as a rewrite to named route. This doesn’t
     # work like a rewrite in the traditional sense, since it is intended to be
     # used to redirect requests to a controller. Becuase of this it can't rewrite
     # to a path, it needs to use a named route.
@@ -165,120 +190,65 @@ module Gluttonberg
     def rewrite_required?
       @options[:behaviour] == :rewrite
     end
-    
+
     # Returns the named route to be used when rewriting the request.
     def rewrite_route
       @rewrite_route
     end
-    
+
     # Declare this description as a redirect. The redirect type can be:
-    #
-    # :remote - A full url to another domain
-    # :block  - A block that will be evaluated and it’s return value will be 
-    #           used to handle the redirect
     # :path   - The path to redirect to, hey, simple!
-    # :page   - Allows the user to specify which other page they want to 
+    # :page   - Allows the user to specify which other page they want to
     #           redirect to.
-    def redirect_to(type = nil, opt = nil, &blk)
-      if block_given?
-        @redirect_block = blk
-        @redirect_type  = :block
-      else
-        @redirect_option  = opt if opt
-        @redirect_type    = type
-      end
+    def redirect_to(path_or_url)
+      @redirect_path_or_url  = path_or_url if path_or_url
       @options[:behaviour]  = :redirect
     end
-    
-    # Checks to see if the description has been defined as a redirect.
-    def redirect?
-      !@redirect_type.nil?
-    end
-    
+
     # Checks to see if this is home. Duh.
     def home?
       @options[:home]
     end
-    
+
     # Checks to see if this is home for a domain. Duh.
     def home_for_domain?(domain_name)
       if Rails.configuration.multisite == false
         home?
       else
-        @options[:home] && Rails.configuration.multisite[@options[:domain]] == domain_name
-      end  
+        home? && Rails.configuration.multisite[@options[:domain]] == domain_name
+      end
     end
-    
-    # Returns the path that this description wants to redirect to. It accepts 
-    # the current page — from which is extracts the redirect options — and the 
+
+    # Returns the path that this description wants to redirect to. It accepts
+    # the current page — from which is extracts the redirect options — and the
     # params for the current request.
-    def redirect_url(page, params)
-      case @redirect_type
-        when :remote
-          @redirect_option
-        when :block
-          @redirect_block.call(page, params)
-        when :path
-          Router.localized_url(redirect_value(page, params), params)
-        when :page
-          path_to_page(page, params)
-      end
+    def redirect_url(page, params={})
+      @redirect_path_or_url
     end
-    
+
     private
-    
-    # This method is used in conjunction with #redirect_url when a redirect to
-    # another page has been specified. It finds and examines the specified page 
-    # to figure out what it’s path is.
-    def path_to_page(page, params)
-      localization = PageLocalization.find(:first,
-        :conditions => {
-          :page_id  => page.redirect_target_id,
-          :locale   => params[:locale]
-        }  
-      )
-      raise ActiveRecord::RecordNotFound if localization.blank?
-      localization.path
-    end
-    
-    # This class is used to define the sections of content in a page 
+
+    # This class is used to define the sections of content in a page
     # description. This class should never be instantiated direction, instead
     # sections should be declared in the description DSL.
     class Section
-      
-      #attr_accessor :position
-      
       def initialize(name , pos)
         @options = {:name => name, :limit => 1 , :position => pos}
         @custom_config = {}
       end
-      
-      %w(type limit label).each do |opt|
+
+      %w(type limit label select_options_data select_options_default_value).each do |opt|
         class_eval %{
           def #{opt}(opt_value)
             @options[:#{opt}] = opt_value
           end
         }
       end
-      
-      # Stores additional configuration options, which can be used by arbitrary
-      # code. Generally however it is intended to be used to provide 
-      # configuration for the particular content class associated with this 
-      # section.
-      def configure(opts)
-        @custom_config ||= {}
-        @custom_config.merge!(opts)
-      end
-      
+
       # Returns the value for the specified option — name, description etc.
       def [](opt)
         @options[opt]
       end
-      
-      # Returns the custom configuration as a hash.
-      def config
-        @custom_config
-      end
     end # Section
   end # PageDescription
 end # Gluttonberg

data/lib/gluttonberg/random_string_generator.rb

@@ -0,0 +1,31 @@
+module Gluttonberg
+  class RandomStringGenerator
+    SIMILAR_CHARS = %w{ i I 1 0 O o 5 S s }
+    def self.generate(length=10)
+      newpass  = self.generate_lowercase_string(1)
+      newpass += self.generate_uppercase_string(length-2)
+      newpass += self.generate_number_string(1)
+      newpass
+    end
+
+    private
+      def self.generate_lowercase_string(length)
+        self.generate_string_for(("a".."z").to_a, length)
+      end
+
+      def self.generate_uppercase_string(length)
+        self.generate_string_for(("A".."Z").to_a, length)
+      end
+
+      def self.generate_number_string(length)
+        self.generate_string_for(("0".."9").to_a, length)
+      end
+
+      def self.generate_string_for(character_set, length)
+        newstr = ""
+        character_set.delete_if {|x| SIMILAR_CHARS.include? x}
+        1.upto(length) { |i| newstr << character_set[rand(character_set.size-1)] }
+        newstr
+      end
+  end
+end

data/lib/gluttonberg/record_history.rb

@@ -6,9 +6,7 @@ module Gluttonberg
     end
 
     module ActionController
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
+      extend ActiveSupport::Concern
 
 
       module ClassMethods
@@ -31,6 +29,10 @@ module Gluttonberg
           unless object.blank?
             if object.new_record?
             else
+              if object.respond_to?(:user_id) # record creator user id
+                object.user_id = current_user.id
+                object.save
+              end
               Gluttonberg::Feed.log(current_user, object ,object_title , "created")
             end
           end
@@ -80,12 +82,8 @@ module Gluttonberg
             end
           end
         end
-
       end #ControllerHelperClassMethods
-
-
     end
-
   end #RecordHistory
 end #Gluttonberg
 

data/lib/gluttonberg/tasks/asset.rake

@@ -5,9 +5,9 @@ ASSET_LIBRARY_BASE_DIR = File.join(File.dirname(__FILE__), "../..")
 namespace :gluttonberg do
   namespace :library do
 
-    desc "Try and generate thumbnails for all assets"
+    desc "Regenerate all thumbnails for all assets"
     task :create_thumbnails => :environment do
-      category = Gluttonberg::AssetCategory.find( :first , :conditions =>{  :name => "image" } )
+      category = Gluttonberg::AssetCategory.where(:name => "image").first
       if category
         assets = category.assets
         assets.each do |asset|
@@ -15,15 +15,23 @@ namespace :gluttonberg do
           if !File.exist?(asset.tmp_location_on_disk) && !File.exist?(asset.tmp_original_file_on_disk)
             asset.download_asset_to_tmp_file
           end
-          # asset.generate_image_thumb
-          # asset.generate_proper_resolution
-          # asset.save
-          Gluttonberg::Library::Processor::Image.process(asset)
+          Gluttonberg::Library::Processor::Image.process(asset, false)
           asset.remove_file_from_tmp_storage
         end
       end
     end
 
+    desc "Regenerate all thumbnails for all assets using sidekiq"
+    task :create_thumbnails_delayed => :environment do
+      category = Gluttonberg::AssetCategory.where(:name => "image").first
+      if category
+        assets = category.assets
+        assets.each do |asset|
+          PhotoJob.perform_async(asset.id)
+        end
+      end
+    end
+
     desc "Rebuild AssetType information and reassociate with existing Assets"
     task :bootstrap => :environment do
       Gluttonberg::Library.bootstrap
@@ -51,12 +59,15 @@ namespace :gluttonberg do
 
     desc "Migrate assets from public/user_assets folder to S3"
     task :migrate_assets_to_s3 => :environment do
+      class S3Storage
+        include Gluttonberg::Library::Storage::S3
+      end
       Dir.entries("public/user_assets").each do |asset_folder|
         if !asset_folder.include?(".DS_Store") && File.directory?("public/user_assets/" + asset_folder)
           Dir.entries("public/user_assets/"+asset_folder).each do |asset_file|
             if !asset_file.include?(".DS_Store") && !File.directory?("public/user_assets/" + asset_folder+"/"+asset_file)
               begin
-                Gluttonberg::Library::Storage::S3::ClassMethods.migrate_file_to_s3(asset_folder , asset_file)
+                S3Storage.migrate_file_to_s3(asset_folder , asset_file)
               rescue => e
                 puts "Error: #{e.message}"
               end
@@ -67,4 +78,4 @@ namespace :gluttonberg do
     end
 
   end
-end
+end