active_any 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39acdd4989cf8260cd694f9c90c7e1dee0781e90
-  data.tar.gz: 8942a09c7523b615a19bc3853141b47fdbfe9d46
+  metadata.gz: a75e1b79e1e6e0f79b2a8d19e730e4a47ddca996
+  data.tar.gz: 31cc1c7938c0649d3da04cfcaca9f2a55ff2e558
 SHA512:
-  metadata.gz: a83b242f2d8a25fe53d78b3fe842f01a701cd8bc6a3605dbe097e337484876eafb804f0da660ab2e6cbe37efae74b6242977dff8fb6a3bad1bb0bf3df07a09bf
-  data.tar.gz: e60bc3993222d390e5d2d0b779fe94075d6abfa43f52bd3892c5443a4147a25f475afcea7fd3e6ca30eb48f073ed47a1bc6b33c12cfaecb571f089a87f8f065a
+  metadata.gz: cc4a1f10b34b27e3412593e5094e09de8caab31e02e9ff4f3350a91bf16ef4a8bcaed9fcf71f467a40fb87342a21cdd0f23c241d05635d5df0033a0447a62c33
+  data.tar.gz: 94a64062ba15266cf0222e53170f0c187f2c3f39b5f15d7914523dfdcf1a63b77b06356317ea21d748d6c2dec57e7443b2fa36f3c6382d02df9f7c2332f2b301

data/.rubocop.yml

@@ -16,6 +16,9 @@ Style/PredicateName:
 Style/AccessorMethodName:
   Enabled: false
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Metrics/ClassLength:
   Max: 120
 

data/lib/active_any/association_relation.rb

@@ -14,5 +14,14 @@ module ActiveAny
     def ==(other)
       other == records
     end
+
+    private
+
+    def exec_queries
+      super do |r|
+        @association.set_inverse_instance r
+        yield r if block_given?
+      end
+    end
   end
 end

data/lib/active_any/associations.rb

@@ -4,10 +4,15 @@ require 'active_any/associations/preloader'
 require 'active_any/associations/collection_proxy'
 require 'active_any/associations/association_scope'
 require 'active_any/associations/builder/association'
+require 'active_any/associations/builder/singular_association'
 require 'active_any/associations/builder/has_many'
+require 'active_any/associations/builder/has_one'
 require 'active_any/associations/builder/belongs_to'
 require 'active_any/associations/association'
+require 'active_any/associations/singular_association'
+require 'active_any/associations/foreign_association'
 require 'active_any/associations/has_many_association'
+require 'active_any/associations/has_one_association'
 require 'active_any/associations/belongs_to_association'
 
 module ActiveAny
@@ -34,6 +39,11 @@ module ActiveAny
         reflection = Builder::BelongsTo.build(self, name, scope, options)
         Reflection.add_reflection self, name, reflection
       end
+
+      def has_one(name, scope = nil, options = {})
+        reflection = Builder::HasOne.build(self, name, scope, options)
+        Reflection.add_reflection self, name, reflection
+      end
     end
 
     def initialize_dup(*)

data/lib/active_any/associations/association.rb

@@ -14,11 +14,7 @@ module ActiveAny
       end
 
       def reader
-        # TODO: implement
-        # reload if stale_target?
-
-        @proxy ||= CollectionProxy.create(owner, self)
-        @proxy.reset_scope
+        raise NotImplementedError.new, 'reader is unimplemented'
       end
 
       def writer(_records)
@@ -51,7 +47,7 @@ module ActiveAny
       def load_target
         @target = find_target if find_target?
 
-        loaded! unless loaded?
+        loaded!
         target
         # TODO: implement
         # rescue ActiveRecord::RecordNotFound
@@ -110,7 +106,11 @@ module ActiveAny
       end
 
       def find_target?
-        !loaded? && klass
+        !loaded? && (!owner.new_record? || foreign_key_present?) && klass
+      end
+
+      def foreign_key_present
+        false
       end
 
       def inverse_reflection_for(_record)

data/lib/active_any/associations/belongs_to_association.rb

@@ -2,20 +2,7 @@
 
 module ActiveAny
   module Associations
-    class BelongsToAssociation < Association
-      def reader
-        reload unless loaded?
-
-        target
-      end
-
-      def writer(_records)
-        raise NotImplementedError.new, 'writer is unimplemented'
-      end
-
-      def find_target
-        scope.first
-      end
+    class BelongsToAssociation < SingularAssociation
     end
   end
 end

data/lib/active_any/associations/builder/association.rb

@@ -6,19 +6,18 @@ module ActiveAny
       class Association
         def self.build(klass, name, scope, options)
           reflection = create_reflection(klass, name, scope, options)
-          define_writer_method klass, reflection.name
-          define_reader_method klass, reflection.name
+          define_accessors klass, reflection
           reflection
         end
 
         VALID_OPTIONS = %i[class_name foreign_key].freeze
 
-        def self.valid_options
+        def self.valid_options(_options)
           VALID_OPTIONS
         end
 
         def self.validate_options(options)
-          options.assert_valid_keys(valid_options)
+          options.assert_valid_keys(valid_options(options))
         end
 
         def self.create_reflection(klass, name, scope, options)
@@ -41,16 +40,23 @@ module ActiveAny
           new_scope
         end
 
-        def self.define_reader_method(klass, name)
-          klass.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def self.define_accessors(klass, reflection)
+          mixin = klass.generated_association_methods
+          name = reflection.name
+          define_readers(mixin, name)
+          define_writers(mixin, name)
+        end
+
+        def self.define_readers(mixin, name)
+          mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
             def #{name}(*args)
               association(:#{name}).reader(*args)
             end
           CODE
         end
 
-        def self.define_writer_method(klass, name)
-          klass.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def self.define_writers(mixin, name)
+          mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
             def #{name}=(value)
               association(:#{name}).writer(value)
             end

data/lib/active_any/associations/builder/has_many.rb

@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-module ActiveAny
-  module Associations
-    module Builder
-      class HasMany < Association
-        def self.macro
-          :has_many
-        end
-
-        def self.valid_options
-          super + %i[primary_key]
-        end
-      end
+module ActiveAny::Associations::Builder
+  class HasMany < SingularAssociation
+    def self.macro
+      :has_many
     end
   end
 end

data/lib/active_any/associations/builder/has_one.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ActiveAny::Associations::Builder
+  class HasOne < SingularAssociation
+    def self.macro
+      :has_one
+    end
+
+    def self.valid_options(options)
+      valid = super
+      # valid += %i[through source source_type] if options[:through]
+      valid
+    end
+  end
+end

data/lib/active_any/associations/builder/singular_association.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ActiveAny::Associations::Builder
+  class SingularAssociation < Association
+    def self.valid_options(options)
+      super + %i[primary_key]
+    end
+  end
+end

data/lib/active_any/associations/collection_proxy.rb

@@ -5,7 +5,7 @@ module ActiveAny
     class CollectionProxy < ActiveAny::Relation
       attr_reader :association
 
-      delegate :target, :load_target, :load_target,
+      delegate :target, :load_target, :load_target, :loaded?, :find, :concat,
                :size, :empty?, :include?, to: :@association
 
       def initialize(klass, association)
@@ -13,6 +13,11 @@ module ActiveAny
         super(klass)
       end
 
+      def last(limit = nil)
+        load_target if find_from_target?
+        super
+      end
+
       def take(limit = nil)
         load_target if find_from_target?
         super

data/lib/active_any/associations/foreign_association.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActiveAny::Associations
+  module ForeignAssociation
+    def foreign_key_present?
+      if reflection.klass.primary_key
+        owner.attribute_present?(reflection.record_class_primary_key)
+      else
+        false
+      end
+    end
+  end
+end

data/lib/active_any/associations/foreign_key_association.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActiveAny::Associations
+  module ForeignKeyAssociation
+    def foreign_key_present?
+      if reflection.klass.primary_key
+        owner.attribute_present?(reflection.record_class_primary_key)
+      else
+        false
+      end
+    end
+  end
+end

data/lib/active_any/associations/has_many_association.rb

@@ -3,11 +3,13 @@
 module ActiveAny
   module Associations
     class HasManyAssociation < Association
+      include ForeignAssociation
+
       def reader
         # TODO: implement
         # reload if stale_target?
 
-        @proxy ||= CollectionProxy.create(owner, self)
+        @proxy ||= CollectionProxy.create(klass, self)
         @proxy.reset_scope
       end
 

data/lib/active_any/associations/has_one_association.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ActiveAny
+  module Associations
+    class HasOneAssociation < SingularAssociation
+      include ForeignAssociation
+    end
+  end
+end

data/lib/active_any/associations/preloader.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'active_any/associations/preloader/association'
+require 'active_any/associations/preloader/singular_association'
 require 'active_any/associations/preloader/has_many'
+require 'active_any/associations/preloader/has_one'
 require 'active_any/associations/preloader/belongs_to'
 
 module ActiveAny

data/lib/active_any/associations/preloader/belongs_to.rb

@@ -3,16 +3,7 @@
 module ActiveAny
   module Associations
     class Preloader
-      class BelongsTo < Association
-        def preload(preloader)
-          associated_records_by_owner(preloader).each do |owner, associated_records|
-            record = associated_records.first
-
-            association = owner.association(reflection.name)
-            association.target = record
-          end
-        end
-
+      class BelongsTo < SingularAssociation
         def association_key_name
           reflection.options[:primary_key] || klass && klass.primary_key
         end

data/lib/active_any/associations/preloader/has_one.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ActiveAny
+  module Associations
+    class Preloader
+      class HasOne < SingularAssociation
+        def association_key_name
+          reflection.foreign_key
+        end
+
+        def owner_key_name
+          reflection.record_class_primary_key
+        end
+      end
+    end
+  end
+end

data/lib/active_any/associations/preloader/singular_association.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module ActiveAny
+  module Associations
+    class Preloader
+      class SingularAssociation < Association
+        def preload(preloader)
+          associated_records_by_owner(preloader).each do |owner, associated_records|
+            record = associated_records.first
+
+            association = owner.association(reflection.name)
+            association.target = record
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_any/associations/singular_association.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ActiveAny
+  module Associations
+    class SingularAssociation < Association
+      def find_target
+        scope.first
+      end
+
+      def reader
+        reload unless loaded?
+
+        target
+      end
+    end
+  end
+end

data/lib/active_any/attribute.rb

@@ -16,6 +16,10 @@ module ActiveAny
       attributes.fetch(name)
     end
 
+    def attribute_present?(name)
+      attributes[name].present?
+    end
+
     def attribute_for_inspect(attr_name)
       value = read_attribute(attr_name)
 

data/lib/active_any/core.rb

@@ -37,12 +37,26 @@ module ActiveAny
       def abstract_class?
         defined?(@abstract_class) && abstract_class == true
       end
+
+      def generated_association_methods
+        @generated_association_methods ||= begin
+          mod = const_set(:GeneratedAssociationMethods, Module.new)
+          private_constant :GeneratedAssociationMethods
+          include mod
+
+          mod
+        end
+      end
     end
 
     def initialize(*args)
       init_internals(*args)
     end
 
+    def new_record?
+      false
+    end
+
     def [](key)
       send(key)
     end

data/lib/active_any/reflection.rb

@@ -2,6 +2,7 @@
 
 require 'active_any/reflection/association_reflection'
 require 'active_any/reflection/has_many_reflection'
+require 'active_any/reflection/has_one_reflection'
 require 'active_any/reflection/belongs_to_reflection'
 
 module ActiveAny
@@ -33,6 +34,8 @@ module ActiveAny
     def self.create(macro, name, scope, options, klass)
       reflection_class =
         case macro
+        when :has_one
+          HasOneReflection
         when :belongs_to
           BelongsToReflection
         when :has_many

data/lib/active_any/reflection/association_reflection.rb

@@ -40,6 +40,10 @@ module ActiveAny
         false
       end
 
+      def has_one?
+        false
+      end
+
       JoinKeys = Struct.new(:key, :foreign_key)
 
       def join_keys

data/lib/active_any/reflection/belongs_to_reflection.rb

@@ -18,7 +18,7 @@ module ActiveAny
       private
 
       def join_pk
-        primary_key
+        record_class_primary_key
       end
 
       def join_fk

data/lib/active_any/reflection/has_many_reflection.rb

@@ -22,7 +22,7 @@ module ActiveAny
       end
 
       def join_fk
-        primary_key
+        record_class_primary_key
       end
     end
   end

data/lib/active_any/reflection/has_one_reflection.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ActiveAny
+  module Reflection
+    class HasOneReflection < AssociationReflection
+      def association_class
+        Associations::HasOneAssociation
+      end
+
+      def macro
+        :has_one
+      end
+
+      def has_one?
+        true
+      end
+
+      def collection?
+        false
+      end
+
+      private
+
+      def join_pk
+        foreign_key
+      end
+
+      def join_fk
+        record_class_primary_key
+      end
+    end
+  end
+end

data/lib/active_any/relation.rb

@@ -20,14 +20,6 @@ module ActiveAny
 
     class ImmutableRelation < StandardError; end
 
-    def self.create(klass, *args)
-      relation_class_for(klass).new(klass, *args)
-    end
-
-    def self.relation_class_for(klass)
-      klass.relation_delegate_class(self)
-    end
-
     def initialize(klass)
       @klass = klass
       @records = []

data/lib/active_any/relation/delegation.rb

@@ -80,9 +80,23 @@ module ActiveAny
         end
       end
 
-      def respond_to_missing?(name, include_private)
-        super
+      def respond_to_missing?(name, _)
+        super || @klass.respond_to?(name)
+      end
+    end
+
+    module ClassMethods
+      def create(klass, *args)
+        relation_class_for(klass).new(klass, *args)
       end
+
+      def relation_class_for(klass)
+        klass.relation_delegate_class(self)
+      end
+    end
+
+    def respond_to_missing?(name, _)
+      super || @klass.respond_to?(name)
     end
   end
 end

data/lib/active_any/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveAny
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_any
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -209,12 +209,20 @@ files:
 - lib/active_any/associations/builder/association.rb
 - lib/active_any/associations/builder/belongs_to.rb
 - lib/active_any/associations/builder/has_many.rb
+- lib/active_any/associations/builder/has_one.rb
+- lib/active_any/associations/builder/singular_association.rb
 - lib/active_any/associations/collection_proxy.rb
+- lib/active_any/associations/foreign_association.rb
+- lib/active_any/associations/foreign_key_association.rb
 - lib/active_any/associations/has_many_association.rb
+- lib/active_any/associations/has_one_association.rb
 - lib/active_any/associations/preloader.rb
 - lib/active_any/associations/preloader/association.rb
 - lib/active_any/associations/preloader/belongs_to.rb
 - lib/active_any/associations/preloader/has_many.rb
+- lib/active_any/associations/preloader/has_one.rb
+- lib/active_any/associations/preloader/singular_association.rb
+- lib/active_any/associations/singular_association.rb
 - lib/active_any/attribute.rb
 - lib/active_any/attribute_assignment.rb
 - lib/active_any/base.rb
@@ -225,6 +233,7 @@ files:
 - lib/active_any/reflection/association_reflection.rb
 - lib/active_any/reflection/belongs_to_reflection.rb
 - lib/active_any/reflection/has_many_reflection.rb
+- lib/active_any/reflection/has_one_reflection.rb
 - lib/active_any/relation.rb
 - lib/active_any/relation/delegation.rb
 - lib/active_any/relation/finder_methods.rb