padrino-admin 0.9.21 → 0.9.22

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Padrino
+Copyright (c) 2011 Padrino
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -67,4 +67,4 @@ For a more complete look at using the Admin panel functionality and access featu
 
 == Copyright
 
-Copyright (c) 2010 Padrino. See LICENSE for details.
+Copyright (c) 2011 Padrino. See LICENSE for details.

data/lib/padrino-admin/generators/templates/account/activerecord.rb.tt

@@ -13,7 +13,7 @@ class Account < ActiveRecord::Base
   validates_format_of       :role,     :with => /[A-Za-z]/
 
   # Callbacks
-  before_save :encrypt_password
+  before_save :encrypt_password, :if => :password_required
 
   ##
   # This method is for authentication purpose
@@ -33,6 +33,6 @@ class Account < ActiveRecord::Base
     end
 
     def password_required
-      crypted_password.blank? || !password.blank?
+      crypted_password.blank? || password.present?
     end
-end
+end

data/lib/padrino-admin/generators/templates/account/couchrest.rb.tt

@@ -27,7 +27,7 @@ class Account < CouchRest::ExtendedDocument
   validates_format_of       :role,     :with => /[A-Za-z]/
 
   # Callbacks
-  before_save :encrypt_password
+  before_save :encrypt_password, :if => :password_required
 
   ##
   # This method is for authentication purpose
@@ -56,7 +56,7 @@ class Account < CouchRest::ExtendedDocument
     end
 
     def password_required
-      crypted_password.blank? || !password.blank?
+      crypted_password.blank? || password.present?
     end
 
     def email_is_unique
@@ -69,4 +69,4 @@ class Account < CouchRest::ExtendedDocument
       end
       [false, "Email has already been taken"]
     end
-end
+end

data/lib/padrino-admin/generators/templates/account/datamapper.rb.tt

@@ -47,10 +47,10 @@ class Account
 
   private
     def password_required
-      crypted_password.blank? || !password.blank?
+      crypted_password.blank? || password.present?
     end
 
     def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
+      self.crypted_password = ::BCrypt::Password.create(password) if password.present?
     end
 end

data/lib/padrino-admin/generators/templates/account/mongoid.rb.tt

@@ -16,12 +16,12 @@ class Account
   validates_length_of       :password, :within => 4..40, :if => :password_required
   validates_confirmation_of :password,                   :if => :password_required
   validates_length_of       :email,    :within => 3..100
-  validates_uniqueness_of   :email
+  validates_uniqueness_of   :email,    :case_sensitive => false
   validates_format_of       :email,    :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
   validates_format_of       :role,     :with => /[A-Za-z]/
 
   # Callbacks
-  before_save :generate_password
+  before_save :encrypt_password, :if => :password_required
 
   ##
   # This method is for authentication purpose
@@ -43,11 +43,11 @@ class Account
   end
 
   private
-    def generate_password
+    def encrypt_password
       self.crypted_password = ::BCrypt::Password.create(self.password)
     end
 
     def password_required
-      crypted_password.blank? || !password.blank?
+      crypted_password.blank? || self.password.present?
     end
-end
+end

data/lib/padrino-admin/generators/templates/account/mongomapper.rb.tt

@@ -21,7 +21,7 @@ class Account
   validates_format_of       :role,     :with => /[A-Za-z]/
 
   # Callbacks
-  before_save :generate_password
+  before_save :encrypt_password, :if => :password_required
 
   ##
   # This method is for authentication purpose
@@ -36,11 +36,11 @@ class Account
   end
 
   private
-    def generate_password
+    def encrypt_password
       self.crypted_password = ::BCrypt::Password.create(password)
     end
 
     def password_required
-      crypted_password.blank? || !password.blank?
+      crypted_password.blank? || password.present?
     end
-end
+end

data/lib/padrino-admin/generators/templates/account/sequel.rb.tt

@@ -19,7 +19,7 @@ class Account < ::Sequel::Model
 
   # Callbacks
   def before_save
-    generate_password
+    encrypt_password
   end
 
   ##
@@ -42,11 +42,11 @@ class Account < ::Sequel::Model
   end
 
   private
-    def generate_password
-      self.crypted_password = ::BCrypt::Password.create(password)
+    def encrypt_password
+      self.crypted_password = ::BCrypt::Password.create(password) if password.present?
     end
 
     def password_required
-      crypted_password.blank? || !password.blank?
+      crypted_password.blank? || password.present?
     end
-end
+end

data/lib/padrino-admin/locale/admin/ja.yml

@@ -0,0 +1,16 @@
+ja:
+  padrino:
+    admin:
+      save: 保存
+      cancel: キャンセル
+      list: 一覧
+      edit: 編集
+      new: 新規
+      show: 詳細
+      delete: 削除
+      confirm: 本当に削除しますか？
+      created_at: 作成日時
+      all: 全ての
+      profile: プロフィール
+      settings: 設定
+      logout: ログアウト

data/lib/padrino-admin/locale/orm/ja.yml

@@ -0,0 +1,26 @@
+ja:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "は、次の値のうちどれかでなければなりません:"
+        exclusion: "は、使用できない値です"
+        invalid: "は、不正な値です"
+        confirmation: "は、条件を満たしません"
+        accepted: "は、受け入れられなければなりません"
+        empty: "は、空であってはなりません"
+        blank: "は、空欄であってはなりません"
+        too_long: "は、長すぎます (最大 %{count} 文字)"
+        too_short: "は、短すぎます (少なくとも %{count} 文字)"
+        wrong_length: "の文字数が不正です (%{count} 文字であること)"
+        taken: "は、すでに利用された値です"
+        not_a_number: "は、数字である必要があります"
+        greater_than: "は、 %{count} より大きな値である必要があります"
+        greater_than_or_equal_to: "は、 %{count} 以上の値である必要があります"
+        equal_to: "は、 %{count} と等しい値である必要があります"
+        less_than: "は、 %{count} より少ない値である必要があります"
+        less_than_or_equal_to: "は、 %{count} 以下の値である必要があります"
+        odd: "は、奇数でなければなりません"
+        even: "は、偶数でなければなりません"
+        record_invalid: "不正なレコードです: %{errors}"
+        content_type: "そのファイルフォーマットはサポートされていません。"
+  activerecord: *activemodel

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 9
-  - 21
-  version: 0.9.21
+  - 22
+  version: 0.9.22
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 0
         - 9
-        - 21
-        version: 0.9.21
+        - 22
+        version: 0.9.22
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 0
         - 9
-        - 21
-        version: 0.9.21
+        - 22
+        version: 0.9.22
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -130,6 +130,7 @@ files:
 - lib/padrino-admin/locale/admin/es.yml
 - lib/padrino-admin/locale/admin/fr.yml
 - lib/padrino-admin/locale/admin/it.yml
+- lib/padrino-admin/locale/admin/ja.yml
 - lib/padrino-admin/locale/admin/nl.yml
 - lib/padrino-admin/locale/admin/no.yml
 - lib/padrino-admin/locale/admin/pl.yml
@@ -146,6 +147,7 @@ files:
 - lib/padrino-admin/locale/orm/es.yml
 - lib/padrino-admin/locale/orm/fr.yml
 - lib/padrino-admin/locale/orm/it.yml
+- lib/padrino-admin/locale/orm/ja.yml
 - lib/padrino-admin/locale/orm/nl.yml
 - lib/padrino-admin/locale/orm/no.yml
 - lib/padrino-admin/locale/orm/pl.yml
@@ -194,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-admin
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Admin Dashboard for Padrino