acts_as_customized_attributes 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTcyNDM3Njc0M2MyMTFmZGEyOGQ1OTM3ZjhiNzdkMTFiYmU1YzRkNg==
+    OWIxNDQ5MjA4ZjBmYzAxZDU0NDJiYTRhYzExZjMwZGE2Y2E4NDZhYg==
   data.tar.gz: !binary |-
-    YWYzN2Q3OWY4ZjE5MDY3MDY2YTYyNGYzYWI4OThkN2E0YjQyNTk4ZA==
+    MjM5NGRkYzIzZTBlYTUzYWU2MDljNGI0ZTAwZWE5ODAxMjM4M2Y2Zg==
 SHA512:
   metadata.gz: !binary |-
-    ZjRkNWI5YWNmZGFiMjJmNzBjMGM4YmRkYzBhOTk4YjFmOWU4Njc3ODM3M2Jj
-    NjcyNzBmYTEyYWE0ODZlOGE5OWQ2MTg2NWE1ZTQ5OWYxOGNkZmVhNDI1MWE1
-    N2Y5ODUzM2ZkMTIyYjkxN2FkNjE5ZTVhNDA0YTE0NmE3MjYwYTU=
+    ODQ4MGQyNGMyMjkxYzdiOGEzNWVhYTVhYmU2MTYxNTQyM2UwZmY3ZGNiNDM0
+    MjRjMWVhMWI5MDllNTEwYWVhMzNkZDhkODYzNjFkODc2MGRmZGRmN2FmNzA3
+    MTI2NzgwYzc4NDgxOGI4ZTU3NjEzYWExN2ZmZDNiNTA3ODU0NzI=
   data.tar.gz: !binary |-
-    YzMxMjNiZDI5NGZiY2QyYWY4MzgxZWNiNmUwMGY1ZDFmNDk5YWY2NjQ4YmI5
-    MTAxNjQ2YjFjOWZlY2E4NTExMGQ5NTgzZWE4MTg5Y2RlYzA2NDRiN2Q4YWFh
-    MTY5NmI2MmQ3NTE1YjkzYjYxYWNhOTY4YmM3OGZlODhlMTY2MGI=
+    ODM1NWFkM2FjZDY1ODUxMGZiZDhiZjYyMWExYTAzODUxYWY1ZGIyZThlZTQx
+    YzdhYWRmYTI4ZmVlMjE5NTFkNGQ3ZmU1ZGMxOGIzNjgxMDgyYzc2NTcxODA0
+    YzcwMGUxYmZmZDUzZmYzZmEwZTFlNjFiNzE0NGNhODkyYzg4Yjk=

data/README.md

@@ -33,7 +33,7 @@ class AddCustomizedAttributesForSomeModel < ActiveRecord::Migration
   def up
     SomeModel.create_customized_attributes!
   end
-  
+
   def down
     SomeModel.drop_customized_attributes!
   end
@@ -68,6 +68,15 @@ SomeModel::DataKey.where("name LIKE '%facebook%'")
 SomeModel::Data.where("resource_id > 5")
 ```
 
+### Optimize inserts with transactions for inserts / updates.
+```ruby
+ActiveRecordTransactioner.new do |trans|
+  models.each do |model|
+    model.update_customized_attributes_with_args(data: {my_custom_attribute: 5}, transactioner: trans)
+  end
+end
+```
+
 ## License
 
 This project uses MIT-LICENSE.

data/app/models/acts_as_customized_attributes/data.rb

@@ -1,3 +1,29 @@
 class ActsAsCustomizedAttributes::Data < ActiveRecord::Base
-  belongs_to :resource, polymorphic: true
+  validate :associated_resource_and_data_key
+
+  def self.key_class=(key_class)
+    @key_class = key_class
+  end
+
+  def self.key_class
+    return @key_class
+  end
+
+private
+
+  def associated_resource_and_data_key
+    unless data_key_id?
+      return errors.add :data_key_id, "not valid"
+    end
+
+    if !resource_id? || !resource
+      return errors.add :resource_id, "not associated"
+    end
+
+    begin
+      self.class.key_class.name_for_id(data_key_id)
+    rescue KeyError
+      errors.add :data_key_id, "doesn't exist"
+    end
+  end
 end

data/app/models/acts_as_customized_attributes/data_key.rb

@@ -1,5 +1,11 @@
 class ActsAsCustomizedAttributes::DataKey < ActiveRecord::Base
+  after_create :add_to_cache
+  after_update :add_to_cache
+  after_destroy :remove_from_cache
+  before_update :remove_from_cache
+
   validates_presence_of :name
+  validate :validate_unique_name
 
   def self.id_for_name(name)
     cache_name_to_id.fetch(name.to_s)
@@ -9,26 +15,38 @@ class ActsAsCustomizedAttributes::DataKey < ActiveRecord::Base
     cache_name_to_id.key(id) or raise KeyError, "No such ID: #{id}"
   end
 
-private
+  def self.cache_name_to_id
+    update_cache_name_to_id unless @cache_name_to_id
+    return @cache_name_to_id
+  end
 
   # Initializes / reloads the cache.
   def self.update_cache_name_to_id
-    @@cache_name_to_id = {}
+    @cache_name_to_id = {}
     find_each do |data_key|
-      @@cache_name_to_id[data_key.name] = data_key.id
+      @cache_name_to_id[data_key.name] = data_key.id
     end
   end
 
-  def self.cache_name_to_id
-    update_cache_name_to_id unless @cache_name_to_id
-    return @@cache_name_to_id
-  end
+private
 
   def add_to_cache
     self.class.cache_name_to_id[name.to_s] = id
   end
 
   def remove_from_cache
-    self.class.cache_name_to_id.delete(name)
+    self.class.cache_name_to_id.delete(name_was)
+  end
+
+  def validate_unique_name
+    begin
+      id_exists = self.class.id_for_name(name)
+
+      if id_exists != id
+        errors.add :name, :taken
+      end
+    rescue KeyError
+      # No problem.
+    end
   end
 end

data/lib/acts_as_customized_attributes/class_methods.rb

@@ -2,29 +2,26 @@ module ActsAsCustomizedAttributes::ClassMethods
   def acts_as_customized_attributes(args = {})
     $aaca_class_name_key = "#{name}DataKey"
     $aaca_class_name_data = "#{name}Data"
+    $original_class_name = name
 
     class_data_key = Class.new(ActsAsCustomizedAttributes::DataKey) do
       set_table_name $aaca_class_name_key.tableize
 
       has_many :data, class_name: $aaca_class_name_data, foreign_key: "data_key_id", dependent: :destroy
-
-      after_create :add_to_cache
-      after_update :add_to_cache
-      after_destroy :remove_from_cache
-      before_update :remove_from_cache
     end
 
     class_data = Class.new(ActsAsCustomizedAttributes::Data) do
       set_table_name $aaca_class_name_data.tableize
 
+      belongs_to :resource, class_name: $original_class_name
       belongs_to :data_key, class_name: $aaca_class_name_key
-
-      validates_associated :data_key
     end
 
     Object.const_set($aaca_class_name_key, class_data_key)
     Object.const_set($aaca_class_name_data, class_data)
 
+    class_data.key_class = Object.const_get($aaca_class_name_key)
+
     include ActsAsCustomizedAttributes::InstanceMethods
 
     has_many :data, class_name: "#{name}Data", foreign_key: "resource_id", dependent: :destroy

data/lib/acts_as_customized_attributes/instance_methods.rb

@@ -1,6 +1,13 @@
 module ActsAsCustomizedAttributes::InstanceMethods
   def update_customized_attributes(data)
-    data.each do |key, value|
+    update_customized_attributes_with_args(data: data)
+  end
+
+  UPDATE_CUSTOMIZED_ATTRIBUTES_VALID_ARGS = [:data, :transactioner]
+  def update_customized_attributes_with_args(args)
+    args.each { |key, value| raise "Invalid argument: '#{key}'." unless UPDATE_CUSTOMIZED_ATTRIBUTES_VALID_ARGS.include?(key) }
+
+    args[:data].each do |key, value|
       begin
         key_id = self.class.aaca_key_class.id_for_name(key)
       rescue KeyError
@@ -8,9 +15,21 @@ module ActsAsCustomizedAttributes::InstanceMethods
         key_id = key_model.id
       end
 
-      data = self.class.aaca_data_class.find_or_initialize_by_data_key_id_and_resource_id(key_id, id)
-      data.value = value
-      data.save!
+      data_model = self.data.where(data_key_id: key_id).first
+      if data_model
+        data_model.resource = self # Saves query when validating.
+      else
+        # Set resource in order to skip query when validating.
+        data_model = self.data.new(data_key_id: key_id, resource: self)
+      end
+
+      data_model.value = value
+
+      if args[:transactioner]
+        args[:transactioner].save!(data_model)
+      else
+        data_model.save!
+      end
     end
   end
 

data/lib/acts_as_customized_attributes/version.rb

@@ -1,3 +1,3 @@
 module ActsAsCustomizedAttributes
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end