acts_as_customized_attributes 0.0.6 → 0.0.7

data/spec/dummy/script/rails

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'
+APP_PATH = File.expand_path("../../config/application", __FILE__)
+require File.expand_path("../../config/boot", __FILE__)
+require "rails/commands"

data/spec/factories/order.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 FactoryGirl.define do
   factory :order do
     association :user, factory: :user

data/spec/factories/user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 FactoryGirl.define do
   factory :user do
     email { Forgery::Internet.email_address }

data/spec/models/user_spec.rb

@@ -1,44 +1,45 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe User do
-  let!(:user){ create :user }
-  let!(:order){ create :order, user: user }
+  let!(:user) { create :user }
+  let!(:order) { create :order, user: user }
 
   before do
     UserDataKey.update_cache_name_to_id
 
     user.update_customized_attributes(facebook_email: "kaspernj@facebook.com")
-    user.customized_attribute(:facebook_email).should eq "kaspernj@facebook.com"
+    expect(user.customized_attribute(:facebook_email)).to eq "kaspernj@facebook.com"
   end
 
   it "should be possible to set custom data and it shouldn't mix up" do
     order.update_customized_attributes(affiliate_data: "test")
-    order.customized_attributes[:affiliate_data].should eq "test"
-    order.customized_attributes[:facebook_email].should eq nil
+    expect(order.customized_attributes[:affiliate_data]).to eq "test"
+    expect(order.customized_attributes[:facebook_email]).to eq nil
   end
 
   it "should autodelete when destroyed" do
     user_id = user.id
     user.destroy
 
-    UserData.joins(:data_key).where(resource_id: user_id, user_data_keys: {name: "facebook_email"}).first.should eq nil
+    expect(UserData.joins(:data_key).where(resource_id: user_id, user_data_keys: {name: "facebook_email"}).first).to eq nil
   end
 
   it "should help search for attributes" do
     users_query = User.where_customized_attribute(:facebook_email, "kaspernj@facebook.com")
-    users_query.count.should eq 1
-    users_query.first.should eq user
+    expect(users_query.count).to eq 1
+    expect(users_query.first).to eq user
   end
 
   it "should clear cache when key is destroyed" do
     keys = UserDataKey.where(name: "facebook_email")
-    keys.count.should eq 1
+    expect(keys.count).to eq 1
     keys.destroy_all
-    keys.count.should eq 0
+    expect(keys.count).to eq 0
 
-    expect {
+    expect do
       UserDataKey.id_for_name("facebook_email")
-    }.to raise_error(KeyError)
+    end.to raise_error(KeyError)
   end
 
   it "should update the cache name" do
@@ -46,29 +47,29 @@ describe User do
     key.name = "facebook_mail"
     key.save!
 
-    expect {
+    expect do
       UserDataKey.id_for_name("facebook_email")
-    }.to raise_error(KeyError)
+    end.to raise_error(KeyError)
 
-    user.customized_attribute(:facebook_mail).should eq "kaspernj@facebook.com"
+    expect(user.customized_attribute(:facebook_mail)).to eq "kaspernj@facebook.com"
   end
 
   it "shouldn't allow the same key twice" do
-    user.customized_attribute(:facebook_email).should eq "kaspernj@facebook.com"
+    expect(user.customized_attribute(:facebook_email)).to eq "kaspernj@facebook.com"
 
-    expect {
+    expect do
       UserDataKey.create!(name: "facebook_email")
-    }.to raise_error(ActiveRecord::RecordInvalid)
+    end.to raise_error(ActiveRecord::RecordInvalid)
   end
 
   it "shouldn't allow the same data twice" do
-    expect {
+    expect do
       UserData.create!(
         resource_id: user.id,
         data_key_id: UserDataKey.id_for_name("facebook_email"),
         value: "test"
       )
-    }.to raise_error(ActiveRecord::RecordNotUnique)
+    end.to raise_error(ActiveRecord::RecordNotUnique)
   end
 
   it "should support transactioner" do
@@ -84,7 +85,7 @@ describe User do
       )
     end
 
-    user.customized_attribute(:facebook_email).should eq "test@example.com"
-    user.customized_attribute(:some_attribute).should eq "test"
+    expect(user.customized_attribute(:facebook_email)).to eq "test@example.com"
+    expect(user.customized_attribute(:some_attribute)).to eq "test"
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
-require 'factory_girl_rails'
-require 'forgery'
+ENV["RAILS_ENV"] ||= "test"
+require "dummy/config/environment"
+require "rspec/rails"
+require "factory_girl_rails"
+require "forgery"
+require "sqlite3"
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   # ## Mock Framework

metadata

@@ -1,113 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_customized_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: forgery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: active-record-transactioner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: best_practice_project
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.10
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.42.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.42.0
 description: Key-based custom attributes that can be created on the fly for ActiveRecord
   models.
 email:
@@ -119,8 +147,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/models/acts_as_customized_attributes/data.rb
-- app/models/acts_as_customized_attributes/data_key.rb
 - config/routes.rb
 - lib/acts_as_customized_attributes.rb
 - lib/acts_as_customized_attributes/class_methods.rb
@@ -155,11 +181,13 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20141118114902_create_users.rb
 - spec/dummy/db/migrate/20141118114941_create_user_customized_attributes.rb
 - spec/dummy/db/migrate/20141118134833_create_orders.rb
 - spec/dummy/db/migrate/20141118135027_create_order_customized_attributes.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
@@ -180,17 +208,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Customized attributes for models.
@@ -213,10 +241,12 @@ test_files:
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/db/migrate/20141118114941_create_user_customized_attributes.rb
 - spec/dummy/db/migrate/20141118135027_create_order_customized_attributes.rb
 - spec/dummy/db/migrate/20141118134833_create_orders.rb
 - spec/dummy/db/migrate/20141118114902_create_users.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/Rakefile
 - spec/dummy/config.ru
 - spec/dummy/config/initializers/wrap_parameters.rb

data/app/models/acts_as_customized_attributes/data.rb

@@ -1,29 +0,0 @@
-class ActsAsCustomizedAttributes::Data < ActiveRecord::Base
-  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,52 +0,0 @@
-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)
-  end
-
-  def self.name_for_id(id)
-    cache_name_to_id.key(id) or raise KeyError, "No such ID: #{id}"
-  end
-
-  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 = {}
-    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
-    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