cassie-queries 0.0.1.a4 → 0.0.1.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d357d81ed74c4e0e24a0536842f3cb0c135681
-  data.tar.gz: 246a0d7be210bbdea3bc1c1ce3f70fdd445d7eb7
+  metadata.gz: 24b13bcc78da6a2d63d65cdf05e117668e1f579f
+  data.tar.gz: c3fde5752744563dc4a1e335d62bc2c62b515600
 SHA512:
-  metadata.gz: 4561e775d74984005a279c954b4ad638da526830b6a1ab52a82f17def1208604180b168b2011b9baed3e993e9e0a0e5e730e88e70698604b8a439c91781541a1
-  data.tar.gz: 4922dbc93622b6cbc63bf89643e149165fd0484b91b8b617b61acde5291b02f8dc17dcff3e8916ffc57bcc9241e949f00ef8ecb0239d0603faf6101a0db8d76f
+  metadata.gz: 7608f07e36d0ee0cf82d02b1cc84d0a17ab0967ac66f7964ce1bc0820135dd225a3f564fa431b6125693c6e999ce2797725972b7f17331598865f47013f82b63
+  data.tar.gz: 1d5a2f4d059f160477f7ad0dcc7d48e61006c64aa4b6cf50a412ff5c12b4994794af5e7f363a3c6d5e166590c8fed8611dc6999165f325f6a56bb7f985857e16

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie-queries
 version: !ruby/object:Gem::Version
-  version: 0.0.1.a4
+  version: 0.0.1.alpha.5
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -86,35 +86,8 @@ email: evan.prothro@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
-files:
-- lib/cassie-queries.rb
-- lib/cassie/queries/instrumentation.rb
-- lib/cassie/queries/logging.rb
-- lib/cassie/queries/logging/cql_execution_event.rb
-- lib/cassie/queries/logging/logger.rb
-- lib/cassie/queries/logging/subscription.rb
-- lib/cassie/queries/pagination.rb
-- lib/cassie/queries/pagination/cursors.rb
-- lib/cassie/queries/pagination/page_size.rb
-- lib/cassie/queries/session.rb
-- lib/cassie/queries/statement.rb
-- lib/cassie/queries/statement/assignment.rb
-- lib/cassie/queries/statement/assignments.rb
-- lib/cassie/queries/statement/deleting.rb
-- lib/cassie/queries/statement/fetching.rb
-- lib/cassie/queries/statement/inserting.rb
-- lib/cassie/queries/statement/limiting.rb
-- lib/cassie/queries/statement/loading.rb
-- lib/cassie/queries/statement/mapping.rb
-- lib/cassie/queries/statement/ordering.rb
-- lib/cassie/queries/statement/preparation.rb
-- lib/cassie/queries/statement/preparation/cache.rb
-- lib/cassie/queries/statement/relation.rb
-- lib/cassie/queries/statement/relations.rb
-- lib/cassie/queries/statement/selection.rb
-- lib/cassie/queries/statement/updating.rb
-- lib/cassie/query.rb
-homepage: https://github.com/eprothro/cassie-queries
+files: []
+homepage: https://github.com/eprothro/cassie/tree/master/queries
 licenses:
 - MIT
 metadata: {}

data/lib/cassie/queries/instrumentation.rb

@@ -1,24 +0,0 @@
-module Cassie::Queries
-  module Instrumentation
-    extend ::ActiveSupport::Concern
-
-    def execute
-      instrument { super }
-    end
-
-    def instrument #:nodoc:
-      instrumenter.instrument("cql.execute") do |payload|
-        execution_val = yield # execution populates #result
-
-        payload[:execution_info] = result.execution_info if result.respond_to?(:execution_info)
-        execution_val
-      end
-    end
-
-    protected
-
-    def instrumenter
-      ActiveSupport::Notifications
-    end
-  end
-end

data/lib/cassie/queries/logging/cql_execution_event.rb

@@ -1,44 +0,0 @@
-module Cassie::Queries::Logging
-  class CqlExecutionEvent < ActiveSupport::Notifications::Event
-
-    def duration # in milliseconds
-      return super unless traced?
-
-      # trace duration is in microseconds
-      trace.duration / 1000.0
-    end
-
-    def message
-      color "(#{duration.round(1)}ms) #{statement}"
-    end
-
-    protected
-
-    def execution_info
-      payload[:execution_info]
-    end
-
-    def statement
-      if execution_info
-        statement = execution_info.statement
-        str = statement.cql
-        str += " [#{statement.params}]" if statement.respond_to? :params
-        str
-      else
-        "CQL executed: (`execution_info` was not present?)"
-      end
-    end
-
-    def traced?
-      execution_info && !!trace
-    end
-
-    def trace
-      execution_info.trace
-    end
-
-    def color(message)
-      "\e[1m\e[37m#{message}\e[0m\e[22m"
-    end
-  end
-end

data/lib/cassie/queries/logging/logger.rb

@@ -1,27 +0,0 @@
-module Cassie::Queries
-  module Logging
-
-    def self.logger
-      @logger ||= init_logger
-    end
-
-    def self.logger=(new_logger)
-      @logger = new_logger || Logger.new('/dev/null')
-    end
-
-    def self.init_logger(target = STDOUT)
-      previous_logger = defined?(@logger) ? @logger : nil
-
-      @logger = Logger.new(target)
-      @logger.level = Logger::INFO
-      @logger.formatter = log_formatter
-
-      previous_logger.close if previous_logger
-      @logger
-    end
-
-    def self.log_formatter
-      ActiveSupport::Logger::SimpleFormatter.new
-    end
-  end
-end

data/lib/cassie/queries/logging/subscription.rb

@@ -1,22 +0,0 @@
-require_relative 'cql_execution_event'
-
-module Cassie::Queries::Logging
-  module Subscription
-    extend ::ActiveSupport::Concern
-
-    included do
-      ActiveSupport::Notifications.subscribe('cql.execute') do |*args|
-        # args:
-        # name    # => String, name of the event (such as 'render' from above)
-        # start   # => Time, when the instrumented block started execution
-        # finish  # => Time, when the instrumented block ended execution
-        # id      # => String, unique ID for this notification
-        # payload # => Hash, the payload
-        #             [:exception] => if raised during event
-        unless args.last[:exception]
-          logger.debug(CqlExecutionEvent.new(*args).message)
-        end
-      end
-    end
-  end
-end

data/lib/cassie/queries/logging.rb

@@ -1,22 +0,0 @@
-require_relative 'logging/logger'
-require_relative 'logging/subscription'
-
-module Cassie::Queries
-  module Logging
-    extend ::ActiveSupport::Concern
-
-    included do
-      include Subscription
-    end
-
-    module ClassMethods
-      def logger
-        Cassie::Queries::Logging.logger
-      end
-    end
-
-    def logger
-      self.class.logger
-    end
-  end
-end

data/lib/cassie/queries/pagination/cursors.rb

@@ -1,15 +0,0 @@
-module Cassie::Queries::Pagination
-  module Cursors
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def max_cursor(field, opts={})
-        relation field, :lteq, opts
-      end
-
-      def since_cursor(field, opts={})
-        relation field, :gt, opts
-      end
-    end
-  end
-end

data/lib/cassie/queries/pagination/page_size.rb

@@ -1,7 +0,0 @@
-module Cassie::Queries::Pagination
-  module PageSize
-    def self.default
-      100
-    end
-  end
-end

data/lib/cassie/queries/pagination.rb

@@ -1,37 +0,0 @@
-require_relative 'pagination/cursors'
-require_relative 'pagination/page_size'
-
-module Cassie::Queries
-  module Pagination
-    extend ActiveSupport::Concern
-
-    included do
-      include Cursors
-    end
-
-    module ClassMethods
-      def inherited(subclass)
-        subclass.page_size = page_size
-        super
-      end
-
-      def page_size
-        return @page_size if defined?(@page_size)
-        Cassie::Queries::Pagination::PageSize.default
-      end
-
-      def page_size=(val)
-        @page_size = val
-      end
-    end
-
-    def page_size
-      return @page_size if defined?(@page_size)
-      self.class.page_size
-    end
-
-    def page_size=(val)
-      @page_size = val
-    end
-  end
-end

data/lib/cassie/queries/session.rb

@@ -1,22 +0,0 @@
-module Cassie::Queries
-  module Session
-    extend ::ActiveSupport::Concern
-
-    module ClassMethods
-      def session
-        # until cassie-configuration exists,
-        # we're relying on the client to
-        # supply the session
-        if defined?(super)
-          super
-        else
-          raise "Oops! Cassie::Queries doesn't manage a Cassandra session for you, yet. You must provide a .session class method that returns a valid session."
-        end
-      end
-    end
-
-    def session
-      self.class.session
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-module Cassie::Queries::Statement
-  #    set "username = ?", value: :username
-  #    set "favs = favs + ?" value: "{ 'movie' : 'Cassablanca' }"
-  #    set :username
-  class Assignment
-    # https://cassandra.apache.org/doc/cql3/CQL.html#updateStmt
-
-    attr_reader :identifier
-
-    def initialize(identifier, opts={})
-      if String === identifier
-        #  custom assignment is being defined:
-        #
-        #  `assign "username = ?", value: :username`
-        @cql = identifier
-        @custom = true
-      else
-        @identifier = identifier
-      end
-    end
-
-    def to_insert_cql
-      return @cql if defined?(@cql)
-      identifier
-    end
-
-    def to_update_cql
-      return @cql if defined?(@cql)
-      "#{identifier} = ?"
-    end
-
-    def custom?
-      !!@custom
-    end
-  end
-end

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

@@ -1,67 +0,0 @@
-require_relative 'assignment'
-require_relative 'mapping'
-
-module Cassie::Queries::Statement
-  module Assignments
-    extend ActiveSupport::Concern
-
-    included do
-      include Mapping
-    end
-
-    module ClassMethods
-      def set(identifier, opts={})
-        assignment = Assignment.new(identifier, opts)
-        opts[:value] ||= identifier.to_sym
-
-        if Symbol === opts[:value]
-          define_term_methods(opts[:value])
-        end
-
-        assignments[assignment] = opts
-      end
-
-      def assignments
-        @assignments ||= {}
-      end
-    end
-
-    def assignments
-      self.class.assignments
-    end
-
-    def build_update_and_bindings
-      cql = ""
-      bindings = []
-      assignment_strings = []
-
-      assignments.each do |a, opts|
-        if eval_if_opt?(opts[:if])
-          assignment_strings << a.to_update_cql
-          bindings << eval_value_opt(opts[:value])
-        end
-      end
-
-      cql = "#{assignment_strings.join(', ')}" unless bindings.empty?
-
-      [cql , bindings]
-    end
-
-    def build_insert_and_bindings
-      identifiers = []
-      bindings = []
-
-      assignments.each do |a, opts|
-        if eval_if_opt?(opts[:if])
-          identifiers << a.to_insert_cql
-          bindings << eval_value_opt(opts[:value])
-        end
-      end
-
-      identifiers_cql = "#{identifiers.join(', ')}"
-      terms_cql = Array.new(identifiers.count){"?"}.join(", ")
-
-      [identifiers_cql, terms_cql , bindings]
-    end
-  end
-end

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

@@ -1,60 +0,0 @@
-require_relative 'relations'
-
-module Cassie::Queries::Statement
-  module Deleting
-    extend ::ActiveSupport::Concern
-
-    module ClassMethods
-      #TODO: accept block to add specific selectors and aliases
-      #      select :table do |t|
-      #        t.id
-      #        t.name as: :username
-      #      end
-      def delete(table)
-        include Relations
-
-        self.table = table
-        self.identifier = :delete
-
-        yield(self) if block_given?
-      end
-
-      # TODO rename to identifiers and extract
-      def selectors
-        @selectors ||= []
-      end
-    end
-
-    def delete(opts={})
-      execute
-      execution_successful?
-    end
-
-    protected
-
-    def build_delete_cql_and_bindings
-      where_str, bindings = build_where_and_bindings
-
-      cql = %(
-        DELETE #{build_delete_clause}
-          FROM #{table}
-          #{where_str}
-      ).squish + ";"
-
-      [cql, bindings]
-    end
-
-    # a select clause is built up of selectors
-    def selectors
-      self.class.selectors
-    end
-
-    def build_delete_clause
-      str = if selectors.empty?
-        ''
-      else
-        selectors.join(', ')
-      end
-    end
-  end
-end

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

@@ -1,55 +0,0 @@
-require_relative 'relation'
-require_relative 'loading'
-
-class Cassie::Queries::RecordNotFound < StandardError; end
-
-module Cassie::Queries::Statement
-  module Fetching
-    extend ActiveSupport::Concern
-
-    included do
-      include Loading
-    end
-
-    # Returns array of rows or empty array
-    #
-    #   query.fetch(id: 1)
-    #   => [{id: 1, name: 'eprothro'}]
-    def fetch(args={})
-      args.each do |k, v|
-        setter = "#{k}="
-        send(setter, v) if respond_to? setter
-      end
-
-      execute
-      result.rows
-    end
-
-    # Returns first result or nil
-    #
-    #   query.find(id: 1)
-    #   => {id: 1, name: 'eprothro'}
-    #
-    #   query.find(id: 2)
-    #   => nil
-    def find(args={})
-      old_limit = defined?(@limit) ? @limit : nil
-      self.limit = 1
-
-      fetch.first
-    ensure
-      self.limit = old_limit
-    end
-
-    # Returns first result or raises RecordNotFound
-    #
-    #   query.find!(id: 1)
-    #   => {id: 1, name: 'eprothro'}
-    #
-    #   query.find!(id: 2)
-    #   RecordNotFound: RecordNotFound
-    def find!(args={})
-      find || raise(Cassie::Queries::RecordNotFound)
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-require_relative 'assignments'
-
-module Cassie::Queries::Statement
-  module Inserting
-    extend ::ActiveSupport::Concern
-
-    module ClassMethods
-      def insert(table)
-        include Assignments
-
-        self.table = table
-        self.identifier = :insert
-
-        yield(self) if block_given?
-      end
-    end
-
-    def insert(opts={})
-      execute
-      execution_successful?
-    end
-
-    protected
-
-    def build_insert_cql_and_bindings
-      identifiers_str, terms_str, bindings = build_insert_and_bindings
-
-      cql = %(
-        INSERT INTO #{table}
-        (#{identifiers_str})
-        VALUES (#{terms_str})
-      ).squish + ";"
-
-      [cql, bindings]
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-module Cassie::Queries::Statement
-  module Limiting
-    extend ActiveSupport::Concern
-
-    included do
-      attr_accessor :limit
-
-      class << self
-        attr_accessor :limit
-      end
-    end
-
-    def limit
-      @limit || self.class.limit
-    end
-
-    protected
-
-    def build_limit_str
-      return "" if limit.nil?
-
-      "LIMIT #{limit}"
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-module Cassie::Queries::Statement
-  module Loading
-    extend ActiveSupport::Concern
-
-    def fetch(args={})
-      rows = super(args)
-      rows.map {|r| build_resource(r) }
-    end
-
-    # When class doesn't override
-    # simply return a struct with the row data
-    def build_resource(row)
-      Struct.new(*row.keys).new(*row.values)
-    end
-  end
-end

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

@@ -1,66 +0,0 @@
-module Cassie::Queries::Statement
-  module Mapping
-    extend ActiveSupport::Concern
-
-    MAPPED_METHODS = [:insert, :update, :delete].freeze
-
-    included do
-      MAPPED_METHODS.each do |method|
-        next unless method_defined?(method)
-
-        define_method(method) do |resource=nil, opts={}|
-          return super(opts) if _resource.nil? && resource.nil?
-
-          self._resource = resource
-
-          if super(opts)
-            _resource
-          else
-            false
-          end
-        end
-      end
-    end
-
-    module ClassMethods
-      def map_from(resource_name)
-        attr_accessor resource_name
-
-        define_method "_resource" do
-          send resource_name
-        end
-
-        define_method "_resource=" do |val|
-          send("#{resource_name}=", val)
-        end
-      end
-
-      protected
-
-      def define_term_methods(field)
-        getter = field
-        setter = "#{field}="
-
-        if method_defined?(getter) || method_defined?(setter)
-          raise "accessor or getter already defined for #{field}. Fix the collisions by using the `:value` option."
-        else
-          # Order of prefrence for finding term value
-          # 1. overriden getter instance method
-          # 2. value set by setter instance method
-          # 3. (Eventually) Mapping getter instance method
-          # 4. instance resource getter instance method
-          define_method getter do
-            if instance_variable_defined?("@#{field}")
-              return instance_variable_get("@#{field}")
-            end
-            _resource.send(field) if(_resource && _resource.respond_to?(field))
-          end
-
-          define_method setter do |val|
-            instance_variable_set("@#{field}", val)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Cassie::Queries::Statement
-  module Ordering
-    extend ActiveSupport::Concern
-
-    protected
-
-    def build_order_str
-      ""
-    end
-  end
-end

data/lib/cassie/queries/statement/preparation/cache.rb

@@ -1,55 +0,0 @@
-module Cassie::Queries::Statement
-  module Preparation
-    class Cache
-      attr_reader :data
-
-      def initialize
-        clear
-        @monitor = Monitor.new
-      end
-
-      def write(key, value)
-        synchronize do
-          @data[key] = value
-        end
-      end
-      def read(key)
-        synchronize do
-          data[key]
-        end
-      end
-      def fetch(key)
-        return read(key) if data.has_key?(key)
-        write(key, yield) if block_given?
-      end
-      def clear
-        @data = {}
-      end
-      def close
-        clear
-      end
-
-      private
-
-      def synchronize(&block)
-        @monitor.synchronize(&block)
-      end
-    end
-
-    def self.cache
-      @cache ||= init_cache
-    end
-
-    def self.init_cache
-      previous_cache = defined?(@cache) ? @cache : nil
-
-      #TODO: research why memory story is blowing up when
-      #     serializing the Cassandra prepared statement result
-      # @cache = ActiveSupport::Cache::MemoryStore.new
-      @cache = Cache.new
-
-      previous_cache.close if previous_cache
-      @cache
-    end
-  end
-end

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

@@ -1,47 +0,0 @@
-require_relative 'preparation/cache'
-
-module Cassie::Queries::Statement
-  module Preparation
-    extend ::ActiveSupport::Concern
-
-    included do
-      class << self
-        attr_accessor :prepare
-      end
-      self.prepare = true
-    end
-
-    module ClassMethods
-      def inherited(subclass)
-        subclass.prepare = prepare
-        super
-      end
-
-      def prepare?
-        !!prepare
-      end
-    end
-
-    def statement
-      statement = super
-
-      if self.class.prepare?
-        key = statement.cql if statement.respond_to?(:cql)
-        key ||= statement.to_s
-
-        unbound = statement_cache.fetch(key) do
-          session.prepare(statement)
-        end
-        unbound.bind(statement.params)
-      else
-        statement
-      end
-    end
-
-    private
-
-    def statement_cache
-      Cassie::Queries::Statement::Preparation.cache
-    end
-  end
-end

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

@@ -1,59 +0,0 @@
-module Cassie::Queries::Statement
-  #
-  #
-  #    relation "username = ?", value: :username
-  #    relation :username, :eq
-  #    relation :username, :eq, value: :method
-  #    relation :phone, :in
-  class Relation
-    # https://cassandra.apache.org/doc/cql3/CQL.html#selectStmt
-
-    OPERATIONS = {
-                  eq: "=",
-                  lt: "<",
-                  lteq: "<=",
-                  gt: ">",
-                  gteq: ">=",
-                  contains: "CONTAINS",
-                  contains_key: "CONTAINS KEY",
-    }
-
-    attr_reader :identifier,
-                :op_type
-
-    def initialize(identifier, op_type, opts={})
-      if Hash === op_type
-        #  custom relation is being defined:
-        #  `relation "username = ?", value: :username`
-
-        # swap the 2nd arg that sucked in options hash
-        opts.merge!(op_type)
-
-        @cql = identifier
-        @custom = true
-      else
-        @identifier = identifier
-        @op_type = op_type.to_sym
-      end
-    end
-
-    def custom?
-      !!@custom
-    end
-
-    def to_cql
-      cql
-    end
-
-    protected
-
-    def cql
-      # we always generate bound statements
-      @cql ||= "#{identifier} #{OPERATIONS[op_type]} ?"
-    end
-
-    def op_type
-      @op_type
-    end
-  end
-end

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

@@ -1,64 +0,0 @@
-require_relative 'relation'
-
-module Cassie::Queries::Statement
-  module Relations
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      #    where :username, :eq, value: :method
-      #    where :phone, :in
-      #    were "username = ?", value: :username
-      def where(identifier, op, opts={})
-        relation = Relation.new(identifier, op, opts)
-
-        opts[:value] ||= identifier.to_sym
-
-        if Symbol === opts[:value]
-          define_term_methods(opts[:value])
-        end
-
-        relations[relation] = opts
-      end
-
-      # a where clause is built up of multiple 'relations'
-      def relations
-        @relations ||= {}
-      end
-
-      private
-
-      def define_term_methods(name)
-        #TODO: this should probably only raise
-        #      if value option was nil and we
-        #      are implicilty creating getter/setters.
-        if method_defined?(name) || method_defined?("#{name}=")
-          raise "accessor or getter already defined for #{name}. Fix the collions by using the `:value` option."
-        else
-          attr_accessor name
-        end
-      end
-    end
-
-    # a where clause is built up of multiple 'relations'
-    def relations
-      self.class.relations
-    end
-
-    def build_where_and_bindings
-      cql = ""
-      bindings = []
-      relation_strings = []
-
-      relations.each do |r, opts|
-        if eval_if_opt?(opts[:if])
-          relation_strings << r.to_cql
-          bindings << eval_value_opt(opts[:value])
-        end
-      end
-
-      cql = "WHERE #{relation_strings.join(' AND ')}" unless bindings.empty?
-
-      [cql , bindings]
-    end
-  end
-end

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

@@ -1,63 +0,0 @@
-require_relative 'relations'
-require_relative 'limiting'
-require_relative 'ordering'
-require_relative 'fetching'
-
-module Cassie::Queries::Statement
-  module Selection
-    extend ::ActiveSupport::Concern
-
-    module ClassMethods
-      #TODO: accept block to add specific selectors and aliases
-      #      select :table do |t|
-      #        t.id
-      #        t.name as: :username
-      #      end
-      def select(table)
-        include Relations
-        include Limiting
-        include Ordering
-        include Fetching
-
-        self.table = table
-        self.identifier = :select
-
-        yield(self) if block_given?
-      end
-
-      # a select clause is built up of selectors
-      def selectors
-        @selectors ||= []
-      end
-    end
-
-    protected
-
-    def build_select_cql_and_bindings
-      where_str, bindings = build_where_and_bindings
-
-      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
-    def selectors
-      self.class.selectors
-    end
-
-    def build_select_clause
-      str = if selectors.empty?
-        '*'
-      else
-        selectors.join(', ')
-      end
-    end
-  end
-end

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

@@ -1,39 +0,0 @@
-require_relative 'assignments'
-
-module Cassie::Queries::Statement
-  module Updating
-    extend ::ActiveSupport::Concern
-
-    module ClassMethods
-      def update(table)
-        include Relations
-        include Assignments
-
-        self.table = table
-        self.identifier = :update
-
-        yield(self) if block_given?
-      end
-    end
-
-    def update(opts={})
-      execute
-      execution_successful?
-    end
-
-    protected
-
-    def build_update_cql_and_bindings
-      assignment_str, update_bindings = build_update_and_bindings
-      where_str, where_bindings = build_where_and_bindings
-
-      cql = %(
-        UPDATE #{table}
-        SET #{assignment_str}
-        #{where_str}
-      ).squish + ";"
-
-      [cql, update_bindings + where_bindings]
-    end
-  end
-end

data/lib/cassie/queries/statement.rb

@@ -1,99 +0,0 @@
-require 'active_support/core_ext/string/filters'
-require_relative 'statement/preparation'
-require_relative 'statement/selection'
-require_relative 'statement/deleting'
-require_relative 'statement/updating'
-require_relative 'statement/inserting'
-
-
-module Cassie::Queries
-  module Statement
-    # https://cassandra.apache.org/doc/cql3/CQL.html#selectStmt
-    extend ::ActiveSupport::Concern
-
-    included do
-      include Preparation
-      include Selection
-      include Deleting
-      include Updating
-      include Inserting
-
-      attr_reader :result
-
-      class << self
-        attr_accessor :table
-        attr_accessor :identifier
-      end
-    end
-
-    def table
-      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
-      Cassandra::Statements::Simple.new(*build_cql_and_bindings)
-    end
-
-    protected
-
-    def build_cql_and_bindings
-      if identifier
-        send "build_#{identifier}_cql_and_bindings"
-      else
-        [cql, bindings]
-      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 identifier
-      self.class.identifier
-    end
-
-    def eval_if_opt?(value)
-      case value
-      when nil
-        true # if is true by default
-      when Symbol
-        !!send(value)
-      when String
-        !!eval(value)
-      else
-        !!value
-      end
-    end
-
-    def eval_value_opt(value)
-      case value
-      when Symbol
-        send(value)
-      when String
-        eval(value)
-      else
-        value
-      end
-    end
-  end
-end

data/lib/cassie/query.rb

@@ -1,25 +0,0 @@
-module Cassie
-  require 'cassandra'
-  require_relative 'queries/session'
-  require_relative 'queries/statement'
-  require_relative 'queries/pagination'
-  require_relative 'queries/instrumentation'
-  require_relative 'queries/logging'
-
-  class Query
-    include Queries::Session
-    include Queries::Statement
-    include Queries::Pagination
-    include Queries::Instrumentation
-    include Queries::Logging
-
-    def initialize(*args)
-      value = super(*args)
-      after_initialize(*args)
-      value
-    end
-
-    def after_initialize(*args)
-    end
-  end
-end

data/lib/cassie-queries.rb

@@ -1,16 +0,0 @@
-# Active Support used for
-#  * include convenience via ActiveSupport::Concern
-#  * string extensions
-#  * notification pub/sub
-#  * log formatting
-#
-# We require/autoload extensions only as needed,
-# this base require has almost no overhead
-#
-# http://guides.rubyonrails.org/active_support_core_extensions.html
-require 'active_support'
-
-# Use cassie directory instead of cassie-queries
-# to allow sharing of cassie module with other libraries
-# but maintain folder/file/module/class naming conventions
-require_relative 'cassie/query'