utusemi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d9dc71891093baf91f418243e79cda7c2fde5e
-  data.tar.gz: 3c298928855391ac65f36f93b93c44226ba2b54a
+  metadata.gz: 0de35704b1f48b29fd9b17d6cfcde7b3a4b58dae
+  data.tar.gz: c45997636abef147456bce3644560253359aed76
 SHA512:
-  metadata.gz: f327281cc8a51c3f0c779bde5f78a0ad4f6f039102024df4dfc07d630a33161e7bba35a2cef9a0c444b78e46af2348a8d545d0df038ba08f4d6d2b641ff86e51
-  data.tar.gz: 721fb167c66338488ba3e136f981e8dddf4d699628a8fb0ad7d38117e41a2fce1562ae01209ffe848f843b44ee42bef328ffbde8ecbce6429a42dc605b277e0d
+  metadata.gz: aa10b9e42f0b726d46e0cce55d93fecaede375ef93783dd70d3c6a26b7fda39a4ec25a46f899c4c104dffd7743d69f208c1e1079ec8fdca1752c2ae6ff1cfeb5
+  data.tar.gz: 274d391ef5645427c30ff4c8911c3b4978c953842161be256ed88dd085974fb1cf5b6c761bb38437b90480dffe0286020be859249b25b0813bc8254b7c37e458

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 YOURNAME
+Copyright 2014 YOSHIDA Hiroki
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/utusemi.rb

@@ -29,6 +29,7 @@ module Utusemi
     end
 
     def include_to_activerecord_base
+      # TODO: Organize name spaces
       ActiveRecord::Base.send(:include, Core::InstanceMethods)
     end
 
@@ -42,7 +43,7 @@ module Utusemi
     end
 
     def prepend_to_activerecord_eigenclass
-      activerecord_eigenclass.send(:prepend, Core::ActiveRecord::Querying)
+      activerecord_eigenclass.send(:prepend, Core::ActiveRecord::Base::ClassMethods)
       # for rails 3.x
       activerecord_eigenclass.send(:prepend, Core::ActiveRecord::RelationMethod) if Rails::VERSION::MAJOR == 3
       # for association

data/lib/utusemi/configuration.rb

@@ -5,6 +5,7 @@ module Utusemi
     end
 
     def map(name, *args, &block)
+      name = (name || '').to_sym
       return map_get(name, *args) unless block_given?
       options = args.shift if args.first.is_a? Hash
       map_set(name, options, &block)
@@ -13,12 +14,14 @@ module Utusemi
     private
 
     def map_set(name, options, &block)
-      @maps[name.to_sym] = (options || {}).merge(block: block)
+      @maps[name] = {}
+      @maps[name].update(options) if options
+      @maps[name].update(block: block)
     end
 
     def map_get(name, *args)
-      map = @maps[name.to_sym].try(:dup) if name
-      block = map.delete(:block) if map
+      map = @maps[name].try(:dup) || {}
+      block = map.delete(:block)
       definition = Definition.new(map)
       definition.exec(*args, &block)
     end

data/lib/utusemi/core.rb

@@ -132,19 +132,21 @@ module Utusemi
     #   #=> [<products.titleが"test"であるレコード>]
     #
     module ActiveRecord
-      module Querying
-        include Base
-
-        case Rails::VERSION::MAJOR
-        when 4
-          delegate :utusemi, to: :all
-        when 3
-          delegate :utusemi, to: :scoped
+      module Base
+        module ClassMethods
+          include Utusemi::Core::Base
+
+          case Rails::VERSION::MAJOR
+          when 4
+            delegate :utusemi, to: :all
+          when 3
+            delegate :utusemi, to: :scoped
+          end
         end
       end
 
       module QueryMethods
-        include Base
+        include Utusemi::Core::Base
 
         def utusemi!(obj = nil, options = {})
           super.tap { warning_checker unless Rails.env.production? }
@@ -264,6 +266,25 @@ module Utusemi
           utusemi!(utusemi_values[:type], utusemi_values[:options]) if utusemi_values[:flag]
           super
         end
+
+        # 用途
+        #   cloneでは浅いコピーしか行われず@utusemi_valuesの内容が
+        #   書き変わってしまうので、これを解決するために@utusemi_valuesもdupする
+        def initialize_copy(original_obj)
+          @utusemi_values = original_obj.utusemi_values.dup
+          super
+        end
+
+        # 用途
+        #   association_cacheの影響でAssociation#ownerでclone前のインスタンスしか取得できないため
+        #   別経路から実際の呼び出し元インスタンスを参照できるようにし、utusemi_valuesを取り出せるようにする
+        def association(name)
+          truthly_owner = self
+          association = super
+          eigenclass = class << association; self; end
+          eigenclass.send(:define_method, :truthly_owner) { truthly_owner }
+          association
+        end
       end
 
       # 用途
@@ -280,35 +301,29 @@ module Utusemi
       #
       module Associations
         def scope(*args)
-          utusemi_values = owner.utusemi_values
+          utusemi_values = truthly_owner.utusemi_values
           return super unless utusemi_values[:flag]
           super.utusemi!(@reflection.name.to_s.singularize, utusemi_values[:options])
         end
+
+        def load_target(*args)
+          utusemi_values = truthly_owner.utusemi_values
+          return super unless utusemi_values[:flag]
+          super.each { |record| record.utusemi!(@reflection.name.to_s.singularize, utusemi_values[:options]) }
+        end
       end
 
       module AssociationMethods
-        def belongs_to(name, scope = nil, options = {})
-          check_deplicated_association_warning(:belongs_to, name, scope)
-          utusemi_flag = scope.try(:delete, :utusemi)
-          scope = utusemi_association_scope(:belongs_to, name, scope) if utusemi_flag
-          super if !utusemi_flag || !method_defined?(name)
-          define_utusemi_association_reader(name, utusemi_flag => true)
+        def belongs_to(name, *args)
+          utusemi_association(:belongs_to, name, *args) { |*a| super(*a) }
         end
 
-        def has_one(name, scope = nil, options = {})
-          check_deplicated_association_warning(:has_one, name, scope)
-          utusemi_flag = scope.try(:delete, :utusemi)
-          scope = utusemi_association_scope(:has_one, name, scope) if utusemi_flag
-          super if !utusemi_flag || !method_defined?(name)
-          define_utusemi_association_reader(name, utusemi_flag => true)
+        def has_one(name, *args)
+          utusemi_association(:has_one, name, *args) { |*a| super(*a) }
         end
 
-        def has_many(name, scope = nil, options = {}, &extension)
-          check_deplicated_association_warning(:has_many, name, scope)
-          utusemi_flag = scope.try(:delete, :utusemi)
-          scope = utusemi_association_scope(:has_many, name, scope) if utusemi_flag
-          super if !utusemi_flag || !method_defined?(name)
-          define_utusemi_association_reader(name, utusemi_flag => true)
+        def has_many(name, *args)
+          utusemi_association(:has_many, name, *args) { |*a| super(*a) }
         end
 
         private
@@ -320,7 +335,20 @@ module Utusemi
           Rails.logger.warn "[Utusemi:WARNING] \"#{association_type} :#{name}\" is duplicated in #{self.name}."
         end
 
-        def utusemi_association_scope(method_name, name, scope = {})
+        def utusemi_association(association_type, name, *args)
+          if args.empty?
+            yield name, *args
+            return define_utusemi_association_reader(name)
+          end
+          scope = args.shift
+          check_deplicated_association_warning(association_type, name, scope)
+          utusemi_flag = scope.try(:delete, :utusemi)
+          scope = utusemi_association_scope(association_type, name, scope) if utusemi_flag
+          yield name, scope, *args if !utusemi_flag || !method_defined?(name)
+          define_utusemi_association_reader(name, utusemi_flag => true)
+        end
+
+        def utusemi_association_scope(method_name, name, scope)
           utusemi_map = Utusemi.config.map(name.to_s.singularize)
           default_scope = { class_name: utusemi_map.class_name }
           default_scope[:foreign_key] = utusemi_map.foreign_key if method_name == :belongs_to

data/lib/utusemi/version.rb

@@ -1,3 +1,3 @@
 module Utusemi
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utusemi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: pry-rails
+  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'
 description: Providing a flexible alias for column names in ActiveRecord.
 email:
 - hyoshida@appirits.com