cql_model 0.0.1 → 0.0.2

data/README.md

@@ -25,7 +25,11 @@ Or install it yourself as:
     Cql::Base.establish_connection(host: '127.0.0.1')
 
     class Person < Cql::Model
-      # Define your class
+      primary_key :id
+
+      column :first_name, String
+      column :last_name, String
+      column :dob, Date
     end
 
 ## Contributing

data/cql_model.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'cql-rb', '~> 1.0.0'
   spec.add_dependency 'activemodel', '~> 4.0.0.rc1'
+  spec.add_dependency 'activesupport', '~> 4.0.0.rc1'
 
   spec.add_development_dependency 'minitest', '~> 4.2.0'
+  spec.add_development_dependency 'simplecov', '~> 0.7.1'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

data/lib/cql/model/finder_methods.rb

@@ -0,0 +1,17 @@
+module Cql::Model::FinderMethods
+  extend ::ActiveSupport::Concern
+
+  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)
+    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
+    end
+  end
+end

data/lib/cql/model/query_result.rb

@@ -0,0 +1,19 @@
+class Cql::Model::QueryResult
+  include Enumerable
+
+  attr_reader :metadata
+
+  def initialize(results, klass)
+    @metadata = results.metadata
+    @rows = results.collect {|result| klass.new(result, metadata: @metadata)}
+  end
+
+  def empty?
+    @rows.nil? || @rows.empty?
+  end
+
+  def each(&block)
+    @rows.each(&block)
+  end
+  alias_method :each_row, :each
+end

data/lib/cql/model/schema_methods.rb

@@ -0,0 +1,22 @@
+module Cql::Model::SchemaMethods
+  extend ::ActiveSupport::Concern
+
+  module ClassMethods
+    def columns
+      @@columns ||= {}
+    end
+
+    def primary_key(key_name = nil)
+      @@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] = {
+        attribute_name: attribute_name.to_sym,
+        klass: ruby_class.to_s.constantize
+      }.merge(options)
+    end
+  end
+end

data/lib/cql/model/version.rb

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

data/lib/cql/model.rb

@@ -1,8 +1,14 @@
-require 'cql/model/version'
-require 'cql/base'
-
 require 'active_model'
 
+require 'active_support/concern'
+require 'active_support/core_ext'
+
+require 'cql/base'
+require 'cql/model/version'
+require 'cql/model/schema_methods'
+require 'cql/model/finder_methods'
+require 'cql/model/query_result'
+
 module Cql
   class Model
     extend ActiveModel::Naming
@@ -15,5 +21,26 @@ module Cql
     include ActiveModel::Serialization
     #include ActiveModel::Translation
     include ActiveModel::Validations
+
+    include Cql::Model::SchemaMethods
+    include Cql::Model::FinderMethods
+
+    def initialize(attributes = {}, options = {})
+      self.class.columns.each do |key, config|
+        class_eval do
+          attr_reader config[:attribute_name]
+          attr_writer config[:attribute_name] unless config[:read_only]
+        end
+      end
+
+      @metadata = options[:metadata]
+
+      attributes.each do |key, value|
+        attr_name = "@#{key.to_s}".to_sym
+        instance_variable_set(attr_name, value)
+      end
+
+      self
+    end
   end
 end

data/spec/cql/model/finders_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Cql::Model 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 '#find' do
+      it { Person.find(1).must_be_instance_of Person }
+    end
+  end
+end

data/spec/cql/model/query_result_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Cql::Model::QueryResult do
+  before :all do
+    Cql::Base.establish_connection(host: '127.0.0.1')
+    Cql::Base.connection.use('cql_model_test')
+  end
+
+  let(:empty_result) do
+    query = 'SELECT * FROM events'
+    result = Cql::Base.connection.execute(query)
+    Cql::Model::QueryResult.new(result, Event)
+  end
+
+  let(:full_result) do
+    query = 'SELECT * FROM people'
+    result = Cql::Base.connection.execute(query)
+    Cql::Model::QueryResult.new(result, Person)
+  end
+
+  describe '#empty?' do
+    it { full_result.empty?.must_equal false }
+    it { empty_result.must_be_empty }
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,34 @@
+require 'bundler/setup'
+require 'simplecov'; SimpleCov.start
+
 require 'minitest/spec'
 require 'minitest/autorun'
 
 require 'cql_model'
+
+unless ENV['COVERAGE'] == 'no'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+    add_group 'Source', 'lib'
+  end
+end
+
+require 'support/setup_test_keyspace'
+
+setup_cql_test
+
+class Event < Cql::Model
+  primary_key :id
+
+  column :location, String
+  column :date, Date
+end
+
+class Person < Cql::Model
+  primary_key :id
+
+  column :first_name, String
+  column :last_name, String
+  column :birth_date, Date, column_name: :dob
+end

data/spec/support/setup_test_keyspace.rb

@@ -0,0 +1,53 @@
+require 'cql'
+
+def setup_cql_test
+  cql_client = Cql::Client.connect(host: '127.0.0.1')
+
+  begin
+    cql_client.use('cql_model_test')
+  rescue Cql::QueryError
+    keyspace_definition = <<-KSDEF
+    CREATE KEYSPACE cql_model_test
+    WITH replication = {
+      'class': 'SimpleStrategy',
+      'replication_factor': 1
+    }
+    KSDEF
+
+    cql_client.execute(keyspace_definition)
+    cql_client.use('cql_model_test')
+  end
+
+  begin
+    table_definition = <<-TABLEDEF
+      CREATE TABLE people (
+        id INT,
+        first_name VARCHAR,
+        last_name VARCHAR,
+        dob TIMESTAMP,
+        PRIMARY KEY (id)
+      )
+    TABLEDEF
+
+    cql_client.execute(table_definition)
+  rescue Exception
+  end
+
+  cql_client.execute("INSERT INTO people (id,first_name,last_name,dob) VALUES (1,'John','Doe','1942-06-08')")
+  cql_client.execute("INSERT INTO people (id,first_name,last_name) VALUES (2,'Jane','Doe')")
+  cql_client.execute("INSERT INTO people (id,first_name,last_name) VALUES (3,'Will','Smith')")
+
+  begin
+    table_definition = <<-TABLEDEF
+      CREATE TABLE events (
+        id INT,
+        location VARCHAR,
+        date TIMESTAMP,
+        PRIMARY KEY (id)
+      )
+    TABLEDEF
+
+    cql_client.execute(table_definition)
+  rescue Exception
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql_model
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,11 +138,17 @@ files:
 - cql_model.gemspec
 - lib/cql/base.rb
 - lib/cql/model.rb
+- lib/cql/model/finder_methods.rb
+- lib/cql/model/query_result.rb
+- lib/cql/model/schema_methods.rb
 - lib/cql/model/version.rb
 - lib/cql_model.rb
 - spec/active_model_lint_spec.rb
 - spec/cql/base_spec.rb
+- spec/cql/model/finders_spec.rb
+- spec/cql/model/query_result_spec.rb
 - spec/spec_helper.rb
+- spec/support/setup_test_keyspace.rb
 homepage: https://github.com/plainprogrammer/cql_model
 licenses:
 - MIT
@@ -126,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -838785113870071967
+      hash: 2224793988251735129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -838785113870071967
+      hash: 2224793988251735129
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -145,4 +183,7 @@ summary: ActiveModel implementation on cql-rb
 test_files:
 - spec/active_model_lint_spec.rb
 - spec/cql/base_spec.rb
+- spec/cql/model/finders_spec.rb
+- spec/cql/model/query_result_spec.rb
 - spec/spec_helper.rb
+- spec/support/setup_test_keyspace.rb