hydra_attribute 0.2.0 → 0.3.0.beta1

data/lib/hydra_attribute/association_builder.rb

@@ -1,40 +1,64 @@
 module HydraAttribute
   class AssociationBuilder
+    attr_reader :klass, :type
 
     def initialize(klass, type)
       @klass, @type = klass, type
     end
 
+    class << self
+      def build(klass, type)
+        new(klass, type).build
+      end
+
+      def model_name(klass, type)
+        "Hydra#{type.to_s.capitalize}#{klass.model_name}"
+      end
+
+      def class_name(klass, type)
+        "::HydraAttribute::#{model_name(klass, type)}"
+      end
+
+      def table_name(klass, type)
+        "hydra_#{type}_#{klass.table_name}"
+      end
+
+      def association_name(type)
+        "hydra_#{type}_values".to_sym
+      end
+    end
+
     def build
-      create_associated_model
-      add_association_for_class
+      create_value_model
+      add_association
+    end
+
+    def create_value_model
+      value_model = ::HydraAttribute.const_set(model_name, Class.new(::ActiveRecord::Base))
+      value_model.table_name = table_name
+      value_model.belongs_to :entity, class_name: klass.model_name, autosave: false
+      value_model.belongs_to :hydra_attribute, class_name: 'HydraAttribute::HydraAttribute'
+      value_model.attr_accessible :hydra_attribute_id, :value
     end
 
-    private
+    def add_association
+      klass.has_many association_name, class_name: class_name, foreign_key: :entity_id, autosave: false
+    end
 
-    def create_associated_model
-      const = config.associated_const_name(@type)
-      unless namespace.const_defined?(const)
-        klass = namespace.const_set(const, Class.new(::ActiveRecord::Base))
-        klass.table_name = config.table_name(@type)
-        klass.attr_accessible :name, :value
-        klass.belongs_to :entity, polymorphic: true, touch: true, autosave: true
-      end
+    def model_name
+      self.class.model_name(klass, type)
     end
 
-    def add_association_for_class
-      assoc = config.association(@type)
-      unless @klass.reflect_on_association(assoc)
-        @klass.has_many assoc, as: :entity, class_name: config.associated_model_name(@type), autosave: true, dependent: :delete_all
-      end
+    def class_name
+      self.class.class_name(klass, type)
     end
 
-    def config
-      HydraAttribute.config
+    def table_name
+      self.class.table_name(klass, type)
     end
 
-    def namespace
-      config.use_module_for_associated_models ? HydraAttribute : Object
+    def association_name
+      self.class.association_name(type)
     end
   end
 end

data/lib/hydra_attribute/builder.rb

@@ -3,23 +3,25 @@ module HydraAttribute
     attr_reader :klass
 
     def initialize(klass)
-      @klass = klass
-      @klass.class_eval do
-        include ActiveRecord::Scoping
-        include ActiveRecord::AttributeMethods
+      [
+        ActiveRecord::Scoping,
+        ActiveRecord::AttributeMethods,
+        EntityCallbacks
+      ].each do |m|
+        klass.send :include, m
       end
+
+      @klass = klass
     end
 
-    SUPPORT_TYPES.each do |type|
-      class_eval <<-EOS, __FILE__, __LINE__ + 1
-        def #{type}(*attributes)
-          AssociationBuilder.new(klass, :#{type}).build
+    def self.build(klass)
+      new(klass).build
+    end
 
-          attributes.each do |attribute|
-            AttributeBuilder.new(klass, attribute, :#{type}).build
-          end
-        end
-      EOS
+    def build
+      SUPPORT_TYPES.each do |type|
+        AssociationBuilder.build(klass, type)
+      end
     end
   end
 end

data/lib/hydra_attribute/configuration.rb

@@ -3,37 +3,16 @@ module HydraAttribute
     def self.add_setting(name, default_value)
       attr_writer name
 
-      define_method name do
-        instance_variable_set("@#{name}", default_value) unless instance_variable_defined?("@#{name}")
-        instance_variable_get("@#{name}")
-      end
+      class_eval <<-EOS, __FILE__, __LINE__ + 1
+        def #{name}
+          @#{name} = #{default_value} unless defined?(@#{name})
+          @#{name}
+        end
 
-      define_method "#{name}?" do
-        send(name).present?
-      end
-    end
-
-    add_setting :table_prefix,                     'hydra_'
-    add_setting :association_prefix,               'hydra_'
-    add_setting :use_module_for_associated_models, true
-
-    def table_name(type)
-      "#{table_prefix}#{type}_attributes".to_sym
-    end
-
-    def association(type)
-      "#{association_prefix}#{type}_attributes".to_sym
-    end
-
-    # Return string for compatibility with ActiveRecord 3.1.x
-    def associated_model_name(type)
-      klass = associated_const_name(type).to_s
-      klass = "HydraAttribute::#{klass}" if use_module_for_associated_models?
-      klass
-    end
-
-    def associated_const_name(type)
-      "#{type.to_s.titlecase}Attribute".to_sym
+        def #{name}?
+          #{name}.present?
+        end
+      EOS
     end
   end
 end

data/lib/hydra_attribute/entity_callbacks.rb

@@ -0,0 +1,46 @@
+module HydraAttribute
+  module EntityCallbacks
+    extend ActiveSupport::Concern
+
+    included do
+      after_create   :create_hydra_values
+      after_update   :update_hydra_values
+      before_destroy :destroy_hydra_values
+    end
+
+    private
+
+    def create_hydra_values
+      created = false
+      each_hydra_value_model do |model|
+        model.entity_id = id
+        model.save
+        created = true
+      end
+      touch if created
+    end
+
+    def update_hydra_values
+      updated = false
+      each_hydra_value_model do |model|
+       if model.changed?
+         updated = true
+         model.save
+       end
+      end
+      touch if updated
+    end
+
+    def destroy_hydra_values
+      self.class.hydra_attribute_backend_types.each do |type|
+        AssociationBuilder.class_name(self.class, type).constantize.where(entity_id: id).delete_all
+      end
+    end
+
+    def each_hydra_value_model(&block)
+      self.class.hydra_attribute_backend_types.each do |type|
+        association(AssociationBuilder.association_name(type)).all_models.each(&block)
+      end
+    end
+  end
+end

data/lib/hydra_attribute/hydra_attribute.rb

@@ -0,0 +1,27 @@
+require 'active_support/core_ext/object/with_options'
+
+module HydraAttribute
+  class HydraAttribute < ActiveRecord::Base
+    self.table_name = 'hydra_attributes'
+
+    with_options presence: true do |klass|
+      klass.validates :entity_type,  inclusion: { in: lambda { |attr| [(attr.entity_type.constantize.name rescue nil)] } }
+      klass.validates :name,         uniqueness: { scope: :entity_type }
+      klass.validates :backend_type, inclusion: SUPPORT_TYPES
+    end
+
+    before_destroy :delete_dependent_values
+    after_commit   :reload_entity_attributes
+
+    private
+
+    def delete_dependent_values
+      value_class = AssociationBuilder.class_name(entity_type.constantize, backend_type).constantize
+      value_class.delete_all(hydra_attribute_id: id)
+    end
+
+    def reload_entity_attributes
+      entity_type.constantize.reset_hydra_attribute_methods
+    end
+  end
+end

data/lib/hydra_attribute/migrator.rb

@@ -0,0 +1,106 @@
+module HydraAttribute
+  class Migrator
+
+    def initialize(migration)
+      @migration = migration
+    end
+
+    class << self
+      %w(create remove migrate rollback).each do |method|
+        class_eval <<-EOS, __FILE__, __LINE__ + 1
+          def #{method}(migration, *args, &block)
+            new(migration).#{method}(*args, &block)
+          end
+        EOS
+      end
+    end
+
+    def create(name, options = {}, &block)
+      create_entity(name, options, &block)
+      create_attribute unless attribute_exists?
+      create_values(name)
+    end
+
+    def drop(name)
+      drop_values(name)
+      drop_attributes unless values_exists?
+      drop_entity(name)
+    end
+
+    def migrate(name)
+      create_attribute unless attribute_exists?
+      create_values(name)
+    end
+
+    def rollback(name)
+      drop_values(name)
+      drop_attribute unless values_exists?
+    end
+
+    private
+
+    def create_entity(name, options = {})
+      create_table name, options do |t|
+        yield t if block_given?
+      end
+    end
+
+    def create_attribute
+      create_table :hydra_attributes do |t|
+        t.string :entity_type,  limit: 32, null: false
+        t.string :name,         limit: 32, null: false
+        t.string :backend_type, limit: 16, null: false
+        t.string :default_value
+        t.timestamps
+      end
+      add_index :hydra_attributes, [:entity_type, :name], unique: true, name: 'hydra_attributes_index'
+    end
+
+    def create_values(name)
+      SUPPORT_TYPES.each do |type|
+        table_name = value_table(name, type)
+        create_table table_name do |t|
+          t.integer :entity_id,          null: false
+          t.integer :hydra_attribute_id, null: false
+          t.send type, :value
+          t.timestamps
+        end
+        add_index table_name, [:entity_id, :hydra_attribute_id], unique: true, name: "#{table_name}_index"
+      end
+    end
+
+    def drop_entity(name)
+      drop_table(name)
+    end
+
+    def drop_attribute
+      drop_table(:hydra_attributes)
+    end
+
+    def drop_values(name)
+      SUPPORT_TYPES.each do |type|
+        drop_table(value_table(name, type))
+      end
+    end
+
+    def value_table(name, type)
+      "hydra_#{type}_#{name}"
+    end
+
+    def attribute_exists?
+      table_exists?(:hydra_attributes)
+    end
+
+    def values_exists?
+      tables.any? do |table|
+        SUPPORT_TYPES.any? do |type|
+          table.start_with?("hydra_#{type}_")
+        end
+      end
+    end
+
+    def method_missing(symbol, *args, &block)
+      @migration.send(symbol, *args, &block)
+    end
+  end
+end

data/lib/hydra_attribute/railtie.rb

@@ -3,6 +3,8 @@ module HydraAttribute
     initializer 'hydra_attribute.active_record' do
       ActiveSupport.on_load :active_record do
         extend ::HydraAttribute::ActiveRecord
+
+        ::ActiveRecord::Migration.send :include, ::HydraAttribute::ActiveRecord::Migration
       end
     end
   end

data/lib/hydra_attribute/version.rb

@@ -1,3 +1,3 @@
 module HydraAttribute
-  VERSION = '0.2.0'
-end
+  VERSION = '0.3.0.beta1'
+end

data/lib/hydra_attribute.rb

@@ -1,5 +1,5 @@
 module HydraAttribute
-  SUPPORT_TYPES = [:string, :text, :integer, :float, :boolean, :datetime]
+  SUPPORT_TYPES = %w(string text integer float boolean datetime).freeze
 
   class << self
     def config
@@ -16,16 +16,18 @@ end
 require 'hydra_attribute/version'
 require 'hydra_attribute/configuration'
 require 'hydra_attribute/association_builder'
-require 'hydra_attribute/attribute_builder'
 require 'hydra_attribute/builder'
-require 'hydra_attribute/migration'
-require 'hydra_attribute/attribute_proxy'
+require 'hydra_attribute/migrator'
+require 'hydra_attribute/hydra_attribute'
+require 'hydra_attribute/entity_callbacks'
 require 'hydra_attribute/active_record'
 require 'hydra_attribute/active_record/scoping'
+require 'hydra_attribute/active_record/reflection'
+require 'hydra_attribute/active_record/association'
+require 'hydra_attribute/active_record/association_preloader'
+require 'hydra_attribute/active_record/migration'
 require 'hydra_attribute/active_record/relation'
 require 'hydra_attribute/active_record/relation/query_methods'
 require 'hydra_attribute/active_record/attribute_methods'
-require 'hydra_attribute/active_record/attribute_methods/read'
-require 'hydra_attribute/active_record/attribute_methods/before_type_cast'
 
 require 'hydra_attribute/railtie' if defined?(Rails)

data/lib/rails/generators/hydra_attribute/install/templates/hydra_attribute.txt

@@ -0,0 +1,4 @@
+# Change default hydra_attribute configurations
+HydraAttribute.setup do |config|
+
+end

data/spec/spec_helper.rb

@@ -7,11 +7,10 @@ ActiveRecord::Base.extend(HydraAttribute::ActiveRecord)
 require 'database_cleaner'
 RSpec.configure do |config|
   config.before do
-    HydraAttribute.instance_variable_set(:@config, nil)
     DatabaseCleaner.start
   end
 
   config.after do
     DatabaseCleaner.clean
   end
-end
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Kostyantyn Stepanyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000Z
+date: 2012-07-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2151761260 !ruby/object:Gem::Requirement
+  requirement: &2152234260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151761260
+  version_requirements: *2152234260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151759920 !ruby/object:Gem::Requirement
+  requirement: &2152233160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151759920
+  version_requirements: *2152233160
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2151757300 !ruby/object:Gem::Requirement
+  requirement: &2152232280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151757300
+  version_requirements: *2152232280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151755780 !ruby/object:Gem::Requirement
+  requirement: &2152231480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151755780
+  version_requirements: *2152231480
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2151753880 !ruby/object:Gem::Requirement
+  requirement: &2152230780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151753880
+  version_requirements: *2152230780
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2151747420 !ruby/object:Gem::Requirement
+  requirement: &2152229960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151747420
+  version_requirements: *2152229960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151746260 !ruby/object:Gem::Requirement
+  requirement: &2152229020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151746260
+  version_requirements: *2152229020
 description: hydra_attribute is an implementation of EAV pattern for ActiveRecord
   models.
 email: kostya.stepanyuk@gmail.com
@@ -104,55 +104,49 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- features/attribute_methods.feature
-- features/define_attributes.feature
-- features/load_associations.feature
+- cucumber.yml
+- features/attributes/create.feature
+- features/attributes/destroy.feature
+- features/attributes/update.feature
+- features/create.feature
+- features/define.feature
 - features/query_methods/group.feature
 - features/query_methods/order.feature
 - features/query_methods/select.feature
 - features/query_methods/where.feature
-- features/step_definitions/class_steps.rb
 - features/step_definitions/model_steps.rb
 - features/step_definitions/query_methods.rb
 - features/step_definitions/record_steps.rb
 - features/support/env.rb
 - features/support/schema.rb
 - features/support/world.rb
-- features/typecast_attributes.feature
+- features/update.feature
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
 - hydra_attribute.gemspec
-- lib/generators/hydra_attribute/install/USAGE
-- lib/generators/hydra_attribute/install/install_generator.rb
-- lib/generators/hydra_attribute/install/templates/hydra_attribute.txt
 - lib/hydra_attribute.rb
 - lib/hydra_attribute/active_record.rb
+- lib/hydra_attribute/active_record/association.rb
+- lib/hydra_attribute/active_record/association_preloader.rb
 - lib/hydra_attribute/active_record/attribute_methods.rb
-- lib/hydra_attribute/active_record/attribute_methods/before_type_cast.rb
-- lib/hydra_attribute/active_record/attribute_methods/read.rb
+- lib/hydra_attribute/active_record/migration.rb
+- lib/hydra_attribute/active_record/reflection.rb
 - lib/hydra_attribute/active_record/relation.rb
 - lib/hydra_attribute/active_record/relation/query_methods.rb
 - lib/hydra_attribute/active_record/scoping.rb
 - lib/hydra_attribute/association_builder.rb
-- lib/hydra_attribute/attribute_builder.rb
-- lib/hydra_attribute/attribute_proxy.rb
 - lib/hydra_attribute/builder.rb
 - lib/hydra_attribute/configuration.rb
-- lib/hydra_attribute/migration.rb
+- lib/hydra_attribute/entity_callbacks.rb
+- lib/hydra_attribute/hydra_attribute.rb
+- lib/hydra_attribute/migrator.rb
 - lib/hydra_attribute/railtie.rb
 - lib/hydra_attribute/version.rb
-- spec/hydra_attribute/active_record/relation/query_methods_spec.rb
-- spec/hydra_attribute/active_record/relation_spec.rb
-- spec/hydra_attribute/active_record/scoping_spec.rb
-- spec/hydra_attribute/active_record_spec.rb
-- spec/hydra_attribute/association_builder_spec.rb
-- spec/hydra_attribute/attribute_builder_spec.rb
-- spec/hydra_attribute/attribute_helpers_spec.rb
-- spec/hydra_attribute/builder_spec.rb
-- spec/hydra_attribute/configuration_spec.rb
-- spec/hydra_attribute_spec.rb
+- lib/rails/generators/hydra_attribute/install/USAGE
+- lib/rails/generators/hydra_attribute/install/install_generator.rb
+- lib/rails/generators/hydra_attribute/install/templates/hydra_attribute.txt
 - spec/spec_helper.rb
 homepage: https://github.com/kostyantyn/hydra_attribute
 licenses: []
@@ -169,12 +163,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -33625434151420815
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -183,33 +174,24 @@ specification_version: 3
 summary: hydra_attribute is an implementation of EAV pattern for ActiveRecord models.
 test_files:
 - Appraisals
-- features/attribute_methods.feature
-- features/define_attributes.feature
-- features/load_associations.feature
+- features/attributes/create.feature
+- features/attributes/destroy.feature
+- features/attributes/update.feature
+- features/create.feature
+- features/define.feature
 - features/query_methods/group.feature
 - features/query_methods/order.feature
 - features/query_methods/select.feature
 - features/query_methods/where.feature
-- features/step_definitions/class_steps.rb
 - features/step_definitions/model_steps.rb
 - features/step_definitions/query_methods.rb
 - features/step_definitions/record_steps.rb
 - features/support/env.rb
 - features/support/schema.rb
 - features/support/world.rb
-- features/typecast_attributes.feature
+- features/update.feature
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
-- spec/hydra_attribute/active_record/relation/query_methods_spec.rb
-- spec/hydra_attribute/active_record/relation_spec.rb
-- spec/hydra_attribute/active_record/scoping_spec.rb
-- spec/hydra_attribute/active_record_spec.rb
-- spec/hydra_attribute/association_builder_spec.rb
-- spec/hydra_attribute/attribute_builder_spec.rb
-- spec/hydra_attribute/attribute_helpers_spec.rb
-- spec/hydra_attribute/builder_spec.rb
-- spec/hydra_attribute/configuration_spec.rb
-- spec/hydra_attribute_spec.rb
 - spec/spec_helper.rb