datastax_rails 1.0.17.1 → 1.0.17.2

data/lib/datastax_rails/connection.rb

@@ -113,7 +113,7 @@ module DatastaxRails
       # @return [DatastaxRails::RSolrClientWrapper] a wrapped RSolr connection      
       def solr_connection(reconnect = false)
         if(!@rsolr || reconnect)
-          @rsolr = DatastaxRails::RSolrClientWrapper.new(establish_solr_connection)
+          @rsolr = DatastaxRails::RSolrClientWrapper.new(establish_solr_connection, self)
         end
         @rsolr
       end

data/lib/datastax_rails/relation/search_methods.rb

@@ -431,7 +431,15 @@ module DatastaxRails
     
     protected
       def find_by_attributes(match, attributes, *args) #:nodoc:
-        conditions = Hash[attributes.map {|a| [a, args[attributes.index(a)]]}]
+        conditions = {}
+        Hash[attributes.map {|a| [a, args[attributes.index(a)]]}].each do |k,v|
+          if(v.is_a?(String))
+            conditions[k] = v.gsub(/(\W)/, '\\\\\1')
+          else
+            conditions[k] = v
+          end
+        end
+        
         result = where(conditions).send(match.finder)
         
         if match.blank? && result.blank?

data/lib/datastax_rails/rsolr_client_wrapper.rb

@@ -3,14 +3,15 @@ module DatastaxRails
   # a new server tried (if one is available)
   class RSolrClientWrapper < BlankSlate
     # @param [RSolr::Client] rsolr the initial RSolr client object to wrap
-    def initialize(rsolr)
+    def initialize(rsolr,model)
       @rsolr = rsolr
+      @model = model
     end
     
     def method_missing(sym, *args, &block)
       if @rsolr.uri.host != DatastaxRails::Base.current_server
         @rsolr.uri.host = DatastaxRails::Base.current_server
-        @rsolr = DatastaxRails::Base.establish_solr_connection
+        @rsolr = @model.establish_solr_connection
       end
       @rsolr.__send__(sym, *args, &block)
     rescue Errno::ECONNREFUSED

data/lib/datastax_rails/version.rb

@@ -1,4 +1,4 @@
 module DatastaxRails
   # The current version of the gem
-  VERSION = "1.0.17.1"
+  VERSION = "1.0.17.2"
 end

data/spec/dummy/config/datastax.yml

@@ -1,4 +1,16 @@
 development:
+  servers: ["sade-rs-ds1.opensource.gov:9160", "sade-rs-ds2.opensource.gov:9160", "sade-rs-ds3.opensource.gov:9160"]
+  keyspace: "datastax_rails_development"
+  strategy_options: {"RS": "3"}
+  connection_options:
+    timeout: 20
+    retries: 3
+    server_max_requests: 1000
+  solr:
+    port: 8983
+    path: /solr
+
+dev:
   servers: ["127.0.0.1:9160"]
   keyspace: "datastax_rails_development"
   strategy_class: "org.apache.cassandra.locator.SimpleStrategy"