cassie 1.0.0.beta.24 → 1.0.0.beta.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65b5763101f92f5797356a1081e0fee0219cd86a
-  data.tar.gz: ff6994cee1c3f6d04d4ff35f01bd2e59e4d50ac5
+  metadata.gz: ada280d1a8cc943ec5c6a2fd096b7721134c6f79
+  data.tar.gz: 27c7f3ec0cd636839891747a298d1c3af13ad232
 SHA512:
-  metadata.gz: 77986c9aeb90d02ef1fdb107d168312390099ac0094ebef092985b737436f7ad5f23ce97f5068e4b0ca27579431fed9d7c95a426318b4008052dd5c9ebbe1b60
-  data.tar.gz: 961f2603659b2d3a770425fa571ea715ebe12314b602cd21539af579fcd48b0ff48a11aaf45d3304c3ca2211ed0a27303f6b36b76972d64782eac0637470baab
+  metadata.gz: 3b893a1bf8402d76a5c1c79e832dfe543afac03bbb2033d88e53c9985b1adc9aa5756ebe237926e3e2814ad256679339993b75fb48f5e847cc4a7edbbbcc418e
+  data.tar.gz: cbda596807f165500df579cf8a8d88a8210bfbcfb800024a7fe0ddfee618f406ef8bedbeb76144c865eb0ea914f9a61a90b84ed45376bbac01d54a8f8af323bc

data/lib/cassie/statements/execution/errors.rb

@@ -0,0 +1,30 @@
+module Cassie::Statements
+
+  class ExecutionError < StandardError
+    attr_reader :statement
+
+    def initialize(statement)
+      @statement = statement
+      super
+    end
+
+    def message
+      "Failed to execute statement: #{cql}"
+    end
+
+    private
+
+    def cql
+      case
+      when statement.respond_to?(:to_cql)
+        statement.to_cql
+      when statement.result && statement.result.execution_info && statement.result.execution_info.statement
+        statement.result.execution_info.statement.to_cql
+      when statement.respond_to?(:statement)
+        statement.statement.to_s
+      else
+        statement.to_s
+      end
+    end
+  end
+end

data/lib/cassie/statements/execution/partition_linking/cursoring_policy.rb

@@ -2,12 +2,33 @@ require_relative 'simple_policy'
 
 module Cassie::Statements::Execution::PartitionLinking
   class CursoringPolicy < SimplePolicy
+    
+    def combine_rows(rows_a, rows_b)
+      return super unless peeking_execution.since_cursor
+      rows_b
+    end
+    
+    def adjust_limit
+      return super unless peeking_execution.since_cursor
+      # leave the limit to return all results
+      # from latest partition
+    end
 
-    def prepare_execution
-      super
-      # We are changing to the next partition
-      # so, reset the max cursor to start at the top
-      # execution.max_cursor = nil
+    def seek_partition?
+      return super unless peeking_execution.since_cursor
+      raise "linking partitions only supported for descending orderings. Open an issue if you need this!" if ascending?
+      
+      # linking while cursoring with since
+      # should return latest results
+      current_key != last_key
+    end
+    
+    def previous_key(current_key)
+      return super unless peeking_execution.since_cursor
+      
+      # linking while cursoring with since
+      # should return results from latest partition
+      last_key 
     end
   end
 end

data/lib/cassie/statements/execution/partition_linking/policy_methods.rb

@@ -14,9 +14,10 @@ module Cassie::Statements::Execution::PartitionLinking
       @direction = direction
       @range = range
     end
-
+    
+    # returns linked result
     def link
-      if end_of_partition? && partition_available?
+      if seek_partition? && partition_available?
         prepare_execution
         execution.execute
         combine_results
@@ -31,6 +32,10 @@ module Cassie::Statements::Execution::PartitionLinking
       adjust_limit
       execution
     end
+    
+    def seek_partition?
+      end_of_partition?
+    end
 
     def end_of_partition?
       !peeking_execution.result.peeked_row
@@ -41,15 +46,8 @@ module Cassie::Statements::Execution::PartitionLinking
     end
 
     def partition_available?
-      if ascending?
-        #     |0| |1| |2| |3|
-        # |X| |✓| |✓| |✓| |X|
-        current_key < last_key && current_key >= first_key
-      else
-        # |0| |1| |2| |3|
-        # |X| |✓| |✓| |✓|  |X|
-        current_key > first_key && current_key <= last_key
-      end
+      key = ascending? ? next_key(current_key) : previous_key(current_key)
+      key >= first_key && key <= last_key
     end
 
     protected
@@ -63,7 +61,7 @@ module Cassie::Statements::Execution::PartitionLinking
     end
 
     def change_partition
-      _partition = if ascending?
+      key = if ascending?
         # explicitly pass key to keep policy subclass
         # interface clear and consistent
         next_key(current_key)
@@ -72,15 +70,15 @@ module Cassie::Statements::Execution::PartitionLinking
         # interface clear and consistent
         previous_key(current_key)
       end
-      if _partition < first_key || _partition > last_key
-        logger.warn("warning: linking to partition that is outside of ranges defined. #{_partition} outside of (#{first_key}..#{last_key}). This could result in unexpected records being returned.")
+      if key < first_key || key > last_key
+        logger.warn("warning: linking to partition that is outside of ranges defined. #{key} outside of (#{first_key}..#{last_key}). This could result in unexpected records being returned.")
       end
 
       # define object singleton method to
       # override getter for partition key
       # returning the partion that needs to be linked
       execution.define_singleton_method(identifier) do
-        _partition
+        key
       end
     end
 

data/lib/cassie/statements/execution/peeking.rb

@@ -8,13 +8,20 @@ module Cassie::Statements::Execution
 
     def execute
       assert_limit
-      with_limit(limit + 1) { super }
+      @unpeeked_limit = limit
+      with_limit(limit + 1) do
+       super
+      end
+    end
+    
+    def unpeeked_limit
+      @unpeeked_limit if defined?(@unpeeked_limit)
     end
 
     protected
 
     def result_opts
-      super.merge(limit: limit - 1)
+      super.merge(limit: unpeeked_limit || limit)
     end
 
     private

data/lib/cassie/statements/execution.rb

@@ -1,5 +1,6 @@
 module Cassie::Statements
   module Execution
+    require_relative 'execution/errors'
     require_relative 'execution/consistency'
     require_relative 'execution/callbacks'
     require_relative 'execution/results'
@@ -39,6 +40,12 @@ module Cassie::Statements
       result.success?
     end
 
+    # Executes the statment, populates result
+    # true or raises if the  was not successful
+    def execute!
+      execute || (raise Cassie::Statements::ExecutionError.new(result))
+    end
+
     def execution_options
       {}.tap do |opts|
         #TODO: rework consistency module to be more

data/lib/cassie/statements/statement/assignment.rb

@@ -23,9 +23,12 @@ module Cassie::Statements::Statement
       !!enabled
     end
 
+    def argument?
+      enabled? && positional?
+    end
+
     def argument
-      return nil unless enabled? && positional?
-      value
+      value if argument?
     end
 
     def positional?

data/lib/cassie/statements/statement/assignments.rb

@@ -44,7 +44,7 @@ module Cassie::Statements::Statement
       self.class.assignments_args
     end
 
-    def build_update_and_bindings
+    def build_update_and_params
       cql = ""
       arguments = []
       assignment_strings = []
@@ -52,7 +52,7 @@ module Cassie::Statements::Statement
       assignments_args.each do |args|
         a = Assignment.new(self, *args)
         assignment_strings += Array(a.to_update_cql)
-        arguments += Array(a.argument)
+        arguments << a.argument if a.argument?
       end
 
       cql = assignment_strings.join(', ')
@@ -60,7 +60,7 @@ module Cassie::Statements::Statement
       [cql , arguments]
     end
 
-    def build_insert_and_bindings
+    def build_insert_and_params
       identifiers = []
       terms = []
       arguments = []

data/lib/cassie/statements/statement/conditions.rb

@@ -28,7 +28,7 @@ module Cassie::Statements::Statement
       self.class.conditions
     end
 
-    def build_condition_and_bindings
+    def build_condition_and_params
       condition_strings = []
       bindings = []
 

data/lib/cassie/statements/statement/deleting.rb

@@ -39,18 +39,18 @@ module Cassie::Statements::Statement
 
     protected
 
-    def build_delete_cql_and_bindings
-      where_str, where_bindings = build_where_and_bindings
-      condition_str, condition_bindings = build_condition_and_bindings
+    def build_delete_cql_and_params
+      where_str, where_params = build_where_and_params
+      condition_str, condition_params = build_condition_and_params
 
-      cql = %(
+      @cql = %(
         DELETE #{build_delete_clause}
           FROM #{table}
           #{where_str}
           #{condition_str}
       ).squish + ";"
 
-      [cql, where_bindings + condition_bindings]
+      @params = where_params + condition_params
     end
 
     # a select clause is built up of selectors

data/lib/cassie/statements/statement/idempotency.rb

@@ -0,0 +1,52 @@
+module Cassie::Statements
+  def self.default_idempotency
+    return @default_idempotency if defined?(@default_idempotency)
+    false
+  end
+
+  def self.default_idempotency=(val)
+    @default_idempotency = val
+  end
+
+
+  module Statement::Idempotency
+    extend ActiveSupport::Concern
+
+    included do
+      attr_writer :idempotent
+    end
+
+    module ClassMethods
+      def inherited(subclass)
+        subclass.idempotent = idempotent if defined?(@idempotent)
+        super
+      end
+
+      def idempotent=(val)
+        @idempotent = val
+      end
+
+      def idempotent(val=:get)
+        if val == :get
+          return @idempotent if defined?(@idempotent)
+          Cassie::Statements.default_idempotency
+        else
+          self.idempotent = val
+        end
+      end
+      
+      def idempotent?
+        !!idempotent
+      end
+    end
+
+    def idempotent
+      return @idempotent if defined?(@idempotent)
+      self.class.idempotent
+    end
+    
+    def idempotent?
+      !!idempotent
+    end
+  end
+end

data/lib/cassie/statements/statement/inserting.rb

@@ -27,18 +27,18 @@ module Cassie::Statements::Statement
 
     protected
 
-    def build_insert_cql_and_bindings
-      identifiers_str, terms_str, value_bindings = build_insert_and_bindings
-      condition_str, condition_bindings = build_condition_and_bindings
+    def build_insert_cql_and_params
+      identifiers_str, terms_str, value_params = build_insert_and_params
+      condition_str, condition_params = build_condition_and_params
 
-      cql = %(
+      @cql = %(
         INSERT INTO #{table}
         (#{identifiers_str})
         VALUES (#{terms_str})
         #{condition_str}
       ).squish + ";"
 
-      [cql, value_bindings + condition_bindings]
+      @params = value_params + condition_params
     end
   end
 end

data/lib/cassie/statements/statement/relations.rb

@@ -73,7 +73,7 @@ module Cassie::Statements::Statement
 
     protected
 
-    def build_where_and_bindings
+    def build_where_and_params
       cql = ""
       relation_strings = []
       arguments = []

data/lib/cassie/statements/statement/selection.rb

@@ -14,6 +14,7 @@ module Cassie::Statements::Statement
       include Pagination
 
       @result_class = Cassie::Statements::Results::QueryResult
+      @idempotent = true
     end
 
     module ClassMethods
@@ -58,18 +59,16 @@ module Cassie::Statements::Statement
       super.merge(opts)
     end
 
-    def build_select_cql_and_bindings
-      where_str, bindings = build_where_and_bindings
+    def build_select_cql_and_params
+      where_str, @params = build_where_and_params
 
-      cql = %(
+      @cql = %(
         SELECT #{build_select_clause}
           FROM #{table}
           #{where_str}
           #{build_order_str}
           #{build_limit_str}
       ).squish + ";"
-
-      [cql, bindings]
     end
 
     # a select clause is built up of selectors

data/lib/cassie/statements/statement/type_hinting.rb

@@ -0,0 +1,34 @@
+module Cassie::Statements  
+  module Statement::TypeHinting
+    extend ActiveSupport::Concern
+
+    included do
+      attr_writer :type_hints
+    end
+
+    module ClassMethods
+      def inherited(subclass)
+        subclass.type_hints = type_hints if defined?(@type_hints)
+        super
+      end
+
+      def type_hints=(val)
+        @type_hints = val
+      end
+
+      def type_hints(val=:get)
+        if val == :get
+          return @type_hints if defined?(@type_hints)
+          nil
+        else
+          self.type_hints = val
+        end
+      end
+    end
+
+    def type_hints
+      return @type_hints if defined?(@type_hints)
+      self.class.type_hints
+    end
+  end
+end

data/lib/cassie/statements/statement/updating.rb

@@ -24,19 +24,19 @@ module Cassie::Statements::Statement
 
     protected
 
-    def build_update_cql_and_bindings
-      assignment_str, update_bindings = build_update_and_bindings
-      where_str, where_bindings = build_where_and_bindings
-      condition_str, condition_bindings = build_condition_and_bindings
+    def build_update_cql_and_params
+      assignment_str, update_params = build_update_and_params
+      where_str, where_params = build_where_and_params
+      condition_str, condition_params = build_condition_and_params
 
-      cql = %(
+      @cql = %(
         UPDATE #{table}
         SET #{assignment_str}
         #{where_str}
         #{condition_str}
       ).squish + ";"
 
-      [cql, update_bindings + where_bindings + condition_bindings]
+      @params = update_params + where_params + condition_params
     end
   end
 end

data/lib/cassie/statements/statement.rb

@@ -11,6 +11,8 @@ module Cassie::Statements
   # cql and bindings for different statement types.
   module Statement
     require_relative 'statement/preparation'
+    require_relative 'statement/type_hinting'
+    require_relative 'statement/idempotency'
 
     class Invalid < StandardError; end
 
@@ -18,6 +20,8 @@ module Cassie::Statements
 
     included do
       include Preparation
+      include TypeHinting
+      include Idempotency
 
       class << self
         attr_accessor :table
@@ -32,11 +36,11 @@ module Cassie::Statements
     # returns a CQL string, or a Cassandra::Statement
     # that is ready for execution
     def statement
-      Cassandra::Statements::Simple.new(*build_cql_and_bindings)
+      Cassandra::Statements::Simple.new(*build_cql_and_params, type_hints, idempotent?)
     end
 
     # returns a CQL string with inline parameters, that
-    # is representative of what would be executed in a CQL shell
+    # is representative of what could be executed in a CQL shell
     def to_cql
       if statement.respond_to?(:cql) && statement.respond_to?(:params)
         Cassie::Support::StatementParser.new(statement).to_cql
@@ -44,15 +48,28 @@ module Cassie::Statements
         statement.to_s
       end
     end
+    
+    def logger
+      Cassie::Statements.logger
+    end
+    
+    def cql
+      return @cql if defined?(@cql)
+      ""
+    end
+    
+    def params
+      return @params if defined?(@params)
+      nil
+    end
 
     protected
 
-    def build_cql_and_bindings
+    def build_cql_and_params
       if self.class.type
-        send "build_#{self.class.type}_cql_and_bindings"
-      else
-        raise "No statement type has been declared. Call `.select`, `.update`, `.delete`, or `.insert` to set query type."
+        send "build_#{self.class.type}_cql_and_params"
       end
+      [cql, params]
     end
 
     private

data/lib/cassie/support/command_runner.rb

@@ -1,69 +1,80 @@
-module Cassie::Support
-  class CommandRunner
-    attr_reader :binary, :args, :command, :status, :duration, :output
+module Cassie
+  module Support
+    class CommandRunner
+      attr_reader :binary, :args, :command, :status, :duration, :output
 
-    # When a block is given, the command runs before yielding
-    def initialize(binary, args=[])
-      @binary = binary
-      @args = args
-      @command = (Array(binary) + args).join(" ")
-      @command = command + " 2>&1" unless command =~ / > /
+      # When a block is given, the command runs before yielding
+      def initialize(binary, args=[])
+        @binary = binary
+        @args = args
+        @command = (Array(binary) + args).join(" ")
+        @command = command + " 2>&1" unless command =~ / > /
 
-      if block_given?
-        run
-        yield self
+        if block_given?
+          run
+          yield self
+        end
       end
-    end
 
-    # Runs the command
-    def run
-      t1=Time.now
+      # Runs the command
+      def run
+        t1=Time.now
+
+        IO.popen(command) do |io|
+          @output=io.read
+          @status=Process.waitpid2(io.pid)[1]
+        end
 
-      IO.popen(command) do |io|
-        @output=io.read
-        @status=Process.waitpid2(io.pid)[1]
+        @duration=Time.now-t1
+        completed?
       end
 
-      @duration=Time.now-t1
-      completed?
-    end
+      # Runs the command, raising if program
+      # was not run successfully
+      def run!
+        unless run && success?
+          raise RuntimeError.new(failure_message)
+        end
+        true
+      end
 
-    # Returns false if the command hasn't been executed yet
-    def run?
-      !!@duration
-    end
+      # Returns false if the command hasn't been executed yet
+      def run?
+        !!@duration
+      end
 
-    # Returns the exit code for the command. Runs the command if it hasn't run yet.
-    def exitcode
-      status.exitstatus
-    end
+      # Returns the exit code for the command. Runs the command if it hasn't run yet.
+      def exitcode
+        status.exitstatus
+      end
 
-    # Returns true if exited 0
-    def success?
-      return false unless run?
-      exitcode == 0
-    end
+      # Returns true if exited 0
+      def success?
+        return false unless run?
+        exitcode == 0
+      end
 
-    # Returns true if the command completed execution and success bits were set.
-    # Will return false if the command hasn't been executed
-    def completed?
-      return false unless run?
-      status.exited? && @status.success?
-    end
+      # Returns true if the command completed execution and success bits were set.
+      # Will return false if the command hasn't been executed
+      def completed?
+        return false unless run?
+        status.exited? && @status.success?
+      end
 
-    def failure_message
-      msg = "---------------------\n"
-      msg << red(output)
-      msg << "---------------------\n"
-      msg << "Failed to execute `#{command}`:\n"
-      msg << "\tPlease check the output above for any errors and make sure that `#{binary}` is installed in your PATH with proper permissions."
-      msg
-    end
+      def failure_message
+        msg = "---------------------\n"
+        msg << red(output)
+        msg << "---------------------\n"
+        msg << "Failed to execute `#{command}`:\n"
+        msg << "\tPlease check the output above for any errors and make sure that `#{binary}` is installed in your PATH with proper permissions."
+        msg
+      end
 
-    protected
+      protected
 
-    def red(message)
-      "\e[1m\e[31m#{message}\e[0m\e[22m"
+      def red(message)
+        "\e[1m\e[31m#{message}\e[0m\e[22m"
+      end
     end
   end
 end

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.0.0.beta.24"
+  VERSION = "1.0.0.beta.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.24
+  version: 1.0.0.beta.25
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 description: Cassie provides database configration, versioned migrations, efficient
   session management, and query classes. This allows applications to use the functionality
   provided by the official `cassandra-driver` through lightweight and easy to use
@@ -125,6 +125,7 @@ files:
 - lib/cassie/statements/execution/callbacks.rb
 - lib/cassie/statements/execution/consistency.rb
 - lib/cassie/statements/execution/deserialization.rb
+- lib/cassie/statements/execution/errors.rb
 - lib/cassie/statements/execution/fetching.rb
 - lib/cassie/statements/execution/instrumentation.rb
 - lib/cassie/statements/execution/partition_linking.rb
@@ -156,6 +157,7 @@ files:
 - lib/cassie/statements/statement/assignments.rb
 - lib/cassie/statements/statement/conditions.rb
 - lib/cassie/statements/statement/deleting.rb
+- lib/cassie/statements/statement/idempotency.rb
 - lib/cassie/statements/statement/inserting.rb
 - lib/cassie/statements/statement/limiting.rb
 - lib/cassie/statements/statement/mapping.rb
@@ -167,6 +169,7 @@ files:
 - lib/cassie/statements/statement/relation.rb
 - lib/cassie/statements/statement/relations.rb
 - lib/cassie/statements/statement/selection.rb
+- lib/cassie/statements/statement/type_hinting.rb
 - lib/cassie/statements/statement/updating.rb
 - lib/cassie/support.rb
 - lib/cassie/support/command_runner.rb