cql_model 0.0.2 → 0.0.3

data/README.md

@@ -32,6 +32,33 @@ Or install it yourself as:
       column :dob, Date
     end
 
+### Schema Definition
+
+While Cassandra doesn't get super picky about schemas you should understand how
+you're storing your data. To help with this you should define the primary key
+and the columns you care about within your model.
+
+#### Primary Key
+
+Defining the primary key determines which column the id-oriented finders will
+work with. The default primary key is `id`.
+
+    primary_key :id
+    primary_key 'card_number'
+
+#### Columns
+
+You define columns by supplying the attribute name, Ruby class for type
+conversion and an optional set of options.
+
+    column :first_name, String
+    column :birth_date, Date
+    column :birth_date, Date, column_name: :dob
+
+The supported options for columns are as follows:
+
+* `column_name`: actual column name for storing the attribute.
+
 ## Contributing
 
 1. Fork it

data/lib/cql/model.rb

@@ -7,6 +7,7 @@ require 'cql/base'
 require 'cql/model/version'
 require 'cql/model/schema_methods'
 require 'cql/model/finder_methods'
+require 'cql/model/persistence_methods'
 require 'cql/model/query_result'
 
 module Cql
@@ -24,6 +25,9 @@ module Cql
 
     include Cql::Model::SchemaMethods
     include Cql::Model::FinderMethods
+    include Cql::Model::PersistenceMethods
+
+    attr_reader :primary_value
 
     def initialize(attributes = {}, options = {})
       self.class.columns.each do |key, config|
@@ -34,6 +38,8 @@ module Cql
       end
 
       @metadata = options[:metadata]
+      @primary_value = attributes[self.class.primary_key.to_sym]
+      @persisted = false
 
       attributes.each do |key, value|
         attr_name = "@#{key.to_s}".to_sym
@@ -42,5 +48,18 @@ module Cql
 
       self
     end
+
+    def quoted_primary_value
+      primary_value.is_a?(Fixnum) ? primary_value : "'#{primary_value}'"
+    end
+
+    def persisted?
+      @persisted
+    end
+
+    def self.execute(query)
+      cql_results = Cql::Base.connection.execute(query)
+      Cql::Model::QueryResult.new(cql_results, self)
+    end
   end
 end

data/lib/cql/model/finder_methods.rb

@@ -4,14 +4,33 @@ module Cql::Model::FinderMethods
   module ClassMethods
     def all
       query = "SELECT * FROM #{self.model_name.plural}"
-      cql_results = Cql::Base.connection.execute(query)
-      Cql::Model::QueryResult.new(cql_results, self)
+      execute(query)
     end
 
-    def find(primary_key_value)
-      query = "SELECT * FROM #{self.model_name.plural} WHERE #{self.primary_key} = #{primary_key_value}"
-      cql_results = Cql::Base.connection.execute(query)
-      Cql::Model::QueryResult.new(cql_results, self).first
+    def find(*args)
+      value = args.to_a.flatten.join(',')
+      key = self.primary_key
+      table = self.model_name.plural
+
+      query = "SELECT * FROM #{table} WHERE #{key} IN (#{value})"
+
+      if args[0].is_a?(Array) || args.size > 1
+        execute(query).to_a
+      else
+        execute(query).first
+      end
+    end
+
+    def find_by(hash)
+      table = self.model_name.plural
+
+      clause = "WHERE "
+      clause_pieces = hash.collect {|key,value| "#{key.to_s} = '#{value}'"}
+      clause << clause_pieces.join(' AND ')
+
+      query = "SELECT * FROM #{table} #{clause} ALLOW FILTERING"
+
+      execute(query).to_a
     end
   end
 end

data/lib/cql/model/persistence_methods.rb

@@ -0,0 +1,28 @@
+module Cql::Model::PersistenceMethods
+  extend ::ActiveSupport::Concern
+
+  def save
+    updates = []
+
+    self.class.columns.each do |key, config|
+      value = instance_variable_get("@#{config[:attribute_name].to_s}".to_sym)
+      value = "'#{value}'" unless value.is_a?(Fixnum)
+      updates << "#{key.to_s} = #{value}" unless value.nil?
+    end
+
+    updates = updates.join(', ')
+
+    table = self.class.model_name.plural
+    primary_key = self.class.primary_key.to_s
+
+    query = "UPDATE #{table} SET #{updates} WHERE #{primary_key} = #{quoted_primary_value}"
+    Cql::Base.connection.execute(query)
+
+    @persisted = true
+    self
+  end
+
+  module ClassMethods
+
+  end
+end

data/lib/cql/model/schema_methods.rb

@@ -3,17 +3,18 @@ module Cql::Model::SchemaMethods
 
   module ClassMethods
     def columns
-      @@columns ||= {}
+      @columns ||= {}
     end
 
     def primary_key(key_name = nil)
-      @@primary_key ||= key_name.nil? ? 'id' : key_name.to_s
+      @primary_key ||= key_name.nil? ? 'id' : key_name.to_s
     end
 
     def column(attribute_name, ruby_class, options = {})
       column_name = options[:column_name] || attribute_name
 
-      columns[column_name.to_sym] = {
+      @columns ||= {}
+      @columns[column_name.to_sym] = {
         attribute_name: attribute_name.to_sym,
         klass: ruby_class.to_s.constantize
       }.merge(options)

data/lib/cql/model/version.rb

@@ -1,5 +1,5 @@
 module Cql
   class Model
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/spec/cql/model/finders_spec.rb

@@ -1,19 +1,39 @@
 require 'spec_helper'
 
-describe Cql::Model do
+describe 'Cql::Model Finders' do
   before :all do
     Cql::Base.establish_connection(host: '127.0.0.1')
     Cql::Base.connection.use('cql_model_test')
   end
 
-  describe 'Finders' do
-    describe '#all' do
-      it { Person.all.must_be_instance_of Cql::Model::QueryResult }
-      it { Person.all.first.must_be_instance_of Person }
-    end
+  describe '#all' do
+    it { Person.all.must_be_instance_of Cql::Model::QueryResult }
+    it { Person.all.first.must_be_instance_of Person }
+  end
 
-    describe '#find' do
+  describe '#find' do
+    describe 'single records' do
       it { Person.find(1).must_be_instance_of Person }
+      it { Person.find('1').must_be_instance_of Person }
     end
+
+    describe 'multiple/array records' do
+      it { Person.find(1,2).must_be_instance_of Array }
+      it { Person.find(1,2).size.must_equal 2 }
+
+      it { Person.find([1]).must_be_instance_of Array }
+      it { Person.find([1]).size.must_equal 1 }
+
+      it { Person.find([1,2]).must_be_instance_of Array }
+      it { Person.find([1,2]).size.must_equal 2 }
+    end
+  end
+
+  describe '#find_by' do
+    it { Person.find_by(first_name: 'John').must_be_instance_of Array }
+    it { Person.find_by(first_name: 'John').size.must_equal 1 }
+
+    it { Person.find_by(first_name: 'John', last_name: 'Doe').must_be_instance_of Array }
+    it { Person.find_by(first_name: 'John', last_name: 'Doe').size.must_equal 1 }
   end
 end

data/spec/cql/model/persistence_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'Cql::Model Finders' do
+  before :all do
+    Cql::Base.establish_connection(host: '127.0.0.1')
+    Cql::Base.connection.use('cql_model_test')
+  end
+
+  before :each do
+    @person = Person.new(id: 123, first_name: 'Alex', last_name: 'Jones')
+  end
+
+  after :each do
+    Cql::Base.connection.execute('DELETE FROM people WHERE id = 123')
+  end
+
+  describe '#save' do
+    it { @person.save.must_be_instance_of Person }
+    it do
+      @person.persisted?.must_equal false
+      @person.save
+      @person.persisted?.must_equal true
+    end
+  end
+
+  describe '#update_attribute' do
+
+  end
+
+  describe '#update_attributes' do
+
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ unless ENV['COVERAGE'] == 'no'
   require 'simplecov'
   SimpleCov.start do
     add_filter "/spec/"
-    add_group 'Source', 'lib'
   end
 end
 

data/spec/support/setup_test_keyspace.rb

@@ -50,4 +50,7 @@ def setup_cql_test
     cql_client.execute(table_definition)
   rescue Exception
   end
+
+  begin; cql_client.execute("CREATE INDEX ON people (first_name);") rescue Exception end
+  begin; cql_client.execute("CREATE INDEX ON people (last_name);") rescue Exception end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -139,6 +139,7 @@ files:
 - lib/cql/base.rb
 - lib/cql/model.rb
 - lib/cql/model/finder_methods.rb
+- lib/cql/model/persistence_methods.rb
 - lib/cql/model/query_result.rb
 - lib/cql/model/schema_methods.rb
 - lib/cql/model/version.rb
@@ -146,6 +147,7 @@ files:
 - spec/active_model_lint_spec.rb
 - spec/cql/base_spec.rb
 - spec/cql/model/finders_spec.rb
+- spec/cql/model/persistence_spec.rb
 - spec/cql/model/query_result_spec.rb
 - spec/spec_helper.rb
 - spec/support/setup_test_keyspace.rb
@@ -164,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2224793988251735129
+      hash: 3909175812129280825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2224793988251735129
+      hash: 3909175812129280825
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -184,6 +186,7 @@ test_files:
 - spec/active_model_lint_spec.rb
 - spec/cql/base_spec.rb
 - spec/cql/model/finders_spec.rb
+- spec/cql/model/persistence_spec.rb
 - spec/cql/model/query_result_spec.rb
 - spec/spec_helper.rb
 - spec/support/setup_test_keyspace.rb