padrino-admin 0.6.7 → 0.7.0

data/README.rdoc

@@ -89,7 +89,52 @@ All upload definitions are defined in lib/uploader.rb, here you can preproces yo
 
 See http://github.com/jnicklas/carrierwave
 
-... here some example howto attach uploads to any model ...
+==== Attach Many Uploads to a Model
+
+If you want attach in a model ex: Account many uploads you can do that in a simple way add a habtm relation!
+
+  # app/models/account.rb
+  has n, :uploads
+
+or for ActiveRecord
+
+  # app/models/account.rb
+  has_and_belongs_to_many :uploads
+
+Now edit the form and add these lines:
+
+  # admin/views/accounts/_form.haml
+  %tr
+    %td=f.label :uploads
+    %td=f.open_window_grid :upload_ids, :with => :uploads, :get => :id, :show => :file, :multiple => true, :item => :panel
+
+*open_window_grid* is a padrino-admin method that open an extjs window contains your +grids+ so in this case:
+
+open window grid for :+account+ model in method :+upload_ids+ with the help of controller :+uploads+ and 
+get as a value the :+id+ and display :+file+.
+
+:+multiple+ indicate that we need more than one :+id+.
+:+item+ tell to the grid who is the container, we need to explicit this because we have two container in our upload.js
+
+See view helpers[http://github.com/padrino/padrino-framework/blob/master/padrino-admin/lib/padrino-admin/helpers/view.rb#L145] for more docs.
+
+That's all! Now run mingrations and browse accounts for see our uploader.
+
+==== Attach One Upload to a Model
+
+The process is the same as above you need only define in your model:
+
+  # app/models/account.rb
+  belongs_to :upload
+
+and add this to your account form:
+
+  # admin/views/accounts/_form.haml
+  %tr
+    %td=f.label :upload
+    %td=f.open_window_grid :upload_id, :with => :uploads, :get => :id, :show => :file, :item => :panel
+
+Remember to run migrations before start your server.
 
 == Copyright
 

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_runtime_dependency     "json_pure",       ">= 1.2.0"
     gem.add_runtime_dependency     "padrino-core",    "= #{GEM_VERSION}"
     gem.add_runtime_dependency     "padrino-gen",     "= #{GEM_VERSION}"
+    gem.add_runtime_dependency     "padrino-helpers", "= #{GEM_VERSION}"
     gem.add_runtime_dependency     "tilt",            ">= 0.4"
     gem.add_development_dependency "haml",            ">= 2.2.1"
     gem.add_development_dependency "shoulda",         ">= 0"

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.7.0

data/lib/padrino-admin.rb

@@ -2,6 +2,7 @@ require 'tilt'
 require 'thor'
 require 'padrino-core'
 require 'padrino-gen'
+require 'padrino-helpers'
 
 Dir[File.dirname(__FILE__) + '/padrino-admin/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,orm,generators,middleware,utils}/*.rb'].each {|file| require file }
@@ -23,6 +24,11 @@ Padrino::Application.send(:access_control=, Class.new(Padrino::AccessControl::Ba
 # 
 CarrierWave.root = Padrino.root if defined?(CarrierWave)
 
+##
+# Extend Abastract Form builder
+# 
+Padrino::Helpers::FormBuilder::AbstractFormBuilder.send(:include, Padrino::Admin::Helpers::AbstractFormBuilder)
+
 ##
 # Load our Padrino::Admin locales
 # 

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

@@ -53,11 +53,8 @@ module Padrino
             -----------------------------------------------------------------
             Your admin now is installed, now follow this steps:
 
-              - edit your config/database.rb
-              - run padrino rake -T and run db creation according to your orm
-              - run padrino rake seed
-
-            That's all
+              1) Run migrations
+              2) That's all!!
             -----------------------------------------------------------------
 
             TEXT

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

@@ -67,10 +67,12 @@ module Padrino
 
           say (<<-TEXT).gsub(/ {10}/,'')
 
-          -----------------------------------------------------
-          1) Run migrations
-          2) That's all!!
-          -----------------------------------------------------
+          --------------------------------------------------------
+          Your admin uploader is installed, now follow this steps:
+
+            1) Run migrations
+            2) That's all!!
+          --------------------------------------------------------
 
           TEXT
         else

data/lib/padrino-admin/generators/app/public/stylesheets/standard.css

@@ -1,10 +1,3 @@
-/*
- * Lipsiasadmin
- * Copyright(c) 2007-2008, LipsiaSoft s.r.l.
- * info@lipsiasoft.com
- * 
- * http://www.lipsiasoft.com
- */
 body               { font-size:12px; font-family:"Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif; padding:0; margin:0; color:#222; }
 table              { font-size:12px; font-family:"Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif; }
 table.form         { padding:10px; }
@@ -63,5 +56,7 @@ input,textarea{margin:0;font:normal 12px tahoma,arial,helvetica,sans-serif;width
 input,textarea{padding:1px 3px;background:#fff url(../images/ext/default/form/text-bg.gif) repeat-x 0 0;border:1px solid #B5B8C8;}
 input{height:22px;line-height:18px;vertical-align:middle;}
 /* Errors */
-.errorExplanation{font-size:13px;padding:10px;width:300px;border:2px solid #B64134;margin:0 auto; background-color:#E5BD69;}
-.errorExplanation h1{font-size:15px;}
+.field-errors{border:2px solid red;background-color:#ECEBC3;padding:10px;margin-top:5px;margin-bottom:5px;}
+.field-errors h2{font-size:1.2em}
+.field-errors ul{list-style-type: disc;margin-left:25px;margin-top:10px;display:block;}
+.field-errors ul li{margin-left:0px;padding-top:5px;margin:0px;}

data/lib/padrino-admin/generators/app/views/javascripts/admin.js.erb

@@ -91,6 +91,14 @@ Admin.app = function(){
         this.cleanScripts();
         this.clean();
         Ext.History.add(url, true);
+        // Enable this for debug errors:
+        // // We append the js into the head so we can easy inspect errors
+        // var hd = document.getElementsByTagName("head")[0];
+        // var s  = document.createElement("script");
+        // s.src  = url;
+        // s.type = 'text/javascript';
+        // // Now we can append the child.
+        // hd.appendChild(s);
         Ext.Ajax.request({ url: url, nocache:true });
       } else if (ext == 'html'){
         this.loadWidget(url);
@@ -222,7 +230,7 @@ Admin.app = function(){
           defaults: { autoScroll:true, layout:'fit' }
         });
 
-        this.tabPanel.render();
+        this.addItem(this.tabPanel);
       }
 
       this.fireEvent('contentLoaded');
@@ -264,7 +272,6 @@ Admin.grid = Ext.extend(Ext.grid.GridPanel, {
   title: 'Grid',
   baseUrl: '',
   region: "center",
-  viewConfig: { forceFit: true },
   border: false,
   buttons: ['add', 'edit', 'remove'],
   search: true,
@@ -275,65 +282,50 @@ Admin.grid = Ext.extend(Ext.grid.GridPanel, {
 
   initComponent: function(){
     // Prepare our View/Cm/Sm
-    this.view = new Ext.grid.GroupingView({ forceFit: true }),
-    this.sm = new Ext.grid.CheckboxSelectionModel(),
-    this.column_fields.unshift(new Ext.grid.CheckboxSelectionModel());
-    this.cm = new Ext.grid.ColumnModel({ columns: this.column_fields });
+    this.view = new Ext.grid.GroupingView({ forceFit: true });
+    this.selModel = new Ext.grid.CheckboxSelectionModel();
+    this.column_fields.unshift(this.selModel);
+    this.colModel = new Ext.grid.ColumnModel({ columns: this.column_fields });
     // Toolbar
     if (this.buttons.length > 0 || this.search){ this.tbar = new Ext.Toolbar() };
     // Add Buttons
     Ext.each(this.buttons, function(button){
       switch(button){
         case 'add':
-          this.tbar.addButton({
+          this.btnAdd = this.tbar.addButton({
             handler: this.addRecord,
             text: Admin.locale.buttons.add,
             disabled: false,
             scope: this,
             cls: "x-btn-text-icon add",
-            id: "add"
+            name: "add"
           });
           break;
         case 'edit':
-          this.tbar.addButton({
+          this.btnEdit = this.tbar.addButton({
             handler: this.editRecord,
             text: Admin.locale.buttons.edit,
             disabled: true,
             scope: this,
             cls: "x-btn-text-icon edit",
-            id: "edit"
+            name: "edit"
           });
-          break
+          break;
         case 'remove':
-          this.tbar.addButton({
+          this.btnRemove = this.tbar.addButton({
             handler: this.removeRecord,
             text: Admin.locale.buttons.remove,
             disabled: true,
             scope: this,
             cls: "x-btn-text-icon remove",
-            id: "remove"
+            name: "remove"
           });
+          break;
       }
     }, this);
     this.buttons = undefined; // Remove all bbar buttons, we don't want them in the bottom of grid.
-    // Now we need to add some handlers for activate/deactivate buttons
-    this.sm.on('selectionchange', function(){
-      var n = this.getSelectionModel().getSelected();
-      var btns = this.getTopToolbar().items.map;
-      if(!n){
-        if (btns.remove){ btns.remove.disable() };
-        if (btns.edit){ btns.edit.disable() };
-      } else {
-        if (btns.remove){ btns.remove.enable() };
-        if (btns.edit){ btns.edit.enable() };
-      }
-    }, this);
     // Add search functions
     if (this.search){ this.plugins = [new Ext.grid.Search()] };
-    // Add dblclick
-    this.on("dblclick", function() {
-      if (this.getTopToolbar().items.map.edit){ this.editRecord() }
-    }, this);
     // Build our store
     this.store = new Ext.data.GroupingStore({
       remoteSort: true,
@@ -346,8 +338,6 @@ Admin.grid = Ext.extend(Ext.grid.GridPanel, {
         id: "id"
       })
     });
-    this.store.on('beforeload', function(){ this.el.mask(); }, this);
-    this.store.on('load', function(){ this.el.unmask(); }, this);
     // Build bbar
     this.bbar = new Ext.PagingToolbar({
       pageSize: 50,
@@ -356,8 +346,23 @@ Admin.grid = Ext.extend(Ext.grid.GridPanel, {
     });
     // Call our superclass
     Admin.grid.superclass.initComponent.call(this);
-    // Now we can load our records
+    // Now we need to add some handlers for activate/deactivate buttons
     this.on('render', function(){ this.store.load() }, this);
+    this.selModel.on('selectionchange', function(){
+      var n = this.selModel.getSelected();
+      if(!n){
+        if (this.btnRemove){ this.btnRemove.disable() };
+        if (this.btnEdit){ this.btnEdit.disable() };
+      } else {
+        if (this.btnRemove){ this.btnRemove.enable() };
+        if (this.btnEdit){ this.btnEdit.enable() };
+      }
+    }, this);
+    this.on("dblclick", function() {
+      if (this.btnEdit){ this.editRecord() }
+    }, this);
+    this.store.on('beforeload', function(){ this.el.mask(); }, this);
+    this.store.on('load', function(){ this.el.unmask(); }, this);
   }, // initComponent
 
   addRecord: function(){
@@ -365,17 +370,22 @@ Admin.grid = Ext.extend(Ext.grid.GridPanel, {
   }, // addRecord
 
   editRecord: function(){
-    Ext.each(this.getSelectionModel().getSelections(), function(selection){
-      var id  = this.baseUrl + '-edit-' + selection.id;
-      Admin.app.loadWidget(this.baseUrl + '/edit/' + selection.id);
-    }, this)
+    var selections = this.selModel.getSelections();
+    if (selections.length > 10) {
+      Admin.showAlert(Admin.locale.messages.alert.tooMany);
+    } else {
+      Ext.each(selections, function(selection){
+        var id  = this.baseUrl + '-edit-' + selection.id;
+        Admin.app.loadWidget(this.baseUrl + '/edit/' + selection.id);
+      }, this);
+    }
   }, // editRecord
 
   removeRecord: function(){
     Ext.Msg.confirm(Admin.locale.messages.confirm.title, String.format(Admin.locale.messages.confirm.message, this.getSelectionModel().getCount()), function(btn, text){
       if (btn == 'yes'){
         Admin.app.mask();
-        var records = this.getSelectionModel().getSelections();
+        var records = this.selModel.getSelections();
         var store   = this.store;
         Ext.Ajax.request({
           url: this.baseUrl + '/destroy.json',
@@ -403,7 +413,6 @@ Admin.grid = Ext.extend(Ext.grid.GridPanel, {
 Admin.window = Ext.extend(Ext.Window, {
   width: 700,
   layout: 'fit',
-  autoScroll: true,
   maximizable: true,
   bodyStyle: 'background-color:#FFF',
   grid: undefined,
@@ -422,7 +431,6 @@ Admin.window = Ext.extend(Ext.Window, {
       handler: this[this.closeAction].createDelegate(this, [])
     });
     if (this.grid){
-      this.border = false;
       this.addButton({
         text: Admin.locale.buttons.select,
         handler: this.closeWithSelections.createDelegate(this, [])}

data/lib/padrino-admin/generators/templates/page/views/edit.haml.tt

@@ -1,3 +1,3 @@
 =title "Edit <%= @model_name %>"
--form_for @<%= @model_singular %>, url(:<%= @model_plural %>_update, :id => @<%= @model_singular %>.id, :format => :js), :method => :put, :remote => true do |f|
+-form_for :<%= @model_singular %>, url(:<%= @model_plural %>_update, :id => @<%= @model_singular %>.id, :format => :js), :method => :put, :remote => true do |f|
   =partial '<%= @model_plural %>/form', :locals => { :f => f }

data/lib/padrino-admin/generators/templates/page/views/new.haml.tt

@@ -1,3 +1,3 @@
 =title "New <%= @model_plural %>"
--form_for @<%= @model_singular %>, url(:<%= @model_plural %>_create, :format => :js), :remote => true do |f|
+-form_for :<%= @model_singular %>, url(:<%= @model_plural %>_create, :format => :js), :remote => true do |f|
   =partial '<%= @model_plural %>/form', :locals => { :f => f }

data/lib/padrino-admin/generators/templates/uploader/lib/uploader.rb

@@ -13,7 +13,7 @@ class Uploader < CarrierWave::Uploader::Base
   # This is a sensible default for uploaders that are meant to be mounted:
 
   def root
-    "shared/public"
+    "app/public"
   end
 
   def store_dir

data/lib/padrino-admin/generators/templates/uploader/views/grid.js.erb

@@ -50,6 +50,7 @@ upload.on('fileUploadComplete', function(){ grid.store.reload() });
 
 var panel = new Ext.Panel({
   layout: 'border',
+  border: false,
   items: [grid, upload]
 });
 

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

@@ -67,7 +67,7 @@ module Padrino
       # if the account is not allowed/logged return it to a default page
       # 
       def redirect_back_or_default(default)
-        redirect_to(session[:return_to] || default)
+        redirect(session[:return_to] || default)
         session[:return_to] = nil
       end
 

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

@@ -21,7 +21,7 @@ module Padrino
       def show_messages_for(*objects)
         options       = objects.extract_options!.symbolize_keys
         count         = objects.inject(0) {|sum, object| sum + object.errors.count }
-        error_cleaner = objects.map{|object| object.class.properties.map{|k| "if ($('#{object.class.to_s.downcase}_#{k.name}')) $('#{object.class.to_s.downcase}_#{k.name}').removeClassName('x-form-invalid');" } }.join("\n")
+        error_cleaner = objects.map{|object| object.class.properties.map {|k| "var x = parent.body.select('*[id=#{object.class.to_s.downcase}_#{k.name}]').first(); if (x) { x.removeClass('x-form-invalid') };" } }.join("\n")
 
         unless count.zero?
           html = {}
@@ -37,12 +37,13 @@ module Padrino
             end
             message = escape_javascript(options.include?(:message) ? options[:message] : locale.t(:body))
             error_messages = objects.map {|object| object.errors.full_messages.map {|msg| content_tag(:li, escape_javascript(msg)) } }.join
-            error_highlighter = objects.map {|object| object.errors_keys.map{ |k| "$('#{object.class.to_s.downcase}_#{k}').addClassName('x-form-invalid');" } }.join("\n")
+            error_highlighter = objects.map {|object| object.errors_keys.map{ |k| "var x = parent.body.select('*[id=#{object.class.to_s.downcase}_#{k}]').first(); x.addClass('x-form-invalid');" } }.join("\n")
             contents = ''
             contents << content_tag(:p, message) if message.present?
             contents << content_tag(:ul, error_messages, :class => :list)
-            
+
             (<<-JAVASCRIPT).gsub(/ {14}/, '')
+              var parent = Ext.WindowMgr.getActive();
               #{error_cleaner}
               Ext.Msg.show({
                 title: '#{header_message}',
@@ -55,6 +56,7 @@ module Padrino
           end
         else
           (<<-JAVASCRIPT).gsub(/ {12}/, '')
+            var parent = Ext.WindowMgr.getActive();
             #{error_cleaner}
             Ext.Msg.alert(Admin.locale.messages.compliments.title, Admin.locale.messages.compliments.message);
           JAVASCRIPT
@@ -71,16 +73,9 @@ module Padrino
       #   tab :settings do
       #     ...
       # 
-      # The second argument specify if is necessary 10px of padding inside the tab, default is +true+
-      # 
-      # Third argument is an hash that accepts:
-      # 
-      # :id:: The id of the tab
-      # :style:: Custom style of the tab
-      # 
-      def tab(name, padding=true, options={}, &block)
+      def tab(name, options={}, &block)
         options[:id]    ||= name.to_s.downcase.gsub(/[^a-z0-9]+/, '_').gsub(/-+$/, '').gsub(/^-+$/, '')
-        options[:style] ||= "padding:10px;#{options[:style]}" if padding
+        options[:style]  = "padding:10px;#{options[:style]}"
         options[:title]  = name.is_a?(Symbol) ? I18n.t("admin.tabs.#{name.to_s.downcase}", :default => name.to_s.humanize) : name
         options[:tabbed] = true
         options[:class]  = "x-hide-display"
@@ -225,7 +220,8 @@ module Padrino
         end
 
         # And we add our link for add new records
-        collection << content_tag(:li, link_to(options[:prompt], "#", :onclick => "#{options[:function]}(); return false;"), :class => :clean)
+        li_link = content_tag(:li, link_to(options[:prompt], "#", :onclick => "#{options[:function]}(); return false;"), :class => :clean)
+        collection << li_link
 
         # Now we have the final container
         container = content_tag(:ul, collection.join.gsub("\\",""), :id => "#{object_name}_#{method}", :class => "open-window-grid")
@@ -234,30 +230,33 @@ module Padrino
         show   = "data['#{controller}.#{options[:show]}']" if options[:show].is_a?(Symbol)
         get    = options[:get].is_a?(Symbol) && options[:get] != :id ? "data['#{controller}.#{options[:get]}']" : options[:get]
 
+        # Updater handler
         update_function = if options[:multiple]
           (<<-JAVASCRIPT).gsub(/ {12}/, "")
+            var parent = win.parent.body.select("*[id=#{object_name}_#{method}]").first();
             Ext.each(selections, function(selection){
               var template = String.format('#{template.gsub(/\n/,"")}', selection.#{show}, selection.#{get});
-              Ext.fly('#{object_name}_#{method}').insertHtml('afterBegin', template);
+              parent.insertHtml('afterBegin', template);
             });
           JAVASCRIPT
         else
           (<<-JAVASCRIPT).gsub(/ {12}/, "")
             var selection = selections.first();
-            var template = String.format('#{template.gsub(/\n/,"")}', selection.#{show}, selection.#{get});
-            Ext.fly('#{object_name}_#{method}').update(template);
+            var template = String.format('#{template.gsub(/\n/,"")}', selection.#{show}, selection.#{get}) + '#{li_link}';
+            win.parent.body.select("*[id=#{object_name}_#{method}]").first().update(template);
           JAVASCRIPT
         end
 
         # Now we build the update function (if not present)
         javascript = (<<-JAVASCRIPT).gsub(/ {10}/, '')
           function #{options[:function]}(){
+            var me = Ext.WindowMgr.getActive();
             Ext.Ajax.request({ 
               url: '#{options[:url]}',
               scripts: false,
               success: function(response){
                 try { eval(response.responseText) } catch(e) { Admin.app.error(e) };
-                var win = new Admin.window({ grid: #{options[:grid]}, item: #{options[:item]}, width: 800, height: 600 });
+                var win = new Admin.window({ grid: #{options[:grid]}, item: #{options[:item]}, width: 800, height:600, modal: true, parent:me });
                 win.on('selected', function(win, selections){
                   #{update_function}
                 });
@@ -270,6 +269,13 @@ module Padrino
         # Now we return our html code
         [content_tag(:script, javascript, :type => 'text/javascript'), container, tag(:div, :class => :clear)].join("\n")
       end
+
+      module AbstractFormBuilder
+        # f.open_window_grid :upload_ids, :brand_ids, :with => :brands, :get => :id, :show => :name
+        def open_window_grid(field, options={})
+          @template.open_window_grid object_name, field, options
+        end
+      end
     end # Helpers
   end # Admin
 end # Padrino

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

@@ -66,6 +66,7 @@ en:
           message: "There are some connection issues.<br />Contact tecnical support."
           notConfigured: "This fatures is not ready yet.<br />Contact tecnical support."
           notSelected: "You must select at least one record"
+          tooMany: "You have selected too many records. Maximum is 10!"
     print:
       footer: 
         page: "Page"

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.6.7"
+  s.version = "0.7.0"
 
   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"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-01-31}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -355,8 +355,9 @@ 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.7"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.6.7"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.7.0"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.4"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -365,8 +366,9 @@ 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.7"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.6.7"])
+      s.add_dependency(%q<padrino-core>, ["= 0.7.0"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.7.0"])
+      s.add_dependency(%q<padrino-helpers>, ["= 0.7.0"])
       s.add_dependency(%q<tilt>, [">= 0.4"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -376,8 +378,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<padrino-core>, ["= 0.6.7"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.6.7"])
+    s.add_dependency(%q<padrino-core>, ["= 0.7.0"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.7.0"])
+    s.add_dependency(%q<padrino-helpers>, ["= 0.7.0"])
     s.add_dependency(%q<tilt>, [">= 0.4"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/test/test_active_record.rb

@@ -33,6 +33,7 @@ class TestActiveRecord < Test::Unit::TestCase
       assert_respond_to account, :new_record?
       assert_respond_to account, :to_param
       assert_respond_to account, :update_attributes
+      assert_respond_to Account, :properties
       assert_respond_to Account, :count
     end
 
@@ -42,6 +43,12 @@ class TestActiveRecord < Test::Unit::TestCase
       assert_equal [:email, :role, :password, :password_confirmation], account.errors_keys
     end
 
+    should 'have columns names' do
+      property = Account.properties.first
+      assert_respond_to property, :name
+      assert_equal "id", property.name
+    end
+
     should 'have table name' do
       assert_equal "accounts", Account.table_name
     end

data/test/test_data_mapper.rb

@@ -37,6 +37,7 @@ class TestDataMapper < Test::Unit::TestCase
       assert_respond_to account, :new_record?
       assert_respond_to account, :to_param
       assert_respond_to account, :update_attributes
+      assert_respond_to Account, :properties
       assert_respond_to Account, :count
     end
 
@@ -53,6 +54,12 @@ class TestDataMapper < Test::Unit::TestCase
       assert_equal [:email, :role, :password, :password_confirmation], account.errors_keys
     end
 
+    should 'have columns names' do
+      property = Account.properties.first
+      assert_respond_to property, :name
+      assert_equal :id, property.name
+    end
+
     should 'have table name' do
       assert_equal "accounts", Account.table_name
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +01:00
+date: 2010-01-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.7
+        version: 0.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-gen
@@ -43,7 +43,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.7
+        version: 0.7.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: padrino-helpers
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt