acts_as_customized_attributes 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWIxNDQ5MjA4ZjBmYzAxZDU0NDJiYTRhYzExZjMwZGE2Y2E4NDZhYg==
-  data.tar.gz: !binary |-
-    MjM5NGRkYzIzZTBlYTUzYWU2MDljNGI0ZTAwZWE5ODAxMjM4M2Y2Zg==
+SHA1:
+  metadata.gz: 6cf3da61d6819da1a7d8562dcad8619affda62f5
+  data.tar.gz: 36bc64c145508ac95af5dfe0045854979bc13412
 SHA512:
-  metadata.gz: !binary |-
-    ODQ4MGQyNGMyMjkxYzdiOGEzNWVhYTVhYmU2MTYxNTQyM2UwZmY3ZGNiNDM0
-    MjRjMWVhMWI5MDllNTEwYWVhMzNkZDhkODYzNjFkODc2MGRmZGRmN2FmNzA3
-    MTI2NzgwYzc4NDgxOGI4ZTU3NjEzYWExN2ZmZDNiNTA3ODU0NzI=
-  data.tar.gz: !binary |-
-    ODM1NWFkM2FjZDY1ODUxMGZiZDhiZjYyMWExYTAzODUxYWY1ZGIyZThlZTQx
-    YzdhYWRmYTI4ZmVlMjE5NTFkNGQ3ZmU1ZGMxOGIzNjgxMDgyYzc2NTcxODA0
-    YzcwMGUxYmZmZDUzZmYzZmEwZTFlNjFiNzE0NGNhODkyYzg4Yjk=
+  metadata.gz: b0947725f00d7d5f619a78f7a291f0a7250752a8730f2f29ffb6d6dc5da16e8eb65109a31b87a81962ca44ceeb140a8ed13d50f4123c2b8c619f90af3e78b037
+  data.tar.gz: 82dfbf339ae77a97b164b94ed38c61ee5e4fa2fd0689af80108a5c743cab765f24c72186b0948f36f26e93f092352438d3ed06f4867e623a75c2823c57494440

data/README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://api.shippable.com/projects/546b3f7bd46935d5fbbde6b9/badge?branchName=master)](https://app.shippable.com/projects/546b3f7bd46935d5fbbde6b9/builds/latest)
 [![Code Climate](https://codeclimate.com/github/kaspernj/acts_as_customized_attributes/badges/gpa.svg)](https://codeclimate.com/github/kaspernj/acts_as_customized_attributes)
 [![Test Coverage](https://codeclimate.com/github/kaspernj/acts_as_customized_attributes/badges/coverage.svg)](https://codeclimate.com/github/kaspernj/acts_as_customized_attributes)
+[![Build Status](https://img.shields.io/shippable/546b3f7bd46935d5fbbde6b9.svg)](https://app.shippable.com/projects/546b3f7bd46935d5fbbde6b9/builds/latest)
 
 # ActsAsCustomizedAttributes
 
@@ -59,13 +59,13 @@ some_model.customized_attributes #=> {:my_custom_attribute => 5}
 #### Query keys.
 
 ```ruby
-SomeModel::DataKey.where("name LIKE '%facebook%'")
+SomeModelDataKey.where("name LIKE '%facebook%'")
 ```
 
 ### Query data
 
 ```ruby
-SomeModel::Data.where("resource_id > 5")
+SomeModelData.where("resource_id > 5")
 ```
 
 ### Optimize inserts with transactions for inserts / updates.

data/Rakefile

@@ -1,26 +1,30 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 begin
-  require 'rdoc/task'
+  require "rdoc/task"
 rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
+  require "rdoc/rdoc"
+  require "rake/rdoctask"
   RDoc::Task = Rake::RDocTask
 end
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActsAsCustomizedAttributes'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "ActsAsCustomizedAttributes"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
+
+require "best_practice_project"
+BestPracticeProject.load_tasks
 
 Bundler::GemHelper.install_tasks

data/config/routes.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 Rails.application.routes.draw do
 end

data/lib/acts_as_customized_attributes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "acts_as_customized_attributes/engine"
 
 module ActsAsCustomizedAttributes

data/lib/acts_as_customized_attributes/class_methods.rb

@@ -1,20 +1,102 @@
+# frozen_string_literal: true
 module ActsAsCustomizedAttributes::ClassMethods
-  def acts_as_customized_attributes(args = {})
+  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
+    class_data_key = Class.new(ActiveRecord::Base) do
+      if respond_to?(:set_table_name)
+        set_table_name $aaca_class_name_key.tableize
+      else
+        self.table_name = $aaca_class_name_key.tableize
+      end
+
+      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
 
-      has_many :data, class_name: $aaca_class_name_data, foreign_key: "data_key_id", dependent: :destroy
+      has_many :data, class_name: $aaca_class_name_data.to_s, table_name: $aaca_class_name_data.tableize.to_s, foreign_key: "data_key_id", dependent: :destroy
+
+      def self.id_for_name(name)
+        cache_name_to_id.fetch(name.to_s)
+      end
+
+      def self.name_for_id(id)
+        cache_name_to_id.key(id) || raise(KeyError, "No such ID: #{id}")
+      end
+
+      def self.cache_name_to_id
+        update_cache_name_to_id unless @cache_name_to_id
+        @cache_name_to_id
+      end
+
+      # Initializes / reloads the cache.
+      def self.update_cache_name_to_id
+        @cache_name_to_id = {}
+        find_each do |data_key|
+          @cache_name_to_id[data_key.name] = data_key.id
+        end
+      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_was)
+      end
+
+      def validate_unique_name
+        id_exists = self.class.id_for_name(name)
+
+        errors.add :name, :taken if id_exists != id
+      rescue KeyError
+        # No problem.
+      end
     end
 
-    class_data = Class.new(ActsAsCustomizedAttributes::Data) do
-      set_table_name $aaca_class_name_data.tableize
+    class_data = Class.new(ActiveRecord::Base) do
+      if respond_to?(:set_table_name)
+        set_table_name $aaca_class_name_data.tableize
+      else
+        self.table_name = $aaca_class_name_data.tableize
+      end
+
+      belongs_to :resource, class_name: $original_class_name.to_s
+      belongs_to :data_key, class_name: $aaca_class_name_key.to_s
+
+      validate :associated_resource_and_data_key
+
+      def self.key_class=(key_class)
+        @key_class = key_class
+      end
+
+      def self.key_class
+        @key_class
+      end
+
+                 private
+
+      def associated_resource_and_data_key
+        return errors.add :data_key_id, "not valid" unless data_key_id?
 
-      belongs_to :resource, class_name: $original_class_name
-      belongs_to :data_key, class_name: $aaca_class_name_key
+        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
 
     Object.const_set($aaca_class_name_key, class_data_key)
@@ -59,8 +141,9 @@ private
   def migration_class
     $acts_as_customized_attributes_keys_table_name = "#{name.downcase}_data_keys"
     $acts_as_customized_attributes_table_name = "#{name.downcase}_data"
+    $table_name = table_name
 
-    clazz = Class.new(ActiveRecord::Migration) do
+    Class.new(ActiveRecord::Migration) do
       def up
         create_table $acts_as_customized_attributes_keys_table_name do |t|
           t.string :name
@@ -71,14 +154,13 @@ private
         add_index $acts_as_customized_attributes_keys_table_name, :name, unique: true
 
         create_table $acts_as_customized_attributes_table_name do |t|
-          t.belongs_to :resource
-          t.belongs_to :data_key
+          t.belongs_to :resource, index: true
+          t.belongs_to :data_key, index: true
           t.string :value
           t.timestamps
         end
 
-        add_index $acts_as_customized_attributes_table_name, :data_key_id
-        add_index $acts_as_customized_attributes_table_name, :resource_id
+        add_foreign_key $acts_as_customized_attributes_table_name, $table_name, column: "data_key_id", on_delete: :cascade
         add_index $acts_as_customized_attributes_table_name, [:data_key_id, :resource_id], unique: true
       end
 

data/lib/acts_as_customized_attributes/compatibility.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActsAsCustomizedAttributes::Compatibility
   def self.included(base)
     base.extend ActsAsCustomizedAttributes::ClassMethods

data/lib/acts_as_customized_attributes/engine.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 module ActsAsCustomizedAttributes
-  class Engine < Rails::Engine
-  end
+end
+
+class ActsAsCustomizedAttributes::Engine < Rails::Engine
 end

data/lib/acts_as_customized_attributes/instance_methods.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 module ActsAsCustomizedAttributes::InstanceMethods
   def update_customized_attributes(data)
     update_customized_attributes_with_args(data: data)
   end
 
-  UPDATE_CUSTOMIZED_ATTRIBUTES_VALID_ARGS = [:data, :transactioner]
+  UPDATE_CUSTOMIZED_ATTRIBUTES_VALID_ARGS = [:data, :transactioner].freeze
   def update_customized_attributes_with_args(args)
-    args.each { |key, value| raise "Invalid argument: '#{key}'." unless UPDATE_CUSTOMIZED_ATTRIBUTES_VALID_ARGS.include?(key) }
+    args.each { |key, _value| raise "Invalid argument: '#{key}'." unless UPDATE_CUSTOMIZED_ATTRIBUTES_VALID_ARGS.include?(key) }
 
-    args[:data].each do |key, value|
+    args.fetch(:data).each do |key, value|
       begin
         key_id = self.class.aaca_key_class.id_for_name(key)
       rescue KeyError
@@ -15,12 +16,12 @@ module ActsAsCustomizedAttributes::InstanceMethods
         key_id = key_model.id
       end
 
-      data_model = self.data.where(data_key_id: key_id).first
+      data_model = 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)
+        data_model = data.new(data_key_id: key_id, resource: self)
       end
 
       data_model.value = value
@@ -45,6 +46,6 @@ module ActsAsCustomizedAttributes::InstanceMethods
       hash[key_name.to_sym] = data_i.value
     end
 
-    return hash
+    hash
   end
 end

data/lib/acts_as_customized_attributes/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActsAsCustomizedAttributes
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/tasks/acts_as_customized_attributes_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :acts_as_customized_attributes do
 #   # Task goes here

data/spec/dummy/Rakefile

@@ -1,7 +1,8 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path("../config/application", __FILE__)
 
 Dummy::Application.load_tasks

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ApplicationController < ActionController::Base
   protect_from_forgery
 end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 module ApplicationHelper
 end

data/spec/dummy/app/models/order.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Order < ActiveRecord::Base
   acts_as_customized_attributes
 

data/spec/dummy/app/models/user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class User < ActiveRecord::Base
   acts_as_customized_attributes
 end

data/spec/dummy/config.ru

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path("../config/environment", __FILE__)
 run Dummy::Application

data/spec/dummy/config/application.rb

@@ -1,6 +1,7 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
+require File.expand_path("../boot", __FILE__)
 
-require 'rails/all'
+require "rails/all"
 
 Bundler.require
 require "acts_as_customized_attributes"
@@ -39,7 +40,6 @@ module Dummy
     config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.assets.version = "1.0"
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -1,10 +1,11 @@
-require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+# frozen_string_literal: true
+require "rubygems"
+gemfile = File.expand_path("../../../../Gemfile", __FILE__)
 
 if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
+  ENV["BUNDLE_GEMFILE"] = gemfile
+  require "bundler"
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../../lib", __FILE__)

data/spec/dummy/config/database.example.yml

@@ -1,42 +1,11 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-# 
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_development
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
+  adapter: sqlite3
+  database: db/development.sqlite3
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_test
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
+  adapter: sqlite3
+  database: db/test.sqlite3
 
 production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_production
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
+  adapter: sqlite3
+  database: db/production.sqlite3

data/spec/dummy/config/database.shippable.yml

@@ -1,6 +1,3 @@
 test:
-  adapter: mysql2
-  encoding: utf8
-  database: acts_as_customized_attributes
-  pool: 5
-  username: shippa
+  adapter: sqlite3
+  database: db/test.sqlite3