labelizer 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzMyMzMzYjRlNTdhZDZhNTIwZTZjZWRlNWRiM2IyYjBlYzA2NTI5ZQ==
+    MjEzNjdlYzcyMTA3Nzc1NTFmZTgxYWZiMmRjODI1ZWRjN2VkN2VjYQ==
   data.tar.gz: !binary |-
-    MjExZTFlYzQ1MzEwYTZlNTQ1NzRlM2I0NmJlNGI5ZDQ5YmRmNTkxOA==
+    ZDQwNzI5NTU1Nzk0MDMwZGQ2YjNlODk3NmVlYTllNzIwZmZhNzdmMA==
 SHA512:
   metadata.gz: !binary |-
-    ODhiZjE2NGEzNmFiNWQ1MDlmOWI0Y2U2YzEyZmJjYmY3NjEwZDVmZTcxYTY1
-    ODBhNGE1NmYwMDIzYTdhMDBjNDJlMDgwMTFlYjAwYzA3ZjExZmJjMzViYWE3
-    YjI1ZWFjNzA4N2FjNjAxMGVkNDNmN2VkNmM3MDllODI0ODcxY2E=
+    YTMyZjUyYzUxYjVkMmVmNWZlYzk2ZjAyNmI2ZTIwYzNjYTE2ZjJkNmFjOGUy
+    YWVhZDA0NzVlMzIyNTQ5NGE5ODcyMWVkMWQ3ODgyNDk2NDAwNDA2NjIyYTFj
+    NWY5NGVjYzRmMzQxNTRiYjc5Y2UwYzJmZWZlZTk4ZGM4YjNjNTQ=
   data.tar.gz: !binary |-
-    NWE2OGU2ZTIwZjc5MjdlYjE4OWJhODIzMTM4MTgxMTNmNWY1ZjYwZmQyZWI1
-    YTVjZDU5NGNjNWEwMDRiZTcyZGQyNmZhNmM4MWI3MDVjNDdiM2EyYzM3YjIz
-    ZmM2MTA5ZmNiOWQxZjZmOWMwNTM5NDlmOWE4NDI2ZDI4YjlkNzc=
+    YTI3MmUxNTY1YTRmYmIwOGRlMTlhM2IyMzA3MTg2ZGQxZmE0YzE2NGYzZTdi
+    MzgyNzZkZjMwNTE3ZjMzYzJhMjBhNTQzNzQ1OGIyMTZjMTU1NmU5ZjNmY2Q1
+    NmQ2Y2RlNDIzYmMwMjc0NTliMDQ5YjA1MGMwNTQxMmEyZDcxMWQ=

data/lib/labelizer.rb

@@ -17,7 +17,53 @@ module Labelizer
 
   module ClassMethods
     def labelized
-      @labelized
+      @labelized ||= Container.new([]){|attr_labelized,attr|
+        model = self.to_s.underscore
+        values = __send__(attr.to_s.pluralize)
+        labelized = Container.new(values, accept_array_key: true){|value_labelized,value|
+          data = labelized.instance_variable_get(:@data)
+          attr_label_types = data[:label_types]
+          attr_converter = data[:converter]
+
+          unless labelized.has_key?(value)
+            Container.new(attr_label_types){|h,label_type|
+              h[label_type] = value.map{|val| value_labelized[val][label_type]}
+            }
+          else
+            value_labelized[value] = Container.new(attr_label_types){|h,label_type|
+              if label_type == :value
+                result = value
+              else
+                result = ::I18n.translate(
+                  "labelizer.#{model}.#{attr}.#{value}.#{label_type}",
+                  default: [
+                    :"labelizer.#{model}.#{attr}.#{label_type}",
+                    :"labelizer.#{model}.#{label_type}",
+                    :"labelizer.#{label_type}",
+                    "",
+                  ],
+                )
+                if c = attr_converter[label_type]
+                  result = c[result]
+                end
+              end
+              h[label_type] = result
+            }
+          end
+        }
+
+        labelized.singleton_class.class_eval do
+          define_method :pluck do |*require_label_types|
+            map{|value,label_type_labelized|
+              require_label_types.map{|require_label_type|
+                label_type_labelized[require_label_type]
+              }
+            }
+          end
+        end
+
+        attr_labelized[attr] = labelized
+      }
     end
 
     private
@@ -38,61 +84,18 @@ module Labelizer
           end
         end
 
-        @labelized ||= Container.new([]){|attr_labelized,attr|
-          model = self.to_s.underscore
-          attr_labelized[attr] = Container.new(__send__(attr.to_s.pluralize), accept_array_key: true){|value_labelized,value|
-            data = attr_labelized[attr].instance_variable_get(:@data)
-            attr_label_types = data[:label_types]
-            attr_converter = data[:converter]
-            unless attr_labelized[attr].has_key?(value)
-              Container.new(attr_label_types){|h,label_type|
-                h[label_type] = value.map{|val| value_labelized[val][label_type]}
-              }
-            else
-              value_labelized[value] = Container.new(attr_label_types){|h,label_type|
-                if label_type == :value
-                  result = value
-                else
-                  result = ::I18n.translate(
-                    "labelizer.#{model}.#{attr}.#{value}.#{label_type}",
-                    default: [
-                      :"labelizer.#{model}.#{attr}.#{label_type}",
-                      :"labelizer.#{model}.#{label_type}",
-                      :"labelizer.#{label_type}",
-                      "",
-                    ],
-                  )
-                  if c = attr_converter[label_type]
-                    result = c[result]
-                  end
-                end
-                h[label_type] = result
-              }
-            end
-          }
-
-          attr_labelized[attr].singleton_class.class_eval do
-            define_method :pluck do |*require_label_types|
-              map{|value,label_type_labelized|
-                require_label_types.map{|require_label_type|
-                  label_type_labelized[require_label_type]
-                }
-              }
-            end
-          end
-          data = attr_labelized[attr].instance_variable_get(:@data)
-          data[:label_types] = label_types
-          data[:converter] = converter
-
-          attr_labelized[attr]
-        }
-
-        @labelized.instance_variable_get(:@keys) << attr_name
-        @labelized.singleton_class.class_eval do
+        labelized.instance_variable_get(:@keys) << attr_name
+        labelized.singleton_class.class_eval do
           define_method attr_name do
-            @hash[attr_name]
+            self[attr_name]
           end
         end
+
+        data = labelized[attr_name].instance_variable_get(:@data)
+        data[:label_types] = label_types
+        data[:converter] = converter
+
+        labelized[attr_name]
       end
   end
 end

data/lib/labelizer/version.rb

@@ -1,3 +1,3 @@
 module Labelizer
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/version.txt

@@ -1 +1 @@
-0.1.4
+0.1.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labelizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - shun