nay-record_with_operator 0.0.7 → 0.0.8

data/Rakefile

@@ -12,7 +12,7 @@ DESCRIPTION = "Rails plugin to set created_by, updated_by, deleted_by to ActiveR
 GITHUB_PROJECT = "record_with_operator"
 HOMEPAGE = "http://github.com/nay/#{GITHUB_PROJECT}/tree"
 BIN_FILES = %w( )
-VER = "0.0.7"
+VER = "0.0.8"
 CLEAN.include ['pkg']
 
 desc 'Default: run unit tests.'

data/lib/record_with_operator.rb

@@ -8,6 +8,24 @@ module RecordWithOperator
 
   def self.included(base)
     class << base
+      def reflections_with_operator
+        create_operator_associations
+        reflections_without_operator
+      end
+      alias_method_chain :reflections, :operator
+
+      def operator_associations_created?
+        @operator_associations_created
+      end
+
+      def create_operator_associations
+        return if operator_associations_created?
+	      belongs_to :creator, :foreign_key => "created_by", :class_name => RecordWithOperator.config[:user_class_name] if column_names.include?('created_by')
+        belongs_to :updater, :foreign_key => "updated_by", :class_name => RecordWithOperator.config[:user_class_name] if column_names.include?('updated_by')
+        belongs_to :deleter, :foreign_key => "deleted_by", :class_name => RecordWithOperator.config[:user_class_name] if column_names.include?('deleted_by')
+        @operator_associations_created = true
+      end
+
       def has_many_with_operator(*args, &extension)
         options = args.extract_options!
         # add AssociationWithOprator to :extend
@@ -57,35 +75,35 @@ module RecordWithOperator
       alias_method_chain :validate_find_options, :for
 
       private
-        # define_method association, association= ...
-        def association_accessor_methods_with_operator(reflection, association_proxy_class)
-          association_accessor_methods_without_operator(reflection, association_proxy_class)
-          define_method("#{reflection.name}_with_operator") do |*params|
-            r = send("#{reflection.name}_without_operator", *params)
-            r.operator ||= self.operator if r && r.respond_to?(:operator=)
-            r
-          end
-          alias_method_chain "#{reflection.name}".to_sym, :operator
+      # define_method association, association= ...
+      def association_accessor_methods_with_operator(reflection, association_proxy_class)
+        association_accessor_methods_without_operator(reflection, association_proxy_class)
+        define_method("#{reflection.name}_with_operator") do |*params|
+          r = send("#{reflection.name}_without_operator", *params)
+          r.operator ||= self.operator if r && r.respond_to?(:operator=)
+          r
+        end
+        alias_method_chain "#{reflection.name}".to_sym, :operator
 
-          define_method("#{reflection.name}_with_operator=") do |new_value|
-            new_value.operator ||= self.operator if new_value.respond_to?(:operator=)
-            send("#{reflection.name}_without_operator=", new_value)
-          end
-          alias_method_chain "#{reflection.name}=".to_sym, :operator
+        define_method("#{reflection.name}_with_operator=") do |new_value|
+          new_value.operator ||= self.operator if new_value.respond_to?(:operator=)
+          send("#{reflection.name}_without_operator=", new_value)
         end
-        alias_method_chain :association_accessor_methods, :operator
-
-        # define_method build_association, create_association ...
-        def association_constructor_method_with_operator(constructor, reflection, association_proxy_class)
-          association_constructor_method_without_operator(constructor, reflection, association_proxy_class)
-          define_method("#{constructor}_#{reflection.name}_with_operator") do |*params|
-            options = { :operator => self.operator }
-            params.empty? ? params[0] = options : params.first.merge!(options)
-            self.send("#{constructor}_#{reflection.name}_without_operator", *params)
-          end
-          alias_method_chain "#{constructor}_#{reflection.name}".to_sym, :operator
+        alias_method_chain "#{reflection.name}=".to_sym, :operator
+      end
+      alias_method_chain :association_accessor_methods, :operator
+
+      # define_method build_association, create_association ...
+      def association_constructor_method_with_operator(constructor, reflection, association_proxy_class)
+        association_constructor_method_without_operator(constructor, reflection, association_proxy_class)
+        define_method("#{constructor}_#{reflection.name}_with_operator") do |*params|
+          options = { :operator => self.operator }
+          params.empty? ? params[0] = options : params.first.merge!(options)
+          self.send("#{constructor}_#{reflection.name}_without_operator", *params)
         end
-        alias_method_chain :association_constructor_method, :operator
+        alias_method_chain "#{constructor}_#{reflection.name}".to_sym, :operator
+      end
+      alias_method_chain :association_constructor_method, :operator
     end
 
     base.before_create :set_created_by
@@ -115,14 +133,8 @@ module RecordWithOperator
   def method_missing(method, *args)
     return super unless respond_to?(method)
     case method.to_sym
-    when :creator
-      self.class.belongs_to :creator, :foreign_key => "created_by", :class_name => RecordWithOperator.config[:user_class_name]
-      send(method, *args)
-    when :updater
-      self.class.belongs_to :updater, :foreign_key => "updated_by", :class_name => RecordWithOperator.config[:user_class_name]
-      send(method, *args)
-    when :deleter
-      self.class.belongs_to :deletor, :foreign_key => "deleted_by", :class_name => RecordWithOperator.config[:user_class_name]
+    when :creator, :updater, :deleter
+      self.class.create_operator_associations
       send(method, *args)
     else
       super

data/test/record_with_operator_reflection_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class User < ActiveRecord::Base
+end
+
+class NoteForReflectionTest < ActiveRecord::Base
+  set_table_name "notes"
+end
+
+class CreatorNoteForReflectionTest < ActiveRecord::Base
+  set_table_name "creator_notes"
+end
+
+class RecordWithOperatorReflectionTest < ActiveSupport::TestCase
+  def setup
+    RecordWithOperator.config[:user_class_name] = "User"
+    @user1 = User.create!(:name => "user1")
+    raise "@user1.id is nil" unless @user1.id
+    @note = NoteForReflectionTest.create!(:body => "test", :operator => @user1)
+
+    @creator_note = CreatorNoteForReflectionTest.create!(:body => "test", :operator => @user1)
+  end
+
+  def test_include
+    assert NoteForReflectionTest.find(:all, :include => [:creator, :updater])
+  end
+
+  def test_joins
+    assert NoteForReflectionTest.find(:all, :joins => [:creator, :updater])
+  end
+
+  def test_include_missing_association
+    assert_raise(ActiveRecord::ConfigurationError) { CreatorNoteForReflectionTest.find(:all, :include => [:updater]) }
+  end
+
+  def test_joins_missing_association
+    assert_raise(ActiveRecord::ConfigurationError) { CreatorNoteForReflectionTest.find(:all, :joins => [:updater]) }
+  end
+end

data/test/record_with_operator_test.rb

@@ -62,7 +62,6 @@ class RecordWithOperatorTest < ActiveSupport::TestCase
   end
 
   # creator/updater/deleter association operation
-
   def test_note_should_be_respond_to_creator
     assert NoteWithUser.new.respond_to? :creator
   end
@@ -219,6 +218,4 @@ class RecordWithOperatorTest < ActiveSupport::TestCase
     note.memos.create!(:body => "memo")
     assert_equal @user2, note.memos.new_arrivals.find_by_body("memo").operator
   end
-
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nay-record_with_operator
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Yasuko Ohba
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-23 00:00:00 -08:00
+date: 2009-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - rails/init.rb
 - test/record_with_operator_belongs_to_association_test.rb
 - test/record_with_operator_has_one_association_test.rb
+- test/record_with_operator_reflection_test.rb
 - test/record_with_operator_test.rb
 - test/record_with_operator_user_class_name_test.rb
 - test/schema.rb
@@ -79,6 +80,7 @@ summary: Rails plugin to set created_by, updated_by, deleted_by to ActiveRecord
 test_files: 
 - test/record_with_operator_belongs_to_association_test.rb
 - test/record_with_operator_has_one_association_test.rb
+- test/record_with_operator_reflection_test.rb
 - test/record_with_operator_test.rb
 - test/record_with_operator_user_class_name_test.rb
 - test/schema.rb