command_post 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94022e90946d5610c0d667352783d73244e83da2
-  data.tar.gz: e30cb09fd2d836c8012b6d40e4394f0ccd03285e
+  metadata.gz: 5d72f7139b440a1258cc5ed8fb18d4aa9dc27bcf
+  data.tar.gz: 4e6d5edd913c5163521af6254a1263302fd25a0c
 SHA512:
-  metadata.gz: 2cb3dc6044d1fe45e73769d9bafc99ec7dc19422aa52f42fec8592c72587199639c950b7e21d7cf8ce170baadee85e566a6b18748d7fe0606040fc210cbf028a
-  data.tar.gz: 6ca34cdb22b8a11e8a65f80e1fd72bac80dc2ff952ff26f7e5fe6e489fb0345efb7ee46ea68d650cab9f159c3e26cd0c9481c24749516254693992ec0ed311d2
+  metadata.gz: ead892be9876a67322fd188c890bef660351544c04d27dc0b00447ca1014aac5dafafb0e5399a6133af60fef1771f0f038f2b2156bd1fcec0be77a81066a6259
+  data.tar.gz: 12edc1df51fcb7f4342aeecfd29164035660e273912378214d5f04f381a7460fffabeb2ab0ce63091c1a5e8d6c6f05a7fa6bc80a24da3d23d888700c0a93f542

data/lib/command_post/db/postgresql.sql

@@ -39,7 +39,9 @@ CREATE INDEX aggregate_lookup_idx ON aggregates(aggregate_lookup_value);
 CREATE TABLE aggregate_indexes (
 aggregate_id    		BIGINT NOT NULL,
 index_field             VARCHAR(100) NOT NULL,
-index_value      		VARCHAR(100) NOT NULL,
+index_value_text		TEXT,
+index_value_integer     INTEGER,
+index_value_decimal     DECIMAL(20,4),
 PRIMARY KEY             (aggregate_id,index_field)
 )  ; 
 

data/lib/command_post/event_sourcing/aggregate.rb

@@ -11,12 +11,13 @@ module CommandPost
   class Aggregate   
    
     @@prep_stmt_insert ||= $DB[:aggregates].prepare(:insert,  :insert_aggregate, :aggregate_id => :$aggregate_id, :aggregate_type => :$aggregate_type, :content => :$content, :aggregate_lookup_value => :$aggregate_lookup_value )
-    @@prep_stmt_insert_index ||= $DB[:aggregate_indexes].prepare(:insert,  :insert_aggregate_indexes, :aggregate_id => :$aggregate_id, :index_field => :$index_field, :index_value => :$index_value )
-        
-
-    def self.replace object, aggregate_lookup_value
 
+    def update_index object, index_value , field
+      index_field = "#{object.class.to_s}.#{field.to_s}"
+       $DB["UPDATE aggregate_indexes set #{Persistence.compute_index_column_name(field) } = ?  where aggregate_id = ? and index_field = ?", index_value,  aggregate_id.to_i, index_field ].update
+    end
 
+    def self.replace object, aggregate_lookup_value
       content = JSON.generate object
       aggregate_id = object[:aggregate_info][:aggregate_id] 
       aggregate_type = object[:aggregate_info][:aggregate_type] 
@@ -31,7 +32,7 @@ module CommandPost
         object.index_fields.each do |field|
           index_value = object.send field
           index_field = "#{object.class.to_s}.#{field.to_s}"
-          @@prep_stmt_insert_index.call(:aggregate_id => aggregate_id, :index_field => index_field, :index_value => index_value )
+          $DB["INSERT INTO aggregate_indexes (aggregate_id , #{Persistence.compute_index_column_name(index_value)}, index_field ) values (?, ?, ?) ", aggregate_id,  index_value,  index_field ].insert
         end
       else
         $DB["UPDATE aggregates set content = ?, aggregate_lookup_value = ? where aggregate_id = ?", content,  aggregate_lookup_value,  aggregate_id ].update
@@ -39,8 +40,7 @@ module CommandPost
         @@prep_stmt_insert.call(:aggregate_id => aggregate_id.to_i, :aggregate_type => aggregate_type  , :content => content, :aggregate_lookup_value => aggregate_lookup_value  ) 
         object.index_fields.each do |field|
           index_value = object.send field
-          index_field = "#{object.class.to_s}.#{field.to_s}"
-          $DB["UPDATE aggregate_indexes set index_value = ?  where aggregate_id = ? and index_field = ?", index_value,  aggregate_id.to_i, index_field ].update
+          update_index object, index_value, field
         end
       end
     end

data/lib/command_post/persistence/persistence.rb

@@ -2,6 +2,9 @@ require_relative './schema_validation'
 require_relative './data_validation'
 require_relative './auto_load'
 
+require 'pry'
+require 'pry-debugger'
+
 
 module CommandPost
 
@@ -66,34 +69,50 @@ module CommandPost
 
     end
 
-    def self.get_index_sql  name, values
-        
-      "SELECT  aggregate_id FROM    aggregate_indexes WHERE   index_field = '#{name}' AND     index_value in (#{self.stringify_values(values)}) "
+    def self.listify(values)
+      return values.collect { |x| "'#{x}'"}.join(',') if values.first.is_a? String
+      values.collect { |x|  "#{x}"  }.join(',')
     end
 
 
-    def self.get_ids_for_index index_name, *args
+    def self.get_sql_for_in  name, values
+      "SELECT  aggregate_id FROM    aggregate_indexes WHERE   index_field = '#{name}' AND   #{self.compute_index_column_name(values.first)} in (#{self.listify(values)}) "
+    end
+
+
+    def self.get_sql_for_is  name , value
+      "SELECT  aggregate_id FROM    aggregate_indexes WHERE   index_field = '#{name}' AND  #{self.compute_index_column_name(value)} = ? "
+    end
+
 
-      values = args[0][0]
-      name = "#{self.to_s}.#{index_name.to_s.sub(/_in$/,'')}"
-      sql = get_index_sql name, values
-      results = Array.new 
-      $DB.fetch(sql) do |row|
-        results << row[:aggregate_id]
-      end
 
-      results
+    def self.compute_index_column_name(field)
+      return 'INDEX_VALUE_INTEGER' if field.is_a? Fixnum
+      return 'INDEX_VALUE_DECIMAL' if field.is_a? BigDecimal
+      'INDEX_VALUE_TEXT'
+    end
+
+
+    def self.get_ids_for_in index_name, *args
+      name = "#{self.to_s}.#{index_name.to_s.sub(/_in$/,'')}"
+      $DB.fetch(get_sql_for_in name, args.last).collect { |row|  row[:aggregate_id] }
+    end
 
+    def self.get_ids_for_is index_name, value
+      name = "#{self.to_s}.#{index_name.to_s.sub(/_is$/,'')}"
+      $DB.fetch(get_sql_for_is(name,value),value.to_s).collect { |row|  row[:aggregate_id] }
     end
 
 
     def self.method_missing nm, *args , &block
       name = nm.to_s
-      search_index = name.gsub(/_in/,'').to_sym
-      if (name.end_with?('_in') && self.indexes.include?(search_index))
-        ids =  self.get_ids_for_index nm, args
+      if (name.end_with?('_in') && self.indexes.include?(name.gsub(/_in/,'').to_sym))
+        ids =  self.get_ids_for_in nm, args
         return ids
-      else 
+      elsif (name.end_with?('_is') && self.indexes.include?(name.gsub(/_is/,'').to_sym))
+        ids =  self.get_ids_for_is nm, args.last
+        return ids
+      else
         begin
           super
         rescue Exception => e

data/lib/command_post/version.rb

@@ -1,5 +1,9 @@
 module CommandPost
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 
-# $ gem build command_post-0.0.5.gem
+# 1. bump version number in this file
+# 2. run the command below from the command line.
+# $ gem build command_post.gemspec
+# $ gem build command_post-0.0.6.gem
+

data/spec/command_post/persistence/indexing_spec.rb

@@ -1,10 +1,14 @@
 require 'faker'
 require 'securerandom'
+
+require 'pry'
+require 'pry-debugger'
+
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 
 
-class Test100Person < CommandPost::Persistence 
+class TestXXXPerson < CommandPost::Persistence 
   include CommandPost::Identity
 
   def initialize
@@ -15,60 +19,115 @@ class Test100Person < CommandPost::Persistence
     fields[  :first_name        ] = { :required => true,       :type => String,    :location => :local  } 
     fields[  :last_name         ] = { :required => true,       :type => String,    :location => :local  } 
     fields[  :ssn               ] = { :required => true,       :type => String,    :location => :local  } 
+    fields[  :state             ] = { :required => true,       :type => String,    :location => :local  }
     fields[  :favorite_number   ] = { :required => true,       :type => Fixnum,    :location => :local  } 
     fields[  :lookup            ] = { :use => :ssn }
     fields 
   end 
   def self.indexes
-    [:favorite_number]
+    [:favorite_number, :state]
   end
 end
 
 
+$DB["delete from aggregates"].delete
+$DB["delete from aggregate_events"].delete
+$DB["delete from aggregate_indexes"].delete
 
-describe CommandPost::Identity do 
-  it 'should aggregate_ids via index methods' do 
 
 
+1000.times do |i|
 
-    1000.times do |i|
 
+  puts "count = #{i.to_s}"
+  params = Hash.new  # like a web request... 
 
-      puts "count = #{i.to_s}"
-      params = Hash.new  # like a web request... 
+  params['first_name']  = Faker::Name.first_name                                           #hash key is a string to mimic a web post/put
+  params['last_name']   = Faker::Name.last_name                                            #hash key is a string to mimic a web post/put
+  params['ssn']         = "%09d" %  CommandPost::SequenceGenerator.misc                    #hash key is a string to mimic a web post/put
+  params['favorite_number'] = rand(5)
+  params['state'] = Faker::Address.state_abbr    
 
-      params['first_name']  = Faker::Name.first_name                                           #hash key is a string to mimic a web post/put
-      params['last_name']   = Faker::Name.last_name                                            #hash key is a string to mimic a web post/put
-      params['ssn']         = "%09d" %  CommandPost::SequenceGenerator.misc     #hash key is a string to mimic a web post/put
-      params['favorite_number'] = rand(20)
+  #----------------------------------------------------------------
+  # The code below will eventually be replaced by the 
+  # 'handle' method of the CommandXXXXXX class.
+  #----------------------------------------------------------------
 
-      #----------------------------------------------------------------
-      # The code below will eventually be replaced by the 
-      # 'handle' method of the CommandXXXXXX class.
-      #----------------------------------------------------------------
+  object = TestXXXPerson.load_from_hash TestXXXPerson, params
+  puts "OBJECT IS NIL #{'=' * 80}" if object.nil?
+  event = CommandPost::AggregateEvent.new 
+  event.aggregate_id = object.aggregate_id
+  event.object = object
+  event.aggregate_type =  TestXXXPerson
+  event.event_description = 'hired'
+  event.user_id = 'test' 
+  event.publish
 
-      object = Test100Person.load_from_hash Test100Person, params
-      puts "OBJECT IS NIL #{'=' * 80}" if object.nil?
-      event = CommandPost::AggregateEvent.new 
-      event.aggregate_id = object.aggregate_id
-      event.object = object
-      event.aggregate_type =  Test100Person
-      event.event_description = 'hired'
-      event.user_id = 'test' 
-      event.publish
 
+  #----------------------------------------------------------------
+  # Retrieve the object by both aggregate_id and aggregate_lookup_value
+  # Both ways should retrieve the same object and the fields of both
+  # should match the original values used to create the object.
+  #----------------------------------------------------------------
 
-      #----------------------------------------------------------------
-      # Retrieve the object by both aggregate_id and aggregate_lookup_value
-      # Both ways should retrieve the same object and the fields of both
-      # should match the original values used to create the object.
-      #----------------------------------------------------------------
 
+  saved_person = CommandPost::Aggregate.get_by_aggregate_id TestXXXPerson, event.aggregate_id 
+
+end
+
+
+
+describe CommandPost::Identity do 
+  it 'test 1' do 
 
-      saved_person = CommandPost::Aggregate.get_by_aggregate_id Test100Person, event.aggregate_id 
+    sql_cnts_in_array = 0
 
+    $DB.fetch("SELECT * FROM aggregate_indexes WHERE index_field  = 'TestXXXPerson.favorite_number' and index_value_integer in (1,2,3) " ) do |row|
+      sql_cnts_in_array += 1
     end
+
+    ids = TestXXXPerson.favorite_number_in(1,2,3)
+    ids.length.must_equal sql_cnts_in_array
+
+
   end
+
+  it 'should pass test 2' do 
+
+    sql_cnts_eq = 0
+    $DB.fetch("SELECT * FROM aggregate_indexes WHERE index_field  = 'TestXXXPerson.favorite_number' and index_value_integer = 4 " ) do |row|
+      sql_cnts_eq += 1
+    end
+
+    ids = TestXXXPerson.favorite_number_is(4)
+    ids.length.must_equal sql_cnts_eq
+    sql_cnts_eq.wont_equal 0
+
+  end
+
+  it 'should pass test 3' do 
+
+    mi_counts_eq = 0
+
+    $DB.fetch("SELECT * FROM aggregate_indexes WHERE index_field  = 'TestXXXPerson.state' and index_value_text = 'MI' " ) do |row|
+      mi_counts_eq += 1
+    end
+
+    ids = TestXXXPerson.state_is('MI')
+    ids.length.must_equal mi_counts_eq
+    mi_counts_eq.wont_equal 0
+
+  end
+
+  it 'should pass test 3' do 
+
+    puts "count of people from Michigan whose favorite number is even. #{(TestXXXPerson.state_is('MI') & TestXXXPerson.favorite_number_in(2,4)).length}."
+
+  end
+
+
+
+
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_post
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Joe Meirow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler