radiant-sitemap_search-extension 1.0.3 → 1.0.4

data/Rakefile

@@ -33,7 +33,7 @@ unless defined? RADIANT_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/app/controllers/admin/search_controller.rb

@@ -3,8 +3,8 @@ class Admin::SearchController < ApplicationController
     if params[:q]
       @pages = Page.search(params[:q]).uniq
       if current_user.designer? || current_user.admin?
-        @snippets = Snippet.search(params[:q]).uniq
         @layouts = Layout.search(params[:q]).uniq
+        @snippets = Snippet.search(params[:q]).uniq if defined?(SnippetsExtension)
         @templates = Template.search(params[:q]).uniq if defined?(TemplatesExtension)
         @banners = Banner.search(params[:q]).uniq if defined?(BannerRotatorExtension)
       end

data/lib/sitemap_search/model.rb

@@ -7,10 +7,10 @@ module SitemapSearch::Model
       base.search_fields = [:title, :slug, :breadcrumb, :content]
       base.search_fields << :draft_content if defined?(ConcurrentDraftExtension)
       base.includes = [:parts]
-    elsif base == Snippet
+    elsif base == Layout
       base.search_fields = [:name, :content]
       base.search_fields << :draft_content if defined?(ConcurrentDraftExtension)
-    elsif base == Layout
+    elsif defined?(SnippetsExtension) && base == Snippet
       base.search_fields = [:name, :content]
       base.search_fields << :draft_content if defined?(ConcurrentDraftExtension)
     elsif defined?(TemplatesExtension) && base == Template

data/radiant-sitemap_search-extension.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{radiant-sitemap_search-extension}
-  s.version = "1.0.3"
+  s.name = "radiant-sitemap_search-extension"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew vonderLuft", "Sean Cribbs"]
-  s.date = %q{2011-06-20}
-  s.description = %q{Adds search feature for pages, snippets, layouts, et al.}
-  s.email = %q{avonderluft@avlux.net}
+  s.date = "2013-01-30"
+  s.description = "Adds search feature for pages, snippets, layouts, et al."
+  s.email = "avonderluft@avlux.net"
   s.extra_rdoc_files = [
     "README.textile"
   ]
@@ -47,16 +47,10 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{https://github.com/avonderluft/radiant-sitemap_search-extension}
+  s.homepage = "https://github.com/avonderluft/radiant-sitemap_search-extension"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Sitemap Search Extension for Radiant CMS}
-  s.test_files = [
-    "spec/controllers/search_controller_spec.rb",
-    "spec/models/page_extensions_spec.rb",
-    "spec/models/snippet_extensions_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Sitemap Search Extension for Radiant CMS"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/sitemap_search_extension.rb

@@ -13,13 +13,15 @@ class SitemapSearchExtension < Radiant::Extension
     tab "Content" do
       add_item "Search", '/admin/search'
     end
-    [Page, Snippet, Layout].each do |klass|
-      klass.send :include, SitemapSearch::Model
-    end
-    admin.snippet.index.bottom.delete 'new_button'
-    admin.snippet.index.add :bottom, 'admin/search/snippet_index_bottom'
+    Page.send :include, SitemapSearch::Model
+    Layout.send :include, SitemapSearch::Model
     admin.layout.index.bottom.delete 'new_button'
-    admin.layout.index.add :bottom, 'admin/search/layout_index_bottom'    
+    admin.layout.index.add :bottom, 'admin/search/layout_index_bottom'
+    if defined?(SnippetsExtension)
+      Snippet.send :include, SitemapSearch::Model
+      admin.snippet.index.bottom.delete 'new_button'
+      admin.snippet.index.add :bottom, 'admin/search/snippet_index_bottom'
+    end
     if defined?(TemplatesExtension)
       Template.send :include, SitemapSearch::Model
       admin.template.index.bottom.delete 'new_button'

data/spec/controllers/search_controller_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Admin::SearchController do
   dataset :users
@@ -6,9 +7,8 @@ describe Admin::SearchController do
   [:admin, :designer].each do |user|
     describe "search as user with #{user} privileges" do
       before :each do
-        @page, @snippet, @layout = mock_model(Page), mock_model(Snippet), mock_model(Layout)
+        @page, @layout = mock_model(Page), mock_model(Layout)
         Page.stub!(:search).and_return([@page])
-        Snippet.stub!(:search).and_return([@snippet])
         Layout.stub!(:search).and_return([@layout])
         login_as user
       end
@@ -20,14 +20,18 @@ describe Admin::SearchController do
         Page.should_receive(:search).with('radiant').and_return([@page])
         do_get
       end
-      it "should search snippets" do
-        Snippet.should_receive(:search).with('radiant').and_return([@snippet])
-        do_get
-      end
       it "should search layouts" do
         Layout.should_receive(:search).with('radiant').and_return([@layout])
         do_get
       end
+      if defined?(SnippetsExtension)
+        it "should search snippets" do
+          @snippet = mock_model(Snippet)
+          Snippet.stub!(:search).and_return([@snippet])
+          Snippet.should_receive(:search).with('radiant').and_return([@snippet])
+          do_get
+        end
+      end
       if defined?(TemplatesExtension)
         it "should search templates" do
           @banner = mock_model(Template)
@@ -58,9 +62,8 @@ describe Admin::SearchController do
   [:existing, :non_admin].each do |user|
     describe "search as user with #{user} privileges" do
       before :each do
-        @page, @snippet, @layout = mock_model(Page), mock_model(Snippet), mock_model(Layout)
+        @page, @layout = mock_model(Page), mock_model(Layout)
         Page.stub!(:search).and_return([@page])
-        Snippet.stub!(:search).and_return([@snippet])
         Layout.stub!(:search).and_return([@layout])
         login_as user
       end
@@ -73,17 +76,21 @@ describe Admin::SearchController do
         Page.should_receive(:search).with('radiant').and_return([@page])
         do_get
       end
-      it "should not search snippets" do
-        Snippet.should_not_receive(:search).with('radiant')
-        do_get
-      end
       it "should not search layouts" do
         Layout.should_not_receive(:search).with('radiant')
         do_get
       end
+      if defined?(SnippetsExtension)
+        it "should not search templates" do
+          @snippet = mock_model(Snippet)
+          Snippet.stub!(:search).and_return([@snippet])
+          Snippet.should_not_receive(:search).with('radiant')
+          do_get
+        end
+      end
       if defined?(TemplatesExtension)
         it "should not search templates" do
-          @banner = mock_model(Template)
+          @template = mock_model(Template)
           Template.stub!(:search).and_return([@template])
           Template.should_not_receive(:search).with('radiant')
           do_get

data/spec/models/page_extensions_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Page, "search" do
   dataset :pages

data/spec/models/snippet_extensions_spec.rb

@@ -1,24 +1,27 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+#require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
-describe Snippet, "search" do
-  dataset :snippets
-  before :each do
-    if defined?(ConcurrentDraft)
-      snippets(:first).update_attributes(:draft_content => "Special draft content")
-    else
-      snippets(:first).update_attributes(:content => "Special content")
+if defined?(SnippetsExtension)
+  describe Snippet, "search" do
+    dataset :snippets
+    before :each do
+      if defined?(ConcurrentDraft)
+        snippets(:first).update_attributes(:draft_content => "Special draft content")
+      else
+        snippets(:first).update_attributes(:content => "Special content")
+      end
     end
-  end
   
-  it "should find snippets from words in the name" do
-    Snippet.search('first').should include(snippets(:first))
-  end
+    it "should find snippets from words in the name" do
+      Snippet.search('first').should include(snippets(:first))
+    end
   
-  it "should find snippets from words in the content" do
-    Snippet.search('Before').should include(snippets(:yielding))
-  end
+    it "should find snippets from words in the content" do
+      Snippet.search('Before').should include(snippets(:yielding))
+    end
   
-  it "should find snippets from words in the content" do
-    Snippet.search('special').should include(snippets(:first))
+    it "should find snippets from words in the content" do
+      Snippet.search('special').should include(snippets(:first))
+    end
   end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ unless defined? RADIANT_ROOT
 end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
+Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
+Dataset::Resolver.default << (SnippetsExtension.root + "/spec/datasets") if defined?(SnippetsExtension)
 if File.directory?(File.dirname(__FILE__) + "/scenarios")
   Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios"
 end

metadata

@@ -1,51 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radiant-sitemap_search-extension
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Andrew vonderLuft
 - Sean Cribbs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-01-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: radiant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc2
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15424049
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.rc2
-  name: radiant
-  version_requirements: *id001
 description: Adds search feature for pages, snippets, layouts, et al.
 email: avonderluft@avlux.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - HELP.textile
 - README.textile
 - Rakefile
@@ -76,42 +65,31 @@ files:
 - spec/models/snippet_extensions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/avonderluft/radiant-sitemap_search-extension
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1656006514844971377
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sitemap Search Extension for Radiant CMS
-test_files: 
-- spec/controllers/search_controller_spec.rb
-- spec/models/page_extensions_spec.rb
-- spec/models/snippet_extensions_spec.rb
-- spec/spec_helper.rb
+test_files: []