easy_model 1.0.3 → 1.0.4

data/README.rdoc

@@ -21,8 +21,8 @@ EasyModel::Base はデータベースに関連付かないモデルの基本ク
 
     end
 
-属性を定義する場合は, 以下のように attr_accessor ではなく column メソッドを利用すると便利です.
-column メソッドを利用すると, 属性の型とデフォルト値を指定することができます.
+属性を定義する場合は, 以下のように attr_accessor ではなく column メソッドを使用します.
+column メソッドを使用すると, 属性の型とデフォルト値を指定することができます.
 
     #
     # ログインフォーム.
@@ -60,8 +60,8 @@ column メソッドで定義した属性は, 代入時に ActiveRecord と同様
     login_form.remember                   # => false
     login_form.remember_before_type_cast  # => 'false'
 
-データベースのテーブルに関連付いているモデルでも column メソッドを利用したい場合は,
-EasyModel::Column モジュールを include します.
+EasyModel::Column モジュールを include することで,
+EasyModel::Base を継承しないモデルでも column メソッドを使用することができます.
 
     class User < ActiveRecord::Base
 
@@ -71,7 +71,30 @@ EasyModel::Column モジュールを include します.
 
     end
 
+== 国際化
 
+国際化は I18n で行われます.
+デフォルトでは '<locale>.easy_model' 以下がルックアップされます.
+
+  ja:
+    easy_model:
+      models:
+        user_search_form: 会員検索フォーム
+      attributes:
+        user:
+          name: 会員名
+          status: ステータス
+
+EasyModel::Base.i18n_scope を上書きすることで, ルックアップされるキーを変更することができます.
+例えば, ActiveRecord と同じキーを参照させたい場合は, 以下のように上書きします.
+
+    class UserSearchForm < EasyModel::Base
+
+      def self.i18n_scope
+        :activerecord
+      end
+
+    end
 
 == 検索フォーム
 

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/easy_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "easy_model"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["SUZUKI Kei"]
-  s.date = "2012-07-30"
+  s.date = "2012-09-10"
   s.description = "\u{30c7}\u{30fc}\u{30bf}\u{30d9}\u{30fc}\u{30b9}\u{306b}\u{4f9d}\u{5b58}\u{3057}\u{306a}\u{3044}\u{30e2}\u{30c7}\u{30eb}\u{306e}\u{57fa}\u{672c}\u{30af}\u{30e9}\u{30b9}\u{3084}, ActiveRecord \u{3068}\u{540c}\u{3058}\u{578b}\u{5909}\u{63db}\u{3092}\u{884c}\u{3046}\u{5c5e}\u{6027}\u{5b9a}\u{7fa9}\u{30e1}\u{30bd}\u{30c3}\u{30c9}\u{3092}\u{63d0}\u{4f9b}\u{3057}\u{307e}\u{3059}."
   s.email = "info-techscore@synergy101.jp"
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/easy_model/base.rb",
     "lib/easy_model/column.rb",
     "lib/easy_model/search_form.rb",
+    "test/easy_model/ja.yml",
     "test/easy_model/test_base.rb",
     "test/easy_model/test_column.rb",
     "test/easy_model/test_search_form.rb",
@@ -35,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/techscore/easy_model"
   s.licenses = ["BSD"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "\u{30c7}\u{30fc}\u{30bf}\u{30d9}\u{30fc}\u{30b9}\u{306b}\u{4f9d}\u{5b58}\u{3057}\u{306a}\u{3044}\u{30e2}\u{30c7}\u{30eb}\u{306e}\u{57fa}\u{672c}\u{30af}\u{30e9}\u{30b9}\u{3084}, ActiveRecord \u{3068}\u{540c}\u{3058}\u{578b}\u{5909}\u{63db}\u{3092}\u{884c}\u{3046}\u{5c5e}\u{6027}\u{5b9a}\u{7fa9}\u{30e1}\u{30bd}\u{30c3}\u{30c9}\u{3092}\u{63d0}\u{4f9b}\u{3057}\u{307e}\u{3059}."
 
   if s.respond_to? :specification_version then

data/lib/easy_model/base.rb

@@ -12,15 +12,44 @@ class EasyModel::Base
   include ActiveModel::Validations
   include EasyModel::Column
 
+  #
+  # ロケールファイルからルックアップするときのキー.
+  #
+  def self.i18n_scope
+    :easy_model
+  end
+
   #
   # 指定された属性値で初期化する.
   #
   # ==== 引数
   # attributes::
-  #   属性値を保持する Hash.
+  #   属性名と属性値を保持する Hash.
   #
   def initialize(attributes=nil)
-    (attributes || {}).each do |name, value|
+    assign_attributes(attributes)
+  end
+
+  #
+  # 属性を一括代入する.
+  #
+  # ==== 引数
+  # new_attributes::
+  #   属性名と属性値を保持する Hash.
+  #
+  def attributes=(new_attributes)
+    assign_attributes(new_attributes)
+  end
+
+  #
+  # 属性を一括代入する.
+  #
+  # ==== 引数
+  # new_attributes::
+  #   属性名と属性値を保持する Hash.
+  #
+  def assign_attributes(new_attributes)
+    (new_attributes || {}).each do |name, value|
       send("#{name}=", value)
     end
   end

data/test/easy_model/ja.yml

@@ -0,0 +1,10 @@
+ja:
+  easy_model:
+    models:
+      user: ユーザ
+    attributes:
+      user:
+        name: 名前
+        email: メールアドレス
+        age: 年齢
+

data/test/easy_model/test_base.rb

@@ -2,24 +2,45 @@
 
 require File.join(File.dirname(__FILE__), '..', 'helper')
 
+class User < EasyModel::Base
+  column :name, :string
+  column :email, :string
+  column :age, :integer
+end
+
 class EasyModel::TestBase < Test::Unit::TestCase
 
+  def setup
+    I18n.load_path = [File.join(File.dirname(__FILE__), 'ja.yml')]
+    I18n.default_locale = :ja
+  end
+
   def test_initialize
-    model = Class.new(EasyModel::Base)
-    model.send(:column, :name, :string)
-    model.send(:column, :email, :string)
-    model.send(:column, :age, :integer)
-
-    object = model.new(:name => 'taro', :email => 'taro@example.com', :age => 20)
-    assert_equal 'taro', object.name
-    assert_equal 'taro@example.com', object.email
-    assert_equal 20, object.age
+    user = User.new(:name => 'taro', :email => 'taro@example.com', :age => 20)
+    assert_equal 'taro', user.name
+    assert_equal 'taro@example.com', user.email
+    assert_equal 20, user.age
+  end
+
+  def test_attributes=
+    user = User.new
+    user.attributes = {:name => 'taro', :email => 'taro@example.com', :age => 20}
+    assert_equal 'taro', user.name
+    assert_equal 'taro@example.com', user.email
+    assert_equal 20, user.age
+  end
+
+  def test_i18n_scope
+    assert_equal :easy_model, User.i18n_scope
+    assert_equal 'ユーザ', User.model_name.human
+    assert_equal '名前', User.human_attribute_name(:name)
+    assert_equal 'メールアドレス', User.human_attribute_name(:email)
+    assert_equal '年齢', User.human_attribute_name(:age)
   end
 
   def test_persisted?
-    model = Class.new(EasyModel::Base)
-    object = model.new
-    assert_equal false, object.persisted?
+    user = User.new
+    assert_equal false, user.persisted?
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_model
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &71228770 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *71228770
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &71228330 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *71228330
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &71227660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *71227660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &71226630 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *71226630
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &71225660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *71225660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &71224630 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71224630
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: データベースに依存しないモデルの基本クラスや, ActiveRecord と同じ型変換を行う属性定義メソッドを提供します.
 email: info-techscore@synergy101.jp
 executables: []
@@ -95,6 +125,7 @@ files:
 - lib/easy_model/base.rb
 - lib/easy_model/column.rb
 - lib/easy_model/search_form.rb
+- test/easy_model/ja.yml
 - test/easy_model/test_base.rb
 - test/easy_model/test_column.rb
 - test/easy_model/test_search_form.rb
@@ -114,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -442526499
+      hash: -208701485
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: データベースに依存しないモデルの基本クラスや, ActiveRecord と同じ型変換を行う属性定義メソッドを提供します.