datastax_rails 1.0.12 → 1.0.13

data/lib/blankslate.rb

@@ -67,7 +67,7 @@ module Kernel
 end
 
 ######################################################################
-# Same as above, except in Object.
+# @see Kernel
 class Object
   class << self
     alias_method :blank_slate_method_added, :method_added

data/lib/datastax_rails/base.rb

@@ -152,13 +152,18 @@ module DatastaxRails #:nodoc:
   # by ID.  SOLR only supports a consistency level of ONE.  See the documentation for
   # SearchMethods#consistency for a more detailed explanation.
   #
-  # The overall default consistency for a given model can be overridden by adding a method
-  # to the model like so:
+  # The overall default consistency for a given model can be overridden by setting the
+  # +default_consistency+ property.
   #
-  #   def default_consistency
-  #     :local_quorum
+  #   class Model < DatastaxRails::Base
+  #     self.default_consistency = :local_quorum
   #   end
   #
+  # The default consistency for all models can be selected by setting the property on
+  # DatastaxRails::Base.
+  #
+  #   DatastaxRails::Base.default_consistency = :one
+  #
   # == Conditions
   #
   # Conditions are specified as a hash representing key/value pairs that will eventually be passed to SOLR or as
@@ -314,6 +319,9 @@ module DatastaxRails #:nodoc:
     # Stores the configuration information
     class_attribute :config
     
+    class_attribute :default_consistency
+    self.default_consistency = :quorum
+    
     class_attribute :models
     self.models = []
     

data/lib/datastax_rails/cql/base.rb

@@ -3,7 +3,7 @@ module DatastaxRails
     class Base
       # Base initialize that sets the default consistency.
       def initialize(klass, *args)
-        @consistency = klass.respond_to?(:default_consistency) ? klass.default_consistency.to_s.upcase : DatastaxRails::Cql::Consistency::QUORUM
+        @consistency = klass.default_consistency.to_s.upcase
       end
 
       # Abstract.  Should be overridden by subclasses

data/lib/datastax_rails/persistence.rb

@@ -2,10 +2,6 @@ module DatastaxRails
   module Persistence
     extend ActiveSupport::Concern
     
-    included do
-      attr_accessor :ds_consistency_level
-    end
-    
     module ClassMethods
       # Removes one or more records with corresponding keys.  Last parameter can be a hash
       # specifying the consistency level.
@@ -77,6 +73,13 @@ module DatastaxRails
         end
       end
 
+      # Instantiates a new object without calling +initialize+.
+      #
+      # @param [String] key the primary key for the record
+      # @param [Hash] attributes a hash containing the columns to set on the record
+      # @param [Array] selected_attributes an array containing the attributes that were originally selected from cassandra
+      #   to build this object.  Used so that we can avoid lazy-loading attributes that don't exist.
+      # @return [DatastaxRails::Base] a model with the given attributes
       def instantiate(key, attributes, selected_attributes = [])
         allocate.tap do |object|
           object.instance_variable_set("@loaded_attributes", {}.with_indifferent_access)
@@ -88,6 +91,12 @@ module DatastaxRails
         end
       end
 
+      # Encodes the attributes in preparation for storing in cassandra. Calls the coders on the various type classes
+      # to do the heavy lifting.
+      #
+      # @param [Hash] attributes a hash containing the attributes to be encoded for storage
+      # @param [String] schema_version the schema version to set in Cassandra.  Not currently used.
+      # @return [Hash] a new hash with attributes encoded for storage
       def encode_attributes(attributes, schema_version)
         encoded = {"schema_version" => schema_version.to_s}
         attributes.each do |column_name, value|

data/lib/datastax_rails/reflection.rb

@@ -3,7 +3,12 @@ require 'active_support/core_ext/object/inclusion'
 
 module DatastaxRails
   # This is shamelessly ripped from Active Record 3.1
-  # = DatastaxRails Reflection
+  #
+  # Reflection enables interrogation of DatastaxRails classes and objects
+  # about their associations and aggregations. This information can,
+  # for example, be used in a form builder that takes an DatastaxRails object
+  # and creates input fields for all of the attributes depending on their type
+  # and displays the associations to other objects.
   module Reflection # :nodoc:
     extend ActiveSupport::Concern
 
@@ -12,11 +17,6 @@ module DatastaxRails
       self.reflections = {}
     end
 
-    # Reflection enables interrogation of DatastaxRails classes and objects
-    # about their associations and aggregations. This information can,
-    # for example, be used in a form builder that takes an DatastaxRails object
-    # and creates input fields for all of the attributes depending on their type
-    # and displays the associations to other objects.
     module ClassMethods
       def create_reflection(macro, name, options, datastax_rails)
         klass = options[:through] ? ThroughReflection : AssociationReflection

data/lib/datastax_rails/version.rb

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

data/lib/datastax_rails.rb

@@ -15,7 +15,6 @@ module DatastaxRails
   autoload :Collection
   autoload :Connection
   autoload :Cql
-  autoload :Cursor
   autoload :Identity
   autoload :Migrations
   autoload :Persistence

data/spec/datastax_rails/cql/select_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DatastaxRails::Cql::Select do
   before(:each) do
-    @model_class = mock("Model Class", :column_family => 'users')
+    @model_class = mock("Model Class", :column_family => 'users', :default_consistency => DatastaxRails::Cql::Consistency::QUORUM)
   end
   
   it "should generate valid CQL" do

data/spec/datastax_rails/cql/update_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DatastaxRails::Cql::Update do
   before(:each) do
-    @model_class = mock("Model Class", :column_family => 'users')
+    @model_class = mock("Model Class", :column_family => 'users', :default_consistency => DatastaxRails::Cql::Consistency::QUORUM)
   end
   
   it "should generate valid CQL" do