solrsan 0.5.8 → 0.5.9

data/README.md

@@ -110,6 +110,9 @@ A simple search query:
 More searching examples can be seen in test/unit/search_test.rb
 
 ## Changelog
+0.5.9
+Reverted ability to custom modify solr 'type' attribute field.
+
 0.5.8
 Allow any version of activesupport > 3.1 for gem dependency.
 

data/lib/solrsan/indexer.rb

@@ -2,44 +2,41 @@ module Solrsan
   module Search
     extend ActiveSupport::Concern
 
-    module InstanceMethods
-      def as_solr_document
-         self.attributes
-      end
-
-      def indexed_fields
-        raise "Object has have a valid as_solr_document defined" if as_solr_document.nil?
+    def as_solr_document
+       self.attributes
+    end
 
-        doc = {:type => self.class.solr_type, :db_id => id_value, :id => solr_id_value}
+    def indexed_fields
+      raise "Object has have a valid as_solr_document defined" if as_solr_document.nil?
 
-        initial_document_fields = as_solr_document.reject{|k,v| k == :id || k == :_id}
-        converted_fields = initial_document_fields.reduce({}) do |acc, tuple|
-          value = tuple[1]
-          value = value.to_time.utc.xmlschema if value.respond_to?(:utc) || value.is_a?(Date)
-          acc[tuple[0]] = value
-          acc 
-        end
-        doc.merge(converted_fields)
-      end
+      doc = {:type => self.class.solr_type, :db_id => id_value, :id => solr_id_value}
 
-      def solr_index(opts={:add_attributes => {:commitWithin => 10}})
-        self.class.solr_index(self, opts)
+      initial_document_fields = as_solr_document.reject{|k,v| k == :id || k == :_id}
+      converted_fields = initial_document_fields.reduce({}) do |acc, tuple|
+        value = tuple[1]
+        value = value.to_time.utc.xmlschema if value.respond_to?(:utc) || value.is_a?(Date)
+        acc[tuple[0]] = value
+        acc 
       end
+      doc.merge(converted_fields)
+    end
 
-      def destroy_index_document
-        self.class.destroy_index_document(self)
-      end
+    def solr_index(opts={:add_attributes => {:commitWithin => 10}})
+      self.class.solr_index(self, opts)
+    end
 
-      def id_value
-        item_id = self.attributes[:_id] || self.attributes[:id] || self.id
-        raise "Object must have an id attribute defined before being indexed" if item_id.nil?
-        item_id
-      end
+    def destroy_index_document
+      self.class.destroy_index_document(self)
+    end
 
-      def solr_id_value
-        "#{self.class.solr_type}-#{id_value.to_s}"
-      end
+    def id_value
+      item_id = self.attributes[:_id] || self.attributes[:id] || self.id
+      raise "Object must have an id attribute defined before being indexed" if item_id.nil?
+      item_id
+    end
 
+    def solr_id_value
+      "#{self.class.solr_type}-#{id_value.to_s}"
     end
 
     module ClassMethods

data/lib/solrsan/search.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/module/attribute_accessors'
-
 module Solrsan
   module Search
     extend ActiveSupport::Concern
@@ -8,8 +6,9 @@ module Solrsan
       HL_START_TAG = "<mark>"
       HL_END_TAG = "</mark>"
 
-      @@solr_type = self.to_s.underscore
-      mattr_accessor :solr_type
+      def solr_type
+        self.to_s.underscore
+      end
 
       def perform_solr_command
         @rsolr ||= Solrsan::Config.instance.rsolr_object
@@ -44,7 +43,7 @@ module Solrsan
           :'facet.mincount' => 1}.merge(search_params)
 
         solr_params[:hl] = true unless search_params[:'hl.fl'].blank?
-        solr_params[:fq] = ["type:#{@@solr_type}"] + parse_fq(search_params[:fq])
+        solr_params[:fq] = ["type:#{solr_type}"] + parse_fq(search_params[:fq])
         solr_params
       end
 
@@ -180,7 +179,9 @@ if defined?(Rails) && Rails.env == "test"
     module Search
       extend ActiveSupport::Concern
       module ClassMethods
-        @@solr_type = "#{self.to_s.underscore}_test"
+        def solr_type
+          "#{self.to_s.underscore}_test"
+        end
       end
     end
   end

data/lib/solrsan/version.rb

@@ -1,3 +1,3 @@
 module Solrsan
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/test/unit/search_test.rb

@@ -13,6 +13,19 @@ class SearchTest < Test::Unit::TestCase
     Document.destroy_all_index_documents!
   end
 
+  def test_attributes
+    Document.solr_index(@document)
+    sleep 1
+    q = @document.attributes[:title]
+
+    response = Document.search(:q => q)
+    metadata = response[:metadata]
+    docs = response[:docs]
+    doc = docs.first
+
+    assert_equal "document_test", doc["type"]
+  end
+
   def test_simple_query
     Document.solr_index(@document)
     sleep 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrsan
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &70308054024800 !ruby/object:Gem::Requirement
+  requirement: &70361182665480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70308054024800
+  version_requirements: *70361182665480
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70308054024300 !ruby/object:Gem::Requirement
+  requirement: &70361182664500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308054024300
+  version_requirements: *70361182664500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70308054023820 !ruby/object:Gem::Requirement
+  requirement: &70361182662680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -43,7 +43,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308054023820
+  version_requirements: *70361182662680
 description: solrsan is a lightweight wrapper for using Apache Solr within a Ruby
   application including Rails and Sinatra.
 email: