utusemi 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b16d77100fe212c9bd6e394b78d2d78016f88ff
-  data.tar.gz: b0f86e567be982e9e9e90ea676ad1996da452f45
+  metadata.gz: 5d2f1842ad1590bc9ffd7d86284f73621e09dc98
+  data.tar.gz: 879c977d5859077234e3cf4cab9f1f0e404bab36
 SHA512:
-  metadata.gz: 2807f6a7381168122fc1d6240c207e897d20d1bd7a5d6240d493584265a1670f62eeba4f1d007d0b96a44cbc8da8f4ce97723868ca9d00835dad03027115fd78
-  data.tar.gz: 3ab9cacae33c0bb31faa35e5b11b3ca82606e0356023ecc5075f681cd8dde9444ad3090516a0d98ccabc71f67dcc01de35d3fb93eac65d16519054e2cb338472
+  metadata.gz: 21680f17fc9aec12a3ff2c82afcdd3ef7ebe15008e35c4d9c399d56df6ad9987f3badb1ee132d244f48e13394ef2de9dad290da2e0bd80faf1935c937a315c7d
+  data.tar.gz: b40a9ac874264953470c9ca404012c0370fd84d211f8a3197b011ca3bdb37c97fe0f11fb95626ec0ccd504a14cb400a4ac3201e0252f0a0ad8b24d1ca867039c

data/lib/utusemi.rb

@@ -15,7 +15,7 @@ module Utusemi
         # for model and relation
         this.prepend_to_activerecord_base
         this.prepend_to_activerecord_relation
-        this.prepend_to_activerecord_eigenclass
+        this.prepend_to_activerecord_singleton_class
         this.prepend_to_activerecord_associations_hasmanyassociation
         this.prepend_to_activerecord_associations_collectionproxy
       end
@@ -43,12 +43,12 @@ module Utusemi
       ActiveRecord::Relation.send(:prepend, Core::ActiveRecord::Relation)
     end
 
-    def prepend_to_activerecord_eigenclass
-      activerecord_eigenclass.send(:prepend, Core::ActiveRecord::Base::ClassMethods)
+    def prepend_to_activerecord_singleton_class
+      ActiveRecord::Base.singleton_class.send(:prepend, Core::ActiveRecord::Base::ClassMethods)
       # for rails 3.x
-      activerecord_eigenclass.send(:prepend, Core::ActiveRecord::RelationMethod) if Rails::VERSION::MAJOR == 3
+      ActiveRecord::Base.singleton_class.send(:prepend, Core::ActiveRecord::RelationMethod) if Rails::VERSION::MAJOR == 3
       # for association
-      activerecord_eigenclass.send(:prepend, Core::ActiveRecord::AssociationMethods)
+      ActiveRecord::Base.singleton_class.send(:prepend, Core::ActiveRecord::AssociationMethods)
     end
 
     def prepend_to_activerecord_associations_hasmanyassociation
@@ -58,11 +58,5 @@ module Utusemi
     def prepend_to_activerecord_associations_collectionproxy
       ActiveRecord::Associations::CollectionProxy.send(:prepend, Core::ActiveRecord::CollectionProxy) if Rails::VERSION::MAJOR == 3
     end
-
-    private
-
-    def activerecord_eigenclass
-      ActiveRecord::Base.class_eval { class << self; self; end }
-    end
   end
 end

data/lib/utusemi/core.rb

@@ -15,7 +15,9 @@ module Utusemi
     #
     module Base
       def utusemi_values
-        @utusemi_values ||= {}
+        utusemi_values = @utusemi_values || {}
+        utusemi_values = klass_utusemi_values unless utusemi_values[:flag]
+        utusemi_values
       end
 
       def utusemi(obj = nil, options = {})
@@ -24,10 +26,11 @@ module Utusemi
 
       def utusemi!(obj = nil, options = {})
         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
+        @utusemi_values ||= {}
+        @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
       end
@@ -70,6 +73,13 @@ module Utusemi
           self
         end
       end
+
+      def klass_utusemi_values
+        return {} unless @klass
+        utusemi_values = @klass.instance_variable_get(:@utusemi_values) || {}
+        return {} unless utusemi_values[:flag]
+        utusemi_values
+      end
     end
 
     # 用途
@@ -265,8 +275,6 @@ module Utusemi
         #   #=> true (= products.title)
         #
         def to_a
-          utusemi_values = self.utusemi_values
-          utusemi_values = @klass.utusemi_values unless utusemi_values[:flag]
           return super unless utusemi_values[:flag]
           super.each { |record| record.utusemi!(utusemi_values[:type], utusemi_values[:options]) }
         end
@@ -309,8 +317,7 @@ module Utusemi
         def association(name)
           truthly_owner = self
           association = super
-          eigenclass = class << association; self; end
-          eigenclass.send(:define_method, :truthly_owner) { truthly_owner }
+          association.singleton_class.send(:define_method, :truthly_owner) { truthly_owner }
           association
         end
       end

data/lib/utusemi/version.rb

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

metadata

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