padrino-admin 0.6.1 → 0.6.2

data/README.rdoc

@@ -1,4 +1,6 @@
-= padrino-admin
+= Admin Dashboard and Authentication (padrino-admin)
+
+=== Overview
 
 Padrino has a beautiful Ajax Admin, with these fatures:
 
@@ -21,14 +23,17 @@ For create the admin application:
 Now follow admin instructions so:
 
 * edit your config/database.rb
-* run padrino rake dm:migrate
+* run padrino rake dm:auto:migrate
 * run padrino rake seed
 
 Your admin now is "complete", you can start your server with <tt>padrino start</tt> and point your browser to /admin!
 
 For create a new "scaffold" you need to provide only a Model for them like:
 
+  fun-test$ padrino-gen model post --skip-migration // edit your post.rb model and add some fields
+  fun-test$ padrino-gen rake dm:auto:migrate
   fun-test$ padrino-gen admin_page Post
+  fun-test$ padrino start // and go to yourserver.local/admin
   
 That's all!!
 

data/Rakefile

@@ -52,7 +52,7 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+# task :test => :check_dependencies
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/padrino-admin.rb

@@ -1,7 +1,7 @@
 require 'tilt'
 require 'thor'
 require 'padrino-core'
-require 'padrino-gen' unless defined?(Padrino::Generators)
+require 'padrino-gen'
 
 Dir[File.dirname(__FILE__) + '/padrino-admin/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,adapters,ext_js,generators,utils}/*.rb'].each {|file| require file }

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

@@ -26,14 +26,6 @@ module Padrino
           @app_path = options[:path]
           @orm = fetch_component_choice(:orm, options[:root]).to_sym rescue :datamapper
 
-          orm_short = case @orm
-            when :datamapper    then :dm
-            when :activerecord  then :ar
-            when :mongomapper   then :mm
-            when :couchdb       then :cd
-            when :sequel        then :sq
-          end
-
           say "A the moment we only support datamapper. Sorry!" and exit unless @orm == :datamapper
 
           self.behavior = :revoke if options[:destroy]
@@ -46,7 +38,7 @@ module Padrino
           say "Your admin now is installed, now follow this steps:"
           say ""
           say "   - edit your config/database.rb"
-          say "   - run padrino rake #{orm_short}:migrate"
+          say "   - run padrino rake -T and run db creation according to your orm"
           say "   - run padrino rake seed"
           say ""
           say "That's all"

data/lib/padrino-admin/generators/app/views/accounts/store.jml

@@ -1,7 +1,5 @@
 columns:
-  - method: name.upcase
-    header: Name Upcase
-    dataIndex: name
+  - method: name
   - method: surname
   - method: email
     header: E-mail

data/padrino-admin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
@@ -345,8 +345,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.1"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.6.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.2"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.6.2"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.4"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -355,8 +355,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.6.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.6.2"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.6.2"])
       s.add_dependency(%q<tilt>, [">= 0.4"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -366,8 +366,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.6.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.6.2"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.6.2"])
     s.add_dependency(%q<tilt>, [">= 0.4"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/test/helper.rb

@@ -6,6 +6,14 @@ require 'test/unit'
 require 'rack/test'
 require 'rack'
 require 'shoulda'
+
+# We try to load the vendored padrino-core if exist
+%w(core gen).each do |gem|
+  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
+    $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
+  end
+end
+
 require 'padrino-admin'
 
 module Kernel

data/test/test_column_store.rb

@@ -27,13 +27,13 @@ class TestController < Test::Unit::TestCase
   end
 
   should 'have correct store fields' do
-    result = "[{\"mapping\":\"account_name\",\"name\":\"accounts.name\"},{\"mapping\":\"account_surname\",\"name\":\"accounts.surname\"},{\"mapping\":\"category_name\",\"name\":\"category.name\"},{\"mapping\":\"account_email\",\"name\":\"accounts.email\"},{\"mapping\":\"account_role\",\"name\":\"accounts.role\"}]"
+    result = "[{\"name\":\"accounts.name\",\"mapping\":\"account_name\"},{\"name\":\"accounts.surname\",\"mapping\":\"account_surname\"},{\"name\":\"category.name\",\"mapping\":\"category_name\"},{\"name\":\"accounts.email\",\"mapping\":\"account_email\"},{\"name\":\"accounts.role\",\"mapping\":\"account_role\"}]"
     assert_equal result, @column_store.store_fields
     assert_equal result, @column_store_direct.store_fields
   end
 
   should 'store data' do
-    result = "{\"count\":2,\"results\":[{\"account_surname\":\"Not found\",\"account_email\":\"d.dagostino@lipsiasoft.com\",\"category_name\":\"Not found\",\"id\":1,\"account_role\":\"Admin\",\"account_name\":\"DADDYE\"},{\"account_surname\":\"Not found\",\"account_email\":\"editor@lipsiasoft.com\",\"category_name\":\"Not found\",\"id\":2,\"account_role\":\"Editor\",\"account_name\":\"DEXTER\"}]}"
+    result = "{\"results\":[{\"account_surname\":\"Not found\",\"account_email\":\"d.dagostino@lipsiasoft.com\",\"category_name\":\"Not found\",\"id\":1,\"account_role\":\"Admin\",\"account_name\":\"DADDYE\"},{\"account_surname\":\"Not found\",\"account_email\":\"editor@lipsiasoft.com\",\"category_name\":\"Not found\",\"id\":2,\"account_role\":\"Editor\",\"account_name\":\"DEXTER\"}],\"count\":2}"
     assert_equal result, @column_store.store_data(:fields => "name,role", :query => "d", :sort => :name, :dir => :asc, :limit => 2, :offset => 0)
     assert_equal result, @column_store_direct.store_data(:fields => "name,role", :query => "d", :sort => :name, :dir => :asc, :limit => 2, :offset => 0)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 0.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-gen
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 0.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt