padrino-admin 0.13.0.beta2 → 0.13.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bdb731d3009805857b0a40b0930589db5412c95
-  data.tar.gz: 5175ee233bc7e713dbbb3e88b2f787050396da08
+  metadata.gz: 810a81baa71b89b60c4e7aa0e0a4449f3ef19b27
+  data.tar.gz: 4fa7b242943c7a71b897a5fcb9489ea559dd5478
 SHA512:
-  metadata.gz: d5775d4d9fec7924043e36c8673939730ad955ec3b92adabfa682dd2a983c696089f3f98bd19b4faca1fa348d215731a212af0a9d935d35f3207f8a3353bba6e
-  data.tar.gz: 2519fa376c0d08cd139ebc5157b5feadd733cce7338e8c22825c0836e47b8e21076338e6f359c5b58830d75976376316251a17259ca27dea468ba60a89d64d07
+  metadata.gz: 8e21ac38e18c746d0cd7c85f154342f828e9b51d6b6843e52779316dd5ca135285f7c9eb6337258aa0ee97610be9168fdc5f064d0a95d7f9dc0b3091f3882c3b
+  data.tar.gz: b9bdde805155a9467813651035d740e9881d100b3fd7a6e6284b1c5929a02d38dd053a24263937b3d7d92a51300dab6877fb6a205995a4339130e7399349d536

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

@@ -76,7 +76,8 @@ module Padrino
           template  "templates/app.rb.tt", destination_root(@admin_path + "/app.rb")
           inject_into_file destination_root('config/apps.rb'), "\nPadrino.mount(\"#{@app_name}::#{@admin_name}\", :app_file => Padrino.root('#{@admin_path}/app.rb')).to(\"/#{@admin_path}\")\n", :before => /^Padrino.mount.*\.to\('\/'\)$/
           unless options[:destroy]
-            insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
+            insert_middleware 'ConnectionPoolManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
+            insert_middleware 'IdentityMap', @admin_path if orm == :datamapper
           end
 
           params = [

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

@@ -6,7 +6,7 @@
 #   shell.say name
 #
 email     = shell.ask "Which email do you want use for logging into admin?"
-password  = shell.ask "Tell me the password to use:"
+password  = shell.ask "Tell me the password to use:", :echo => false
 
 shell.say ""
 
@@ -18,7 +18,7 @@ if account.valid?
   shell.say "<%= @model_name %> has been successfully created, now you can login with:"
   shell.say "================================================================="
   shell.say "   email: #{email}"
-  shell.say "   password: #{password}"
+  shell.say "   password: #{?* * password.length}"
   shell.say "================================================================="
 else
   shell.say "Sorry, but something went wrong!"

data/lib/padrino-admin/generators/templates/erb/page/index.erb.tt

@@ -12,7 +12,7 @@
               <%%= tag_icon :magic %> <span class=caret></span>
             </a>
             <ul class="list-menu dropdown-menu" role=menu>
-              <li class=ist-menu-wrapper>
+              <li class=list-menu-wrapper>
                 <%%= link_to tag_icon('check-square-o', pat(:select_all)), '#', :id => 'select-all', :class => 'list-menu-link' %>
               </li>
               <li class=list-menu-wrapper.list-menu-wrapper-disabled>

data/test/generators/test_admin_app_generator.rb

@@ -183,19 +183,33 @@ describe "AdminAppGenerator" do
       it 'should add it for #activerecord' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+        assert_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
       end
 
       it 'should add it #minirecord' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=minirecord', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+        assert_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
       end
 
       it 'should not add it for #datamapper' do
         capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
         capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
-        assert_no_match_in_file(/  use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+        assert_no_match_in_file(/  use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
+      end
+    end
+
+    describe "datamapper middleware" do
+      it 'should add it for #datamapper' do
+        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
+        capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+        assert_match_in_file(/  use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
+      end
+
+      it 'should not add it for #activerecord' do
+        capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+        capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+        assert_no_match_in_file(/  use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta2
+  version: 0.13.0.beta3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement