caboose-cms 0.2.78 → 0.2.79

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWY2MmY1YzRiZTQ3ZGYxM2ZkZDBiMTI4NTVmY2Q3YjM1NzU2M2Q3YQ==
+    Y2UxYmI0MzAwNzhlYWY2OTE3NGFhYWNkMmNkMDI3YTdhMDkxY2ZkYQ==
   data.tar.gz: !binary |-
-    MTQ1NTYxOGNkNjk0ZDFhZjI5NmU2ZDliMTIwZGFjNjFmNmU2ZGE2ZA==
+    NmUyOTQ4OWNhZGE3NTdiMDhjMDJhZTcwZTM1M2Y0ODE3MmI4MzZlYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzIzNGMyMjM5MGQ0YjFhZjIzNmJkYWEyNzU1N2JkYmJjODNlYmQ0NGJiZDYz
-    YTc3M2NlNjE3NjY3YzA5MTY2ZDFmZGMzMzcwYTgyODAxZjk0YzMzYWZlMzNh
-    ZDUwMmNlNThmYTYwZGNmYzJhZjkwZDhkODE0YmIwOTI5MDhlZDA=
+    Mzc0OTQzNmE2NjgxYTJlYWI5MTg3OTlhMmZhZGVmNDBmMzcxYzcyMjgwY2Yz
+    OTRiNzg0NDhiNTA0ZTM3MWFkYTYyYWJmNDEwZTk1NDY3MWEzOWExMjcyNzc0
+    N2Y5Mjc2ZTA3ZjNjNDQ2MjYwMzFlZTVlMzgzMzM5ZWVjMTcyNDA=
   data.tar.gz: !binary |-
-    YzNkYTFjNTRmNDk5Yjk5MDZhNmQyNTVkMjZhZmFkNTk2MDFiNDA3MGZjZGRi
-    NTE4ZGU5Y2JjNmNjMjgwNGUwNDY5NGUyYWM3YzcyODYzNTQ2MDAyNGMzMTY2
-    NWQ0YTQ2NTlkODRjOWRiMmE1NzdmNzdhN2QwMmI1ZjRlZGMyYjg=
+    OTRjOGEzYjU2ODU5NzkzNzEwN2Y5MWZmODQ1ODZjOWE2NGJkN2RhNjcxZjg4
+    ZWJlMmM2OWFhNjM5NzczYmFkNDllZGEwZjZhN2QyMjYyZjE0NzU5Y2EzNDk1
+    NTgzODg4YzNiODU3M2M1ZjMyZTllMzEzMzQ2ZDRmMzk0MDhhMjc=

data/app/models/caboose/page.rb

@@ -55,257 +55,257 @@ class Caboose::Page < ActiveRecord::Base
     return self.index_page if uri.length == 0
 
     page = false
-		parts = uri.split('/')
-			
-		# See where to start looking
-		page_ids = self.where(:alias => parts[0]).limit(1).pluck(:id)
-		page_id = !page_ids.nil? && page_ids.count > 0 ? page_ids[0] : false
-		
-		# Search for the page
-		if (page_id)
-		  page_id = self.page_with_uri_helper(parts, 1, page_id)
-		else
-		  parent_id = self.index_page
-			page_id = self.page_with_uri_helper(parts, 0, parent_id)
-		end
-		
-		return false if page_id.nil?
-				
-		page = self.find(page_id)
-		
-		if (!get_closest_parent) # // Look for an exact match
-			return false if page.uri != uri
-		end
-		return page		
-	end
-	
-	def self.page_with_uri_helper(parts, level, parent_id)
-		return parent_id if level >= parts.count
-		slug = parts[level]		
-		page_ids = self.where(:parent_id => parent_id, :slug => slug).limit(1).pluck(:id)
-		return parent_id if page_ids.nil? || page_ids.count == 0		
-		return self.page_with_uri_helper(parts, level+1, page_ids[0])				
-	end
-	
-	def self.update_uri(page)
-	  #return if page.redirect_url && page.redirect_url.length > 0
-	  
-	  page.slug = self.slug(page.title) if page.slug.nil? || page.slug.strip.length == 0
-	  page.uri = page.alias && page.alias.strip.length > 0 ? page.alias : (page.parent ? "#{page.parent.uri}/#{page.slug}" : "#{page.slug}")
+    parts = uri.split('/')
+      
+    # See where to start looking
+    page_ids = self.where(:alias => parts[0]).limit(1).pluck(:id)
+    page_id = !page_ids.nil? && page_ids.count > 0 ? page_ids[0] : false
+    
+    # Search for the page
+    if (page_id)
+      page_id = self.page_with_uri_helper(parts, 1, page_id)
+    else
+      parent_id = self.index_page
+      page_id = self.page_with_uri_helper(parts, 0, parent_id)
+    end
+    
+    return false if page_id.nil?
+        
+    page = self.find(page_id)
+    
+    if (!get_closest_parent) # // Look for an exact match
+      return false if page.uri != uri
+    end
+    return page   
+  end
+  
+  def self.page_with_uri_helper(parts, level, parent_id)
+    return parent_id if level >= parts.count
+    slug = parts[level]   
+    page_ids = self.where(:parent_id => parent_id, :slug => slug).limit(1).pluck(:id)
+    return parent_id if page_ids.nil? || page_ids.count == 0    
+    return self.page_with_uri_helper(parts, level+1, page_ids[0])       
+  end
+  
+  def self.update_uri(page)
+    #return if page.redirect_url && page.redirect_url.length > 0
+    
+    page.slug = self.slug(page.title) if page.slug.nil? || page.slug.strip.length == 0
+    page.uri = page.alias && page.alias.strip.length > 0 ? page.alias : (page.parent ? "#{page.parent.uri}/#{page.slug}" : "#{page.slug}")
     page.uri[0] = '' if page.uri.starts_with?('/')
     page.save
-	  
-	  page.children.each { |p2| self.update_uri(p2) }	    
-	end
-	
-	def self.update_child_perms(page_id)
-		page = self.find(page_id)
-			
-		viewers_ids 	= Role.roles_with_page_permission(page_id, 'view').collect {|r| r.id }
-		editors_ids 	= Role.roles_with_page_permission(page_id, 'edit').collect {|r| r.id }
-		approvers_ids	= Role.roles_with_page_permission(page_id, 'approve').collect {|r| r.id }		
-		
-		self.update_child_perms_helper(page, viewer_ids, editor_ids, approver_ids)
-	end
-	
-	def self.update_child_perms_helper(page, viewer_ids, editor_ids, approver_ids)
-		self.update_authorized_for_action(page.id, 'view'		  , viewer_ids)
-		self.update_authorized_for_action(page.id, 'edit'		  , editor_ids)
-		self.update_authorized_for_action(page.id, 'approve'	, approver_ids)
+    
+    page.children.each { |p2| self.update_uri(p2) }     
+  end
+  
+  def self.update_child_perms(page_id)
+    page = self.find(page_id)
+      
+    viewers_ids   = Role.roles_with_page_permission(page_id, 'view').collect {|r| r.id }
+    editors_ids   = Role.roles_with_page_permission(page_id, 'edit').collect {|r| r.id }
+    approvers_ids = Role.roles_with_page_permission(page_id, 'approve').collect {|r| r.id }   
+    
+    self.update_child_perms_helper(page, viewer_ids, editor_ids, approver_ids)
+  end
+  
+  def self.update_child_perms_helper(page, viewer_ids, editor_ids, approver_ids)
+    self.update_authorized_for_action(page.id, 'view'     , viewer_ids)
+    self.update_authorized_for_action(page.id, 'edit'     , editor_ids)
+    self.update_authorized_for_action(page.id, 'approve'  , approver_ids)
 
-		page.children.each do |kid|
-			self.update_child_perms_helper(kid, viewer_ids, editor_ids, approver_ids)
-		end
-	end
-	
-	def self.update_authorized_for_action(page_id, action, roles)
-	  Caboose::PagePermission.where(:page_id => page_id, :action => action).destroy_all
-	  if (!roles.nil?)
-	    roles.each do |role|
-	      role_id = role.is_a?(Integer) ? role : role.id
-		  	Caboose::PagePermission.create({
-		  	  :page_id => page_id,
-		  	  :role_id => role_id,
-		  	  :action => action
-		  	})
-		  end
-		end
-		return true
-	end
-	
-	def self.is_allowed(user, page_id, action)
-		user = User.logged_out_user if user.nil?
+    page.children.each do |kid|
+      self.update_child_perms_helper(kid, viewer_ids, editor_ids, approver_ids)
+    end
+  end
+  
+  def self.update_authorized_for_action(page_id, action, roles)
+    Caboose::PagePermission.where(:page_id => page_id, :action => action).destroy_all
+    if (!roles.nil?)
+      roles.each do |role|
+        role_id = role.is_a?(Integer) ? role : role.id
+        Caboose::PagePermission.create({
+          :page_id => page_id,
+          :role_id => role_id,
+          :action => action
+        })
+      end
+    end
+    return true
+  end
+  
+  def self.is_allowed(user, page_id, action)
+    user = User.logged_out_user if user.nil?
 
-		# Allow a user id to be sent instead of a user object
-		user = User.find(user) if user.is_a?(Integer)
-		user.role_ids = [Role.logged_out_role_id] if user.role_ids.nil?
+    # Allow a user id to be sent instead of a user object
+    user = User.find(user) if user.is_a?(Integer)
+    user.role_ids = [Role.logged_out_role_id] if user.role_ids.nil?
 
-		t = PagePermission.table		
-		reqs = nil
-		user.role_ids.each do |role_id|
-		  if (reqs.nil?)
-		    reqs = t[:role_id].eq(role_id)
-		  else
-		    reqs.or(t[:role_id].eq(role_id))
-		  end
-		end	
-		var params = { :page_id => page_id, :action => action }
-		params << reqs if !reqs.nil?
-		count = PagePermission.where(params).count
-		
-		return true if count > 0
-		return false
-	end
-	
-	def self.roles_with_permission(page_id, action)
-		return Role.roles_with_page_permission(page_id, action)
-	end
-	              
-	def self.permissible_actions(user, page_id)
-	  if (user.is_a?(Integer))
-	    user = Caboose::User.find(user)
-	  end
-	  actions = []
-	  user.roles.each do |role|
-	    actions + Caboose::PagePermission.where({
-	        :role_id => role.id, 
-	        :page_id => page_id
-	      }).pluck(:action)
-	  end
-		return actions.uniq
-	end
-	
-	def self.page_ids_with_permission(user, action)
-	  if (user.is_a?(Integer))
-	    user = Caboose::User.find(user)
-	  end
-	  ids = []
-	  user.roles.each do |role|	    
-	    ids + Caboose::PagePermission.where({
-	        :role_id => role.id,
-	        :action => action
-	      }).pluck(:page_id)
-	  end
-		return ids.uniq
-	end
-	
-	def self.crumb_trail(page)
-		page_id = page.is_a?(Integer) ? page : page.id
-		
-		arr = []
-		self.crumb_trail_helper(page_id, arr)
-		arr.reverse!
-		
-		trail = arr.collect do |row|
-			Caboose::StdClass.new({
-			  'href' => !row.uri.nil? && row.uri.length > 0 ? row.uri : '/',
-			  'text' => !row.menu_title.nil? && row.menu_title.length > 0 ? row.menu_title : row.title
-			})
-		end
-		return trail
-	end
-	
-	def self.crumb_trail_helper(page_id, arr)
-		return if page_id.nil? || page_id <= 0
-		p = self.find_with_fields(page_id, [:parent_id, :title, :menu_title, :uri])		
-		return if p.nil?
-		arr << p
-		self.crumb_trail_helper(p.parent_id, arr)
-	end
-	
-	def self.subnav(page, use_redirect_urls = true, user = false)
-	  
-	  # Be nice and allow page ids to be sent
-		if (page.is_a?(Integer)) 
-		  page = self.find_with_fields(page, [:title, :menu_title, :custom_sort_children])
-		end
-		
-		block = Caboose::MenuBlock.new
-		block.title = !page.menu_title.nil? && page.menu_title.length > 0 ? page.menu_title : page.title
-		block.title_id = page.id
-		               
-		pages = self.select([:id, :title, :menu_title, :alias, :slug, :uri, :redirect_url, :sort_order]).where(:parent_id => page.id, :hide => false).reorder(:sort_order).all
-		if (page.custom_sort_children)
-		  pages.sort! {|x,y| x.sort_order <=> y.sort_order }
-		else
-		  pages.sort! {|x,y| x.order_title <=> y.order_title }
-		end
-			
-		if (pages.nil? || pages.count == 0) # No children, go up a level	
-			parent = self.find_with_fields(page.parent_id, [:title, :menu_title, :custom_sort_children])
-			return block if parent.nil? # If we happen to be at the top page
-			
-			block.title = !parent.menu_title.nil? && parent.menu_title.length > 0 ? parent.menu_title : parent.title
-			block.title_id = parent.id
-			
-			pages = self.select([
-			    :id, :title, :menu_title, :alias, :slug, :uri, :redirect_url, :sort_order
-			  ]).where(:parent_id => page.parent_id, :hide => false)
-			if (parent.custom_sort_children)
-			  pages.sort! {|x,y| x.sort_order <=> y.sort_order }
-			else
-			  pages.sort! {|x,y| x.order_title <=> y.order_title }		
-			end
-		end
-		
-		block.links = []
-		pages.each do |p|
-			link = Caboose::StdClass.new({
-			  'href' => !p.redirect_url.nil? && p.redirect_url.length > 0 ? p.redirect_url : p.uri,
-			  'text' => !p.menu_title.nil? && p.menu_title.length > 0 ? p.menu_title : p.title,
-			  'is_current' => p.id == page.id
-			})
-			if (!use_redirect_urls && self.is_allowed(user, p.id, 'edit'))
-			  link.href = row.uri
-			end	
-			block.links << link
-		end		 
-		return block
-	end
-	
-	def self.url(page_id)
-		arr = []
-		self.url_helper(page_id, arr)
-		arr.reverse!
-		
-		path = []      
-		arr.each do |row|
-		  if (row.alias.length > 0)
-		    path = [row.alias]
-			elsif (row.slug.length > 0)
-			  path << row.slug
-			end
-		end
-		return path.join('/')
-	end
-	
-	def self.url_helper(page_id, arr)
-		return if page_id <= 0
-		
-		p = self.find_with_fields(page_id, [:id, :parent_id, :title, :menu_title, :alias, :slug])
-		return if p.nil?
+    t = PagePermission.table    
+    reqs = nil
+    user.role_ids.each do |role_id|
+      if (reqs.nil?)
+        reqs = t[:role_id].eq(role_id)
+      else
+        reqs.or(t[:role_id].eq(role_id))
+      end
+    end 
+    var params = { :page_id => page_id, :action => action }
+    params << reqs if !reqs.nil?
+    count = PagePermission.where(params).count
+    
+    return true if count > 0
+    return false
+  end
+  
+  def self.roles_with_permission(page_id, action)
+    return Role.roles_with_page_permission(page_id, action)
+  end
+                
+  def self.permissible_actions(user, page_id)
+    if (user.is_a?(Integer))
+      user = Caboose::User.find(user)
+    end
+    actions = []
+    user.roles.each do |role|
+      actions + Caboose::PagePermission.where({
+          :role_id => role.id, 
+          :page_id => page_id
+        }).pluck(:action)
+    end
+    return actions.uniq
+  end
+  
+  def self.page_ids_with_permission(user, action)
+    if (user.is_a?(Integer))
+      user = Caboose::User.find(user)
+    end
+    ids = []
+    user.roles.each do |role|     
+      ids + Caboose::PagePermission.where({
+          :role_id => role.id,
+          :action => action
+        }).pluck(:page_id)
+    end
+    return ids.uniq
+  end
+  
+  def self.crumb_trail(page)
+    page_id = page.is_a?(Integer) ? page : page.id
+    
+    arr = []
+    self.crumb_trail_helper(page_id, arr)
+    arr.reverse!
+    
+    trail = arr.collect do |row|
+      Caboose::StdClass.new({
+        'href' => !row.uri.nil? && row.uri.length > 0 ? row.uri : '/',
+        'text' => !row.menu_title.nil? && row.menu_title.length > 0 ? row.menu_title : row.title
+      })
+    end
+    return trail
+  end
+  
+  def self.crumb_trail_helper(page_id, arr)
+    return if page_id.nil? || page_id <= 0
+    p = self.find_with_fields(page_id, [:parent_id, :title, :menu_title, :uri])   
+    return if p.nil?
+    arr << p
+    self.crumb_trail_helper(p.parent_id, arr)
+  end
+  
+  def self.subnav(page, use_redirect_urls = true, user = false)
+    
+    # Be nice and allow page ids to be sent
+    if (page.is_a?(Integer)) 
+      page = self.find_with_fields(page, [:title, :menu_title, :custom_sort_children])
+    end
+    
+    block = Caboose::MenuBlock.new
+    block.title = !page.menu_title.nil? && page.menu_title.length > 0 ? page.menu_title : page.title
+    block.title_id = page.id
+                   
+    pages = self.select([:id, :title, :menu_title, :alias, :slug, :uri, :redirect_url, :sort_order]).where(:parent_id => page.id, :hide => false).reorder(:sort_order).all
+    if (page.custom_sort_children)
+      pages.sort! {|x,y| x.sort_order <=> y.sort_order }
+    else
+      pages.sort! {|x,y| x.order_title <=> y.order_title }
+    end
+      
+    if (pages.nil? || pages.count == 0) # No children, go up a level  
+      parent = self.find_with_fields(page.parent_id, [:title, :menu_title, :custom_sort_children])
+      return block if parent.nil? # If we happen to be at the top page
+      
+      block.title = !parent.menu_title.nil? && parent.menu_title.length > 0 ? parent.menu_title : parent.title
+      block.title_id = parent.id
+      
+      pages = self.select([
+          :id, :title, :menu_title, :alias, :slug, :uri, :redirect_url, :sort_order
+        ]).where(:parent_id => page.parent_id, :hide => false)
+      if (parent.custom_sort_children)
+        pages.sort! {|x,y| x.sort_order <=> y.sort_order }
+      else
+        pages.sort! {|x,y| x.order_title <=> y.order_title }    
+      end
+    end
+    
+    block.links = []
+    pages.each do |p|
+      link = Caboose::StdClass.new({
+        'href' => !p.redirect_url.nil? && p.redirect_url.length > 0 ? p.redirect_url : p.uri,
+        'text' => !p.menu_title.nil? && p.menu_title.length > 0 ? p.menu_title : p.title,
+        'is_current' => p.id == page.id
+      })
+      if (!use_redirect_urls && self.is_allowed(user, p.id, 'edit'))
+        link.href = row.uri
+      end 
+      block.links << link
+    end    
+    return block
+  end
+  
+  def self.url(page_id)
+    arr = []
+    self.url_helper(page_id, arr)
+    arr.reverse!
+    
+    path = []      
+    arr.each do |row|
+      if (row.alias.length > 0)
+        path = [row.alias]
+      elsif (row.slug.length > 0)
+        path << row.slug
+      end
+    end
+    return path.join('/')
+  end
+  
+  def self.url_helper(page_id, arr)
+    return if page_id <= 0
+    
+    p = self.find_with_fields(page_id, [:id, :parent_id, :title, :menu_title, :alias, :slug])
+    return if p.nil?
 
-		arr << p
-		self.url_helper(p.parent_id, arr)
-	end
-	
-	def self.slug(str)
-		return str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
-	end
-	
-	def self.has_children(page_id)
-		count = self.where(:parent_id => page_id).count
-		return count > 0
-	end
-	
-	def self.is_child(parent_id, child_id)
-	  pid = self.where(:id => child_id).limit(1).pluck(:parent_id)[0]
-		return false if pid.nil? || pid <= 0
-		return true if pid == parent_id
-		return self.is_child(parent_id, pid)
-	end
+    arr << p
+    self.url_helper(p.parent_id, arr)
+  end
+  
+  def self.slug(str)
+    return str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
+  end
+  
+  def self.has_children(page_id)
+    count = self.where(:parent_id => page_id).count
+    return count > 0
+  end
+  
+  def self.is_child(parent_id, child_id)
+    pid = self.where(:id => child_id).limit(1).pluck(:parent_id)[0]
+    return false if pid.nil? || pid <= 0
+    return true if pid == parent_id
+    return self.is_child(parent_id, pid)
+  end
 
-	def linked_resources_map
+  def linked_resources_map
     resources = { js: [], css: [] }
     return resources if self.linked_resources.nil?
     self.linked_resources.each_line do |r|
@@ -318,6 +318,6 @@ class Caboose::Page < ActiveRecord::Base
       end
     end
     return resources
-	end
+  end
 
 end

data/app/models/caboose/user.rb

@@ -1,4 +1,3 @@
-
 class Caboose::User < ActiveRecord::Base
   self.table_name = "users"
   has_and_belongs_to_many :roles
@@ -22,18 +21,18 @@ class Caboose::User < ActiveRecord::Base
   end
   
   def self.validate_token(token)
-    user = User.where('token' => token).first
+    user = self.where('token' => token).first
     return user 
   end
   
   def add_to_role_with_name(role_name)
-    r = Role.where(:name => role_name).first
+    r = Caboose::Role.where(:name => role_name).first
     return false if r.nil?
     return add_to_role(r.id)
   end
   
   def add_to_role(role_id)
-    r = Role.find(role_id)
+    r = Caboose::Role.find(role_id)
     return false if r.nil?
     
     if (!is_member?(r.id))

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.78'
+  VERSION = '0.2.79'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.78
+  version: 0.2.79
 platform: ruby
 authors:
 - William Barry