doeskeyvalue 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/doeskeyvalue.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doeskeyvalue}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Awexome Labs"]

data/lib/doeskeyvalue/indexes.rb

@@ -13,7 +13,7 @@ module DoesKeyValue
       raise DoesKeyValue::KeyAndIndexOptionsMustBeHash unless opts.is_a?(Hash)
       
       search_key = "#{key_value_column}.#{key_name}"
-      raise DoesKeyValue::NoKeyForThatIndex if !self.respond_to?(key_name) || !self.respond_to?("#{key_name}=")
+      # TODO: raise DoesKeyValue::NoKeyForThatIndex if !self.respond_to?(key_name) || !self.respond_to?("#{key_name}=")
       
       class_name = self.name.underscore
       class_table_name = self.table_name
@@ -61,9 +61,26 @@ module DoesKeyValue
       define_method("update_index_#{key_value_column}_#{key_name}_after_save") do
         class_name = self.class.name.underscore
         class_table_name = self.class.table_name
-        index_table_name = "key_value_indexes"
+        index_table_name = "key_value_index"
+
         # TODO: Restrict value to 255 characters, the table-enforced limit
-        idx_id = ActiveRecord::Base.connection.insert("INSERT INTO `#{index_table_name}` (`obj_type`,`obj_id`,`key_name`,`value`) VALUES (\""+self.class.to_s+"\","+self.id.to_s+", \""+search_key.to_s+"\", \"#{self.send(key_name).to_s}\")")
+        
+        # TODO: Serialize value in such a nils to be properly represented
+        #  Sample JSON Serialization: tab.to_json
+        #  Sample JSON Reconstruction: Tab.new( JSON.parse(tab.to_json)["tab"] )
+        
+        new_value = self.send(key_name)
+        up_count = ActiveRecord::Base.connection.update("
+          UPDATE `#{index_table_name}` SET `value` = \"#{new_value}\", `updated_at` = NOW()
+          WHERE `obj_type`=\"#{self.class}\" AND `obj_id`=#{self.id} AND `key_name`=\"#{search_key}\"
+        ")
+        if !new_value.nil? && up_count == 0
+          idx_id = ActiveRecord::Base.connection.insert(
+            "INSERT INTO `#{index_table_name}` (`obj_type`,`obj_id`,`key_name`,`value`,`created_at`,`updated_at`) VALUES (\"#{self.class}\", #{self.id}, \"#{search_key}\", \"#{new_value}\", NOW(), NOW())
+          ")
+          return idx_id
+        end
+        
       end
       after_save "update_index_#{key_value_column}_#{key_name}_after_save"
       
@@ -71,7 +88,7 @@ module DoesKeyValue
       define_method("update_index_#{key_value_column}_#{key_name}_after_destroy") do
         class_name = self.class.name.underscore
         class_table_name = self.class.table_name
-        index_table_name = "key_value_indexes"
+        index_table_name = "key_value_index"
         num_del = ActiveRecord::Base.connection.delete("DELETE FROM `#{index_table_name}` WHERE `obj_type` = \"#{self.class}\" AND `obj_id` = #{self.id}")
       end
       after_destroy "update_index_#{key_value_column}_#{key_name}_after_destroy"

data/lib/doeskeyvalue/keys.rb

@@ -10,17 +10,21 @@ module DoesKeyValue
       raise DoesKeyValue::NoColumnNameSpecified unless key_value_column
       raise DoesKeyValue::NoKeyNameSpecified unless key_name
       raise DoesKeyValue::KeyAndIndexOptionsMustBeHash unless opts.is_a?(Hash)
-    
+      
+      # TODO: Allow :type option to set an enforced data type
+      # TODO: Allow :default option to set a default return value
+  
       # Define accessors for the key column in the AR class:
       class_eval <<-EOS
         def #{key_name}
-          return (self.send(:#{key_value_column}) || Hash.new)[:#{key_name}]
+          all_keys = self.send(:read_attribute, :#{key_value_column}) || Hash.new
+          return all_keys[:#{key_name}]
         end
       
         def #{key_name}=(value)
-          key_set = self.send(:#{key_value_column}) || Hash.new
-          key_set[:#{key_name}] = value
-          self.send("#{key_value_column}=", key_set)
+          all_keys = self.send(:read_attribute, :#{key_value_column}) || Hash.new
+          all_keys[:#{key_name}] = value
+          self.send(:write_attribute, :#{key_value_column}, all_keys)
         end
       EOS
     
@@ -30,6 +34,8 @@ module DoesKeyValue
       end
     
     end
+    
+    
         
   end # Keys
 end # DoesKeyValue

data/lib/generators/doeskeyvalue/templates/create_key_value_index.rb

@@ -6,17 +6,11 @@
 class CreateKeyValueIndex < ActiveRecord::Migration
   def self.up
     create_table :key_value_index do |t|
-      # The key is a composite of the grouping and key name (e.g., "settings.user_id")
+      t.string :obj_type
       t.string :key_name
-      
-      # The stored value is saved as varchar(255), which limits indexability slightly:
       t.string :value
-      
-      # Store details about the target object:
-      t.string :obj_type
       t.integer :obj_id
       
-      # Track all touches:
       t.timestamps
     end
     

metadata

@@ -2,7 +2,7 @@
 name: doeskeyvalue
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Awexome Labs
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 136860461958198637
+      hash: -1554093929383851164
       segments: 
       - 0
       version: "0"