utusemi 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ebe354ddd670b48b24665f4867646aa3dbcbb9
-  data.tar.gz: 5d0c5e1b648dfee60d51f54f27cae5b8408a681a
+  metadata.gz: 4b16d77100fe212c9bd6e394b78d2d78016f88ff
+  data.tar.gz: b0f86e567be982e9e9e90ea676ad1996da452f45
 SHA512:
-  metadata.gz: c81151427b717334d4dccb4f213c175c759bf56edf9d1a41122a0f4759921c7f67a0f97c13800a73a5ec7c61d45b7f662b55d88328a38fcaf415369f339086e2
-  data.tar.gz: 993b5541e62a5f5544a3142e883fb378e782c83a0993908256639cbbf3b5e48b3126d593c381288ada94a90c9ab2e8eaf5c3a82e20f58494654abadba1883efb
+  metadata.gz: 2807f6a7381168122fc1d6240c207e897d20d1bd7a5d6240d493584265a1670f62eeba4f1d007d0b96a44cbc8da8f4ce97723868ca9d00835dad03027115fd78
+  data.tar.gz: 3ab9cacae33c0bb31faa35e5b11b3ca82606e0356023ecc5075f681cd8dde9444ad3090516a0d98ccabc71f67dcc01de35d3fb93eac65d16519054e2cb338472

data/lib/utusemi.rb

@@ -3,13 +3,13 @@ require 'rails'
 require 'utusemi/definition'
 require 'utusemi/configuration'
 require 'utusemi/railtie'
+require 'utusemi/core'
 
 module Utusemi
   class << self
     def enable
       this = self
       ActiveSupport.on_load(:active_record) do
-        require 'utusemi/core'
         # for instance
         this.include_to_activerecord_base
         # for model and relation

data/lib/utusemi/core.rb

@@ -26,6 +26,7 @@ module Utusemi
         obj = true if obj.nil?
         utusemi_values[:flag] = obj ? true : false
         utusemi_values[:type] = obj.to_sym if obj.class.in? [Symbol, String]
+        utusemi_values[:type] ||= default_utusemi_type
         utusemi_values[:options] = options
         warning_checker unless Rails.env.production?
         self
@@ -54,6 +55,21 @@ module Utusemi
           Rails.logger.warn "[Utusemi:WARNING] \"#{new_column_name}\" is duplicated in map(:#{utusemi_values[:type]})."
         end
       end
+
+      def default_utusemi_type
+        class_for_default_utusemi_type.model_name.singular.to_sym
+      end
+
+      def class_for_default_utusemi_type
+        case self
+        when ActiveRecord::Relation
+          @klass
+        when ActiveRecord::Base
+          self.class
+        else
+          self
+        end
+      end
     end
 
     # 用途
@@ -213,6 +229,16 @@ module Utusemi
         end
       end
 
+      # Rails 3.x で関連モデルの named scope に対してのカラムマッピングが正常に動作するようにするためのもの
+      #
+      # 原因
+      #   product.stocks.unsold のような named scope において、stocks は utusemi_values を所持していないため
+      #   カラムマッピングが作動しない
+      #
+      # 対策
+      #   stocks は呼び出し元である product を truthly_owner として所持しているので、
+      #   これを見てカラムマッピングを実施するか否かを判別するようにした
+      #
       module CollectionProxy
         def scoped(*args, &block)
           association = @association
@@ -294,7 +320,7 @@ module Utusemi
       #
       # 使用例
       #   class Product
-      #     has_many :stocks, utusemi: true
+      #     has_many :stocks
       #     ...
       #   end
       #   stock = Product.utusemi(:product).stocks.first
@@ -316,48 +342,39 @@ module Utusemi
       end
 
       module AssociationMethods
-        def belongs_to(name, *args)
-          utusemi_association(:belongs_to, name, *args) { |*a| super(*a) }
+        def belongs_to(name, *args, &block)
+          prepend_utusemi_association_reader_module(name)
+          super
         end
 
-        def has_one(name, *args)
-          utusemi_association(:has_one, name, *args) { |*a| super(*a) }
+        def has_one(name, *args, &block)
+          prepend_utusemi_association_reader_module(name)
+          super
         end
 
-        def has_many(name, *args)
-          utusemi_association(:has_many, name, *args) { |*a| super(*a) }
+        def has_many(name, *args, &block)
+          prepend_utusemi_association_reader_module(name)
+          super
         end
 
         private
 
-        def check_deplicated_association_warning(association_type, name, scope)
-          return unless method_defined?(name)
-          return unless method_defined?("#{name}_with_utusemi")
-          return if scope.try(:[], :utusemi)
-          Rails.logger.warn "[Utusemi:WARNING] \"#{association_type} :#{name}\" is duplicated in #{self.name}."
+        def prepend_utusemi_association_reader_module(name)
+          return if method_defined?(name)
+          prepend build_utusemi_association_reader_module(name)
         end
 
-        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)
-          yield name, scope, *args if !utusemi_flag || !method_defined?(name)
-          define_utusemi_association_reader(name, utusemi_flag => true)
-        end
-
-        def define_utusemi_association_reader(name, options = {})
-          return if method_defined?("#{name}_with_utusemi")
-          define_method "#{name}_with_utusemi" do |*args|
-            association = send("#{name}_without_utusemi", *args)
-            return unless association
-            return association unless association.is_a? ActiveRecord::Base
-            utusemi_for_association(name, association, options)
-          end
-          alias_method_chain name, :utusemi
+        def build_utusemi_association_reader_module(name)
+          wodule = Module.new
+          wodule.class_eval <<-EOS, __FILE__, __LINE__ + 1
+            def #{name}(*args, &block)
+              association = super
+              return unless association
+              return association unless association.is_a? ActiveRecord::Base
+              utusemi_for_association('#{name}'.to_sym, association)
+            end
+          EOS
+          wodule
         end
       end
     end

data/lib/utusemi/version.rb

@@ -1,3 +1,3 @@
 module Utusemi
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: utusemi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pg
   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: rspec-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'
 - !ruby/object:Gem::Dependency
   name: factory_girl_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'
 - !ruby/object:Gem::Dependency
   name: rubocop
   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: coveralls
   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: 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.
@@ -163,12 +163,12 @@ 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: []