padrino-admin 0.9.29 → 0.10.0

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

@@ -19,6 +19,7 @@ module Padrino
       desc "Description:\n\n\tpadrino-gen admin generates a new Padrino Admin application"
 
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
+      class_option :app, :aliases => "-a", :desc => "The model destination path", :default => '.', :type => :string
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
       class_option :theme, :desc => "Your admin theme: (#{self.themes.join(", ")})", :default => "default", :type => :string
@@ -52,9 +53,11 @@ module Padrino
           directory "templates/app",       destination_root("admin")
           directory "templates/assets",    destination_root("public", "admin")
           template  "templates/app.rb.tt", destination_root("admin/app.rb")
+          append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/admin\")"
 
           account_params = [
             "account", "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
+            "-a=#{options[:app]}",
             "-r=#{options[:root]}"
           ]
 
@@ -77,7 +80,7 @@ module Padrino
           admin_app.default_orm = Padrino::Admin::Generators::Orm.new(:account, orm, columns, column_fields)
           admin_app.invoke_all
 
-          template "templates/account/#{orm}.rb.tt", destination_root("app", "models", "account.rb"), :force => true
+          template "templates/account/#{orm}.rb.tt", destination_root(options[:app], "models", "account.rb"), :force => true
 
           if File.exist?(destination_root("db/seeds.rb"))
             append_file(destination_root("db/seeds.rb")) { "\n\n" + File.read(self.class.source_root+"/templates/account/seeds.rb.tt") }
@@ -98,14 +101,13 @@ module Padrino
 
           add_project_module :accounts
           require_dependencies('bcrypt-ruby', :require => 'bcrypt')
-          append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/admin\")"
           gsub_file destination_root("admin/views/accounts/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
           gsub_file destination_root("admin/controllers/accounts.rb"), "if account.destroy", "if account != current_account && account.destroy"
           return if self.behavior == :revoke
 
           instructions = []
           instructions << "Run 'padrino rake ar:migrate'" if orm == :activerecord
-          instructions << "Run 'padrino rake dm:migrate'" if orm == :datamapper
+          instructions << "Run 'padrino rake dm:auto:upgrade'" if orm == :datamapper
           instructions << "Run 'padrino rake seed'"
           instructions << "Visit the admin panel in the browser at '/admin'"
           instructions.map! { |i| "  #{instructions.index(i) + 1}) #{i}" }
@@ -125,4 +127,4 @@ module Padrino
       end
     end # AdminApp
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -34,7 +34,7 @@ module Padrino
         def columns
           @columns ||= case orm
             when :activerecord then @klass.columns
-            when :datamapper   then @klass.properties.map { |p| Column.new(p.name, p.primitive || p.type) }
+            when :datamapper   then @klass.properties.map { |p| dm_column(p) }
             when :couchrest    then @klass.properties
             when :mongoid      then @klass.fields.values
             when :mongomapper  then @klass.keys.values.reject { |key| key.name == "_id" } # On MongoMapper keys are an hash
@@ -42,6 +42,25 @@ module Padrino
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
+        
+        def dm_column(p)
+          case p
+          when DataMapper::Property::Text
+            Column.new(p.name, :text)
+          when DataMapper::Property::Boolean
+            Column.new(p.name, :boolean)
+          when DataMapper::Property::Integer
+            Column.new(p.name, :integer)
+          when DataMapper::Property::Decimal
+            Column.new(p.name, :decimal)
+          when DataMapper::Property::Float
+            Column.new(p.name, :float)
+          when DataMapper::Property::String
+            Column.new(p.name, :string)
+          else #if all fails, lets assume its stringish
+            Column.new(p.name, :string)
+          end
+        end
 
         def column_fields
           excluded_columns = %w[id created_at updated_at]

data/lib/padrino-admin/generators/templates/app.rb.tt

@@ -1,4 +1,5 @@
 class Admin < Padrino::Application
+  register Padrino::Rendering
   register Padrino::Mailer
   register Padrino::Helpers
   register Padrino::Admin::AccessControl

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

@@ -0,0 +1,16 @@
+hu:
+  padrino:
+    admin:
+      save: ment
+      cancel: elvet
+      list: lista
+      edit: szerkeszt
+      new: új
+      show: mutat
+      delete: töröl
+      confirm: Biztos vagy benne?
+      created_at: készült
+      all: mind
+      profile: adatlap
+      settings: beállítások
+      logout: kilépés

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

@@ -0,0 +1,26 @@
+hu:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: ": a lista nem tartalmazza"
+        exclusion: ": tilos"
+        invalid: ": érvénytelen"
+        confirmation: ": nem egyezik a megerősítéssel"
+        accepted: ": el kell fogadnod"
+        empty: ": nem lehet üres"
+        blank: ": nem lehet üres"
+        too_long: ": túl hosszú (a maximum %{count} karakter)"
+        too_short: ": túl rövid (a minimum %{count} karakter)"
+        wrong_length: ": nem megfelelő hosszúságú (%{count} karakternek kellene lennie)"
+        taken: ": már foglalt"
+        not_a_number: ": nem szám"
+        greater_than: ": nagyobbnak kell lennie, mint %{count}"
+        greater_than_or_equal_to: ": nem lehet kisebb, mint %{count}"
+        equal_to: ": egyenlőnek kell lennie %{count}"
+        less_than: ": kevesebbnek kell lennie, mint %{count}"
+        less_than_or_equal_to: ": nem lehet nagyobb, mint %{count}"
+        odd: ": páratlannak kell lennie"
+        even: ": párosnak kell lennie"
+        record_invalid: "Érvénytelen: %{errors}"
+        content_type: ": a fájl formátuma nem támogatott"
+  activerecord: *activemodel

data/padrino-admin.gemspec

@@ -1,4 +1,6 @@
-# -*- encoding: utf-8 -*-
+#!/usr/bin/env gem build
+# encoding: utf-8
+
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|

data/test/generators/test_account_model_generator.rb

@@ -14,9 +14,9 @@ class TestAccountModelGenerator < Test::Unit::TestCase
   context 'account model using couchrest' do
     setup do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=couchrest') }
-      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      silence_logger { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
       
-      @model = "#{@apptmp}/sample_project/app/models/account.rb"
+      @model = "#{@apptmp}/sample_project/admin/models/account.rb"
     end
     
     should 'be a couchrest model instance' do
@@ -35,4 +35,4 @@ class TestAccountModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/errors\.add\(:email, "is not unique"\)/m, @model)
     end
   end
-end
+end

data/test/generators/test_admin_app_generator.rb

@@ -52,7 +52,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
       assert_file_exists("#{@apptmp}/sample_project/public/admin")
       assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
-      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
@@ -84,7 +84,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.erb")
       assert_file_exists("#{@apptmp}/sample_project/public/admin")
       assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
-      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
@@ -116,7 +116,7 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.slim")
       assert_file_exists("#{@apptmp}/sample_project/public/admin")
       assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
-      assert_file_exists("#{@apptmp}/sample_project/app/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
       assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
@@ -125,6 +125,39 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.slim"
     end
 
+    should 'correctly generate a new padrino admin application with model in non-default application path' do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') } }
+      assert_nothing_raised { silence_logger { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") } }
+      assert_file_exists("#{@apptmp}/sample_project")
+      assert_file_exists("#{@apptmp}/sample_project/admin")
+      assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/new.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/_sidebar.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/layouts/application.haml")
+      assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin")
+      assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+      assert_file_exists("#{@apptmp}/sample_project/admin/models/account.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/models/account.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
+      assert_match_in_file 'Padrino.mount("Admin").to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
+      assert_match_in_file 'class Admin < Padrino::Application', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'role.project_module :accounts, "/accounts"', "#{@apptmp}/sample_project/admin/app.rb"
+      assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.haml"
+    end
+
     should 'not conflict with existing seeds file' do
       assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') } }
 
@@ -151,4 +184,4 @@ class TestAdminAppGenerator < Test::Unit::TestCase
       # cli(:rake, '-T', "-c=#{@apptmp}/sample_project")
     end
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: padrino-admin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.29
+  version: 0.10.0
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-07-07 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -23,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.29
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -34,7 +35,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.29
+        version: 0.10.0
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -113,6 +114,7 @@ files:
 - lib/padrino-admin/locale/admin/en.yml
 - lib/padrino-admin/locale/admin/es.yml
 - lib/padrino-admin/locale/admin/fr.yml
+- lib/padrino-admin/locale/admin/hu.yml
 - lib/padrino-admin/locale/admin/it.yml
 - lib/padrino-admin/locale/admin/ja.yml
 - lib/padrino-admin/locale/admin/nl.yml
@@ -130,6 +132,7 @@ files:
 - lib/padrino-admin/locale/orm/en.yml
 - lib/padrino-admin/locale/orm/es.yml
 - lib/padrino-admin/locale/orm/fr.yml
+- lib/padrino-admin/locale/orm/hu.yml
 - lib/padrino-admin/locale/orm/it.yml
 - lib/padrino-admin/locale/orm/ja.yml
 - lib/padrino-admin/locale/orm/nl.yml
@@ -149,6 +152,7 @@ files:
 - test/generators/test_admin_page_generator.rb
 - test/helper.rb
 - test/test_admin_application.rb
+has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
@@ -172,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-admin
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Admin Dashboard for Padrino