padrino-admin 0.10.2 → 0.10.3

data/lib/padrino-admin/generators/templates/assets/stylesheets/themes/orange/style.css

@@ -12,7 +12,7 @@ body {
 }
 
 hr {
-  background: #f0f0ee; 
+  background: #f0f0ee;
   color: #f0f0ee;
 }
 
@@ -43,7 +43,7 @@ hr {
   background: #FFF;
 }
 
-#sidebar h3 {  
+#sidebar h3 {
   background: #ff7900;
   color: #FFF;
   border-bottom: 10px solid #262626;
@@ -118,7 +118,7 @@ hr {
   background-color: #262626;
 }
 
-#footer .block {  
+#footer .block {
   color: #FFF;
   background: #262626;
 }
@@ -221,24 +221,24 @@ ul.list li .item .avatar {
   border-color: #F0F0EE;
   border-width: 1px;
   border-style: solid;
-  padding: 2px; 
+  padding: 2px;
 }
 
 /* box */
 
 #box .block {
-  background: #FFF;  
+  background: #FFF;
 }
 
 #box .block h2 {
-  background: #ff7900;  
+  background: #ff7900;
   color: #FFF;
 }
 
 
 /* rounded borders */
 
-#main, #main-navigation, #main-navigation li, .secondary-navigation, #main .block, #sidebar .block, #sidebar h3, ul.list li, 
+#main, #main-navigation, #main-navigation li, .secondary-navigation, #main .block, #sidebar .block, #sidebar h3, ul.list li,
 #footer .block, .form input.button, #box .block, #box .block h2 {
   -moz-border-radius-topleft: 4px;
   -webkit-border-top-left-radius: 4px;

data/lib/padrino-admin/generators/templates/assets/stylesheets/themes/reidb-greenish/style.css

@@ -2,7 +2,7 @@
 .gray { color:#a2b0b6; }
 .hightlight { background-color:#d6e7c7; }
 
-a:link, a:visited, a:hover, a:active { color: #81B953; } 
+a:link, a:visited, a:hover, a:active { color: #81B953; }
 h1, h2, h3 { color: #3B5526; }
 a { -moz-outline: none; }
 
@@ -13,7 +13,7 @@ body {
 }
 
 hr {
-  background: #f0f0ee; 
+  background: #f0f0ee;
   color: #f0f0ee;
 }
 
@@ -28,7 +28,7 @@ hr {
 
 }
 
-#header h1 a:link, #header h1 a:active, 
+#header h1 a:link, #header h1 a:active,
 #header h1 a:hover, #header h1 a:visited {
   color: #3B5526;
 }
@@ -49,7 +49,7 @@ hr {
   border: none;
 }
 
-#sidebar h3 {  
+#sidebar h3 {
   padding: 8px 12px;
   background: #3B5526;
   color: #FFF;
@@ -58,14 +58,14 @@ hr {
 }
 
 
-#sidebar ul li a:link, 
+#sidebar ul li a:link,
 #sidebar ul li a:visited {
   background: #FFF;
   border-bottom: 1px solid #F0F0EE;
   text-decoration: none;
 }
 
-#sidebar ul li a:hover, 
+#sidebar ul li a:hover,
 #sidebar ul li a:active {
   background: #D3E8C1;
   color: #FFF;
@@ -74,7 +74,7 @@ hr {
 #main-navigation {
   background: #44721e;
   margin-right: 20px;
-  padding: 7px 7px 0 7px; 
+  padding: 7px 7px 0 7px;
 }
 
 #main-navigation ul li {
@@ -94,26 +94,26 @@ hr {
 }
 
 #main-navigation ul li a:hover,
-#main-navigation ul li a:link, 
-#main-navigation ul li a:visited, 
+#main-navigation ul li a:link,
+#main-navigation ul li a:visited,
 #main-navigation ul li a:active,
-.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, 
+.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited,
 .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active {
   text-decoration: none;
   color: #FFF;
 }
 
-#user-navigation ul li a:link, 
-#user-navigation ul li a:visited,  
+#user-navigation ul li a:link,
+#user-navigation ul li a:visited,
 #user-navigation ul li a:active {
 	color: #3B5526;
 }
 
 #user-navigation ul li a:hover { color: #fff; }
 
-#main-navigation ul li.active a:link, 
-#main-navigation ul li.active a:visited, 
-#main-navigation ul li.active a:hover, 
+#main-navigation ul li.active a:link,
+#main-navigation ul li.active a:visited,
+#main-navigation ul li.active a:hover,
 #main-navigation ul li.active a:active {
   color: #262626;
 }
@@ -137,13 +137,13 @@ padding: 8px 12px;
   background: #81B953;
 }
 
-#footer .block {  
+#footer .block {
   color: #FFF;
   background: #3B5526;
 }
 
-#footer .block p {      
-  margin: 0;  
+#footer .block p {
+  margin: 0;
   padding: 5px;
 }
 
@@ -241,13 +241,13 @@ ul.list li .item .avatar {
   border-color: #F0F0EE;
   border-width: 1px;
   border-style: solid;
-  padding: 2px; 
+  padding: 2px;
 }
 
 /* box */
 
 #box .block {
-  background: #FFF;  
+  background: #FFF;
 }
 
 #box .block h2 {
@@ -265,9 +265,9 @@ ul.list li .item .avatar {
 
 /* rounded borders */
 
-#main, #main-navigation, #main-navigation li, 
-.secondary-navigation, #main .block, #sidebar .block, 
-#sidebar h3, ul.list li, #footer .block, 
+#main, #main-navigation, #main-navigation li,
+.secondary-navigation, #main .block, #sidebar .block,
+#sidebar h3, ul.list li, #footer .block,
 .form input.button, #box .block, #box .block h2 {
   -moz-border-radius-topleft: 4px;
   -webkit-border-top-left-radius: 4px;
@@ -275,8 +275,8 @@ ul.list li .item .avatar {
   -webkit-border-top-right-radius: 4px;
 }
 
-.secondary-navigation li.first a, 
-.secondary-navigation ul li.first, 
+.secondary-navigation li.first a,
+.secondary-navigation ul li.first,
 .table th.first, .table th.first {
   -moz-border-radius-topleft: 4px;
   -webkit-border-top-left-radius: 4px;
@@ -292,8 +292,8 @@ ul.list li .item .avatar {
   -webkit-border-top-left-radius: 4px;
 }
 
-#sidebar, #sidebar .block, #main .block, 
-#sidebar ul.navigation, ul.list li, 
+#sidebar, #sidebar .block, #main .block,
+#sidebar ul.navigation, ul.list li,
 #footer .block, .form input.button, #box .block {
   -moz-border-radius-bottomleft: 4px;
   -webkit-border-bottom-left-radius: 4px;

data/lib/padrino-admin/generators/templates/assets/stylesheets/themes/ruby/style.css

@@ -12,7 +12,7 @@ body {
 }
 
 hr {
-  background: #f0f0ee; 
+  background: #f0f0ee;
   color: #f0f0ee;
 }
 
@@ -47,7 +47,7 @@ hr {
   background: #FFF;
 }
 
-#sidebar h3 {  
+#sidebar h3 {
   background: #7A1818;
   color: #FFF;
   border-bottom: 10px solid #262626;
@@ -129,13 +129,13 @@ hr {
   background-color: #262626;
 }
 
-#footer .block {  
+#footer .block {
   color: #FFF;
   background: #262626;
 }
 
-#footer .block p {      
-  margin: 0;  
+#footer .block p {
+  margin: 0;
   padding: 10px;
 }
 
@@ -233,24 +233,24 @@ ul.list li .item .avatar {
   border-color: #F0F0EE;
   border-width: 1px;
   border-style: solid;
-  padding: 2px; 
+  padding: 2px;
 }
 
 /* box */
 
 #box .block {
-  background: #FFF;  
+  background: #FFF;
 }
 
 #box .block h2 {
-  background: #7A1818;  
+  background: #7A1818;
   color: #FFF;
 }
 
 
 /* rounded borders */
 
-#main, #main-navigation, #main-navigation li, .secondary-navigation, #main .block, #sidebar .block, #sidebar h3, ul.list li, 
+#main, #main-navigation, #main-navigation li, .secondary-navigation, #main .block, #sidebar .block, #sidebar h3, ul.list li,
 #footer .block, .form input.button, #box .block, #box .block h2 {
   -moz-border-radius-topleft: 4px;
   -webkit-border-top-left-radius: 4px;

data/lib/padrino-admin/generators/templates/assets/stylesheets/themes/warehouse/style.css

@@ -9,7 +9,7 @@ body {
 }
 
 hr {
-  background: #aaa; 
+  background: #aaa;
 }
 
 p {
@@ -118,7 +118,7 @@ input.check_box {
 }
 
 
-#sidebar h3 {  
+#sidebar h3 {
   background: #fff;
   border-bottom:1px solid #ccc;
   border-right:1px solid #ccc;
@@ -384,7 +384,7 @@ ul.list li .left  {
 }
 
 #box .block h2 {
-  background: #576C82;  
+  background: #576C82;
   color: #FFF;
   border-top-left-radius: 5px;
   border-top-right-radius: 5px;

data/lib/padrino-admin/helpers/authentication_helpers.rb

@@ -19,8 +19,7 @@ module Padrino
         ##
         # Override the current_account, you must provide an instance of Account Model
         #
-        # ==== Examples:
-        #
+        # @example
         #     set_current_account(Account.authenticate(params[:email], params[:password])
         #
         def set_current_account(account=nil)

data/lib/padrino-admin/helpers/view_helpers.rb

@@ -3,10 +3,16 @@ module Padrino
     module Helpers
       module ViewHelpers
         ##
-        # Translate a given word for padrino admin
+        # Translates a given word for padrino admin
         #
-        # ==== Examples
+        # @param [String] word
+        #  The specified word to admin translate.
+        # @param [String] default
+        #   The default fallback if no word is available for the locale.
         #
+        # @return [String] The translated word for the current locale.
+        #
+        # @example
         #   # => t("padrino.admin.profile",  :default => "Profile")
         #   pat(:profile)
         #
@@ -19,10 +25,16 @@ module Padrino
         alias :pat :padrino_admin_translate
 
         ##
-        # Translate attribute name for the given model
+        # Translates attribute name for the given model.
+        #
+        # @param [Symbol] model
+        #  The model name for the translation.
+        # @param [Symbol] attribute
+        #  The attribute name in the model to translate.
         #
-        # ==== Examples
+        # @return [String] The translated attribute name for the current locale.
         #
+        # @example
         #   # => t("models.account.email", :default => "Email")
         #   mat(:account, :email)
         #
@@ -32,10 +44,14 @@ module Padrino
         alias :mat :model_attribute_translate
 
         ##
-        # Translate model name
+        # Translates model name
         #
-        # ==== Examples
+        # @param [Symbol] attribute
+        #  The attribute name in the model to translate.
         #
+        # @return [String] The translated model name for the current locale.
+        #
+        # @example
         #   # => t("models.account.name", :default => "Account")
         #   mt(:account)
         #
@@ -43,6 +59,7 @@ module Padrino
           t("models.#{model}.name", :default => model.to_s.humanize)
         end
         alias :mt :model_translate
+
       end # ViewHelpers
     end # Helpers
   end # Admin

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

@@ -0,0 +1,16 @@
+lv:
+  padrino:
+    admin:
+      save: Saglabāt
+      cancel: Atcelt
+      list: Saraksts
+      edit: Labot
+      new: Jauns
+      show: Parādīt
+      delete: Dzēst
+      confirm: Vai esat pārliecināts?
+      created_at: Izveidots
+      all: Viss
+      profile: Profils
+      settings: Uzstādījumi
+      logout: Iziet

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

@@ -1,6 +1,6 @@
-zh_cn: 
-  padrino: 
-    admin: 
+zh_cn:
+  padrino:
+    admin:
       save: 储存
       cancel: 取消
       list: 列表

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

@@ -0,0 +1,26 @@
+lv:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "nav iekļauts sarakstā"
+        exclusion: "nav pieejams"
+        invalid: "nav derīgs"
+        confirmation: "nesakrīt ar apstiprinājumu"
+        accepted: "ir jāpiekrīt"
+        empty: "ir jābūt aizpildītam"
+        blank: "ir jābūt aizpildītam"
+        too_long: "ir par garu (maksimums ir %{count} zīmes)"
+        too_short: "ir par īsu (minimums ir %{count} zīmes)"
+        wrong_length: "ir nepareizs garums (jābūt %{count} zīmēm)"
+        taken: "ir jau aizņemts"
+        not_a_number: "nav skaitlis"
+        greater_than: "ir jābūt lielākam par %{count}"
+        greater_than_or_equal_to: "ir jābūt lielākam vai vienādam ar %{count}"
+        equal_to: "ir jābūt vienādam ar %{count}"
+        less_than: "ir jābūt mazākam par %{count}"
+        less_than_or_equal_to: "ir jābūt mazākam vai vienādam ar %{count}"
+        odd: "ir jābūt nepāra skaitlim"
+        even: "ir jābūt pāra skaitlim"
+        record_invalid: "Pārbaude neizdevās: %{errors}"
+        content_type: "faila formāts netiek atblastīts"
+  activerecord: *activemodel

data/test/generators/test_account_model_generator.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
-class TestAccountModelGenerator < Test::Unit::TestCase
+describe "AccountModelGenerator" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
     `mkdir -p #{@apptmp}`
@@ -9,28 +9,28 @@ class TestAccountModelGenerator < Test::Unit::TestCase
   def teardown
     `rm -rf #{@apptmp}`
   end
-  
+
   # COUCHREST
   context 'account model using couchrest' do
     setup do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=couchrest') }
-      silence_logger { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
-      
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=couchrest') }
+      capture_io { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
+
       @model = "#{@apptmp}/sample_project/admin/models/account.rb"
     end
-    
+
     should 'be a couchrest model instance' do
       assert_match_in_file(/class Account < CouchRest::Model::Base/m, @model)
     end
-    
+
     should 'not require additional validations' do
       assert_no_match_in_file(/include CouchRest::Validation/m, @model)
     end
-    
+
     should 'no longer have validates_with_method' do
       assert_no_match_in_file(/validates_with_method/m, @model)
     end
-    
+
     should 'validate report errors using ActiveModel errors method' do
       assert_match_in_file(/errors\.add\(:email, "is not unique"\)/m, @model)
     end