gluttonberg-core 2.6.4 → 3.0.0

data/lib/gluttonberg/extensions.rb

@@ -2,3 +2,4 @@ extensions = Pathname(__FILE__).dirname.expand_path
 
 require File.join(extensions, "extensions", "array")
 require File.join(extensions, "extensions", "kernel")
+require File.join(extensions, "extensions", "string")

data/lib/gluttonberg/extensions/string.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+class String
+  if !respond_to?(:sluglize)
+    # accepts a string and return slug string
+    #if you're changing this regex, make sure to change the one in /javascripts/slug_management.js too
+    # utf-8 special chars are fixed for new ruby 1.9.2
+    def sluglize
+      new_slug = self
+      unless new_slug.blank?
+        new_slug = new_slug.to_s.downcase.gsub(/\s/, '-').gsub(/[\!\*'"″′‟‛„‚”“”˝\(\)\;\:\.\@\&\=\+\$\,\/?\%\#\[\]]/, '')
+        new_slug = new_slug.gsub(/_$/,'-') # replace underscores with hyphen
+        while new_slug.include?("--")
+          new_slug = new_slug.gsub('--','-') # remove consective hyphen
+        end
+        new_slug = new_slug.gsub(/-$/,'') # remove trailing hyphen
+      end
+      new_slug
+    end
+  end
+end

data/lib/gluttonberg/gb_file.rb

@@ -0,0 +1,30 @@
+module Gluttonberg
+  # i made this class for providing extra methods in file class.
+  # I am using it for making assets from zip folder.
+  # keep in mind when we upload asset from browser, browser injects three extra attributes (that are given in MyFile class)
+  # but we are adding assets from file, i am injecting extra attributes manually. because asset library assumes that file has three extra attributes
+
+  class GbFile < File
+    attr_accessor :original_filename , :content_type , :size
+
+    def self.init(filename)
+      file = self.new(filename)
+      file.original_filename = filename
+      file.content_type = find_content_type(filename)
+      file.size = File.size(filename)
+      file
+    end
+
+    def tempfile
+      self
+    end
+    def self.find_content_type(filename)
+      begin
+       MIME::Types.type_for(filename).first.content_type
+      rescue
+        ""
+      end
+    end
+
+  end
+end

data/lib/gluttonberg/helpers/form_builder.rb

@@ -1,57 +1,110 @@
 module Gluttonberg
-    class FormBuilder < ActionView::Helpers::FormBuilder
-      include ActionView::Helpers::TagHelper
+  module Helpers
+    module FormBuilder
+      include ActionView::Helpers
+      def publisable_dropdown
+        ActiveSupport::Deprecation.warn "f.publisable_dropdown is deprecated and will be removed in Gluttonberg 4.0, use submit_and_publish_controls(form, object, can_publish, schedule_field=true, revisions=true, opts={}) instead."
+        object = self.object
+        val = object.state
+        if val == "not_ready"
+          val = "ready"
+        end
+        @@workflow_states = [  ['Published' , "published" ] ,[ 'Draft' , 'ready' ] , [ "Archived" , 'archived' ]  ]
+        object.published_at = Time.zone.now if object.published_at.blank?
+        html = "<fieldset id='publish_meta'><div class='publishing_block' > "
+        html += select( :state, options_for_select(@@workflow_states , val), {} , :class => "publishing_state" )
+        html += datetime_field("published_at")
+        html += "</div></fieldset>"
 
-      def text_field(attribute, options={})
-        box_class = add_class!('text', options)
-        field(super, attribute, options, box_class)
+        html.html_safe
       end
 
-      def text_area(attribute, options={})
-        box_class = add_class!('text', options)
-        field(super, attribute, options, box_class)
+      def publishing_schedule(schedule_field)
+        object = self.object
+        object.published_at = Time.zone.now if object.published_at.blank?
+        html = ""
+        html += schedule_field ? datetime_field("published_at") : hidden_field("published_at")
+        html.html_safe
       end
 
-      def radio_button(attribute, value, label, options = {})
-        add_class!('radio', options)
-        label_for = "#{object_name}_#{attribute}_#{value}"
-        super(attribute, value, options) + label(attribute, :label => label, :class => 'inline', :for => label_for)
-      end
+      def datetime_field(field_name,date_field_html_opts = {},time_field_html_opts = {})
+        date_field_html_opts["data-datepicker"] = "bsdatepicker"
+        unique_field_name = "#{field_name}_#{Gluttonberg::Member.generateRandomString}"
+        date_field_html_opts[:onblur] = "checkDateFormat(this,'.#{unique_field_name}_error');combine_datetime('#{unique_field_name}');"
+
+        date_field_html_opts[:class] = "" if date_field_html_opts[:class].blank?
+        date_field_html_opts[:class] += " small span2 datefield"
+
+        time_field_html_opts[:class] = "" if time_field_html_opts[:class].blank?
+        time_field_html_opts[:class] += " small span2 timefield"
+
+        time_field_html_opts[:onblur] = "checkTimeFormat(this,'.#{unique_field_name}_error');combine_datetime('#{unique_field_name}');"
 
-      def select(attribute, choices, options={})
-        box_class = add_class!('text', options)
-        field(super, attribute, options, box_class)
+        date = time = ""
+
+        unless self.object.send(field_name).blank?
+          date = self.object.send(field_name).strftime("%d/%m/%Y")
+          time = self.object.send(field_name).strftime("%I:%M %p")
+        end
+
+        _render "/gluttonberg/admin/shared/datetime_field", {
+          :date_field_html_opts => date_field_html_opts,
+          :time_field_html_opts => time_field_html_opts,
+          :date => date,
+          :time => time,
+          :form => self,
+          :unique_field_name => unique_field_name,
+          :field_name => field_name
+        }
       end
 
-      private
 
-      def label(method, options = {})
-        if options.has_key?(:label)
-          super(method, options.delete(:label), options)
+      # Assets
+      def asset_browser( field_name , opts = {} )
+        opts[:asset_id] = asset_id = self.object.send(field_name.to_s)
+        filter = opts[:filter] || "all"
+
+
+        opts[:id] = "#{field_name}_#{asset_id}" if opts[:id].blank?
+        asset = if asset_id.blank?
+          nil
         else
-          super(method, nil, options)
+          Gluttonberg::Asset.where(:id => asset_id).first
         end
+        locals = {
+          :opts => opts,
+          :asset => asset,
+          :field_name => field_name,
+          :form => self
+        }
+        _render("/gluttonberg/admin/asset_library/shared/asset_browser", locals)
       end
 
-      def add_class!(klass, options)
-        classes = [klass]
-        classes << options[:class] if options.has_key?(:class)
-        if options.has_key? :size
-          parts = options[:size].split('.')
-          classes << parts.last
-          options[:class] = classes.join(' ')
-          parts.first
-        else
-          options[:class] = classes.join(' ')
-          nil
+      def asset_tag(asset , thumbnail_type = nil)
+        unless asset.blank?
+          path = thumbnail_type.blank? ? asset.url : asset.url_for(thumbnail_type)
+          tag(:img , :class => asset.name , :alt => asset.name , :src => path)
         end
       end
 
-      def field(field, attribute, options, size = nil)
-        content = label(attribute, options) + field
-        klass = size ? 'field ' + size : 'field'
-        content_tag(:p, content, :class => klass)
+      def clear_asset( field_name , opts = {} )
+        asset_id = self.object.send(field_name.to_s)
+        opts[:id] = "#{field_name}_#{asset_id}" if opts[:id].blank?
+        view = ActionView::Base.new(ActionController::Base.view_paths)
+        view.extend ApplicationHelper
+        view.clear_asset_tag(field_name, opts)
       end
-    end # FormBuilder
-end # Gluttonberg
 
+      private
+
+        def _render(partial, assigns)
+          view = ActionView::Base.new(ActionController::Base.view_paths, assigns)
+          view.extend ApplicationHelper
+          view.render(:partial => partial, :locals => assigns)
+        end
+
+    end #FormBuilder
+
+    ActionView::Helpers::FormBuilder.send(:include , Gluttonberg::Helpers::FormBuilder)
+  end
+end

data/lib/gluttonberg/library.rb

@@ -4,6 +4,7 @@ require File.join(library, "library", "quick_magick")
 require File.join(library, "library", "storage")
 require File.join(library, "library", "processor")
 require File.join(library, "library", "config")
+require File.join(library, "library", "default_asset_types")
 
 module Gluttonberg
   # The library module encapsulates the few bits of functionality that lives
@@ -38,13 +39,16 @@ module Gluttonberg
     end
 
     def self.tmp_root
-      @@tmp_assets_root
+      if ::Rails.env == "test"
+        @@test_assets_root
+      else
+        @@tmp_assets_root
+      end
     end
 
     # This method is mainly for administrative purposes. It will rebuild the
     # table of asset types, then recategorise each asset.
     def self.rebuild
-      Asset.clear_all_asset_types
       flush_asset_types
       build_default_asset_types
       Asset.refresh_all_asset_types
@@ -58,94 +62,9 @@ module Gluttonberg
 
     # Adds a the inbuilt asset types to the database.
     def self.build_default_asset_types
-      begin
-        # ensure that all the categories exist
-        AssetCategory.build_defaults
-        ensure_type('Unknown Image', 'image', AssetCategory.image_category)
-        ensure_type('Unknown Video', 'video', AssetCategory.video_category)
-        ensure_type('Unknown Audio', 'audio', AssetCategory.audio_category)
-        ensure_type('Unknown File',   'multi-part model message unknown', AssetCategory.uncategorised_category)
-
-        ensure_type('Jpeg Image', 'image/jpeg image/pjpeg', AssetCategory.image_category)
-        ensure_type('Gif Image', 'image/gif', AssetCategory.image_category)
-        ensure_type('Png Image', 'image/png', AssetCategory.image_category)
-        ensure_type('Tiff Image', 'image/tiff', AssetCategory.image_category)
-        ensure_type('Adobe Photoshop Image', 'image/vnd.adobe.photoshop', AssetCategory.image_category)
-        ensure_type('Autocad Image', 'image/vnd.dwg', AssetCategory.image_category)
-        ensure_type('Autocad Image', 'image/vnd.dxf', AssetCategory.image_category)
-        ensure_type('Icon Image', 'image/vnd.microsoft.icon', AssetCategory.image_category)
-        ensure_type('Bitmap Image', 'image/x-bmp image/bmp image/x-win-bmp', AssetCategory.image_category)
-        ensure_type('Paintshop Pro Image', 'image/x-paintshoppro', AssetCategory.image_category)
-        ensure_type('Mobile Image (plb,psb,pvb)', 'application/vnd.3gpp.pic-bw-large application/vnd.3gpp.pic-bw-small application/vnd.3gpp.pic-bw-var', AssetCategory.image_category)
-
-        ensure_type('Moile Audio (3gpp,3gpp2)', 'audio/3gpp audio/3gpp2', AssetCategory.audio_category)
-        ensure_type('Dolby Digital Audio (ac3)', 'audio/ac3', AssetCategory.audio_category)
-        ensure_type('Mpeg Audio (mpga,mp2,mp3,mp4,mpa)', 'audio/mpeg audio/mpeg4-generic audio/mp4 audio/mpa-robust', AssetCategory.audio_category) # @mpga,mp2,mp3
-        ensure_type('Aiff Audio (aif,aifc,aiff)', 'audio/x-aiff', AssetCategory.audio_category)
-        ensure_type('Midi Audio (mid,midi,kar)', 'audio/x-midi', AssetCategory.audio_category)
-        ensure_type('Real Audio (rm,ram,ra)', 'audio/x-pn-realaudio audio/x-realaudio', AssetCategory.audio_category)
-        ensure_type('Wav Audio (wav)', 'audio/x-wav', AssetCategory.audio_category)
-        ensure_type('Ogg Vorbis Audio (ogg)', 'application/ogg', AssetCategory.audio_category)
-
-        ensure_type('Mobile Video', 'video/3gpp video/3gpp-tt video/3gpp2', AssetCategory.video_category) #  @3gp,3gpp 'RFC3839,DRAFT:draft-gellens-mime-bucket
-        ensure_type('Digital Video', 'video/DV', AssetCategory.video_category) #  RFC3189
-        ensure_type('Compressed Video', 'application/mpeg4-iod-xmt application/mpeg4-iod application/mpeg4-generic video/mp4  application/mp4 video/MPV video/mpeg4-generic video/mpeg video/MP2T video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/MP1S video/MP2P', AssetCategory.video_category) #  RFC3555
-        ensure_type('Jpeg Video', 'video/JPEG video/MJ2', AssetCategory.video_category) #  RFC3555
-        ensure_type('Quicktime Video', 'video/quicktime', AssetCategory.video_category)
-        ensure_type('Uncompressed Video', 'video/raw', AssetCategory.video_category)
-        ensure_type('Mpeg Playlist (mxu,m4u)', 'video/vnd.mpegurl', AssetCategory.video_category)
-        ensure_type('Avi Video (avi)', 'video/x-msvideo', AssetCategory.video_category)
-        ensure_type('Flash Video', 'video/x-flv', AssetCategory.video_category)
-
-        ensure_type('M4v Video', 'video/x-m4v', AssetCategory.video_category)
-
-        #document category
-        ensure_type('Generic Document', 'application/x-csh application/x-dvi application/oda application/pgp-encrypted application/pgp-keys application/pgp-signature', AssetCategory.document_category)
-        ensure_type('Calendar Document', 'text/calendar text/x-vcalendar', AssetCategory.document_category)
-        ensure_type('Comma Seperated Values Document (csv)', 'text/csv text/comma-separated-values', AssetCategory.document_category)
-        ensure_type('Tab Seperated Values Text Document', 'text/tab-separated-values', AssetCategory.document_category)
-        ensure_type('Web Document', 'text/html', AssetCategory.document_category)
-        ensure_type('Plain Text Document', 'text/plain', AssetCategory.document_category)
-        ensure_type('Rich Text Document', 'text/richtext text/rtf', AssetCategory.document_category)
-        ensure_type('Sgml Document', 'text/sgml', AssetCategory.document_category)
-        ensure_type('Wap Document', 'text/vnd.wap.wml text/vnd.wap.wmlscript', AssetCategory.document_category)
-        ensure_type('XML Document', 'text/xml text/xml-external-parsed-entity', AssetCategory.document_category)
-        ensure_type('V-Card Document (vcf)', 'text/x-vcard', AssetCategory.document_category)
-        ensure_type('Apple Macintosh Document (hqx)', 'application/mac-binhex40', AssetCategory.document_category)
-        ensure_type('Adobe Acrobat Document (pdf)', 'application/pdf', AssetCategory.document_category)
-        ensure_type('Microsoft Word Document (doc,dot,docx)', 'application/msword application/word', AssetCategory.document_category)
-        ensure_type('Microsoft Powerpoint Document (ppt,pps,pot,pptx)', 'application/vnd.ms-powerpoint application/powerpoint', AssetCategory.document_category)
-        ensure_type('Microsoft Excel Document (xls,xlt,xlsx)', 'application/vnd.ms-excel application/excel', AssetCategory.document_category)
-        ensure_type('Microsoft Works Document', 'application/vnd.ms-works', AssetCategory.document_category)
-        ensure_type('Microsoft Project Document (mpp)', 'application/vnd.ms-project', AssetCategory.document_category)
-        ensure_type('Microsoft Visio Document (vsd,vst,vsw,vss)', 'application/vnd.visio', AssetCategory.document_category)
-        ensure_type('HTML Help Document (chm)', 'application/x-chm', AssetCategory.document_category)
-
-
-      rescue => e
-        puts "asset library init fails."
-        puts e
-      end
-
-    end
-
-    private
-
-    # Makes sure the specified type exists in the DB, if it doesn’t it creates
-    # a new record.
-    def self.ensure_type(name, mime_type, category)
-      asset_type = AssetType.first( :conditions => "name = '#{name}'" )
-      if asset_type then
-        asset_type.asset_category = category
-      else
-        asset_type = AssetType.new(:name => name, :asset_category => category)
-      end
-      mime_type.split(' ').each do |this_mime_type|
-        asset_mime_type = AssetMimeType.new(:mime_type => this_mime_type)
-        asset_type.asset_mime_types << asset_mime_type
-        asset_mime_type.save
-      end
-      asset_type.save
+      # ensure that all the categories exist
+      AssetCategory.build_defaults
+      DefaultAssetTypes.build
     end
 
   end # Library

data/lib/gluttonberg/library/attachment_mixin.rb

@@ -7,26 +7,20 @@ module Gluttonberg
     # DocumentAsset.
 
     module AttachmentMixin
+      extend ActiveSupport::Concern
 
-      def self.included(klass)
-        klass.class_eval do
-          after_destroy  :remove_file_from_storage
-          before_save    :generate_reference_hash
-          after_save     :update_file_on_storage
-          attr_accessor  :file_dirty
+      included do
+        after_destroy  :remove_file_from_storage
+        before_save    :generate_reference_hash
+        after_save     :update_file_on_storage
+        attr_accessor  :file_dirty
 
-          extend ClassMethods
-          include InstanceMethods
-          extend Library::Config::ImageSizes::ClassMethods
-          include Library::Config::ImageSizes::InstanceMethods
-
-          initialize_storage()
-        end
+        include Library::Config::ImageSizes
+        initialize_storage
       end
 
 
       module ClassMethods
-
         def initialize_storage
           storage_class_name = Rails.configuration.asset_storage.to_s.downcase.camelize
           begin
@@ -34,8 +28,7 @@ module Gluttonberg
           rescue NameError
             raise Exception, "Cannot load storage module '#{storage_class_name}'"
           end
-          include(storage_module.const_get("InstanceMethods"))
-          extend(storage_module.const_get("ClassMethods"))
+          include storage_module
         end
 
 
@@ -53,111 +46,108 @@ module Gluttonberg
       end #ClassMethods
 
 
-      module InstanceMethods
-
-        # Setter for the file object. It sanatises the file name and stores in
-        # the filename property. It also sets the mime-type and size.
-        def file=(new_file)
-          unless new_file.blank?
-            logger.info("\nFILENAME: #{new_file.original_filename} \n\n")
+      # InstanceMethods
 
-            # Forgive me this naive sanitisation, I'm still a regex n00b
-            clean_filename = new_file.original_filename.split(%r{[\\|/]}).last
-            clean_filename = clean_filename.gsub(" ", "_").gsub(/[^A-Za-z0-9\-_.]/, "").downcase
+      # Setter for the file object. It sanatises the file name and stores in
+      # the filename property. It also sets the mime-type and size.
+      def file=(new_file)
+        unless new_file.blank?
+          logger.info("\nFILENAME: #{new_file.original_filename} \n\n")
 
-            # _thumb.#{file_extension} is a reserved name for the thumbnailing system, so if the user
-            # has a file with that name rename it.
-            if (clean_filename == '_thumb_small.#{file_extension}') || (clean_filename == '_thumb_large.#{file_extension}')
-              clean_filename = 'thumb.#{file_extension}'
-            end
+          # Forgive me this naive sanitisation, I'm still a regex n00b
+          clean_filename = new_file.original_filename.split(%r{[\\|/]}).last
+          clean_filename = clean_filename.gsub(" ", "_").gsub(/[^A-Za-z0-9\-_.]/, "").downcase
 
-            self.mime_type = new_file.content_type
-            self.file_name = clean_filename
-            self.size = new_file.size
-            @file = new_file
-            self.file_dirty = true
+          # _thumb.#{file_extension} is a reserved name for the thumbnailing system, so if the user
+          # has a file with that name rename it.
+          if (clean_filename == '_thumb_small.#{file_extension}') || (clean_filename == '_thumb_large.#{file_extension}')
+            clean_filename = 'thumb.#{file_extension}'
           end
-        end
 
-        # Returns the file assigned by file=
-        def file
-          @file
+          self.mime_type = new_file.content_type
+          self.file_name = clean_filename
+          self.size = new_file.size
+          @file = new_file
+          self.file_dirty = true
         end
+      end
 
-        def file_extension
-          file_name.split(".").last
-        end
+      # Returns the file assigned by file=
+      def file
+        @file
+      end
 
-        def asset_folder_path
-          # "/user_assets/#{asset_hash}"
-          directory
-        end
+      def file_extension
+        file_name.split(".").last
+      end
 
-        def asset_directory_public_url
-          "#{assets_directory_public_url}/#{asset_hash}"
-        end
+      def asset_folder_path
+        directory
+      end
 
-        # Returns the public URL to this asset, relative to the domain.
-        def url
-          "#{asset_directory_public_url}/#{file_name}"
-        end
+      def asset_directory_public_url
+        "#{assets_directory_public_url}/#{asset_hash}"
+      end
 
-        # Returns the full path to the file’s location on disk.
-        def location_on_disk
-          directory + "/" + file_name
-        end
+      # Returns the public URL to this asset, relative to the domain.
+      def url
+        "#{asset_directory_public_url}/#{file_name}"
+      end
 
-        # asset  path in actual assets directory
-        def original_file_on_disk
-          directory + "/original_" + file_name
-        end
+      # Returns the full path to the file’s location on disk.
+      def location_on_disk
+        directory + "/" + file_name
+      end
 
-        # Returns the full path to the file's location on disk in tmp directory.
-        def tmp_location_on_disk
-          tmp_directory + "/" + file_name
-        end
+      # asset  path in actual assets directory
+      def original_file_on_disk
+        directory + "/original_" + file_name
+      end
 
-        # asset full path in tmp directory
-        def tmp_original_file_on_disk
-          tmp_directory + "/original_" + file_name
-        end
+      # Returns the full path to the file's location on disk in tmp directory.
+      def tmp_location_on_disk
+        tmp_directory + "/" + file_name
+      end
 
+      # asset full path in tmp directory
+      def tmp_original_file_on_disk
+        tmp_directory + "/original_" + file_name
+      end
 
-        def generate_cropped_image(x , y , w , h, image_type)
-          if !File.exist?(self.tmp_location_on_disk) && !File.exist?(self.tmp_original_file_on_disk)
-            self.download_asset_to_tmp_file
-          end
-          processor = Library::Processor::Image.new
-          processor.asset = self
-          processor.generate_cropped_image(x , y , w , h, image_type)
-          self.remove_file_from_tmp_storage
+      def generate_cropped_image(x , y , w , h, image_type)
+        if !File.exist?(self.tmp_location_on_disk) && !File.exist?(self.tmp_original_file_on_disk)
+          self.download_asset_to_tmp_file
         end
+        processor = Library::Processor::Image.new
+        processor.asset = self
+        processor.generate_cropped_image(x , y , w , h, image_type)
+        self.remove_file_from_tmp_storage
+      end
 
-
-        def asset_processing
-          asset_id_to_process = self.id
-          asset = Asset.find(:first , :conditions => { :id => asset_id_to_process } )
-          if asset
-            asset_processors = [Library::Processor::Image , Library::Processor::Audio] #Core processors
-            asset_processors << Rails.configuration.asset_processors unless Rails.configuration.asset_processors.blank? #additional processors
-            asset_processors = asset_processors.flatten
-            unless asset_processors.blank?
-              asset_processors.each do |processor|
-                processor.process(asset)
-              end
+      # Perform asset processing
+      def asset_processing
+        asset_id_to_process = self.id
+        asset = Asset.where(:id => asset_id_to_process).first
+        if asset
+          asset_processors = [Library::Processor::Image , Library::Processor::Audio] #Core processors
+          asset_processors << Rails.configuration.asset_processors unless Rails.configuration.asset_processors.blank? #additional processors
+          asset_processors = asset_processors.flatten
+          unless asset_processors.blank?
+            asset_processors.each do |processor|
+              processor.process(asset)
             end
           end
-        end # asset_processing
+        end
+      end # asset_processing
 
 
-        private
+      private
 
-          def generate_reference_hash
-            unless self.asset_hash
-              self.asset_hash = Digest::SHA1.hexdigest(Time.now.to_s + file_name)
-            end
+        def generate_reference_hash
+          unless self.asset_hash
+            self.asset_hash = Digest::SHA1.hexdigest(Time.now.to_s + file_name)
           end
-      end
+        end
     end # AttachmentMixin
   end #Library
-end # Gluttonberg
+end # Gluttonberg