code-box 0.1.0 → 0.2.0

data/README.md

@@ -39,7 +39,7 @@ There are several options to specify an attribute as a code:
 Example
 
     class Person
-      iclude CodeBox::CodeAttribute
+      include CodeBox::CodeAttribute
 
       attr_accessor  :nationality_code
 
@@ -56,7 +56,7 @@ The include will create the following method in Person:
 Example
 
     class Person
-      iclude CodeBox::CodeAttribute
+      include CodeBox::CodeAttribute
 
       attr_accessor :nationality_code
 
@@ -84,7 +84,7 @@ The include will create the following method in Person:
 The code value is interpreted as a foreign key on an associated AR Code object.
 
     class Person < ActiveRecord::Base
-      iclude CodeBox::CodeAttribute
+      include CodeBox::CodeAttribute
 
       code_attribute :nationality, :lookup_type => :activerecord
     end

data/lib/code-box/acts_as_code.rb

@@ -7,19 +7,47 @@ module CodeBox
     @opts = {}
 
     def self.[](*options)
-      @opts = options
+      @opts = options.dup
+
+      instance_eval <<-RUBY_
+        class << self
+          def _code_box_i18n_model_segment
+            "#{options.extract_options![:i18n_model_segment]}"
+          end
+        end
+      RUBY_
+
       self
     end
 
     def self.included(base)
+      unless (class << self; self; end).method_defined?(:_code_box_i18n_model_segment)
+        instance_eval <<-RUBY_
+          class << self
+            def _code_box_i18n_model_segment
+              nil
+            end
+          end
+        RUBY_
+      end
+
+      instance_eval <<-RUBY_
+        class << base
+          def _code_box_i18n_model_segment
+            return CodeBox.i18n_model_segment if "#{self._code_box_i18n_model_segment}".empty?
+            "#{self._code_box_i18n_model_segment}"
+          end
+        end
+      RUBY_
+
       base.extend(ClassMethods)
-      base.acts_as_code(*@opts) if @opts.size > 0
+      base.acts_as_code(*@opts) if @opts
     end
 
 
     module ClassMethods
       DefaultOptions = {
-          :model_type                => :poro,
+          :type                      => :poro,
           :code_attribute            => :code,
           :polymorphic               => false,
           :uniqueness_case_sensitive => true,
@@ -33,16 +61,60 @@ module CodeBox
         code_attr      = opts[:code_attribute]
         position_attr  = opts[:position_attribute]
         case_sensitive = opts[:uniqueness_case_sensitive]
-        model_type     = opts.delete(:model_type)
+        model_type     = opts.delete(:type)
 
         # Create a constant for each code
         codes.each do |code|
           const_set("Code#{code.to_s.camelize}", code)
         end
 
-        case model_type
+        class_eval <<-RUBY_
+          def translated_#{code_attr}(locale=I18n.locale)
+            self.class.translate_#{code_attr}(code, :locale => locale)
+          end
+
+          # translator
+          class << self
+            def translate_#{code_attr}(*code)
+              options           = code.extract_options!
+              locale            = options[:locale] || I18n.locale
+              codes             = code.first
+              is_paramter_array = codes.kind_of? Array
+
+              codes = Array(codes)
+              translated_codes = codes.map { |code|
+                code_key = code.nil? ? :null_value : code
+                I18n.t("\#{self._code_box_i18n_model_segment}.values.\#{self.name.underscore}.#{code_attr}.\#{code_key}", :locale => locale)
+              }
+
+              if options[:build] == :zip
+                translated_codes.zip(codes)
+              else
+                is_paramter_array ? translated_codes : translated_codes.first
+              end
+            end
+          end
 
+          def self.for_code(code)
+            code_cache[code]
+          end
+
+          def self.initialize_cache
+            Hash[all.map{ |code| [code.#{code_attr}, code] }]
+          end
+        RUBY_
+
+        instance_eval <<-CODE
+          class << self
+            def code_cache
+              @code_cache ||= initialize_cache
+            end
+          end
+        CODE
+
+        case model_type
           when :active_record
+
             order_expression = if self.attribute_names.include?(position_attr) then
               "coalesce(#{position_attr.to_s}, #{code_attr.to_s})"
             else
@@ -54,48 +126,12 @@ module CodeBox
               validates_uniqueness_of :#{code_attr}#{opts[:polymorphic] ? ', :scope => :type' : ' '}, :case_sensitive => #{case_sensitive}
 
               default_scope order('#{order_expression}')
-
-              def self.initialize_cache
-                all.inject({}) {|hash, obj| hash[obj.#{code_attr}] = obj; hash }
-              end
-
-              def self.for_code(code)
-                code_cache[code]
-              end
-
-              def hash
-                (self.class.name + '#' + #{code_attr}).hash
-              end
-
-              def equal?(other)
-                other && is_a?(other.class) && #{code_attr} == other.#{code_attr}
-              end
-
-              def ==(other)
-                self.equal? other
-              end
-            CODE
-
-            instance_eval <<-CODE
-              class << self
-                def code_cache
-                  @code_cache ||= initialize_cache
-                end
-              end
             CODE
 
           when :poro
             order_attr = position_attr ? position_attr.to_s : code_attr.to_s
 
             class_eval <<-CODE
-              def self.initialize_cache
-                all.inject({}) {|hash, obj| hash[obj.#{code_attr}] = obj; hash }
-              end
-
-              def self.for_code(code)
-                code_cache[code]
-              end
-
               def hash
                 (self.class.name + '#' + #{code_attr}).hash
               end
@@ -113,14 +149,6 @@ module CodeBox
               end
             CODE
 
-            instance_eval <<-CODE
-              class << self
-                def code_cache
-                  @code_cache ||= initialize_cache
-                end
-              end
-            CODE
-
           else
             raise ArgumentError, "'#{model_type}' is not a valid type. Use :active_record or :poro(default) instead"
         end

data/lib/code-box/code_attribute.rb

@@ -1,18 +1,7 @@
 # encoding: utf-8
 
 module CodeBox
-
   module CodeAttribute
-    Config = { :i18n_model_segment => :activerecord }
-
-    def i18n_model_segment=(segment)
-      Config[:i18n_model_segment] = segment
-    end
-    def i18n_model_segment
-      Config[:i18n_model_segment]
-    end
-    module_function :i18n_model_segment=, :i18n_model_segment
-
 
     def self.[](*options)
       instance_eval <<-RUBY_
@@ -41,7 +30,7 @@ module CodeBox
       instance_eval <<-RUBY_
         class << base
           def _code_box_i18n_model_segment
-            return CodeBox::CodeAttribute.i18n_model_segment if "#{self._code_box_i18n_model_segment}".empty?
+            return CodeBox.i18n_model_segment if "#{self._code_box_i18n_model_segment}".empty?
             "#{self._code_box_i18n_model_segment}"
           end
         end
@@ -69,7 +58,6 @@ module CodeBox
           code_class_name = opts_copy.delete(:class_name) || "::Codes::#{code_name.to_s.camelize}"
 
           case lookup_type
-
             when :lookup
               class_eval <<-RUBY_
                 # getter
@@ -116,7 +104,7 @@ module CodeBox
                     codes = Array(codes)
                     translated_codes = codes.map { |code|
                       code_key = code.nil? ? :null_value : code
-                      I18n.t("\#{self._code_box_i18n_model_segment}.\#{self.name.underscore}.values.#{code_attr_name}.\#{code_key}", :locale => locale)
+                      I18n.t("\#{self._code_box_i18n_model_segment}.values.\#{self.name.underscore}.#{code_attr_name}.\#{code_key}", :locale => locale)
                     }
 
                     if options[:build] == :zip

data/lib/code-box/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module CodeBox
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/code-box.rb

@@ -1,5 +1,16 @@
 # encoding: utf-8
 
-require File.expand_path('code-box/code_attribute', File.dirname(__FILE__))
-require File.expand_path('code-box/acts_as_code'  , File.dirname(__FILE__))
+require 'code-box/code_attribute'
+require 'code-box/acts_as_code'
 
+module CodeBox
+  Config = { :i18n_model_segment => :activerecord }
+
+  def i18n_model_segment=(segment)
+    Config[:i18n_model_segment] = segment
+  end
+  def i18n_model_segment
+    Config[:i18n_model_segment]
+  end
+  module_function :i18n_model_segment=, :i18n_model_segment
+end

data/test/code-box/test_acts_as_code.rb

@@ -4,7 +4,6 @@ require 'helper'
 
 class TestActsAsCode < Test::Unit::TestCase
 
-
   def test_constants
     assert_equal 'single', Codes::CivilStatus::CodeSingle
   end
@@ -16,21 +15,36 @@ class TestActsAsCode < Test::Unit::TestCase
     assert_equal Codes::CivilStatus.for_code('married'), Codes::CivilStatus::all.last
   end
 
-
   def test_ar_code_all
+    Codes::ArCode.delete_all
+
     Codes::ArCode.create(:code => 'code_1', :name => "Code_1_name")
     Codes::ArCode.create(:code => 'code_2', :name => "Code_2_name")
 
     assert_equal 2, Codes::ArCode.all.size
   end
 
-
   def test_ar_code_lookup
+    Codes::ArCode.delete_all
     code_1 = Codes::ArCode.create(:code => 'code_1', :name => "Code_1_name")
     code_2 = Codes::ArCode.create(:code => 'code_2', :name => "Code_2_name")
 
     assert_equal code_2, Codes::ArCode.for_code('code_2')
   end
 
+  def test_constant_definition
+    assert Codes::CivilStatus.const_defined?('CodeSingle')
+    assert Codes::CivilStatus.const_defined?('CodeMarried')
+
+    assert_equal Codes::CivilStatus::CodeMarried, 'married'
+    assert_equal Codes::CivilStatus::CodeSingle,  'single'
+  end
+
+  def test_code_translation
+    code = Codes::CivilStatus.new('married')
+
+    assert_equal code.translated_code, 'married'
+    assert_equal code.translated_code(:de), 'verheiratet'
+  end
 
 end

data/test/code-box/test_code_attribute.rb

@@ -7,7 +7,7 @@ class TestCodeAttribute < Test::Unit::TestCase
   def setup
   end
 
-  # :type => :i18n -------------------------------------------------------------------
+  # :type => :i18n -----------------------------------------------------------------
   def test_code_attribute_i18n_lookup
     obj = Codes::SampleClass.new(gender_code: 'f', country_iso: 'de')
     I18n.locale =:en

data/test/resources/locale/de.yml

@@ -2,17 +2,20 @@
 ---
 de:
   activerecord:
-    codes/sample_class:
-      values:
+    values:
+      codes/sample_class:
         gender_code:
           f: weiblich
           m: männlich
         country_iso:
           de: Deutschland
           ch: Schweiz
+      codes/civil_status:
+        code:
+          married: verheiratet
   model:
-    codes/segment_model:
-      values:
+    values:
+      codes/segment_model:
         gender_code:
           f: weiblich
           m: männlich

data/test/resources/locale/en.yml

@@ -2,17 +2,20 @@
 ---
 en:
   activerecord:
-    codes/sample_class:
-      values:
+    values:
+      codes/sample_class:
         gender_code:
           f: female
           m: male
         country_iso:
           de: Germany
           ch: Switzerland
+      codes/civil_status:
+        code:
+          married: married
   model:
-    codes/segment_model:
-      values:
+    values:
+      codes/segment_model:
         gender_code:
           f: female
           m: male

data/test/resources/models.rb

@@ -60,8 +60,8 @@ module Codes
 
 
   class ArCode < ActiveRecord::Base
-    include CodeBox::ActsAsCode[:model_type => :active_record]
     self.table_name = :codes_ar_code
+    include CodeBox::ActsAsCode[:type => :active_record]
   end
 
   class SegmentModel

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-box
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord