multi-solr 01.07.02 → 01.07.03

data/lib/multi_solr/solr_filter_collection.rb

@@ -44,24 +44,6 @@ class MultiSolr::SolrFilterCollection < MultiSolr::SolrFilterSimple
   end
 
 
-  # Generieren Select-Box für ein Sematic-Form
-  # Params:   siehe MultiSolr::SolrFilterSimple#render_for_semantic_form
-  # returns:  HTML-Code des Input-Feldes als Select-Box
-  def render_for_semantic_form sform, value, context=nil, form_input_options={}
-    form_input_options = @options[:semantic_form].merge form_input_options if @options.key? :semantic_form
-    set_label form_input_options
-    data = self.collection_data(nil, context)
-    html_options = form_input_options[:input_html]
-    if html_options
-      if html_options[:size]
-        # size wird als max-size verstanden. wenn akt. Data-Range kleiner
-        # ist, dann darauf reduzieren
-        html_options[:size] = [data.size+1, html_options[:size].to_i].min
-      end
-    end
-    form_input_options.merge! :collection => data
-    sform.input "filter_#{@name}", form_input_options
-  end
 
 
   # Ermittelt den Wertebereich entweder über die bei den Options angegebene Proc

data/lib/multi_solr/solr_filter_date_range.rb

@@ -10,25 +10,6 @@ class MultiSolr::SolrFilterDateRange < MultiSolr::SolrFilterRange
   end
 
 
-  # Generieren der 2 Input-Felder mit der Option :as => :date_picker
-  # Dadurch können diesem Felder das jQuery-Datepicker-UI nutzen
-  # Params:   siehe MultiSolr::SolrFilterSimple#render_for_semantic_form
-  # returns:  HTML-Code mit 2 Input-Feldern
-  def render_for_semantic_form sform, value, context=nil, form_input_options={}
-    set_label form_input_options
-    label = form_input_options[:label]
-    form_input_options.merge! :as => :date_picker
-    from, to = extract_from_to value
-    date_range = Struct.new("#{@name}_from".to_sym, "#{@name}_to".to_sym).new from,to
-    sform.semantic_fields_for "filter_#{@name}", date_range do |filter_form|
-      form_input_options[:label] = "#{label} ab"
-      sform.template.concat filter_form.input("#{@name}_from", form_input_options)
-      form_input_options[:label] = "#{label} bis"
-      sform.template.concat filter_form.input("#{@name}_to", form_input_options)
-    end
-  end
-
-  
 
   def extract_from_to_in_ISO8601 value
     from, to = extract_from_to value

data/lib/multi_solr/solr_filter_range.rb

@@ -14,21 +14,21 @@ class MultiSolr::SolrFilterRange < MultiSolr::SolrFilterSimple
     from, to = extract_from_to value
     return '' if from.nil? && to.nil?
     s = []
-    s << "&gt;=#{from}" unless from.blank?
-    s << "&lt;=#{to}" unless to.blank?
-    s.join(' und ')
+    s << "von #{from}" unless from.blank?
+    s << "bis #{to}" unless to.blank?
+    s.join(' ')
   end
 
 
   
   # Aus dem 'value' von und bis extrahieren
   # Params:
-  #   value: Hash mit from- und to-Datumsangabe (mit Filternamen als Prefix)
-  #          Beispiel: { 'create_date_from' => '2011-01-01', 'create_date_to' => '2011-06-01' }
+  #   value: Hash mit from- und to-Werten
+  #          Beispiel: { 'from' => '2011-01-01', 'to' => '2011-06-01' }
   # returns: Array mit von und bis ['2011-01-01', '2011-06-01']
   def extract_from_to value
     return nil if value.blank? || !value.is_a?(Hash) || value.empty?
-    [ value["#{@name}_from"], value["#{@name }_to"] ]
+    [ value["from"], value["to"] ]
   end
 
 end

data/lib/multi_solr/solr_filter_simple.rb

@@ -57,38 +57,10 @@ class MultiSolr::SolrFilterSimple
 
 
 
-  # Konvertieren der Wertes in HTML-String für ein Semantic-Form
-  # Params:
-  #   sform:              das Semantic-Form-Object
-  #   value:              der konkrete Wert für diesen Filter
-  #   context:            optionaler Hash mit dem Such-Context z.B. mit;
-  #                         :solr_searcher_class => Classe des konkreten Searchers
-  #                         :force_query_params => Parameter für die SolR-Force-Query
-  #   form_input_options: optionale Formula-Input-Feld-Options.
-  #                       Diese werden 1:1 an die Semantic-Form-Methode 'input' weitergegeben
-  #
-  # returns:  HTML-Code des Input-Feldes
-  def render_for_semantic_form sform, value, context=nil, form_input_options={}
-    form_input_options = @options[:semantic_form].merge form_input_options if @options.key? :semantic_form
-    set_label form_input_options
-    sform.input "filter_#{@name}", form_input_options
-  end
-
-
   def label
     I18n.t("solr_search.#{@name}", :default => @name.to_s)
   end
 
-  protected
-
-  # Setzt in die angegebebn 'form_input_options' das Label (nur wenn in diesen noch kein :label definiert ist).
-  # Dieses wird gebildet aus den Filter-Namen unter Nutzung von I18n mit den Prefiy 'solr_search.'.
-  # Beispiel:
-  #   filter-name = :lkz => I18n.t('solr_search.lkz')
-  def set_label form_input_options
-    form_input_options.merge!(:label => self.label) unless form_input_options.key?(:label)
-  end
-
 end
 
 

data/lib/multi_solr/version.rb

@@ -1,3 +1,3 @@
 module MultiSolr
-  VERSION = "01.07.02"
+  VERSION = "01.07.03"
 end

data/spec/multi_solr/solr_filter_range_spec.rb

@@ -7,15 +7,15 @@ describe MultiSolr::SolrFilterRange do
 
   context 'render_value' do
     it "should return '>= 10' if value from is 10" do
-      subject.render_value('test_from' => 10).should == '>=10'
+      subject.render_value('from' => 10).should == 'von 10'
     end
 
     it "should return '<= 20' if value to is 20" do
-      subject.render_value('test_to' => 20).should == '&lt;=20'
+      subject.render_value('to' => 20).should == 'bis 20'
     end
 
     it "should return '>=10 und <= 20' if value from is 10 and to is 20" do
-      subject.render_value('test_from' => 10, 'test_to' => 20).should == '&gt;=10 und &lt;=20'
+      subject.render_value('from' => 10, 'to' => 20).should == 'von 10 bis 20'
     end
 
     it "should return empty string if no value given" do
@@ -27,15 +27,15 @@ describe MultiSolr::SolrFilterRange do
 
   context 'build_solr_query' do
     it do
-      subject.build_solr_query('test_from' => 10).should == 'test:[10 TO *]'
+      subject.build_solr_query('from' => 10).should == 'test:[10 TO *]'
     end
 
     it do
-      subject.build_solr_query('test_to' => 20).should == 'test:[* TO 20]'
+      subject.build_solr_query('to' => 20).should == 'test:[* TO 20]'
     end
 
     it do
-      subject.build_solr_query('test_from' => 10, 'test_to' => 20).should == 'test:[10 TO 20]'
+      subject.build_solr_query('from' => 10, 'to' => 20).should == 'test:[10 TO 20]'
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multi-solr
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 7
-  - 2
-  version: 01.07.02
+  - 3
+  version: 01.07.03
 platform: ruby
 authors: 
 - Bernd Ledig
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-22 00:00:00 Z
+date: 2013-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsolr