cassie 1.0.0.alpha.17 → 1.0.0.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db615986664ba9778d7e97248400a71ff53bc5d
-  data.tar.gz: 717c516823cfef09d656843aabd7f271beec5b93
+  metadata.gz: d1574a96d31d99ad837fc8325c8cb705cdb86e28
+  data.tar.gz: 850b78f9859b02aa5b3593c0c550ac048fb6ce74
 SHA512:
-  metadata.gz: c9acfa78a37ed8a612aec6a8e3f424f6bfd8f25b8f0667791e9025b7d7c85f250bae8dde1dd520c386134d23bd4f1a0a71df49958abf61c002f951f8c4aab28e
-  data.tar.gz: 00013b88d5c35b2a729c9197a6805270f45b6d09718a094b50d9d785bec1683ffb5186db6ee088bcaf8f7117b0e0f69e709ece7db6e5e64c9b4121e872ac4f75
+  metadata.gz: 107e8b6f43aac80be85470fcd210c900603e205fd013074742aba1b9b4bad979bc5da21ccbfa2da2a05228b1135e39428cc7b676a60eb9029c74414251bb324b
+  data.tar.gz: 0b4c6c105b51fe8515979c10543080cc9767aa4f382ddc36ff1c27bb914dc9403b4fc741d82ec7a2fd5eec04b9eefef499ab91e72bf34de4d72a53864740fea3

data/lib/cassie/connection_handler/cluster.rb

@@ -1,6 +1,12 @@
 require 'benchmark'
 
 module Cassie::ConnectionHandler
+  # ## Cassie::ConnectionHandler::Cluster
+  #
+  # Adds cluster instance configuration and memoization.
+  #
+  # Include in any class or module that responds to `configuration` with
+  # a cassandra cluster options hash.
   module Cluster
 
     def cluster
@@ -15,7 +21,7 @@ module Cassie::ConnectionHandler
           _cluster = Cassandra.cluster(config)
         end
 
-        logger.info "Connected to Cassandra cluster #{config[:hosts]} (#{sec.round(3)}s)"
+        logger.info "(#{(sec/1000.0).round(2)}ms) Connected to Cassandra cluster #{config[:hosts]}"
         _cluster
       end
     end

data/lib/cassie/connection_handler/sessions.rb

@@ -20,7 +20,7 @@ module Cassie::ConnectionHandler
         _session = cluster.connect(_keyspace)
       end
 
-      logger.info "Session opened to Cassandra[#{_keyspace}] (#{sec.round(3)}s)"
+      logger.info "(#{(sec/1000.0).round(2)}ms) Session opened to Cassandra[#{_keyspace}]"
       @sessions[_keyspace] = _session
     end
   end

data/lib/cassie/queries/README.md

@@ -148,6 +148,62 @@ or
   end
 ```
 
+#### Consistency configuration
+
+The [consistency level](http://datastax.github.io/ruby-driver/v2.1.6/api/cassandra/#consistencies-constant) for a query is determined by your `Cassie::configuration` by default, falling to back to the `Cassandra` default if none is given.
+
+```ruby
+Cassie.configuration[:consistency]
+=> nil
+
+Cassie.cluster.instance_variable_get(:@execution_options).consistency
+=> :one
+```
+
+A Cassie::Query looks for a consistency level defined on the object, subclass, then base class levels. If one is found, it will override the `Cassandra` default when the query is executed.
+
+```ruby
+  select :posts_by_author_category
+
+  where :author_id, :eq
+  where :category, :eq, if: :filter_by_category?
+
+  def filter_by_category?
+    #true or false, as makes sense for your query
+  end
+
+  def consistency
+    #dynamically determine a query object's consistency level
+    if filter_by_category?
+      :quorum
+    else
+      super
+    end
+  end
+```
+
+```ruby
+  select :posts_by_author_category
+
+  where :author_id, :eq
+  where :category, :eq
+
+  consistency :quorum
+```
+
+```ruby
+# lib/tasks/interesting_task.rake
+require_relative "interesting_worker"
+
+task :interesting_task do
+  Cassandra::Query.consistency = :all
+
+  InterestingWorker.new.perform
+end
+
+
+```
+
 #### Object Mapping
 For Selection Queries, resources are returned as structs by default for manipulation using accessor methods.
 

data/lib/cassie/queries/statement.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/string/filters'
 require 'active_support/hash_with_indifferent_access'
+require_relative 'statement/execution'
 require_relative 'statement/preparation'
 require_relative 'statement/callbacks'
 require_relative 'statement/limiting'
@@ -16,6 +17,7 @@ module Cassie::Queries
     extend ::ActiveSupport::Concern
 
     included do
+      include Execution
       include Preparation
       include Callbacks
       include Limiting
@@ -37,13 +39,6 @@ module Cassie::Queries
       self.class.table
     end
 
-    # Executes the statment, populates result
-    # returns true or false indicating a successful execution or not
-    def execute
-      @result = session.execute(statement)
-      execution_successful?
-    end
-
     # returns a CQL string, or a Cassandra::Statement
     # that is ready for execution
     def statement
@@ -60,19 +55,6 @@ module Cassie::Queries
       end
     end
 
-    def execution_successful?
-      #TODO: rethink this, it knows too much
-      raise "execution not complete, no results to parse" unless result
-
-      # empty select
-      return true if result.empty?
-
-      # failed upsert
-      return false if (!result.rows.first["[applied]"].nil?) && (result.rows.first["[applied]"] == false)
-
-      true
-    end
-
     private
 
     def eval_if_opt?(value)

data/lib/cassie/queries/statement/consistency.rb

@@ -0,0 +1,33 @@
+module Cassie::Queries::Statement
+  module Consistency
+    extend ActiveSupport::Concern
+
+    included do
+      attr_writer :consistency
+    end
+
+    module ClassMethods
+      def inherited(subclass)
+        subclass.consistency = consistency
+        super
+      end
+
+      def consistency=(val)
+        @consistency = val
+      end
+
+      def consistency(val=:get)
+        if val == :get
+          @consistency if defined?(@consistency)
+        else
+          self.consistency = val
+        end
+      end
+    end
+
+    def consistency
+      return @consistency if defined?(@consistency)
+      self.class.consistency
+    end
+  end
+end

data/lib/cassie/queries/statement/execution.rb

@@ -0,0 +1,41 @@
+require_relative 'consistency'
+
+module Cassie::Queries::Statement
+  module Execution
+    extend ActiveSupport::Concern
+
+    included do
+      include Consistency
+    end
+
+    # Executes the statment, populates result
+    # returns true or false indicating a successful execution or not
+    def execute
+      @result = session.execute(statement, execution_options)
+      execution_successful?
+    end
+
+    def execution_options
+      {}.tap do |opts|
+        #TODO: rework consistency module to be more
+        #      abstract implementation for all execution options
+        opts[:consistency] = consistency if consistency
+      end
+    end
+
+    protected
+
+    def execution_successful?
+      #TODO: rethink this, it knows too much
+      raise "execution not complete, no results to parse" unless result
+
+      # empty select
+      return true if result.empty?
+
+      # failed upsert
+      return false if (!result.rows.first["[applied]"].nil?) && (result.rows.first["[applied]"] == false)
+
+      true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.17
+  version: 1.0.0.alpha.18
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -128,7 +128,9 @@ files:
 - lib/cassie/queries/statement/assignments.rb
 - lib/cassie/queries/statement/callbacks.rb
 - lib/cassie/queries/statement/conditions.rb
+- lib/cassie/queries/statement/consistency.rb
 - lib/cassie/queries/statement/deleting.rb
+- lib/cassie/queries/statement/execution.rb
 - lib/cassie/queries/statement/fetching.rb
 - lib/cassie/queries/statement/inserting.rb
 - lib/cassie/queries/statement/limiting.rb