padrino-admin 0.10.6.c → 0.10.6.d

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

@@ -59,6 +59,7 @@ module Padrino
           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\")"
+          insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:mini_record, :activerecord].include?(orm)
 
           account_params = [
             options[:admin_model].underscore, "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
@@ -103,10 +104,13 @@ module Padrino
           template "templates/#{ext}/app/layouts/application.#{ext}.tt", destination_root("admin/views/layouts/application.#{ext}")
           template "templates/#{ext}/app/sessions/new.#{ext}.tt",        destination_root("admin/views/sessions/new.#{ext}")
 
-          add_project_module :accounts
+          model_singular = options[:admin_model].underscore
+          model_plural = model_singular.pluralize
+
+          add_project_module model_plural
           require_dependencies('bcrypt-ruby', :require => 'bcrypt')
-          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"
+          gsub_file destination_root("admin/views/#{model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
+          gsub_file destination_root("admin/controllers/#{model_plural}.rb"), "if #{model_singular}.destroy", "if #{model_singular} != current_account && #{model_singular}.destroy"
           return if self.behavior == :revoke
 
           instructions = []

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

@@ -25,6 +25,13 @@ module Padrino
           raise OrmError, "Model '#{klass_name}' could not be found!" if @columns.nil? && @klass.nil?
         end
 
+        def activerecord?
+          case orm
+          when :activerecord, :mini_record then true
+          else false
+          end
+        end
+
         def field_type(type)
           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)

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

@@ -41,7 +41,7 @@ module Padrino
         # @return [String] The translated attribute name for the current locale.
         #
         # @example
-        #   # => t("models.account.email", :default => "Email")
+        #   # => t("models.account.attributes.email", :default => "Email")
         #   mat(:account, :email)
         #
         def model_attribute_translate(model, attribute)

data/test/generators/test_admin_app_generator.rb

@@ -158,6 +158,24 @@ describe "AdminAppGenerator" do
       assert_match_in_file 'button_to pat(:logout)', "#{@apptmp}/sample_project/admin/views/layouts/application.haml"
     end
 
+    should 'not add activerecord middleware for #datamapper' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
+      capture_io { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
+      assert_no_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+    end
+
+    should 'add activerecord middleware for #activerecord' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+      capture_io { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
+      assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+    end
+
+    should 'add activerecord middleware for #mini_record' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=mini_record', '-e=haml') }
+      capture_io { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
+      assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+    end
+
     should 'not conflict with existing seeds file' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
 

metadata

@@ -1,16 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: padrino-admin
-version: !ruby/object:Gem::Version 
-  hash: 96
+version: !ruby/object:Gem::Version
+  version: 0.10.6.d
   prerelease: 7
-  segments: 
-  - 0
-  - 10
-  - 6
-  - c
-  version: 0.10.6.c
 platform: ruby
-authors: 
+authors:
 - Padrino Team
 - Nathan Esquenazi
 - Davide D'Agostino
@@ -18,53 +12,37 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: padrino-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70263874865080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 96
-        segments: 
-        - 0
-        - 10
-        - 6
-        - c
-        version: 0.10.6.c
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.10.6.d
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: padrino-helpers
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70263874865080
+- !ruby/object:Gem::Dependency
+  name: padrino-helpers
+  requirement: &70263874863700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 96
-        segments: 
-        - 0
-        - 10
-        - 6
-        - c
-        version: 0.10.6.c
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.10.6.d
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70263874863700
 description: Admin View for Padrino applications
 email: padrinorb@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .yardopts
@@ -175,43 +153,32 @@ files:
 - test/helper.rb
 - test/test_admin_application.rb
 - test/test_locale.rb
-has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: padrino-admin
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Admin Dashboard for Padrino
-test_files: 
+test_files:
 - test/fixtures/data_mapper.rb
 - test/generators/test_account_model_generator.rb
 - test/generators/test_admin_app_generator.rb
@@ -219,3 +186,4 @@ test_files:
 - test/helper.rb
 - test/test_admin_application.rb
 - test/test_locale.rb
+has_rdoc: