datastax_rails 1.0.6 → 1.0.8

data/spec/spec_helper.rb

@@ -8,9 +8,10 @@ ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+Dir[File.expand_path(File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb"))].each {|f| require f }
 
 RSpec.configure do |config|
+  config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior:'
   config.before(:each) do
     DatastaxRails::Base.recorded_classes = {}
   end

data/spec/support/default_consistency_shared_examples.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+shared_examples_for 'default_consistency' do
+  it "should default to QUORUM" do
+    cql = DatastaxRails::Cql::Select.new(@model_class, ["*"])
+    cql.to_cql.should match(/using consistency quorum/i)
+  end
+  
+  it "should default to level specified by model class" do
+    @model_class.stub(:default_consistency => 'LOCAL_QUORUM')
+    cql = DatastaxRails::Cql::Select.new(@model_class, ["*"])
+    cql.to_cql.should match(/using consistency local_quorum/i)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datastax_rails
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Jason M. Kusar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -69,14 +69,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 3
         segments: 
-        - 2
-        - 9
         - 0
-        version: 2.9.0
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -148,7 +146,6 @@ files:
 - lib/datastax_rails/cql/delete.rb
 - lib/datastax_rails/attribute_methods.rb
 - lib/datastax_rails/connection.rb
-- lib/datastax_rails/consistency.rb
 - lib/datastax_rails/reflection.rb
 - lib/datastax_rails/identity/custom_key_factory.rb
 - lib/datastax_rails/identity/uuid_key_factory.rb
@@ -207,15 +204,16 @@ files:
 - lib/datastax_rails/persistence.rb
 - lib/datastax_rails/version.rb
 - lib/datastax_rails.rb
-- lib/solr_no_escape.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
+- spec/support/default_consistency_shared_examples.rb
 - spec/support/models.rb
 - spec/support/datastax_test_hook.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
+- spec/datastax_rails/persistence_spec.rb
 - spec/datastax_rails/associations/belongs_to_association_spec.rb
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/relation_spec.rb
@@ -297,11 +295,13 @@ signing_key:
 specification_version: 3
 summary: A Ruby-on-Rails interface to Datastax Enterprise
 test_files: 
+- spec/support/default_consistency_shared_examples.rb
 - spec/support/models.rb
 - spec/support/datastax_test_hook.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
+- spec/datastax_rails/persistence_spec.rb
 - spec/datastax_rails/associations/belongs_to_association_spec.rb
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/relation_spec.rb

data/lib/datastax_rails/consistency.rb

@@ -1,33 +0,0 @@
-module DatastaxRails
-  module Consistency
-    extend ActiveSupport::Concern
-
-    included do
-      cattr_accessor :consistency_levels
-      self.consistency_levels = [:one, :quorum, :all]
-
-      class_attribute :write_consistency
-      class_attribute :read_consistency
-      self.write_consistency  = :quorum
-      self.read_consistency   = :quorum
-    end
-
-    module ClassMethods
-      THRIFT_LEVELS = {
-        :one    => 'ONE',
-        :quorum => 'QUORUM',
-        :local_quorum => 'LOCAL_QUORUM',
-        :each_quorum => 'EACH_QUORUM',
-        :all => 'ALL'
-      }
-
-      def thrift_read_consistency
-        THRIFT_LEVELS[read_consistency] || (raise "Invalid consistency level #{read_consistency}")
-      end
-
-      def thrift_write_consistency
-        THRIFT_LEVELS[write_consistency] || (raise "Invalid consistency level #{write_consistency}")
-      end
-    end
-  end
-end

data/lib/solr_no_escape.rb

@@ -1,28 +0,0 @@
-require 'sunspot'
-module SolrNoEscape
-  def escape(str)
-    # We are purposely not escaping since we want people to be able to do
-    # advanced queries that otherwise wouldn't work.  Spaces are a special
-    # case due to later URL escaping.
-    str.gsub(/ /,"\\\\ ")
-  end
-end
-
-module Sunspot
-  module Query
-    class FunctionQuery
-      include SolrNoEscape
-    end
-  end
-end
-
-module Sunspot
-  module Query
-    module Restriction
-      class Base
-        include SolrNoEscape
-      end
-    end
-  end
-end
-