cassie 1.0.0.alpha.4 → 1.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b525f6072394101c053af5d655136f44cfda52a1
-  data.tar.gz: b70d7576dfd3b36ee4958f5e75dbfee6ce9c16ed
+  metadata.gz: d925ecc0efe8b9f80a3db861e19e0600aefafccc
+  data.tar.gz: a691902f688cabb92e861b5e8117d620d6e783d0
 SHA512:
-  metadata.gz: 3b345d2bb1febc085c96b5deca61fcd61862242d8ea02e17c8ce7ddc2015c8cfa95af8d51ccb52b7714ed9b1ac200f678194d7b2c1a9200ba056992b0126c88a
-  data.tar.gz: d12cda51a8148b416963326eaebad65b67df3e096fc95e887ec6ff15802a36f052b42d0147e49f53515e9934ba2d842add0720521230ef704ce4b059dcc8c4eb
+  metadata.gz: a7d29330368b459d759110f461589776c2552c06e496e2ba2be20bbd7e5f841abbbe617b26cdec7fcd4b919a979998bde14f596ba3f9c06930794cac0b6672a4
+  data.tar.gz: a54572302c88f2fb902800481df8ee2b06dc4de63ab988e51f1e5575b561cc37cb851207f2fd81c9c87d28d0ecd7f2119e59accc4348ddde6bf7baca8b670feb

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

@@ -0,0 +1,47 @@
+require_relative 'assignment'
+
+module Cassie::Queries::Statement
+  module Conditions
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def if_not_exists(opts={})
+        condition = "NOT EXISTS"
+        opts.delete(:value)
+
+        conditions[condition] = opts
+      end
+
+      def if_exists(opts={})
+        condition = "EXISTS"
+        opts.delete(:value)
+
+        conditions[condition] = opts
+      end
+
+      def conditions
+        @conditions ||= {}
+      end
+    end
+
+    def conditions
+      self.class.conditions
+    end
+
+    def build_condition_and_bindings
+      condition_strings = []
+      bindings = []
+
+      conditions.each do |condition, opts|
+        if eval_if_opt?(opts[:if])
+          condition_strings << condition.to_s
+          bindings << eval_value_opt(opts[:value]) if opts.has_key?(:value)
+        end
+      end
+
+      cql = "IF #{condition_strings.join(' AND ')}" unless condition_strings.empty?
+
+      [cql , bindings]
+    end
+  end
+end

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

@@ -1,4 +1,6 @@
 require_relative 'relations'
+require_relative 'conditions'
+require_relative 'mapping'
 
 module Cassie::Queries::Statement
   module Deleting
@@ -12,6 +14,8 @@ module Cassie::Queries::Statement
       #      end
       def delete(table)
         include Relations
+        include Conditions
+        include Mapping
 
         self.table = table
         self.identifier = :delete
@@ -33,15 +37,17 @@ module Cassie::Queries::Statement
     protected
 
     def build_delete_cql_and_bindings
-      where_str, bindings = build_where_and_bindings
+      where_str, where_bindings = build_where_and_bindings
+      condition_str, condition_bindings = build_condition_and_bindings
 
       cql = %(
         DELETE #{build_delete_clause}
           FROM #{table}
           #{where_str}
+          #{condition_str}
       ).squish + ";"
 
-      [cql, bindings]
+      [cql, where_bindings + condition_bindings]
     end
 
     # a select clause is built up of selectors

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

@@ -1,4 +1,5 @@
 require_relative 'assignments'
+require_relative 'conditions'
 
 module Cassie::Queries::Statement
   module Inserting
@@ -7,6 +8,7 @@ module Cassie::Queries::Statement
     module ClassMethods
       def insert(table)
         include Assignments
+        include Conditions
 
         self.table = table
         self.identifier = :insert
@@ -23,15 +25,17 @@ module Cassie::Queries::Statement
     protected
 
     def build_insert_cql_and_bindings
-      identifiers_str, terms_str, bindings = build_insert_and_bindings
+      identifiers_str, terms_str, value_bindings = build_insert_and_bindings
+      condition_str, condition_bindings = build_condition_and_bindings
 
       cql = %(
         INSERT INTO #{table}
         (#{identifiers_str})
         VALUES (#{terms_str})
+        #{condition_str}
       ).squish + ";"
 
-      [cql, bindings]
+      [cql, value_bindings + condition_bindings]
     end
   end
 end

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

@@ -3,7 +3,15 @@ module Cassie::Queries::Statement
     extend ActiveSupport::Concern
 
     def fetch(args={})
-      rows = super(args)
+      build_resources(super(args))
+    end
+
+    protected
+
+    # Default implementation assumes
+    # 1 row per resource, clients
+    # may override if more complex
+    def build_resources(rows)
       rows.map {|r| build_resource(r) }
     end
 

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

@@ -5,13 +5,19 @@ module Cassie::Queries::Statement
     MAPPED_METHODS = [:insert, :update, :delete].freeze
 
     included do
+      attr_accessor :_resource
+
       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 resource.nil?
+            # if no mapping is taking place, keep previously
+            # defined behavior/return value
+            return super(opts) if _resource.nil?
+          else
+            self._resource = resource
+          end
 
           if super(opts)
             _resource

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

@@ -1,3 +1,6 @@
+# for pluralization
+require 'active_support/core_ext/string'
+
 module Cassie::Queries::Statement
   #
   #
@@ -14,6 +17,7 @@ module Cassie::Queries::Statement
                   lteq: "<=",
                   gt: ">",
                   gteq: ">=",
+                  in: "IN",
                   contains: "CONTAINS",
                   contains_key: "CONTAINS KEY",
     }
@@ -27,6 +31,7 @@ module Cassie::Queries::Statement
         #  `relation "username = ?", value: :username`
 
         # swap the 2nd arg that sucked in options hash
+        # to keep consistent feeling interface
         opts.merge!(op_type)
 
         @cql = identifier
@@ -45,6 +50,20 @@ module Cassie::Queries::Statement
       cql
     end
 
+    def multiple_term?
+      op_type == :in
+    end
+
+    def implied_value_method
+      method = if multiple_term?
+        identifier.to_s.pluralize
+      else
+        identifier
+      end
+
+      method.to_sym
+    end
+
     protected
 
     def cql

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

@@ -11,7 +11,7 @@ module Cassie::Queries::Statement
       def where(identifier, op, opts={})
         relation = Relation.new(identifier, op, opts)
 
-        opts[:value] ||= identifier.to_sym
+        opts[:value] ||= relation.implied_value_method
 
         if Symbol === opts[:value]
           define_term_methods(opts[:value])
@@ -25,7 +25,7 @@ module Cassie::Queries::Statement
         @relations ||= {}
       end
 
-      private
+      protected
 
       def define_term_methods(name)
         #TODO: this should probably only raise
@@ -44,6 +44,8 @@ module Cassie::Queries::Statement
       self.class.relations
     end
 
+    protected
+
     def build_where_and_bindings
       cql = ""
       bindings = []

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

@@ -1,4 +1,5 @@
 require_relative 'assignments'
+require_relative 'conditions'
 
 module Cassie::Queries::Statement
   module Updating
@@ -8,6 +9,7 @@ module Cassie::Queries::Statement
       def update(table)
         include Relations
         include Assignments
+        include Conditions
 
         self.table = table
         self.identifier = :update
@@ -26,14 +28,16 @@ module Cassie::Queries::Statement
     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
 
       cql = %(
         UPDATE #{table}
         SET #{assignment_str}
         #{where_str}
+        #{condition_str}
       ).squish + ";"
 
-      [cql, update_bindings + where_bindings]
+      [cql, update_bindings + where_bindings + condition_bindings]
     end
   end
 end

data/lib/cassie/query.rb

@@ -24,13 +24,12 @@ module Cassie
     include Queries::Instrumentation
     include Queries::Logging
 
-    def initialize(*args)
-      value = super(*args)
-      after_initialize(*args)
-      value
-    end
+    def initialize(params={})
+      params.each do |attr, value|
+        self.public_send("#{attr}=", value)
+      end
 
-    def after_initialize(*args)
+      super()
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.4
+  version: 1.0.0.alpha.5
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -102,6 +102,7 @@ files:
 - lib/cassie/queries/statement.rb
 - lib/cassie/queries/statement/assignment.rb
 - lib/cassie/queries/statement/assignments.rb
+- lib/cassie/queries/statement/conditions.rb
 - lib/cassie/queries/statement/deleting.rb
 - lib/cassie/queries/statement/fetching.rb
 - lib/cassie/queries/statement/inserting.rb