radiant-sphinx_search-extension 0.9.1 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.3

data/config/locales/en.yml

@@ -0,0 +1,6 @@
+---
+en:
+  search : 'Search'
+  result :
+    one   : '1 result'
+    other : '{{count}} results'

data/lib/sphinx_search/page_extensions.rb

@@ -7,8 +7,9 @@ module SphinxSearch
      base.define_index do
        set_property :delta => true, :group_concat_max_len => SphinxSearch.content_length || 8.kilobytes
        set_property :field_weights => { 'title' => 100 }
-       indexes title, parts.content
-       has updated_at, status_id, virtual
+       indexes title, :sortable => true
+       indexes parts.content
+       has created_at, updated_at, status_id, virtual
      end
 
      base.extend ClassMethods

data/lib/sphinx_search/radius_tags.rb

@@ -15,18 +15,18 @@ module SphinxSearch
     desc %{
       Renders a basic search form. Takes optional @id@ and @class@ values if
       you need to target the form with specific CSS or JS; also takes an optional
-      @value@ tag as the label on the input. If for some reason you don't want
+      @button@ tag as the label on the input. If for some reason you don't want
       to use the default search term paramater @q@, you can override this by
       defining @SphinxSearch.param_name@ in @/config/initializers/sphinx_search.rb@.
 
       *Usage:*
 
-      <pre><code><r:search:form [id="form-id"] [class="form-class"] [value="Go"] /></code></pre>
+      <pre><code><r:search:form [id="form-id"] [class="form-class"] [button="Go"] /></code></pre>
     }
     tag 'search:form' do |tag|
       form_id = tag.attr['id'] || 'search-form'
       form_class = tag.attr['class'] || 'search-form'
-      form_value = tag.attr['value'] || 'Search'
+      form_value = tag.attr['button'] || I18n.translate('search')
       form_input = SphinxSearch.param_name || 'q'
       return <<-HTML
         <form action="#{tag.globals.page.url}" method="get" id="#{form_id}" class="#{form_class}">
@@ -41,9 +41,14 @@ module SphinxSearch
       one result was found. Takes a @paginated@ attribute and all the standard
       pagination attributes.
 
+      Additional Thinking Sphinx options: @order@ and @sort_mode@ are passed
+      directly to Sphinx. Valid orderable attributes are @created_at@,
+      @updated_at@, @status_id@, @virtual@, and @title@. @sort_mode@ defaults
+      to @asc@ (ascending); to reverse this, use @sort_mode="desc"@.
+
       *Usage:*
 
-      <pre><code><r:search:results [paginated="false|true"] [per_page="..."] [...other pagination attributes]>...</r:search:results></code></pre>
+      <pre><code><r:search:results [paginated="false|true"] [per_page="..."] [order="..."] [sort_mode="ASC|DESC"] [...other pagination attributes]>...</r:search:results></code></pre>
     }
     tag 'search:results' do |tag|
       options = thinking_sphinx_options(tag)
@@ -73,8 +78,12 @@ module SphinxSearch
       <pre><code><r:search:results:count [label="..."] /></code></pre>
     }
     tag 'search:results:count' do |tag|
-      label = tag.attr['label'] || 'result'
-      pluralize tag.globals.results.total_entries, label
+      count = tag.globals.results.total_entries
+      if label = tag.attr['label']
+        pluralize count, label
+      else
+        I18n.translate('result', :count => count)
+      end
     end
 
     desc %{
@@ -159,11 +168,13 @@ module SphinxSearch
       end
 
       def thinking_sphinx_options(tag)
+        options = tag.attr.symbolize_keys.slice(:order, :sort_mode)
+        [:order, :sort_mode].each { |attr| options[attr] &&= options[attr].to_sym }
         {
           :with => { :status_id => 100, :virtual => false },
           :without => { :class_crc => SphinxSearch.hidden_classes.map(&:to_crc32) },
           :retry_stale => true
-        }
+        }.merge(options)
       end
   end
 end

data/radiant-sphinx_search-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-sphinx_search-extension}
-  s.version = "0.9.1"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh French", "Kunal Shah", "Justin Blecher"]
-  s.date = %q{2010-08-08}
+  s.date = %q{2010-08-14}
   s.description = %q{Adds fulltext search capability to Radiant content via Thinking Sphinx.}
   s.email = %q{git@digitalpulp.com}
   s.extra_rdoc_files = [
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "app/models/search_page.rb",
-     "app/views/admin/pages/_search_toggle.haml",
+     "config/locales/en.yml",
      "db/migrate/20100808155751_add_delta_to_pages.rb",
      "lib/radiant-sphinx_search-extension.rb",
      "lib/sphinx_search.rb",

data/spec/models/page_spec.rb

@@ -16,10 +16,18 @@ describe Page do
   end
 
   describe "#thinking_sphinx_options" do
-    it "should description" do
+    before do
+      @tag = stub(:tag, :attr => { 'order' => 'title' })
+    end
+    it "should omit hidden classes" do
       SphinxSearch.hidden_classes = %w(FileNotFoundPage)
-      opts = SearchPage.new.send :thinking_sphinx_options, nil
+      opts = SearchPage.new.send :thinking_sphinx_options, @tag
       opts[:without][:class_crc].should include('FileNotFoundPage'.to_crc32)
     end
+
+    it "should convert Sphinx options to TS format" do
+      opts = SearchPage.new.send :thinking_sphinx_options, @tag
+      opts[:order].should == :title
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Josh French
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -04:00
+date: 2010-08-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,7 @@ files:
 - Rakefile
 - VERSION
 - app/models/search_page.rb
-- app/views/admin/pages/_search_toggle.haml
+- config/locales/en.yml
 - db/migrate/20100808155751_add_delta_to_pages.rb
 - lib/radiant-sphinx_search-extension.rb
 - lib/sphinx_search.rb

data/app/views/admin/pages/_search_toggle.haml

@@ -1,15 +0,0 @@
-- content_for :page_css do
-  :plain
-    #page-search-status .BoxFix { padding: 4px 0; }
-
-%tr#page-search-status
-  %th.label Search
-  %td.field
-    .BoxFix
-      %ul.Inputs.HorizList
-        %li
-          = radio_button :page, :searchable, true, :class => 'RadioInput'
-          %label{:for => 'page_searchable_true' } Searchable
-        %li
-          = radio_button :page, :searchable, false, :class => 'RadioInput'
-          %label{:for => 'page_searchable_false' } Invisible to Search