kit_cms 2.3.20 → 2.3.22

data/app/models/ad.rb

@@ -1,8 +1,10 @@
 class Ad < ActiveRecord::Base
-
+  include ActionView::Helpers
   attr_accessor :duration
   attr_accessor :not_found
 
+  attr_accessible :impression_count, :start_date, :end_date, :user_id, :name, :is_house_ad, :weighting, :body, :allow_html, :creative, :link, :price_paid, :paid_at, :notes, :creative, :create_file_name
+
   has_many :order_items, :as=>:orderable
   belongs_to :sellable, :polymorphic=>true 
 
@@ -13,7 +15,6 @@ class Ad < ActiveRecord::Base
   has_many :ad_clicks
 
   validates :system_id, :presence=>true
-  validates :user_id, :presence=>true
   validates :start_date, :presence=>true
   validates :end_date, :presence=>true
   validates :name, :presence=>true
@@ -96,9 +97,9 @@ class Ad < ActiveRecord::Base
     ad = self
 
     if ad.creative_file_name
-      content = image_tag ad.creative.url(options[:preview] ? :thumb : :display)
+      content = "<img src='#{ad.creative.url(options[:preview] ? :thumb : :display)}' />".html_safe
     else
-      content = ad.not_found ? "[[ad not found]]" : (ad.allow_html==1 ? ad.body : (h ad.body))
+      content = ad.not_found ? "[[ad not found]]" : (ad.body.is_blank ? "[[no HTML]]" : (ad.allow_html==1 ? ad.body : (h ad.body)))
     end
     
     op = []
@@ -134,9 +135,8 @@ class Ad < ActiveRecord::Base
         adsa << ad
       end
     end 
-    rand_id = adsa[rand(adsa.length)].id
+    adsa[rand(adsa.length-1)]
 
-    adsa[rand_id]
   end    
 
   def impress

data/app/models/ad_unit.rb

@@ -1,7 +1,7 @@
-# TODO: DB
 class AdUnit < ActiveRecord::Base
 
  has_many :ad_zones
+ attr_accessible :name, :height, :width, :content_type, :system_id
 
  validates :name, :presence=>true, :uniqueness=>{:scope=>:system_id}
  validates :width, :presence=>true

data/app/models/ad_zone.rb

@@ -7,6 +7,10 @@ class AdZone < ActiveRecord::Base
   has_many :ad_zones_ads
   has_many :ads, :through=>:ad_zones_ads
 
+ def block_name
+   "Ad from zone '#{self.name}'"
+ end
+    
   def display_name_with_price
     "#{self.name} (#{self.width}x#{self.height}) @ &pound;#{('%.2f' % self.price_per_period)}/#{self.period.singularize}".html_safe
   end

data/app/models/block.rb

@@ -1,7 +1,7 @@
 class Block < ActiveRecord::Base
   has_and_belongs_to_many :page_templates
 
-  attr_accessible :name, :show_editors, :all_templates, :page_template_ids, :description, :body, :system_id
+  attr_accessible :name, :show_editors, :all_templates, :page_template_ids, :description, :body, :system_id, :user_id
   validates :name, :presence=>true, :length=>{:minimum=>1, :maximum=>80}
   belongs_to :user
 

data/app/models/delayed_job.rb

@@ -0,0 +1,3 @@
+class DelayedJob < ActiveRecord::Base
+
+end

data/app/models/form.rb

@@ -3,10 +3,14 @@ require 'net/http'
 require 'digest/md5'
 
 class Form < ActiveRecord::Base
+  has_many :html_assetable, :as=>:html_assetable
+  has_many :html_assets, :through=>:html_assetable
+
   has_many :form_fields, :dependent => :destroy, :order=>:display_order
   has_many :form_field_groups, :order=>:order_by
   has_many :form_submissions, :dependent => :destroy
 
+  belongs_to :layout
   has_many :ungrouped_form_fields, :class_name=>"FormField", :conditions=>"form_fields.form_field_group_id is null"  
   validates :title, :uniqueness=>{:scope=>:system_id}, :presence=>true
   validates :url, :uniqueness=>true, :allow_blank=>true
@@ -16,9 +20,16 @@ class Form < ActiveRecord::Base
     self.form_fields.joins(:form_field_type).where("form_field_types.field_type in ('line','paragraph','select','multiselect')").all
   end
 
-  def include_stylesheets
-    return ["application"] if self.stylesheets.is_blank?
-    return self.stylesheets.split(',').uniq
+  def javascripts
+    self.html_assets.where(:file_type=>"js").all
+  end
+
+  def stylesheets
+    self.html_assets.where(:file_type=>"css").all
+  end
+ 
+  def old_stylesheets
+    self.read_attribute(:stylesheets)
   end
 
   def field_by_name(name)
@@ -156,7 +167,8 @@ class Form < ActiveRecord::Base
   end
 
   def self.get_textcaptcha_qa
-    xml   = Net::HTTP.get(URI::Parser.new.parse("http://textcaptcha.com/api/7zsxcgrbaacc4cs4swsswk4sk863uwld"))
+    xml   = Net::HTTP.get(URI::Parser.new.parse("http://textcaptcha.com/api/7zsxcgrbaacc4cs4swsswk4sk863uwld")) rescue nil
+    return unless xml
     if xml.empty?
       raise Textcaptcha::BadResponse
     else

data/app/models/html_asset.rb

@@ -1,4 +1,18 @@
 class HtmlAsset < ActiveRecord::Base
+#  has_many :page_template_html_assets
+#  has_many :layout_html_assets
+#  has_many :page_templates, :through=>:page_template_html_assets
+#  has_many :layouts, :through=>:layout_html_assets
+#  has_many :form_html_assets
+#  has_many :forms, :through=>:form_html_assets
+
+  has_many :html_assetables
+
+  has_many :layouts, :through=>:html_assetables, :source=>:html_assetable, :source_type=>"Layout"
+  has_many :page_templates, :through=>:html_assetables, :source=>:html_assetable, :source_type=>"PageTemplate"
+  has_many :forms, :through=>:html_assetables, :source=>:html_assetable, :source_type=>"Form"
+
+
   belongs_to :user
   validates :name, :presence=>true, :length=>{:minimum=>1, :maximum=>80}
   before_save :generate_fingerprint
@@ -7,6 +21,7 @@ class HtmlAsset < ActiveRecord::Base
   attr_accessor :compiled
 
   before_save :record_history
+  after_save :write_to_file
 
   def display_name
     full_type
@@ -23,7 +38,7 @@ class HtmlAsset < ActiveRecord::Base
   end
 
   def self.fetch(system_id, name, type)
-    Rails.cache.fetch(HtmlAsset.cache_key(system_id, name.downcase, type), :expires_in=>5.minutes) do 
+    Rails.cache.fetch(HtmlAsset.cache_key(system_id, name.downcase, type), :expires_in=>1.second) do 
       asset = HtmlAsset.sys(system_id).where(:name=>name.downcase).where(:file_type=>type).first
       asset.write_to_file if asset
       asset
@@ -35,11 +50,11 @@ class HtmlAsset < ActiveRecord::Base
   end
   
   def write_to_file
-    parent = File.join(Rails.root, "public", "kit", self.file_type)
+    parent = File.join(Rails.root, "public", "kit",  self.system_id.to_s, self.file_type)
     FileUtils.mkdir_p(parent) unless File.exists?(parent)
 
-    path = File.join(Rails.root, "public", "kit", self.file_type, self.kit_name)
-    dir = File.join(Rails.root, "public", "kit", self.file_type)
+    path = File.join(Rails.root, "public", "kit", self.system_id.to_s, self.file_type, self.kit_name)
+    dir = File.join(Rails.root, "public", "kit", self.system_id.to_s, self.file_type)
     found = false
     Dir.glob(dir + "/#{self.name.downcase}*") do |f|
       if f==path

data/app/models/html_asset_usage.rb

@@ -0,0 +1,3 @@
+class HtmlAssetUsage < ActiveRecord::Base
+  belongs_to :html_assetable, :polymorphic => true
+end

data/app/models/html_assetable.rb

@@ -0,0 +1,4 @@
+class HtmlAssetable < ActiveRecord::Base
+  belongs_to :html_asset
+  belongs_to :html_assetable, :polymorphic=>true
+end

data/app/models/layout.rb

@@ -1,9 +1,12 @@
 class Layout < ActiveRecord::Base
+  has_many :html_assetable, :as=>:html_assetable
+  has_many :html_assets, :through=>:html_assetable
+
   store_templates
 
   use_kit_caching
 
-  attr_accessible :name, :handler, :stylesheets, :javascripts, :body
+  attr_accessible :name, :handler,  :body, :html_asset_ids, :path, :format, :locale, :system_id, :user_id
   before_save :make_path
   before_save :set_format
   has_many :page_templates
@@ -32,7 +35,7 @@ class Layout < ActiveRecord::Base
   end
   
   def make_path
-    self.path = "layouts/" + self.name.urlise 
+    self.path = "layouts/#{self.system_id}/#{self.name.urlise}"
   end
 
   def set_format
@@ -47,15 +50,19 @@ class Layout < ActiveRecord::Base
     ['haml', 'erb', 'builder']
   end
 
-  def self.name_exists?(name)
-    Layout.where("name = '#{name}'").count > 0
+  def self.name_exists?(sid, name)
+    Layout.sys(sid).where("name = '#{name}'").count > 0
+  end
+
+  def self.default(sid) 
+    Layout.sys(sid).order(:id).first
   end
 
   def self.create_default(sid, user_id)
-    layout = Layout.new(:stylesheets=>"application", :javascripts=>"", :path=>"layouts/application", :handler=>"haml", :format=>"html", :locale=>"en", :system_id=>sid, :user_id=>user_id, :name=>"application-#{sid}", :body=><<eos
+    layout = Layout.new(:path=>"layouts/#{sid}/application", :handler=>"haml", :format=>"html", :locale=>"en", :system_id=>sid, :user_id=>user_id, :name=>"application", :body=><<eos
 !!!
 %html
-  / Layout: application-#{sid}
+  / Layout: application [#{sid}]
   %head
     = render :partial=>"layouts/kit_header"
     %style(type="text/css")
@@ -67,4 +74,27 @@ eos
 
     layout.save!
   end
+
+  def javascripts
+    self.html_assets.where(:file_type=>"js").all
+  end
+
+  def stylesheets
+    self.html_assets.where(:file_type=>"css").all
+  end
+  
+  def old_stylesheets
+    self.read_attribute(:stylesheets)
+  end
+
+  def old_javascripts
+    self.read_attribute(:javascripts)
+  end
+
+  def self.preference(sid, name)
+    l = Layout.sys(sid).where(:id=>Preference.get_cached(sid, name)).first rescue nil
+    return l if l
+    Layout.sys(sid).order("created_at").first
+  end
+
 end

data/app/models/newsletter.rb

@@ -39,7 +39,7 @@ class Newsletter < ActiveRecord::Base
     job.send_id = ns.id
     job.test_mode = test
 
-    Delayed::Job.enqueue job
+    Delayed::Job.enqueue job, :queue=>sid
 
     self.status = test ? "test" : "sent"
     self.save

data/app/models/page.rb

@@ -1,6 +1,6 @@
 class Page < KitIndexed
 
-  attr_accessible :full_path, :category_id, :status_id, :name, :title, :page_template_id, :created_by, :updated_by, :system_id, :tags, :meta_description, :meta_keywords, :header
+  attr_accessible :full_path, :category_id, :status_id, :name, :title, :page_template_id, :created_by, :updated_by, :system_id, :tags, :meta_description, :meta_keywords, :header, :status, :needs_crawl, :updated_crawl
 
     @@index_def =  [
       {:name=>:id, :index=>:not_analyzed, :include_in_all=>false},
@@ -15,7 +15,7 @@ class Page < KitIndexed
       {:name=>:terms, :as=>"concatenated_terms", :user=>true},
       {:name=>:created_by, :as=>"user.email"},
       {:name=>:updated_at, :type=>'date', :include_in_all=>false},
-      {:name=>:status, :as=>"status.name", :index=>:not_analyzed},
+      {:name=>:status, :as=>"status.name.downcase", :index=>:not_analyzed},
       {:name=>:is_deleted, :index=>:not_analyzed},
       {:name=>:content, :as=>"concatenated_content(:current)", :user=>true},
       {:name=>:old_content, :as=>"concatenated_content(:old)", :include_in_all=>false},
@@ -93,6 +93,7 @@ class Page < KitIndexed
     belongs_to :status
     belongs_to :user, :class_name=>"User", :foreign_key=>"created_by"
 
+    has_many :page_links
     has_many :comments
     has_many :block_instances, :dependent=>:destroy
     has_many :page_histories, :dependent=>:destroy
@@ -108,8 +109,10 @@ class Page < KitIndexed
     before_save { self.name.downcase! }
     before_save :history_start
     before_save :change_full_path
+    
     after_save :history_end
     after_save :clear_cache
+
     after_destroy :clear_cache
     after_create :set_page_template_defaults
 
@@ -123,6 +126,37 @@ class Page < KitIndexed
     validate :path_must_be_unique
 
 
+    def full_url
+      "#{Preference.get_cached(self.system_id, "host")}#{self.full_path}"
+    end
+
+    def queue_crawl(start_crawl = true)
+      logger.debug "Queueing crawl for page #{self.id}"
+      self.needs_crawl = Time.now
+      self.save
+      Delayed::Job.enqueue PageLinkJob.new(self.system_id), :queue=>self.system_id if start_crawl
+    end
+
+    def crawl(force = false)
+      return unless force || self.needs_crawl 
+      self.update_attributes(:needs_crawl=>nil)
+      PageLink.delete_all("page_id = #{self.id}")
+      
+      Anemone.crawl(full_url, :depth_limit=>1, :read_timeout=>2, :discard_page_bodies=>true) do |anemone|
+        first_page = true
+        anemone.on_every_page do |page|
+          if first_page
+            first_page = false
+            next
+          end
+
+          uri = URI.parse(page.url.to_s)
+          PageLink.create(:page_id=>self.id, :url=>uri.path, :http_status=>page.code, :system_id=>self.system_id)
+        end
+      end
+      self.update_attributes(:updated_crawl=>Time.now) 
+    end      
+
     attr_writer :editable
     def editable
       @editable || false

data/app/models/page_link.rb

@@ -0,0 +1,5 @@
+class PageLink < ActiveRecord::Base
+  
+  belongs_to :page
+
+end

data/app/models/page_template.rb

@@ -1,4 +1,7 @@
 class PageTemplate < ActiveRecord::Base
+  has_many :html_assetable, :as=>:html_assetable
+  has_many :html_assets, :through=>:html_assetable
+
   has_many :pages
   belongs_to :layout
   has_and_belongs_to_many :blocks
@@ -6,7 +9,7 @@ class PageTemplate < ActiveRecord::Base
   has_many :page_template_terms
   belongs_to :user
 
-  attr_accessible :name, :template_type, :layout_id, :allow_anonymous_comments, :allow_user_comments, :hidden, :is_mobile, :mobile_version_id, :body, :stylesheets, :javascripts
+  attr_accessible :name, :template_type, :layout_id, :allow_anonymous_comments, :allow_user_comments, :hidden, :is_mobile, :mobile_version_id, :body, :system_id, :html_asset_ids, :header, :footer, :is_default, :page_type
 
   use_kit_caching
 
@@ -83,7 +86,24 @@ class PageTemplate < ActiveRecord::Base
   end
 
   def self.create_default(sid, user_id)
-    PageTemplate.create(:system_id=>sid, :stylesheets=>"application", :header=>'', :footer=>'', :layout_id=>Layout.sys(sid).first.id, :template_type=>"haml", :is_mobile=>0, :is_default=>1, :page_type=>"default", :name=>"default", :body=>"= field('body')")
+    PageTemplate.create(:system_id=>sid, :header=>'', :footer=>'', :layout_id=>Layout.sys(sid).first.id, :template_type=>"haml", :is_mobile=>0, :is_default=>1, :page_type=>"default", :name=>"default", :body=>"= field('body')")
+  end
+
+  def javascripts
+    self.html_assets.where(:file_type=>"js").all
+  end
+
+  def stylesheets
+    self.html_assets.where(:file_type=>"css").all
   end
 
+  def old_stylesheets
+    self.read_attribute(:stylesheets)
+  end
+
+  def old_javascripts
+    self.read_attribute(:javascripts)
+  end
+
+  
 end

data/app/models/preference.rb

@@ -75,7 +75,7 @@ class Preference < ActiveRecord::Base
   end
  
   def Preference.licensed?(sid, name)
-    licensed = Rails.cache.fetch("licenses_#{sid}_#{name}", :expires_in=>10.minutes) do 
+    licensed = Rails.cache.fetch("licenses_#{sid}_#{name}", :expires_in=>1.minutes) do 
       Preference.get_cached(sid, "feature_#{name}")=="true" || Preference.get_cached(sid, "feature_*")=="true"
     end
 

data/app/models/q_event.rb

@@ -0,0 +1,12 @@
+class QEvent < ActiveRecord::Base
+
+  belongs_to :q_publisher
+
+  before_save { self.topic = self.topic.downcase }
+
+  after_create :run_queue
+
+  def run_queue
+    Delayed::Job.enqueue QueueJob.new(self.id), :queue=>self.system_id
+  end    
+end

data/app/models/q_klass.rb

@@ -0,0 +1,5 @@
+class QKlass < ActiveRecord::Base
+
+  belongs_to :q_publisher
+  
+end

data/app/models/q_message.rb

@@ -0,0 +1,9 @@
+class QMessage < ActiveRecord::Base
+
+  attr_accessible  :q_publisher, :q_publisher_id, :q_event, :q_subscription, :q_user, :system_id , :status, :body, :h1, :h2
+
+  belongs_to :q_publisher
+  belongs_to :q_user
+  belongs_to :q_event
+  belongs_to :q_subscription
+end

data/app/models/q_publisher.rb

@@ -0,0 +1,35 @@
+require 'bcrypt'
+require 'digest/md5'
+
+class QPublisher < ActiveRecord::Base
+  include BCrypt
+
+  attr_accessible :name, :token, :auth_method, :auth_id, :encrypted_auth_secret, :auth_secret, :twitter_consumer_key, :twitter_consumer_secret, :twitter_oauth_token, :twitter_oauth_token_secret, :mail_from
+  belongs_to :system
+  has_many :q_subscriptions, :dependent => :destroy
+  has_many :q_users_publishers, :dependent=>:destroy
+  has_many :q_users, :through=>:q_users_publishers
+  has_many :q_events, :dependent => :destroy
+  has_many :q_klasses, :dependent => :destroy
+  has_many :q_messages, :dependent => :destroy
+
+  def auth_secret
+    @auth_secret ||= Password.new(encrypted_auth_secret)
+  end
+
+  def auth_secret=(new_secret)
+    @auth_secret = Password.create(new_secret)
+    self.encrypted_auth_secret = @auth_secret
+  end
+
+  def generate_auth_secret
+    gen = QPublisher.generate_random
+    puts "Generate auth secret: #{gen}"
+    self.auth_secret = gen
+    self.save
+  end
+
+  def QPublisher.generate_random
+    Digest::MD5.hexdigest(Time.now.to_s + rand(10000000).to_s)
+  end
+end