datastax_rails 1.0.13.2 → 1.0.13.6

data/README.rdoc

@@ -36,8 +36,8 @@ Configure the config/datastax.yml file:
     connection_options:
       timeout: 2
     solr:
-  	  port: 8983
-  	  path: /solr
+      port: 8983
+      path: /solr
 
 The above is configured to use NetworkTopologyStrategy.  If you go with this, you'll need to configure Datastax to use the
 NetworkTopologySnitch and set up the cassandra-topology.properties file.  See the Datastax documentation for more information.
@@ -52,8 +52,8 @@ For a more simple, single datacenter setup, something like this should probably
     connection_options:
       timeout: 2 
     solr:
-  	  port: 8983
-  	  path: /solr
+      port: 8983
+      path: /solr
 
 See DatastaxRails::Connection::ClassMethods for a description of what options are available.
 
@@ -75,6 +75,9 @@ attributes on any model.  DSR will only upload schema files if they have changed
 Calling +find+ on a model with a bogus ID returns an empty model instead of RecordNotFound.  This is due to a bug
 in DSE that is supposedly fixed in the upcoming 2.2 release.
 
+Setting an integer field to something other than an integer results in nothing being set and no validation error
+(if you were using one).
+
 === More information
 
 The documentation for DatastaxRails::Base and DatastaxRails::SearchMethods will give you quite a few examples

data/lib/datastax_rails/attribute_methods/typecasting.rb

@@ -11,31 +11,70 @@ module DatastaxRails
         self.lazy_attributes = []
         self.readonly_attributes = []
 
-        %w(array boolean date float integer json string text time time_with_zone).each do |type|
-          instance_eval <<-EOV, __FILE__, __LINE__ + 1
-            def #{type}(name, options = {})                               # def string(name, options = {})
-              attribute(name, options.update(:type => :#{type}))             #   attribute(name, options.update(type: :string))
-            end                                                           # end
-          EOV
+      end
+
+      module ClassMethods
+        # We need to ensure that inherited classes get their own attribute definitions.
+        # In addition, we take the opportunity to track all the DatastaxRails::Base decendents.
+        # This will be useful when it comes to things like schema generation.
+        def inherited(child)
+          super
+          child.attribute_definitions = attribute_definitions.dup
+          self.models << child
         end
         
-        def self.binary(name, options = {})
+        # @!group Attribute Types
+        
+        # @!macro [new] attr_doc
+        #   Declare an attribute of the given type
+        #   
+        #   @param [Symbol] name the name of the attribute to create
+        #   @param [Hash] options the options to use in setting up the attribute
+        def binary(name, options = {})
           options.reverse_merge!(:lazy => true)
           attribute(name, options.update(:type => :binary))
         end
         
-        def self.timestamps(options = {})
+        # Declare the timestamps attribute type method.
+        # Creates both the created_at and updated_at attributes with type +time+.
+        # 
+        # @param [Hash] options the options to use in setting up the attribute
+        def timestamps(options = {})
           attribute(:created_at, options.update(:type => :time))
           attribute(:updated_at, options.update(:type => :time))
         end
-      end
-
-      module ClassMethods
-        def inherited(child)
-          super
-          child.attribute_definitions = attribute_definitions.dup
-          self.models << child
+        
+        # @!method array(name, options = {})
+        #   @macro attr_doc
+        # @!method boolean(name, options = {})
+        #   @macro attr_doc
+        # @!method date(name, options = {})
+        #   @macro attr_doc
+        # @!method float(name, options = {})
+        #   @macro attr_doc
+        # @!method integer(name, options = {})
+        #   @macro attr_doc
+        # @!method json(name, options = {})
+        #   @macro attr_doc
+        # @!method string(name, options = {})
+        #   @macro attr_doc
+        # @!method text(name, options = {})
+        #   @macro attr_doc
+        # @!method time(name, options = {})
+        #   @macro attr_doc
+        # @!method time_with_zone(name, options = {})
+        #   @macro attr_doc
+        
+        # The following sets up a bunch of nearly identical attribute methods
+        %w(array boolean date float integer json string text time time_with_zone).each do |type|
+          class_eval <<-EOV, __FILE__, __LINE__ + 1
+            def #{type}(name, options = {})                               # def string(name, options = {})
+              attribute(name, options.update(:type => :#{type}))             #   attribute(name, options.update(type: :string))
+            end                                                           # end
+          EOV
         end
+        
+        # @!endgroup
 
         # Casts a single attribute according to the appropriate coder.
         #

data/lib/datastax_rails/connection.rb

@@ -20,6 +20,8 @@ module DatastaxRails
       # cluster, and we want to know which server specifically we are connected to.
       #
       # Used by Relation to calculate the SOLR URL so that it follows the Cassandra connection.
+      #
+      # @return [String] the hostname or ip address of the current server
       def current_server
         thrift_client.instance_variable_get(:@current_server).to_s.split(/\:/).first
       end
@@ -99,6 +101,8 @@ module DatastaxRails
       # Similar to +establish_connection+, this method creates a connection object for Solr.  Since HTTP is stateless, this doesn't
       # actually launch the connection, but it gets everything set up so that RSolr can do its work.  It's important to note that
       # unlike the cassandra connection which is global to all of DSR, each model will have its own solr_connection.
+      #
+      # @return [DatastaxRails::RSolrClientWrapper] a wrapped RSolr connection
       def solr_connection
         @rsolr ||= DatastaxRails::RSolrClientWrapper.new(RSolr.connect :url => "#{solr_base_url}/#{DatastaxRails::Base.connection.keyspace}.#{self.column_family}")
       end

data/lib/datastax_rails/relation/finder_methods.rb

@@ -59,7 +59,6 @@ module DatastaxRails
       return to_a.find { |*block_args| yield(*block_args) } if block_given?
 
       options = args.extract_options!
-
       if options.present?
         apply_finder_options(options).find(*args)
       else

data/lib/datastax_rails/relation/search_methods.rb

@@ -309,34 +309,35 @@ module DatastaxRails
       end
     end
     
-    # See documentation for +where+
+    # @see where
     def less_than(value)
       raise ArgumentError, "#less_than can only be called after an appropriate where call. e.g. where(:created_at).less_than(1.day.ago)"
     end
     
-    # See documentation for +where+
+    # @see where
     def greater_than(value)
       raise ArgumentError, "#greater_than can only be called after an appropriate where call. e.g. where(:created_at).greater_than(1.day.ago)"
     end
     
-    def solr_format(value)
-      case
-        when value.is_a?(Date), value.is_a?(Time)
-          value.strftime('%Y-%m-%dT%H:%M:%SZ')
-        when value.is_a?(Array)
-          value.collect {|v| v.gsub(/ /,"\\ ") }.join(" OR ")
-        when value.is_a?(Fixnum)
-          value < 0 ? "\\#{value}" : value
-        when value.is_a?(Range)
-          "[#{solr_format(value.first)} TO #{solr_format(value.last)}]"
-        when value.is_a?(String)
-          solr_escape(downcase_query(value.gsub(/ /,"\\ ")))
-        else
-          value
+    protected
+      def solr_format(value)
+        return value unless use_solr_value
+        case
+          when value.is_a?(Date), value.is_a?(Time)
+            value.strftime('%Y-%m-%dT%H:%M:%SZ')
+          when value.is_a?(Array)
+            value.collect {|v| v.gsub(/ /,"\\ ") }.join(" OR ")
+          when value.is_a?(Fixnum)
+            value < 0 ? "\\#{value}" : value
+          when value.is_a?(Range)
+            "[#{solr_format(value.first)} TO #{solr_format(value.last)}]"
+          when value.is_a?(String)
+            solr_escape(downcase_query(value.gsub(/ /,"\\ ")))
+          else
+            value
+        end
       end
-    end
     
-    protected
       def find_by_attributes(match, attributes, *args) #:nodoc:
         conditions = Hash[attributes.map {|a| [a, args[attributes.index(a)]]}]
         result = where(conditions).send(match.finder)

data/lib/datastax_rails/relation.rb

@@ -271,7 +271,7 @@ module DatastaxRails
       @where_values.each do |wv|
         wv.each do |k,v|
           # If v is blank, check that there is no value for the field in the document
-          filter_queries << (v.blank? ? "-#{k}:[* TO *]" : "#{k}:(#{v})")
+          filter_queries << (v.blank? ? "-#{k}:[\"\" TO *]" : "#{k}:(#{v})")
         end
       end
       

data/lib/datastax_rails/rsolr_client_wrapper.rb

@@ -2,6 +2,7 @@ module DatastaxRails
   # Wraps the RSolr Client class so that exceptions such as Connection Refused can be caught and
   # 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)
       @rsolr = rsolr
     end

data/lib/datastax_rails/types/array_type.rb

@@ -69,13 +69,13 @@ module DatastaxRails
         raise ArgumentError.new("#{self} requires an Array") unless array.kind_of?(Array)
         ar = Array(array)
         ar.uniq! if options[:unique]
-        ar.join("&&&&")
+        ar.join("$$$$")
       end
 
       def decode(str)
         return [] if str.blank?
-        
-        str.is_a?(Array) ? str.flatten : str.split(/&&&&/) 
+        #                                         Temporary fix
+        str.is_a?(Array) ? str.flatten : str.gsub(/&&&&/,'$$$$').split(/\$\$\$\$/).reject{|a|a.blank?} 
       end
 
       def wrap(record, name, value)

data/lib/datastax_rails/version.rb

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