cql_model 0.0.3 → 0.0.4

data/lib/cql/model/finder_methods.rb

@@ -3,16 +3,14 @@ module Cql::Model::FinderMethods
 
   module ClassMethods
     def all
-      query = "SELECT * FROM #{self.model_name.plural}"
+      query = "SELECT * FROM #{table_name}"
       execute(query)
     end
 
     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})"
+      query = "SELECT * FROM #{table_name} WHERE #{primary_key} IN (#{value})"
 
       if args[0].is_a?(Array) || args.size > 1
         execute(query).to_a
@@ -22,13 +20,11 @@ module Cql::Model::FinderMethods
     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"
+      query = "SELECT * FROM #{table_name} #{clause} ALLOW FILTERING"
 
       execute(query).to_a
     end

data/lib/cql/model/persistence_methods.rb

@@ -12,16 +12,26 @@ module Cql::Model::PersistenceMethods
 
     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}"
+    query = "UPDATE #{table_name} SET #{updates} WHERE #{primary_key} = #{quoted_primary_value}"
     Cql::Base.connection.execute(query)
 
     @persisted = true
     self
   end
 
+  def deleted?
+    @deleted
+  end
+
+  def delete
+    query = "DELETE FROM #{table_name} WHERE #{primary_key} = #{quoted_primary_value}"
+    Cql::Base.connection.execute(query)
+
+    @deleted = true
+    @persisted = false
+    self
+  end
+
   module ClassMethods
 
   end

data/lib/cql/model/schema_methods.rb

@@ -1,7 +1,19 @@
 module Cql::Model::SchemaMethods
   extend ::ActiveSupport::Concern
 
+  def table_name
+    self.class.table_name
+  end
+
+  def primary_key
+    self.class.primary_key
+  end
+
   module ClassMethods
+    def table_name
+      @table_name ||= self.model_name.plural
+    end
+
     def columns
       @columns ||= {}
     end

data/lib/cql/model/version.rb

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

data/lib/cql/model.rb

@@ -40,6 +40,7 @@ module Cql
       @metadata = options[:metadata]
       @primary_value = attributes[self.class.primary_key.to_sym]
       @persisted = false
+      @deleted = false
 
       attributes.each do |key, value|
         attr_name = "@#{key.to_s}".to_sym

data/spec/cql/model/persistence_spec.rb

@@ -23,11 +23,24 @@ describe 'Cql::Model Finders' do
     end
   end
 
-  describe '#update_attribute' do
+  describe '#delete' do
+    before :each do
+      @person.save
+    end
 
-  end
+    it { @person.delete.must_be_instance_of Person }
 
-  describe '#update_attributes' do
+    it do
+      @person.deleted?.must_equal false
+      @person.persisted?.must_equal true
+      @person.delete
+      @person.deleted?.must_equal true
+      @person.persisted?.must_equal false
+    end
 
+    it do
+      @person.delete
+      Person.find(123).must_be_nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql_model
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3909175812129280825
+      hash: -2300288373958290693
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3909175812129280825
+      hash: -2300288373958290693
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23