utusemi 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de35704b1f48b29fd9b17d6cfcde7b3a4b58dae
-  data.tar.gz: c45997636abef147456bce3644560253359aed76
+  metadata.gz: 80ebe354ddd670b48b24665f4867646aa3dbcbb9
+  data.tar.gz: 5d0c5e1b648dfee60d51f54f27cae5b8408a681a
 SHA512:
-  metadata.gz: aa10b9e42f0b726d46e0cce55d93fecaede375ef93783dd70d3c6a26b7fda39a4ec25a46f899c4c104dffd7743d69f208c1e1079ec8fdca1752c2ae6ff1cfeb5
-  data.tar.gz: 274d391ef5645427c30ff4c8911c3b4978c953842161be256ed88dd085974fb1cf5b6c761bb38437b90480dffe0286020be859249b25b0813bc8254b7c37e458
+  metadata.gz: c81151427b717334d4dccb4f213c175c759bf56edf9d1a41122a0f4759921c7f67a0f97c13800a73a5ec7c61d45b7f662b55d88328a38fcaf415369f339086e2
+  data.tar.gz: 993b5541e62a5f5544a3142e883fb378e782c83a0993908256639cbbf3b5e48b3126d593c381288ada94a90c9ab2e8eaf5c3a82e20f58494654abadba1883efb

data/lib/utusemi.rb

@@ -17,6 +17,7 @@ module Utusemi
         this.prepend_to_activerecord_relation
         this.prepend_to_activerecord_eigenclass
         this.prepend_to_activerecord_associations_hasmanyassociation
+        this.prepend_to_activerecord_associations_collectionproxy
       end
     end
 
@@ -54,6 +55,10 @@ module Utusemi
       ActiveRecord::Associations::HasManyAssociation.send(:prepend, Core::ActiveRecord::Associations)
     end
 
+    def prepend_to_activerecord_associations_collectionproxy
+      ActiveRecord::Associations::CollectionProxy.send(:prepend, Core::ActiveRecord::CollectionProxy) if Rails::VERSION::MAJOR == 3
+    end
+
     private
 
     def activerecord_eigenclass

data/lib/utusemi/core.rb

@@ -27,6 +27,7 @@ module Utusemi
         utusemi_values[:flag] = obj ? true : false
         utusemi_values[:type] = obj.to_sym if obj.class.in? [Symbol, String]
         utusemi_values[:options] = options
+        warning_checker unless Rails.env.production?
         self
       end
 
@@ -47,8 +48,11 @@ module Utusemi
         utusemi_column_names(index).invert[column_name.to_sym] || column_name
       end
 
-      def eigenclass
-        class << self; self; end
+      def warning_checker
+        utusemi_column_names.each do |new_column_name, origin_column_name|
+          return if new_column_name != origin_column_name
+          Rails.logger.warn "[Utusemi:WARNING] \"#{new_column_name}\" is duplicated in map(:#{utusemi_values[:type]})."
+        end
       end
     end
 
@@ -77,16 +81,6 @@ module Utusemi
         super.tap { utusemi_columns_mapper if obj.class.in? [Symbol, String] }
       end
 
-      def utusemi_columns_mapper
-        utusemi_column_names.keys.each do |column_name|
-          # alias_attributeと同じことを、対象カラム名を動的に変更して行う
-          define_getter_method(column_name)
-          define_setter_method(column_name)
-          define_predicate_method(column_name)
-          define_was_method(column_name)
-        end
-      end
-
       def changed
         return super unless utusemi_values[:flag]
         super + super.map { |column_name| unmapped_utusemi_column_name(column_name).to_s }
@@ -94,6 +88,17 @@ module Utusemi
 
       private
 
+      def utusemi_columns_mapper
+        utusemi_column_names.each_pair do |new_column_name, origin_column_name|
+          next if new_column_name == origin_column_name
+          # alias_attributeと同じことを、対象カラム名を動的に変更して行う
+          define_getter_method(new_column_name)
+          define_setter_method(new_column_name)
+          define_predicate_method(new_column_name)
+          define_was_method(new_column_name)
+        end
+      end
+
       def define_getter_method(column_name)
         target_column_name = mapped_utusemi_column_name(column_name)
         define_singleton_method(column_name) { send target_column_name }
@@ -148,10 +153,6 @@ module Utusemi
       module QueryMethods
         include Utusemi::Core::Base
 
-        def utusemi!(obj = nil, options = {})
-          super.tap { warning_checker unless Rails.env.production? }
-        end
-
         def build_where(opts = :chain, *rest)
           return super unless utusemi_values[:flag]
           if utusemi_values[:options][:times]
@@ -192,13 +193,6 @@ module Utusemi
           end
           string
         end
-
-        def warning_checker
-          utusemi_column_names.each do |old_column_name, new_column_name|
-            return if old_column_name != new_column_name
-            Rails.logger.warn "[Utusemi:WARNING] #{old_column_name} is duplicated in Utusemi::Engine.config.#{utusemi_values[:type]}_columns."
-          end
-        end
       end
 
       # Rails 3.x で scope に対してのカラムマッピングが正常に動作するようにするためのもの
@@ -213,10 +207,18 @@ module Utusemi
       #
       module RelationMethod
         def relation(*args, &block)
-          return super unless current_scope
-          return super unless current_scope.utusemi_values
-          return super unless current_scope.utusemi_values[:flag]
-          super.utusemi(current_scope.utusemi_values[:type], utusemi_values[:options])
+          utusemi_values = current_scope.try(:utusemi_values) || {}
+          return super unless utusemi_values[:flag]
+          super.utusemi(utusemi_values[:type], utusemi_values[:options])
+        end
+      end
+
+      module CollectionProxy
+        def scoped(*args, &block)
+          association = @association
+          utusemi_values = association.truthly_owner.utusemi_values
+          return super unless utusemi_values[:flag]
+          super.utusemi!(association.klass.model_name.singular, utusemi_values[:options])
         end
       end
 
@@ -343,18 +345,10 @@ module Utusemi
           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
-          default_scope.merge(scope)
-        end
-
         def define_utusemi_association_reader(name, options = {})
           return if method_defined?("#{name}_with_utusemi")
           define_method "#{name}_with_utusemi" do |*args|

data/lib/utusemi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utusemi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord