padrino-admin 0.10.0 → 0.10.1

data/lib/padrino-admin/access_control.rb

@@ -146,4 +146,4 @@ module Padrino
       end # ProjectModule
     end # AccessControl
   end # Admin
-end # Padrino
+end # Padrino

data/lib/padrino-admin/generators/actions.rb

@@ -38,7 +38,18 @@ module Padrino
           permission = "    role.project_module :#{controller}, \"/#{controller}\"\n"
           inject_into_file destination_root("/admin/app.rb"),  permission, :after => "access_control.roles_for :admin do |role|\n"
         end
+
+        ##
+        # Remove from access_control permissions
+        #
+        def remove_project_module(controller)
+          path = destination_root("/admin/app.rb")
+          say_status :replace, "admin/app.rb", :red
+          content = File.binread(path)
+          content.gsub!(/^\s+role\.project_module :#{controller}, "\/#{controller}"\n/, '')
+          File.open(path, 'wb') { |f| f.write content }
+        end
       end # Actions
     end # Admin
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-admin/generators/admin_page.rb

@@ -40,7 +40,7 @@ module Padrino
             template "templates/#{ext}/page/index.#{ext}.tt", destination_root("/admin/views/#{@orm.name_plural}/index.#{ext}")
             template "templates/#{ext}/page/new.#{ext}.tt",   destination_root("/admin/views/#{@orm.name_plural}/new.#{ext}")
 
-            add_project_module(@orm.name_plural) unless options[:destroy]
+            options[:destroy] ? remove_project_module(@orm.name_plural) : add_project_module(@orm.name_plural)
           end
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)"
@@ -48,4 +48,4 @@ module Padrino
       end
     end # AdminPage
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-admin/generators/orm.rb

@@ -9,8 +9,8 @@ module Padrino
           name            = name.to_s
           @klass_name     = name.camelize
           @klass          = @klass_name.constantize rescue nil
-          @name_plural    = name.underscore.pluralize
-          @name_singular  = name.underscore
+          @name_singular  = name.underscore.gsub(/^.*\//, '') # convert submodules i.e. FooBar::Jank.all # => jank
+          @name_plural    = @name_singular.pluralize
           @orm            = orm.to_sym
           @columns        = columns
           @column_fields  = column_fields
@@ -18,7 +18,7 @@ module Padrino
         end
 
         def field_type(type)
-          type = :string if type.nil? #Couchrest-Hack to avoid the next line to fail
+          type = :string if type.nil? # couchrest-Hack to avoid the next line to fail
           type = type.to_s.demodulize.downcase.to_sym unless type.is_a?(Symbol)
           case type
             when :integer, :float, :decimal   then :text_field
@@ -42,7 +42,7 @@ module Padrino
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
-        
+
         def dm_column(p)
           case p
           when DataMapper::Property::Text
@@ -114,4 +114,4 @@ module Padrino
       end # Orm
     end # Generators
   end # Admin
-end # Padrino
+end # Padrino

data/lib/padrino-admin/generators/templates/page/controller.rb.tt

@@ -40,7 +40,7 @@ Admin.controllers :<%= @orm.name_plural %> do
     if <%= @orm.destroy %>
       flash[:notice] = '<%= @orm.klass_name %> was successfully destroyed.'
     else
-      flash[:error] = 'Impossible destroy <%= @orm.klass_name %>!'
+      flash[:error] = 'Unable to destroy <%= @orm.klass_name %>!'
     end
     redirect url(:<%= @orm.name_plural %>, :index)
   end

data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt

@@ -1,4 +1,4 @@
-!doctype html
+doctype html
 html lang="en" xmlns="http://www.w3.org/1999/xhtml"
   head
     meta content="text/html; charset=utf-8" http-equiv="Content-Type"

data/lib/padrino-admin/generators/templates/slim/app/sessions/new.slim.tt

@@ -1,4 +1,4 @@
-!doctype html
+doctype html
 html lang="en" xmlns="http://www.w3.org/1999/xhtml"
   head
     meta content="text/html; charset=utf-8" http-equiv="Content-Type"

data/lib/padrino-admin/locale/admin/{cz.yml → cs.yml}

@@ -1,4 +1,4 @@
-cz:
+cs:
   padrino:
     admin:
       save: Uložit
@@ -13,4 +13,4 @@ cz:
       all: Všichni
       profile: Profil
       settings: Nastavení
-      logout: Odhlásit
+      logout: Odhlásit

data/lib/padrino-admin/locale/orm/{cz.yml → cs.yml}

@@ -1,4 +1,4 @@
-cz:
+cs:
   activemodel: &activemodel
     errors:
       messages:
@@ -23,4 +23,4 @@ cz:
         even: "musí být sudé číslo"
         record_invalid: "Následující pole obsahují chybně vyplněné údaje: %{errors}"
         content_type: "nepodporovaný formát souboru"
-  activerecord: *activemodel
+  #activerecord: *activemodel

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

@@ -10,7 +10,7 @@ ru:
         empty: "не может быть пустым"
         blank: "не может быть пустым"
         too_long: "превышает длину (максимум %{count} символов)"
-        too_short: "недостатночной длины (минимум %{count} символов)"
+        too_short: "недостаточной длины (минимум %{count} символов)"
         wrong_length: "неправильной длины (должно быть %{count} символов)"
         taken: "уже занят"
         not_a_number: "не число"

data/test/test_locale.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestFilters < Test::Unit::TestCase 
+  Dir[File.expand_path("../../lib/padrino-admin/locale/admin/*.yml", __FILE__)].each do |file|
+    name = File.basename(file, '.yml')
+    should "have a vaild #{name} locale for admin" do
+      base = YAML.load_file(file)
+      base = base[name]['padrino']['admin']
+      assert base.present?
+      assert base['save'].present?
+      assert base['cancel'].present?
+      assert base['list'].present?
+      assert base['edit'].present?
+      assert base['new'].present?
+      assert base['show'].present?
+      assert base['delete'].present?
+      assert base['confirm'].present?
+      assert base['created_at'].present?
+      assert base['all'].present?
+      assert base['profile'].present?
+      assert base['settings'].present?
+      assert base['logout'].present?
+    end
+  end
+
+  Dir[File.expand_path("../../lib/padrino-admin/locale/orm/*.yml", __FILE__)].each do |file|
+    name = File.basename(file, '.yml')
+    should "have a vaild #{name} locale for orm" do
+      base = YAML.load_file(file)
+      # TODO: some one can know why I can't parse YML aliases?
+      %w(activemodel).each do |m|
+        base = base[name][m]['errors']['messages']
+        assert base.present?
+        assert base['inclusion'].present?
+        assert base['exclusion'].present?
+        assert base['invalid'].present?
+        assert base['confirmation'].present?
+        assert base['accepted'].present?
+        assert base['empty'].present?
+        assert base['blank'].present?
+        assert base['too_long'].present?
+        assert base['too_short'].present?
+        assert base['wrong_length'].present?
+        assert base['taken'].present?
+        assert base['not_a_number'].present?
+        assert base['greater_than'].present?
+        assert base['greater_than_or_equal_to'].present?
+        assert base['equal_to'].present?
+        assert base['less_than'].present?
+        assert base['less_than_or_equal_to'].present?
+        assert base['odd'].present?
+        assert base['even'].present?
+        assert base['record_invalid'].present?
+        assert base['content_type'].present?
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: padrino-admin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
+date: 2011-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.10.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.10.1
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -108,7 +108,7 @@ files:
 - lib/padrino-admin/generators/templates/slim/page/new.slim.tt
 - lib/padrino-admin/helpers/authentication_helpers.rb
 - lib/padrino-admin/helpers/view_helpers.rb
-- lib/padrino-admin/locale/admin/cz.yml
+- lib/padrino-admin/locale/admin/cs.yml
 - lib/padrino-admin/locale/admin/da.yml
 - lib/padrino-admin/locale/admin/de.yml
 - lib/padrino-admin/locale/admin/en.yml
@@ -126,7 +126,7 @@ files:
 - lib/padrino-admin/locale/admin/uk.yml
 - lib/padrino-admin/locale/admin/zh_cn.yml
 - lib/padrino-admin/locale/admin/zh_tw.yml
-- lib/padrino-admin/locale/orm/cz.yml
+- lib/padrino-admin/locale/orm/cs.yml
 - lib/padrino-admin/locale/orm/da.yml
 - lib/padrino-admin/locale/orm/de.yml
 - lib/padrino-admin/locale/orm/en.yml
@@ -152,6 +152,7 @@ files:
 - test/generators/test_admin_page_generator.rb
 - test/helper.rb
 - test/test_admin_application.rb
+- test/test_locale.rb
 has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
@@ -187,3 +188,4 @@ test_files:
 - test/generators/test_admin_page_generator.rb
 - test/helper.rb
 - test/test_admin_application.rb
+- test/test_locale.rb