datastax_rails 1.0.13.1 → 1.0.13.2

data/lib/datastax_rails/connection.rb

@@ -86,14 +86,21 @@ module DatastaxRails
         self.connection = CassandraCQL::Database.new(spec[:servers], {:keyspace => spec[:keyspace]}, connection_options.symbolize_keys)
       end
       
+      # Returns the base portion of the URL for connecting to SOLR based on the current Cassandra server.
+      #
+      # @return [String] in the form of 'http://localhost:8983/solr'
+      def solr_base_url
+        DatastaxRails::Base.establish_connection unless self.connection 
+        port = DatastaxRails::Base.config[:solr][:port]
+        path = DatastaxRails::Base.config[:solr][:path]
+        "http://#{self.current_server}:#{port}#{path}"
+      end
+      
       # 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.
       def solr_connection
-        DatastaxRails::Base.establish_connection unless self.connection 
-        port = DatastaxRails::Base.config[:solr][:port]
-        path = DatastaxRails::Base.config[:solr][:path]
-        @rsolr ||= DatastaxRails::RSolrClientWrapper.new(RSolr.connect :url => "http://#{self.current_server}:#{port}#{path}/#{DatastaxRails::Base.connection.keyspace}.#{self.column_family}")
+        @rsolr ||= DatastaxRails::RSolrClientWrapper.new(RSolr.connect :url => "#{solr_base_url}/#{DatastaxRails::Base.connection.keyspace}.#{self.column_family}")
       end
     end
   end

data/lib/datastax_rails/tasks/column_family.rb

@@ -106,7 +106,7 @@ module DatastaxRails
           results = DatastaxRails::Cql::Select.new(SchemaMigration, ['*']).conditions(:key => model.column_family).execute
           sm_digests = CassandraCQL::Result.new(results).fetch.to_hash
           
-          solr_url = "#{DatastaxRails::Base.config[:solr][:url]}/resource/#{DatastaxRails::Base.config[:keyspace]}.#{model.column_family}"
+          solr_url = "#{DatastaxRails::Base.solr_base_url}/resource/#{DatastaxRails::Base.config[:keyspace]}.#{model.column_family}"
           uri = URI.parse(solr_url)
           Net::HTTP.start(uri.host, uri.port) do |http|
             if force || solrconfig_digest != sm_digests['solrconfig'] 

data/lib/datastax_rails/types/array_type.rb

@@ -1,7 +1,16 @@
 module DatastaxRails
   module Types
+    # ArrayType is used for storing arrays in Datastax Enterprise.
+    # They are indexed into SOLR as discrete values so that you can do something like this:
+    #
+    #   Post.where(:tags => 'Technology')
+    #
+    # That would give you all the posts that have Technology somewhere in the tags array. 
     class ArrayType < BaseType
       DEFAULTS = {:solr_type => 'array', :indexed => true, :stored => true, :multi_valued => false, :sortable => false, :tokenized => true, :fulltext => false}
+      
+      # An extension to normal arrays that allow for tracking of dirty values.  This is
+      # used by ActiveModel's change tracking framework.
       class DirtyArray < Array
         attr_accessor :record, :name, :options
         def initialize(record, name, array, options)

data/lib/datastax_rails/types/base_type.rb

@@ -1,7 +1,13 @@
 module DatastaxRails
   module Types
+    # All of the DSR type classes inherit from here.  It sets up some default options and doesn basic conversion
+    # to strings.  Subclasses can override these methods as needed.
+    #
+    # NOTE: All subclasses MUST declare a +DEFAULTS+ constant that specifies the indexing defaults.  Defaults may of
+    # course be overridden when the attribute is declared.
     class BaseType
       attr_accessor :options
+      # Default initializer.  Sets the indexing options based on the DEFAULTS
       def initialize(options = {})
         @options = self.class::DEFAULTS.merge(options)
       end

data/lib/datastax_rails/version.rb

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

data/lib/schema_migration.rb

@@ -1,6 +1,8 @@
 # Placeholder class to imitate a model for the schema migrations column family.
 # Used as part of the CQL generation.
 class SchemaMigration
+  class_attribute :default_consistency
+  self.default_consistency = :quorum
   # Returns the name of the column family
   def self.column_family
     'schema_migrations'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: datastax_rails
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 111
   prerelease: 
   segments: 
   - 1
   - 0
   - 13
-  - 1
-  version: 1.0.13.1
+  - 2
+  version: 1.0.13.2
 platform: ruby
 authors: 
 - Jason M. Kusar
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails