we5-browsercms 3.0.5 → 3.0.5.1

data/app/models/attachment.rb

@@ -23,28 +23,28 @@ class Attachment < ActiveRecord::Base
   before_save :process_section
 
   after_save :write_temp_file_to_storage_location
-  after_save :clear_ivars  
-  
+  after_save :clear_ivars
+
   #----- Associations ----------------------------------------------------------
 
   has_one :section_node, :as => :node
 
   #----- Validations -----------------------------------------------------------
 
-  validates_presence_of :temp_file, 
+  validates_presence_of :temp_file,
     :message => "You must upload a file", :on => :create
   validates_presence_of :file_path
   validates_uniqueness_of :file_path
   validates_presence_of :section_id
-    
+
   #----- Virtual Attributes ----------------------------------------------------
-  
+
   def section_id
     @section_id ||= section_node ? section_node.section_id : nil
   end
 
   def section_id=(section_id)
-    if @section_id != section_id 
+    if @section_id != section_id
       dirty!
       @section_id = section_id
     end
@@ -61,38 +61,38 @@ class Attachment < ActiveRecord::Base
       @section = section
     end
   end
-  
+
   #----- Callbacks Methods -----------------------------------------------------
-  
+
   def make_dirty_if_temp_file
     dirty! if temp_file
   end
-  
-  def prepend_file_path_with_slash    
+
+  def prepend_file_path_with_slash
     unless file_path.blank?
       self.file_path = "/#{file_path}" unless file_path =~ /^\//
     end
   end
-  
+
   def extract_file_extension_from_file_name
     if file_name && file_name['.']
       self.file_extension = file_name.split('.').last.to_s.downcase
-    end    
+    end
   end
-  
+
   def extract_file_type_from_temp_file
     unless temp_file.blank?
       self.file_type = temp_file.content_type
-    end    
+    end
   end
-  
-  def extract_file_size_from_temp_file  
+
+  def extract_file_size_from_temp_file
     unless temp_file.blank?
       self.file_size = temp_file.size
-    end    
+    end
   end
 
-  # The file will be stored on disk at 
+  # The file will be stored on disk at
   # Attachment.storage_location/year/month/day/sha1
   # The sha1 is a 40 character hash based on the original_filename
   # of the file uploaded and the current time
@@ -109,9 +109,9 @@ class Attachment < ActiveRecord::Base
       section_node.move_to_end(Section.find(section_id))
     else
       build_section_node(:node => self, :section_id => section_id)
-    end    
+    end
   end
-    
+
   def write_temp_file_to_storage_location
     unless temp_file.blank?
       FileUtils.mkdir_p File.dirname(full_file_location)
@@ -120,33 +120,33 @@ class Attachment < ActiveRecord::Base
       else
         open(full_file_location, 'w') {|f| f << temp_file.read }
       end
-      
+
       if Cms.attachment_file_permission
         FileUtils.chmod Cms.attachment_file_permission, full_file_location
       end
     end
-  end  
-  
+  end
+
   def clear_ivars
     @temp_file = nil
     @section = nil
     @section_id = nil
   end
-  
+
   #----- Class Methods ---------------------------------------------------------
-  
+
   def self.storage_location
     @storage_location ||= File.join(Rails.root, "/tmp/uploads")
   end
-  
+
   def self.storage_location=(storage_location)
     @storage_location = storage_location
-  end  
-  
+  end
+
   def self.find_live_by_file_path(file_path)
-    Attachment.published.not_archived.first(:conditions => {:file_path => file_path})
-  end  
-  
+    ::Attachment.published.not_archived.first(:conditions => {:file_path => file_path})
+  end
+
   #----- Instance Methods ------------------------------------------------------
 
   def file_name
@@ -156,7 +156,7 @@ class Attachment < ActiveRecord::Base
   def name
     file_name
   end
-  
+
   def icon
     {
         :doc => %w[doc],
@@ -178,9 +178,9 @@ class Attachment < ActiveRecord::Base
   def public?
     section ? section.public? : false
   end
-  
+
   def full_file_location
-    File.join(Attachment.storage_location, file_location)
+    File.join(::Attachment.storage_location, file_location)
   end
 
   # Forces this record to be changed, even if nothing has changed

data/browsercms.gemspec

@@ -4,7 +4,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{we5-browsercms}
+  s.name = %q{browsercms}
   s.version = "3.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

data/lib/cms/behaviors/attaching.rb

@@ -2,33 +2,33 @@ module Cms
   module Behaviors
     module Attaching
       SANITIZATION_REGEXES = [ [/\s/, '_'], [/[&+()]/, '-'], [/[=?!'"{}\[\]#<>%]/, ''] ]
-      
+
       def self.included(model_class)
         model_class.extend(MacroMethods)
       end
-      module MacroMethods      
+      module MacroMethods
         def belongs_to_attachment?
           !!@belongs_to_attachment
         end
         def belongs_to_attachment(options={})
           @belongs_to_attachment = true
           include InstanceMethods
-          before_validation :process_attachment  
+          before_validation :process_attachment
           before_save :update_attachment_if_changed
           after_save :clear_attachment_ivars
-          belongs_to :attachment, :dependent => :destroy 
-          
+          belongs_to :attachment, :dependent => :destroy, :class_name => "::Attachment"
+
           validates_each :attachment_file do |record, attr, value|
             if record.attachment && !record.attachment.valid?
               record.attachment.errors.each do |err_field, err_value|
                 if err_field.to_sym == :file_path
                   record.errors.add(:attachment_file_path, err_value)
-                else  
+                else
                   record.errors.add(:attachment_file, err_value)
                 end
-              end      
+              end
             end
-          end       
+          end
         end
       end
       module InstanceMethods
@@ -92,10 +92,10 @@ module Cms
             unless attachment_section_id.blank?
               errors.add(:attachment_file, "You must upload a file")
               return false
-            end              
+            end
           else
-            build_attachment if attachment.nil?  
-            attachment.temp_file = attachment_file 
+            build_attachment if attachment.nil?
+            attachment.temp_file = attachment_file
             set_attachment_file_path
             if attachment.file_path.blank?
               errors.add(:attachment_file_path, "File Name is required for attachment")
@@ -113,7 +113,7 @@ module Cms
           @attachment_file = nil
           @attachment_file_path = nil
           @attachment_section_id = nil
-          @attachment_section = nil            
+          @attachment_section = nil
         end
 
         # Override this method if you would like to override the way the section is set
@@ -168,16 +168,16 @@ module Cms
             (published? && live_version?) ? attachment_file_path : "/cms/attachments/#{attachment_id}?version=#{attachment_version}"
           else
             nil
-          end  
+          end
         end
-        
+
         # Forces this record to be changed, even if nothing has changed
         # This is necessary if just the section.id has changed, for example
         def dirty!
           # Seems like a hack, is there a better way?
           self.updated_at = Time.now
-        end          
-        
+        end
+
       end
     end
   end

data/lib/cms/behaviors/versioning.rb

@@ -4,7 +4,7 @@ module Cms
       def self.included(model_class)
         model_class.extend(MacroMethods)
       end
-      module MacroMethods      
+      module MacroMethods
         def versioned?
           !!@is_versioned
         end
@@ -24,7 +24,7 @@ module Cms
           attr_accessor :revert_to_version
 
           #Define the version class
-          const_set("Version", Class.new(ActiveRecord::Base)).class_eval do 
+          const_set("Version", Class.new(ActiveRecord::Base)).class_eval do
             class << self; attr_accessor :versioned_class end
 
             def versioned_class
@@ -35,7 +35,7 @@ module Cms
             end
             def versioned_object
               send(versioned_class.name.underscore.to_sym)
-            end                 
+            end
           end
 
           version_class.versioned_class = self
@@ -46,27 +46,27 @@ module Cms
 
         end
       end
-      module ClassMethods        
+      module ClassMethods
         def version_class
           const_get "Version"
         end
 
         def version_class_name
-          "#{name}::Version"
-        end        
+          "::#{name}::Version"
+        end
 
         def version_foreign_key
           @version_foreign_key
         end
 
-        def version_table_name        
+        def version_table_name
           @version_table_name
         end
 
         def versioned_columns
-          @versioned_columns ||= (version_class.new.attributes.keys - 
+          @versioned_columns ||= (version_class.new.attributes.keys -
             (%w[id lock_version position version_comment created_at updated_at created_by_id updated_by_id type] + [version_foreign_key]))
-        end                   
+        end
       end
       module InstanceMethods
         def initialize_version
@@ -77,7 +77,7 @@ module Cms
           # First get the values from the draft
           attrs = draft_attributes
 
-          # Now overwrite any changed values      
+          # Now overwrite any changed values
           self.class.versioned_columns.each do |col|
             if(send("#{col}_changed?"))
               attrs[col] = send(col)
@@ -85,7 +85,7 @@ module Cms
           end
 
           attrs[:version_comment] = @version_comment || default_version_comment
-          @version_comment = nil            
+          @version_comment = nil
           new_version = versions.build(attrs)
           new_version.version = new_record? ? 1 : (draft.version.to_i + 1)
           after_build_new_version(new_version) if respond_to?(:after_build_new_version)
@@ -97,7 +97,7 @@ module Cms
           # Otherwise we need to use the draft
           d = new_record? ? self : draft
           self.class.versioned_columns.inject({}){|attrs, col| attrs[col] = d.send(col); attrs }
-        end 
+        end
 
         def default_version_comment
           if new_record?
@@ -110,22 +110,22 @@ module Cms
         def save(perform_validations=true)
           transaction do
             #logger.info "..... Calling valid?"
-            return false unless !perform_validations || valid?            
-            
+            return false unless !perform_validations || valid?
+
             if changed?
               #logger.info "..... Changes => #{changes.inspect}"
             else
               #logger.info "..... No Changes"
               return true
             end
-            
+
             #logger.info "..... Calling before_save"
             return false if callback(:before_save) == false
 
             if new_record?
               #logger.info "..... Calling before_create"
               return false if callback(:before_create) == false
-            else      
+            else
               #logger.info "..... Calling before_update"
               return false if callback(:before_update) == false
             end
@@ -142,12 +142,12 @@ module Cms
                   #logger.info "..... Calling after_save"
                   callback(:after_save)
                 end
-                
+
                 if @publish_on_save
                   publish
                   @publish_on_save = nil
-                end                
-                changed_attributes.clear                                   
+                end
+                changed_attributes.clear
               end
               result
             elsif new_version
@@ -158,11 +158,11 @@ module Cms
                   #logger.info "..... Calling after_update"
                   callback(:after_save)
                 end
-                
+
                 if @publish_on_save
                   publish
                   @publish_on_save = nil
-                end 
+                end
                 changed_attributes.clear
               end
               result
@@ -176,13 +176,13 @@ module Cms
         end
 
         def draft
-          versions.first(:order => "version desc")    
+          versions.first(:order => "version desc")
         end
-        
+
         def draft_version?
           version == draft.version
         end
-        
+
         def live_version
           find_version(self.class.find(id).version)
         end
@@ -194,7 +194,7 @@ module Cms
         def current_version
           find_version(self.version)
         end
-        
+
         def find_version(number)
           versions.first(:conditions => { :version => number })
         end
@@ -225,7 +225,7 @@ module Cms
             changed_attrs.clear
           end
 
-          obj      
+          obj
         end
 
         def revert
@@ -239,15 +239,15 @@ module Cms
           raise "Could not find version #{version}" unless revert_to_version
           (self.class.versioned_columns - ["version"]).each do |a|
             send("#{a}=", revert_to_version.send(a))
-          end  
+          end
           self.version_comment = "Reverted to version #{version}"
-          self            
-        end    
+          self
+        end
 
         def revert_to(version)
           revert_to_without_save(version)
           save
-        end    
+        end
 
         def version_comment
           @version_comment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: we5-browsercms
 version: !ruby/object:Gem::Version 
-  version: 3.0.5
+  version: 3.0.5.1
 platform: ruby
 authors: 
 - BrowserMedia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +01:00
+date: 2009-12-14 00:00:00 +01:00
 default_executable: 
 dependencies: []