padrino-admin 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/padrino-admin/adapters.rb

@@ -6,6 +6,8 @@ module Padrino
 
     class AdapterError < StandardError; end
 
+    class ExtSearch < Struct.new(:count, :records); end
+
     module Adapters
       # This method it's used for register for the specified ORM the extensions.
       def self.register(adapter, klass=nil)

data/lib/padrino-admin/adapters/ar.rb

@@ -9,28 +9,16 @@ module Padrino
             base.send :include, Padrino::Admin::Adapters::Base
             base.send :include, InstanceMethods
             base.extend ClassMethods
-            base.class_eval do
-              named_scope :ext_search, lambda { |params|
-                conditions = nil
+          end
 
-                if params[:query].present? && params[:fields].present?
-                  filters = params[:fields].split(",").collect { |f| "#{f} LIKE ?" }.compact
-                  conditions = [filters.join(" OR ")].concat((1..filters.size).collect { "%#{params[:query]}%" })
-                end
+          module InstanceMethods
 
-                { :conditions => conditions }
-              }
-              named_scope :ext_paginate, lambda { |params|
-                params.symbolize_keys!
-                order = params[:sort].blank? && params[:dir].blank? ? nil : "#{params[:sort]} #{params[:dir]}"
-                { :order => order, :limit => params[:limit], :offset => params[:start] }
-              }
+            # Method for get only fields with errors
+            def errors_keys
+              errors.map { |k,v| k.to_sym }.uniq
             end
           end
-          
-          module InstanceMethods
-          end
-          
+
           module ClassMethods
             # Transforms attribute key names into a more humane format, such as "First name" instead of "first_name". Example:
             #   Person.human_attribute_name("first_name") # => "First name"
@@ -53,6 +41,33 @@ module Padrino
               columns
             end
 
+            def ext_search(params, query={})
+
+              # We build a base struct for have some good results
+              result = ExtSearch.new(0, [])
+
+              # We need a basic query
+              query = {}
+
+              # Search conditions
+              if params[:query].present? && params[:fields].present?
+                filters = params[:fields].split(",").collect { |f| "#{f} LIKE ?" }.compact
+                query[:conditions] = [filters.join(" OR ")].concat((1..filters.size).collect { "%#{params[:query]}%" })
+              end
+
+              result.count = count(query)
+
+              # Order conditions
+              query[:order] = params[:sort].present? && params[:dir].to_s =~ /^(asc|desc)$/i ? "#{params[:sort]} #{params[:dir]}" : nil
+
+              # Now time to limit/offset it
+              query[:limit]  = params[:limit].to_i  if params[:limit].to_i > 0
+              query[:offset] = params[:offset].to_i if params[:start].to_i > 0
+
+              result.records = all(query)
+              result
+            end
+
           end
         end
 

data/lib/padrino-admin/adapters/dm.rb

@@ -27,6 +27,12 @@ module Padrino
             def update_attributes(attributes = {})
               update(attributes)
             end
+
+            # Method for get only fields with errors
+            def errors_keys
+              errors.keys
+            end
+
           end
 
           module ClassMethods
@@ -74,7 +80,11 @@ module Padrino
             # 
             # In this example we search in columns name, surname, company the string daddye and then we order by
             # column +name+
-            def ext_search(params)
+            def ext_search(params, query={})
+
+              # We build a base struct for have some good results
+              result = ExtSearch.new(0, [])
+
               # We need a basic query
               query = {}
 
@@ -85,13 +95,8 @@ module Padrino
                 query[:conditions] = [fields.join(" OR ")].concat(1.upto(fields.length).collect { "%#{params[:query]}%" })
               end
 
-              # Now we can perform a search
-              all(query)
-            end
-
-            def ext_paginate(params)
-              # We need a basic query
-              query = {}
+              # Now we can perform a count
+              result.count = count(query)
 
               # First we need to sort our record
               if params[:sort].present? && params[:dir].to_s =~ /^(asc|desc)$/i
@@ -100,10 +105,11 @@ module Padrino
 
               # Now time to limit/offset it
               query[:limit]  = params[:limit].to_i  if params[:limit].to_i > 0
-              query[:offset] = params[:offset].to_i if params[:offset].to_i > 0
+              query[:offset] = params[:offset].to_i if params[:start].to_i > 0
 
               # Now we can perform ording/limiting
-              all(query)
+              result.records = all(query)
+              result
             end
           end
         end

data/lib/padrino-admin/ext_js/column_store.rb

@@ -90,10 +90,8 @@ module Padrino
         # Some can tell me that this method made two identical queries one for count one for paginate.
         # We don't use the select count because in some circumstances require much time than select *.
         params[:limit]     ||= 50
-        collection           = @model.all(options).ext_search(params)
-        collection_count     = collection.length
-        collection_paginated = collection.ext_paginate(params)
-        { :results => store_data_from(collection_paginated), :count => collection_count }.to_json
+        collection           = @model.ext_search(params, options)
+        { :results => store_data_from(collection.records), :count => collection.count }.to_json
       end
 
       private

data/lib/padrino-admin/ext_js/config.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'yaml'
 require 'erb'
-require 'json/pure'
+require 'json/pure' unless defined?(JSON) || defined?(JSON::Pure)
 
 module Padrino
   module ExtJs

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

@@ -16,7 +16,7 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen controller generates a new Padrino Admin"
 
-      class_option :root,    :aliases => '-r', :default => nil,     :type    => :string
+      class_option :root,    :aliases => '-r', :default => ".",     :type    => :string
       class_option :path,    :aliases => '-p', :type    => :string, :default => "admin"
       class_option :destroy, :aliases => '-d', :default => false,   :type    => :boolean
 
@@ -25,23 +25,42 @@ module Padrino
         if in_app_root?(options[:root])
           @app_path = options[:path]
           @orm = fetch_component_choice(:orm, options[:root]).to_sym rescue :datamapper
+          supported_orm = [:datamapper, :activerecord]
+          skip_migration = case @orm
+            when :activerecord then false
+            when :sequel       then false
+            else true
+          end
 
-          say "A the moment we only support datamapper. Sorry!" and exit unless @orm == :datamapper
+          unless supported_orm.include?(@orm)
+            say "<= A the moment we only support #{supported_orm.join(" or ")}. Sorry!"
+            raise SystemExit
+          end
 
           self.behavior = :revoke if options[:destroy]
           directory("app/", File.join(options[:path]))
-          template "templates/models/account.rb.tt", app_root_path("/app/models/account.rb")
+
+          Padrino::Generators::Model.dup.start([
+            "account", "name:string", "surname:string", "email:string", "crypted_password:string", "salt:string", "role:string",
+            "-r=#{options[:root]}", "-s=#{skip_migration}", "-d=#{options[:destroy]}"
+          ])
+
           template "templates/db/seeds.rb.tt", app_root_path("/db/seeds.rb")
-          append_file app_root_path("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/#{@app_path}\")"
-
-          say ""
-          say "Your admin now is installed, now follow this steps:"
-          say ""
-          say "   - edit your config/database.rb"
-          say "   - run padrino rake -T and run db creation according to your orm"
-          say "   - run padrino rake seed"
-          say ""
-          say "That's all"
+
+          if options[:destroy] || !File.read(app_root_path("config/apps.rb")).include?("Padrino.mount(\"Admin\").to(\"/#{@app_path}\")")
+            append_file app_root_path("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/#{@app_path}\")"
+          end
+          
+          unless options[:destroy]
+            say ""
+            say "Your admin now is installed, now follow this steps:"
+            say ""
+            say "   - edit your config/database.rb"
+            say "   - run padrino rake -T and run db creation according to your orm"
+            say "   - run padrino rake seed"
+            say ""
+            say "That's all"
+          end
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and exit unless in_app_root?
         end

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

@@ -32,7 +32,7 @@ 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| "$('#{object.class.to_s.downcase}_#{k}').addClassName('x-form-invalid');" } }.join("\n")
 
             contents = ''
             contents << content_tag(:p, message) if message.present?

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   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-14}
+  s.date = %q{2010-01-15}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -306,7 +306,6 @@ Gem::Specification.new do |s|
      "lib/padrino-admin/generators/app/views/sessions/new.haml",
      "lib/padrino-admin/generators/templates/controller.rb.tt",
      "lib/padrino-admin/generators/templates/db/seeds.rb.tt",
-     "lib/padrino-admin/generators/templates/models/account.rb.tt",
      "lib/padrino-admin/generators/templates/views/_form.haml.tt",
      "lib/padrino-admin/generators/templates/views/edit.haml.tt",
      "lib/padrino-admin/generators/templates/views/grid.js.erb.tt",
@@ -345,8 +344,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.2"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.6.2"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.3"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.6.3"])
       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 +354,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.2"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.6.2"])
+      s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.6.3"])
       s.add_dependency(%q<tilt>, [">= 0.4"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -366,8 +365,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.2"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.6.2"])
+    s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.6.3"])
     s.add_dependency(%q<tilt>, [">= 0.4"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +01:00
+date: 2010-01-15 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.2
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-gen
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.2
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -404,7 +404,6 @@ files:
 - lib/padrino-admin/generators/app/views/sessions/new.haml
 - lib/padrino-admin/generators/templates/controller.rb.tt
 - lib/padrino-admin/generators/templates/db/seeds.rb.tt
-- lib/padrino-admin/generators/templates/models/account.rb.tt
 - lib/padrino-admin/generators/templates/views/_form.haml.tt
 - lib/padrino-admin/generators/templates/views/edit.haml.tt
 - lib/padrino-admin/generators/templates/views/grid.js.erb.tt

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

@@ -1,8 +0,0 @@
-class Account
-  include DataMapper::Resource
-
-  property :id,      Serial
-  property :name,    String
-  property :surname, String
-
-end