caboose-cms 0.4.128 → 0.4.129

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWYxNmY0YjZjYTJkMzBlMGIzNjE0NWI1ZGJlMjU0Njg1M2FmZDc1NA==
+    NDAzMTMyODQzZjVkNzU4ZjZjZDZmOTVjNTBlZGQ1ZjQ1Yzg3NmZjZQ==
   data.tar.gz: !binary |-
-    MzU3ODgzMjM1MjQwNDQ5NTBkZDY2MjlkOWNjNTVhMmVlNjhhMGNjYQ==
+    ZTE3YmViNWZlMDAzMWMwNTA1NDI5MmEyNzY0NWZiMzMzNTI2MWMzNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmJiZWExOTg4YjdjNWYyNzk3YjgwYTMyMzQ2YmRmMmIwYTBhYWNjYzg2Yjdi
-    MTkzODE2MGMyM2Q2ZDk0ZjY1ZTE4NzIyNTQxZTQzNDhiN2I3M2VjMDVlZWIw
-    YmM4MDk4ZDlhMzYxNWRiMDhjMGIzNGIzNzUzMWNhY2M3OGQ0YWQ=
+    ZDYxOTE0MGZiMzE2MTBiMDRiYTk1Yjc5MjAxY2Q3MWQyNjhmZjkwYTc4ZWI1
+    YzRkMmZhNTRjZWU3ZTY2ZTFlZjlmZTMwNDdjM2YxNTBiNTY0MjUzNDJlYmZi
+    MWIyOGQ1YWJjOTAyNzhjZmNmOGQ5ZmU0OWUyZTA3MDdjYWIyMTQ=
   data.tar.gz: !binary |-
-    OTlkZWVlZjYyNTQ4ZWZjMWVmZDUzNmQxYjkwYWU5YjdlODkzZjJlMWE2M2Fm
-    NjExMTBhM2RhNDRhNGY4MDlkMTZlZjljNzUwNWY1ZjU0MzUwYTk3ZTJiNTk4
-    MTM5NzM2ZjMwYTkzMjc4ZDgzNmIzODdiMGJhZTcxNjFiYzQ5MmM=
+    NmNkOTA4ZTA4Njg3MDEyNGEzNDk3ZDVjZjcyMWU4MzEyZTlhOGZlZWQ3Y2Uz
+    OTJmZTA4NGQ1ZTM3YjMwMDkxOWY1NjAxNmZlNjNhYzNkYjVlYzMyNTZmYTk0
+    YWJmY2M3NzZmNDdjNTgxNTlmYjUxZjY0NDQwNTc1ZTA5MDhlZDY=

data/app/models/caboose/page.rb

@@ -293,9 +293,9 @@ class Caboose::Page < ActiveRecord::Base
     
     path = []      
     arr.each do |row|
-      if (row.alias.length > 0)
+      if row.alias && row.alias.strip.length > 0
         path = [row.alias]
-      elsif (row.slug.length > 0)
+      elsif row.slug && row.slug.strip.length > 0
         path << row.slug
       end
     end
@@ -312,6 +312,10 @@ class Caboose::Page < ActiveRecord::Base
     self.url_helper(p.parent_id, arr)
   end
   
+  def url
+    return Caboose::Page.url(self.id)
+  end
+  
   def self.slug(str)
     return str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')
   end
@@ -348,5 +352,9 @@ class Caboose::Page < ActiveRecord::Base
     str << "#{self.title} | " if !self.title.nil? && self.title.strip.length > 0
     str << self.site.description if self.site && self.site.description
   end
+  
+  def self.pages_with_tag(parent_id, tag)
+    self.includes(:page_tags).where(:hide => false, :parent_id => 1, :page_tags => { :tag => tag }).reorder('sort_order, title').all
+  end
 
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.128'
+  VERSION = '0.4.129'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.128
+  version: 0.4.129
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails