tb_cms 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29ed12dca3e942e4ee2e13842af13957f9ddbd78
-  data.tar.gz: 4437788f0073809f050876e5595e192aabf87e96
+  metadata.gz: 42c344bf641663acb745ec63487f3bc3991bdeff
+  data.tar.gz: 04187a4e8221bb57b592cb6cc164939267ab87ee
 SHA512:
-  metadata.gz: d64be12a48126572e2b31dec5aa5ed13305e11c415d9ea30a1286337a42c76f8d221731dd9b95f5446cde01b18b8b56d60a96c2b84e151b918cc404061187de6
-  data.tar.gz: cc7cf7203a6963802c198ee3869fc3b531a9b2032dedaa933ba32860a72d01e4879cbfab42e0e43e19892ba524e48f225d117e7aca08cf9e5f8900ee802f4935
+  metadata.gz: 3b375f04f8021e21612a92982a3d5fa2b6242b874fe3f8826959b9be29b4ac5d7684cac3c7a9b23feb771c5e107aa9d335cad324c8b05823e722c7c9776bd29f
+  data.tar.gz: faa30c0d60fbe576157f9f09f51aa10a709405c170d781e7bf4a902bd0c0168771b291ddddd9cb92a7b5dbc1a130644a52609e38bc045d163bd86f333e02b4ec

data/app/controllers/cms/sitemaps_controller.rb

@@ -1,7 +1,7 @@
 class Cms::SitemapsController < Spud::ApplicationController
 	respond_to :xml
 	def show
-		@pages = SpudPage.published_pages.public.order(:spud_page_id)
+		@pages = SpudPage.published_pages.viewable.order(:spud_page_id)
 		if Spud::Core.multisite_mode_enabled
 			site_config = Spud::Core.site_config_for_host(request.host_with_port)
 			@pages = @pages.site(!site_config.blank? ? site_config[:site_id] : 0)

data/app/helpers/cms/application_helper.rb

@@ -22,7 +22,7 @@ module Cms::ApplicationHelper
 
 	def sp_list_pages(options = {})
 
-		pages = SpudPage.public.published_pages
+		pages = SpudPage.viewable.published_pages
 
 		if Spud::Core.multisite_mode_enabled
 			site_config = Spud::Core.site_config_for_host(request.host_with_port)

data/app/models/spud_page.rb

@@ -19,7 +19,7 @@ class SpudPage < ActiveRecord::Base
 	scope :parent_pages, ->{ where(:spud_page_id => nil)}
 	scope :site, lambda {|sid| where(:site_id => sid)}
 	scope :published_pages, ->{ where(:published => true) }
-	scope :public, ->{ where(:visibility => 0) }
+	scope :viewable, ->{ where(:visibility => 0) }
 
 	def full_content_processed
 		self.spud_page_partials.collect{|partial| partial.content_processed }.join(' ')

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.1.1"
+		VERSION = "1.1.2"
 	end
 end

data/spec/controllers/cms/sitemaps_controller_spec.rb

@@ -12,7 +12,7 @@ describe Cms::SitemapsController do
 
     it "should return the sitemap urls" do
       get :show, :format => :xml
-      assigns(:pages).should == SpudPage.published_pages.public.order(:spud_page_id)
+      assigns(:pages).should == SpudPage.published_pages.viewable.order(:spud_page_id)
     end
 
     it "should only respond to an XML format" do
@@ -34,7 +34,7 @@ describe Cms::SitemapsController do
         2.times {|x| FactoryGirl.create(:spud_page) }
         3.times {|x| FactoryGirl.create(:spud_page,:site_id => 1) }
         get :show, :format => :xml
-        assigns(:pages).should == SpudPage.published_pages.public.order(:spud_page_id).site(1)
+        assigns(:pages).should == SpudPage.published_pages.viewable.order(:spud_page_id).site(1)
       end
 
     end

data/spec/models/spud_page_spec.rb

@@ -50,7 +50,7 @@ describe SpudPage do
 		end
 
 		it "should only show public pages" do
-			SpudPage.public.to_sql.should == SpudPage.where(:visibility => 0).to_sql
+			SpudPage.viewable.to_sql.should == SpudPage.where(:visibility => 0).to_sql
 		end
 
 		it "should group pages by parent" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails