sunspot 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c950bbbf13ef68316389d88a82029e32ebe70b05
-  data.tar.gz: e5cb08d4d7f07f6297adc5a1adb794ba0555c39b
+  metadata.gz: 757abddaa2a6004ccb6f5a9b3dda71c672f80d0b
+  data.tar.gz: 0fb4c5b1b0212b8a70b71dacaea88daa6452c3a7
 SHA512:
-  metadata.gz: 01a20d69d02178fdc65f7adfc2468ce9f598219c867740da7db764d4cb41a4e0cfc1a0c7a755bb341fb0d48125c14d980337699809526de53ac59cd144e1579b
-  data.tar.gz: 8eb444cf535087bc1599509b35d21cfa59adf28714970dcc4c5cc901e38af9043df3f171dea7447f15cbdcc21c4dfce7a08ca81e56e9ca74b2cb5fe4485a92be
+  metadata.gz: ce0f840a319bf645f653529ec91b5738a9ea90327e274c78b07149faeed5650f6ea770680d5ea83899d1a547ddfbca8c19eb39f6b47856541ac9d67ea91a06a0
+  data.tar.gz: 615a3f2b08be30c2cc54bd9a204e3efde81a8f0a67af0fda9ec22e6b95b3b10a340bed9502dcdb6ff5d0c13c8f8687499c959ad8942d0b307ad6c26419670485

data/lib/sunspot/field_factory.rb

@@ -123,18 +123,19 @@ module Sunspot
     # configuration.
     #
     class Dynamic < Abstract
-      attr_accessor :name, :type
+      attr_accessor :name, :type, :separator
 
       def initialize(name, type, options = {}, &block)
         super(name, options, &block)
         @type, @options = type, options
+        @separator = @options.delete(:separator) || ':'
       end
 
       #
       # Build a field based on the dynamic name given.
       #
       def build(dynamic_name)
-        AttributeField.new("#{@name}:#{dynamic_name}", @type, @options.dup)
+        AttributeField.new([@name, dynamic_name].join(separator), @type, @options.dup)
       end
       # 
       # This alias allows a DynamicFieldFactory to be used in place of a Setup

data/lib/sunspot/search/abstract_search.rb

@@ -160,11 +160,13 @@ module Sunspot
       #
       def facet(name, dynamic_name = nil)
         if name
-          if dynamic_name
-            @facets_by_name[:"#{name}:#{dynamic_name}"]
-          else
-            @facets_by_name[name.to_sym]
-          end
+          facet_name = if dynamic_name
+                         separator = @setup.dynamic_field_factory(name).separator
+                         [name, dynamic_name].join(separator)
+                       else
+                         name
+                       end.to_sym
+          @facets_by_name[facet_name]
         end
       end
 

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

data/spec/integration/dynamic_fields_spec.rb

@@ -1,17 +1,17 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
-describe 'dynamic fields' do
+shared_examples 'dynamic fields' do
   before :each do
     Sunspot.remove_all
-    @posts = Post.new(:custom_string => { :cuisine => 'Pizza' }),
-             Post.new(:custom_string => { :cuisine => 'Greek' }),
-             Post.new(:custom_string => { :cuisine => 'Greek' })
+    @posts = Post.new(field_name => { :cuisine => 'Pizza' }),
+             Post.new(field_name => { :cuisine => 'Greek' }),
+             Post.new(field_name => { :cuisine => 'Greek' })
     Sunspot.index!(@posts)
   end
 
   it 'should search for dynamic string field' do
     Sunspot.search(Post) do
-      dynamic(:custom_string) do
+      dynamic(field_name) do
         with(:cuisine, 'Pizza')
       end
     end.results.should == [@posts.first]
@@ -20,20 +20,20 @@ describe 'dynamic fields' do
   describe 'faceting' do
     before :each do
       @search = Sunspot.search(Post) do
-        dynamic :custom_string do
+        dynamic field_name do
           facet :cuisine
         end
       end
     end
 
     it 'should return value "value" with count 2' do
-      row = @search.dynamic_facet(:custom_string, :cuisine).rows[0]
+      row = @search.dynamic_facet(field_name, :cuisine).rows[0]
       row.value.should == 'Greek'
       row.count.should == 2
     end
 
     it 'should return value "other" with count 1' do
-      row = @search.dynamic_facet(:custom_string, :cuisine).rows[1]
+      row = @search.dynamic_facet(field_name, :cuisine).rows[1]
       row.value.should == 'Pizza'
       row.count.should == 1
     end
@@ -41,7 +41,7 @@ describe 'dynamic fields' do
 
   it 'should order by dynamic string field ascending' do
     Sunspot.search(Post) do
-      dynamic :custom_string do
+      dynamic field_name do
         order_by :cuisine, :asc
       end
     end.results.last.should == @posts.first
@@ -49,9 +49,20 @@ describe 'dynamic fields' do
 
   it 'should order by dynamic string field descending' do
     Sunspot.search(Post) do
-      dynamic :custom_string do
+      dynamic field_name do
         order_by :cuisine, :desc
       end
     end.results.first.should == @posts.first
   end
 end
+
+describe "default separator" do
+  it_behaves_like "dynamic fields" do
+    let(:field_name) { :custom_string }
+  end
+end
+describe "custom separator" do
+  it_behaves_like "dynamic fields" do
+    let(:field_name) { :custom_underscored_string }
+  end
+end

data/spec/mocks/post.rb

@@ -15,6 +15,10 @@ class Post < SuperClass
     @custom_string ||= {}
   end
 
+  def custom_underscored_string
+    @custom_underscored_string ||= {}
+  end
+
   def custom_fl
     @custom_fl ||= {}
   end
@@ -28,7 +32,7 @@ class Post < SuperClass
   end
 
   private
-  attr_writer :category_ids, :custom_string, :custom_fl, :custom_time, :custom_boolean
+  attr_writer :category_ids, :custom_string, :custom_underscored_string, :custom_fl, :custom_time, :custom_boolean
 end
 
 Sunspot.setup(Post) do
@@ -59,6 +63,7 @@ Sunspot.setup(Post) do
   latlon(:coordinates_new) { coordinates }
 
   dynamic_string :custom_string, :stored => true
+  dynamic_string :custom_underscored_string, separator: '__'
   dynamic_float :custom_float, :multiple => true, :using => :custom_fl
   dynamic_integer :custom_integer do
     category_ids.inject({}) do |hash, category_id|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr