multi-solr 01.09.05 → 01.10.00

data/.ruby-version

@@ -1 +1 @@
-ruby-1.8.7-p334
+ruby-1.9.3-p194

data/lib/multi_solr/solr_filter_collection.rb

@@ -70,9 +70,8 @@ class MultiSolr::SolrFilterCollection < MultiSolr::SolrFilterSimple
   end
 
 
-  # Wandeltangegebener value in ein Array (wenn es noch keins ist)
+  # Wandelt angegebenen value in ein Array (wenn es noch keins ist)
   # Bereinigt das Array von leeren Elementen
-
   def compact_values value
     value = [value] unless value.is_a?(Array)
     value.delete_if(&:blank?)

data/lib/multi_solr/solr_filter_simple.rb

@@ -5,6 +5,7 @@ class MultiSolr::SolrFilterSimple
 
   attr_reader :name     # Name des Filters als Symbol
   attr_reader :options  # Options des Filters
+  attr_reader :field_name
 
   # Constructor des Filters
   # Params:
@@ -63,7 +64,14 @@ class MultiSolr::SolrFilterSimple
 
 
   def label
-    I18n.t("solr_search.#{@name}", :default => [@name, @name.to_s])
+    name = I18n.t("solr_search.#{@name}", :default => [@name, @name.to_s])
+    prefix = @options[:label_prefix]
+    if prefix
+      prefix_l = I18n.t("solr_search.#{prefix}", :default => [prefix, prefix.to_s])
+      "#{prefix_l}-#{name}"
+    else
+      name
+    end
   end
 
   def sanitize_value value

data/lib/multi_solr/version.rb

@@ -1,3 +1,3 @@
 module MultiSolr
-  VERSION = "01.09.05"
+  VERSION = "01.10.00"
 end

data/spec/multi_solr/solr_filter_simple_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'multi_solr/utils'
+
+describe MultiSolr::SolrFilterRange do
+
+  subject{ MultiSolr::SolrFilterSimple.new('test') }
+
+  context 'render_value' do
+    it "should return '' if value is nil" do
+      subject.render_value(nil).should == ''
+    end
+
+    it "should return value as String" do
+      subject.render_value(20).should == '20'
+    end
+
+    it "should use special renderer if configured" do
+      value_script = ->(val, opt) { (val.to_i + 10).to_s }
+      subject = MultiSolr::SolrFilterSimple.new('test', :render_value => value_script)
+      subject.render_value('30').should == '40'
+    end
+
+  end
+
+  context 'build_solr_query' do
+    it do
+      subject.build_solr_query(nil).should be_nil
+    end
+
+    it do
+      subject.build_solr_query(10).should == 'test:10'
+    end
+
+    it do
+      build_script = ->(val) { "-test:#{val}" }
+      subject = MultiSolr::SolrFilterSimple.new('test', :solr_query => build_script)
+      subject.build_solr_query(50).should == '-test:50'
+    end
+
+  end
+
+
+  context 'label' do
+    it do
+      subject.label.should == 'test'
+    end
+
+    it do
+      subject = MultiSolr::SolrFilterSimple.new('test', :label_prefix => 'L2')
+      subject.label.should == 'L2-test'
+    end
+  end
+
+end

metadata

@@ -1,129 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multi-solr
-version: !ruby/object:Gem::Version 
-  hash: 57
+version: !ruby/object:Gem::Version
+  version: 01.10.00
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 5
-  version: 01.09.05
 platform: ruby
-authors: 
+authors:
 - Bernd Ledig
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-04-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2014-04-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rsolr
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id001
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
-  requirement: *id002
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 7
-        version: "2.7"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2.7'
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id005
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: SOLR-Framework wit multi-core supoort and filters
-email: 
+email:
 - bernd.ledig@ottogroup.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
-- .ruby-gemset
 - .ruby-version
 - Gemfile
 - README.md
@@ -152,6 +146,7 @@ files:
 - spec/multi_solr/solr_filter_boolean_spec.rb
 - spec/multi_solr/solr_filter_collection_spec.rb
 - spec/multi_solr/solr_filter_range_spec.rb
+- spec/multi_solr/solr_filter_simple_spec.rb
 - spec/multi_solr/timeline_core_handler_spec.rb
 - spec/multi_solr/utils_spec.rb
 - spec/solr_test_helper.rb
@@ -181,38 +176,34 @@ files:
 - test-solr/start-test-solr.sh
 - test-solr/start.jar
 - test-solr/webapps/solr.war
-homepage: ""
+homepage: ''
 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: 727765555297971495
+required_rubygems_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"
+      hash: 727765555297971495
 requirements: []
-
 rubyforge_project: multi-solr
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: SOLR-Framework with support for multiple SOLR-Cores
 test_files: []
-

data/.ruby-gemset

@@ -1 +0,0 @@
-multi-solr