padrino-admin 0.6.3 → 0.6.7

data/test/test_data_mapper.rb

@@ -6,7 +6,7 @@ class TestDataMapper < Test::Unit::TestCase
     load_fixture 'data_mapper'
   end
 
-  context 'for datamapper functionality' do
+  context 'for datamapper account functionality' do
 
     should 'override default new_record? deprecation' do
       assert Account.new.respond_to?(:new_record?)
@@ -29,4 +29,70 @@ class TestDataMapper < Test::Unit::TestCase
       assert_equal account_r, account
     end
   end
+
+  context 'for data_mapper functionality' do
+
+    should 'have some standard methods' do
+      account = Account.new
+      assert_respond_to account, :new_record?
+      assert_respond_to account, :to_param
+      assert_respond_to account, :update_attributes
+      assert_respond_to Account, :count
+    end
+
+    should 'have category_ids' do
+      account = Account.first
+      assert_respond_to account, :category_ids
+      assert_respond_to account, :category_ids=
+      assert_equal [1, 3, 5], account.category_ids
+    end
+
+    should 'have errors_keys' do
+      account = Account.new
+      account.valid?
+      assert_equal [:email, :role, :password, :password_confirmation], account.errors_keys
+    end
+
+    should 'have table name' do
+      assert_equal "accounts", Account.table_name
+    end
+
+    should 'have orm defined' do
+      assert_equal :datamapper, Account.orm
+    end
+
+    should 'search correctly fields' do
+      accounts, categories = {}, {}
+
+      Account.auto_migrate!
+      Category.auto_migrate!
+
+      %w(gino paoli mario venuti franco).each do |name|
+        accounts[name] = Account.create(:email => "#{name}@foo.com", :role => name, :password => "some", :password_confirmation => "some")
+        assert_equal [accounts[name]], Account.ext_search(:query => name, :fields => "email,role").records
+        accounts
+      end
+
+      %w(rock soul classic rap jazz).each_with_index do |name, i|
+        categories[name] = Category.create(:name => name, :account_id => i+1)
+        assert_equal [categories[name]], Category.ext_search(:query => name, :fields => "name").records
+        accounts
+      end
+
+      # Make sure that our builtin count is correct
+      assert_equal 5, Account.ext_search({}).count
+      assert_equal 5, Account.ext_search({}).count
+
+      # Perform some search
+      assert_equal [accounts["venuti"]], Account.ext_search(:query => "en", :fields => "email,role").records
+      assert_equal [accounts["gino"], accounts["venuti"], accounts["franco"]], Account.ext_search(:query => "n", :fields => "email,role").records
+      assert_equal [accounts["venuti"], accounts["franco"]], Account.ext_search(:start => 3, :limit => 2).records
+      assert_equal [accounts["paoli"], accounts["venuti"]],  Account.ext_search(:start => 3, :limit => 2, :sort => "role", :dir => "asc").records
+
+      # Perform some extended search
+      # TODO: find a way for fix this DM issue.
+      assert_equal [accounts["venuti"]], Account.ext_search({ :query => "rap", :fields => "categories.name" }, :links => [Account.relationships[:categories].inverse]).records
+      assert_equal [accounts["franco"], accounts["mario"]], Account.ext_search({:start => 3, :limit => 2, :sort => "categories.name", :dir => "desc"}, :links => [Account.relationships[:categories].inverse]).records
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.7
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +01:00
+date: 2010-01-26 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.3
+        version: 0.6.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: padrino-gen
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.6.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -122,15 +122,12 @@ files:
 - VERSION
 - lib/padrino-admin.rb
 - lib/padrino-admin/access_control.rb
-- lib/padrino-admin/adapters.rb
-- lib/padrino-admin/adapters/ar.rb
-- lib/padrino-admin/adapters/dm.rb
-- lib/padrino-admin/adapters/mm.rb
-- lib/padrino-admin/ext_js/column_store.rb
-- lib/padrino-admin/ext_js/config.rb
+- lib/padrino-admin/column_store.rb
+- lib/padrino-admin/config.rb
 - lib/padrino-admin/generators/actions.rb
 - lib/padrino-admin/generators/admin_app.rb
 - lib/padrino-admin/generators/admin_page.rb
+- lib/padrino-admin/generators/admin_uploader.rb
 - lib/padrino-admin/generators/app/app.rb.tt
 - lib/padrino-admin/generators/app/controllers/accounts.rb
 - lib/padrino-admin/generators/app/controllers/base.rb
@@ -139,34 +136,39 @@ files:
 - lib/padrino-admin/generators/app/public/flash/charts.swf
 - lib/padrino-admin/generators/app/public/flash/clippy.swf
 - lib/padrino-admin/generators/app/public/flash/expressinstall.swf
-- lib/padrino-admin/generators/app/public/images/backend/back.gif
-- lib/padrino-admin/generators/app/public/images/backend/background.png
-- lib/padrino-admin/generators/app/public/images/backend/bg-content.png
-- lib/padrino-admin/generators/app/public/images/backend/bg-hd-slate.png
-- lib/padrino-admin/generators/app/public/images/backend/bg-hd.png
-- lib/padrino-admin/generators/app/public/images/backend/bg-intro.png
-- lib/padrino-admin/generators/app/public/images/backend/bg-login.png
-- lib/padrino-admin/generators/app/public/images/backend/bg-menu-slate.png
-- lib/padrino-admin/generators/app/public/images/backend/bg-menu.png
-- lib/padrino-admin/generators/app/public/images/backend/bg.png
-- lib/padrino-admin/generators/app/public/images/backend/btn-login.png
-- lib/padrino-admin/generators/app/public/images/backend/categories.gif
-- lib/padrino-admin/generators/app/public/images/backend/delete.gif
-- lib/padrino-admin/generators/app/public/images/backend/download.gif
-- lib/padrino-admin/generators/app/public/images/backend/duplicate.gif
-- lib/padrino-admin/generators/app/public/images/backend/edit.gif
-- lib/padrino-admin/generators/app/public/images/backend/export.gif
-- lib/padrino-admin/generators/app/public/images/backend/hd-bg.gif
-- lib/padrino-admin/generators/app/public/images/backend/image.gif
-- lib/padrino-admin/generators/app/public/images/backend/loader.gif
-- lib/padrino-admin/generators/app/public/images/backend/logo-loader.png
-- lib/padrino-admin/generators/app/public/images/backend/logo-small.png
-- lib/padrino-admin/generators/app/public/images/backend/new.gif
-- lib/padrino-admin/generators/app/public/images/backend/no-image.png
-- lib/padrino-admin/generators/app/public/images/backend/preview.gif
-- lib/padrino-admin/generators/app/public/images/backend/print.gif
-- lib/padrino-admin/generators/app/public/images/backend/save.gif
-- lib/padrino-admin/generators/app/public/images/backend/support.gif
+- lib/padrino-admin/generators/app/public/flash/swfupload.swf
+- lib/padrino-admin/generators/app/public/images/admin/back.gif
+- lib/padrino-admin/generators/app/public/images/admin/background.png
+- lib/padrino-admin/generators/app/public/images/admin/bg-content.png
+- lib/padrino-admin/generators/app/public/images/admin/bg-hd-slate.png
+- lib/padrino-admin/generators/app/public/images/admin/bg-hd.png
+- lib/padrino-admin/generators/app/public/images/admin/bg-intro.png
+- lib/padrino-admin/generators/app/public/images/admin/bg-login.png
+- lib/padrino-admin/generators/app/public/images/admin/bg-menu-slate.png
+- lib/padrino-admin/generators/app/public/images/admin/bg-menu.png
+- lib/padrino-admin/generators/app/public/images/admin/bg.png
+- lib/padrino-admin/generators/app/public/images/admin/btn-login.png
+- lib/padrino-admin/generators/app/public/images/admin/cancel.gif
+- lib/padrino-admin/generators/app/public/images/admin/categories.gif
+- lib/padrino-admin/generators/app/public/images/admin/close.gif
+- lib/padrino-admin/generators/app/public/images/admin/close.png
+- lib/padrino-admin/generators/app/public/images/admin/delete.gif
+- lib/padrino-admin/generators/app/public/images/admin/download.gif
+- lib/padrino-admin/generators/app/public/images/admin/duplicate.gif
+- lib/padrino-admin/generators/app/public/images/admin/edit.gif
+- lib/padrino-admin/generators/app/public/images/admin/export.gif
+- lib/padrino-admin/generators/app/public/images/admin/hd-bg.gif
+- lib/padrino-admin/generators/app/public/images/admin/image.gif
+- lib/padrino-admin/generators/app/public/images/admin/loader.gif
+- lib/padrino-admin/generators/app/public/images/admin/logo-loader.png
+- lib/padrino-admin/generators/app/public/images/admin/logo-small.png
+- lib/padrino-admin/generators/app/public/images/admin/new.gif
+- lib/padrino-admin/generators/app/public/images/admin/no-image.png
+- lib/padrino-admin/generators/app/public/images/admin/preview.gif
+- lib/padrino-admin/generators/app/public/images/admin/print.gif
+- lib/padrino-admin/generators/app/public/images/admin/save.gif
+- lib/padrino-admin/generators/app/public/images/admin/support.gif
+- lib/padrino-admin/generators/app/public/images/admin/up.gif
 - lib/padrino-admin/generators/app/public/images/ext/default/box/corners-blue.gif
 - lib/padrino-admin/generators/app/public/images/ext/default/box/corners.gif
 - lib/padrino-admin/generators/app/public/images/ext/default/box/l-blue.gif
@@ -388,6 +390,7 @@ files:
 - lib/padrino-admin/generators/app/public/javascripts/effects.js
 - lib/padrino-admin/generators/app/public/javascripts/ext.js
 - lib/padrino-admin/generators/app/public/javascripts/prototype.js
+- lib/padrino-admin/generators/app/public/javascripts/swfupload.js
 - lib/padrino-admin/generators/app/public/stylesheets/admin.css
 - lib/padrino-admin/generators/app/public/stylesheets/ext.css
 - lib/padrino-admin/generators/app/public/stylesheets/login.css
@@ -402,17 +405,27 @@ files:
 - lib/padrino-admin/generators/app/views/javascripts/admin.js.erb
 - lib/padrino-admin/generators/app/views/javascripts/locale.js.erb
 - 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/views/_form.haml.tt
-- lib/padrino-admin/generators/templates/views/edit.haml.tt
-- lib/padrino-admin/generators/templates/views/grid.js.erb.tt
-- lib/padrino-admin/generators/templates/views/new.haml.tt
-- lib/padrino-admin/generators/templates/views/store.jml.tt
+- lib/padrino-admin/generators/templates/page/controller.rb.tt
+- lib/padrino-admin/generators/templates/page/db/seeds.rb.tt
+- lib/padrino-admin/generators/templates/page/views/_form.haml.tt
+- lib/padrino-admin/generators/templates/page/views/edit.haml.tt
+- lib/padrino-admin/generators/templates/page/views/grid.js.erb.tt
+- lib/padrino-admin/generators/templates/page/views/new.haml.tt
+- lib/padrino-admin/generators/templates/page/views/store.jml.tt
+- lib/padrino-admin/generators/templates/uploader/controller.rb
+- lib/padrino-admin/generators/templates/uploader/lib/uploader.rb
+- lib/padrino-admin/generators/templates/uploader/views/grid.js.erb
+- lib/padrino-admin/generators/templates/uploader/views/store.jml
 - lib/padrino-admin/helpers/authentication.rb
 - lib/padrino-admin/helpers/view.rb
 - lib/padrino-admin/locale/admin/en.yml
 - lib/padrino-admin/locale/extjs/en.yml
+- lib/padrino-admin/middleware/flash_middleware.rb
+- lib/padrino-admin/orm.rb
+- lib/padrino-admin/orm/abstract.rb
+- lib/padrino-admin/orm/activerecord.rb
+- lib/padrino-admin/orm/datamapper.rb
+- lib/padrino-admin/orm/mongomapper.rb
 - lib/padrino-admin/utils/crypt.rb
 - lib/padrino-admin/utils/literal.rb
 - padrino-admin.gemspec
@@ -420,8 +433,6 @@ files:
 - test/fixtures/data_mapper.rb
 - test/fixtures/mongo_mapper.rb
 - test/fixtures/test_column_store.jml
-- test/fixtures/test_generic.jml
-- test/fixtures/test_javascript.jml
 - test/helper.rb
 - test/test_access_control.rb
 - test/test_active_record.rb

data/lib/padrino-admin/adapters.rb

@@ -1,108 +0,0 @@
-require 'openssl'
-require 'digest/sha1'
-
-module Padrino
-  module Admin
-
-    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)
-        klass ||= Account
-        case adapter
-          when :activerecord
-            ActiveRecord::Base.send(:include, Padrino::Admin::Adapters::Ar::Base)
-            klass.send(:include, Padrino::Admin::Adapters::Ar::Account)
-          when :datamapper
-            DataMapper::Model.descendants.each { |d| d.send(:include, Padrino::Admin::Adapters::Dm::Base) }
-            klass.send(:include, Padrino::Admin::Adapters::Dm::Account)
-          # Not yet finished
-          when :mongomapper
-            MongoMapper::Document.append_inclusions(Padrino::Admin::Adapters::Mm::Base)
-            klass.send(:include, Padrino::Admin::Adapters::Mm::Account)
-          else
-            raise Padrino::Admin::AdapterError, "The adapter #{adapter.inspect} is not supported, available adapters are: " + 
-                                                ":activerecord, :datamapper, :mongomapper"
-        end
-      end
-
-      # Here standard extension
-      module Base
-        def self.included(base)
-          base.send :include, InstanceMethods
-          base.extend ClassMethods
-        end
-
-        module InstanceMethods
-        end
-
-        module ClassMethods
-          # This method generate store and column config.
-          # for lazinies hands instead supply:
-          # 
-          #   Model.column_store("./../views/model/store.jml")
-          # 
-          # you can:
-          # 
-          #   Model.column_store(options.views, "models/store")
-          def column_store(*args)
-            path   = File.join(*args)
-            path   = Dir[path + ".{jml,jaml}"].first.to_s if path !~ /(\.jml|\.jaml)$/
-            config = YAML.load_file(path)
-            Padrino::ExtJs::ColumnStore.new(self, config)
-          end
-        end
-      end
-      # Here extension for account
-      # 
-      # An Account must have these column/fields:
-      # 
-      # role:: String
-      # email:: String (used as login)
-      # crypted_password:: String
-      # salt:: String
-      # 
-      # We add to Account model some methods:
-      # 
-      # Account.authenticate(email, password):: check if exist an account for the given email and return it if password match
-      # account.password_clean:: return the decrypted password of an Account instance
-      # 
-      module AccountUtils
-
-        def self.included(base) #:nodoc:
-          base.extend ClassMethods
-          base.send :include, InstanceMethods
-        end
-
-        module ClassMethods
-          # This method it's for authentication purpose
-          def authenticate(email, password)
-            account = first(:conditions => { :email => email }) if email.present?
-            account && account.password_clean == password ? account : nil
-          end
-        end
-
-        module InstanceMethods
-          # This method it's used for retrive the original password.
-          def password_clean
-            crypted_password.decrypt(salt)
-          end
-
-        private
-          def generate_password
-            return if password.blank?
-            self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
-            self.crypted_password = password.encrypt(self.salt)
-          end
-
-          def password_required
-            crypted_password.blank? || !password.blank?
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,147 +0,0 @@
-module Padrino
-  module Admin
-    module Adapters
-      module Dm
-
-        # Here basic functions for interact with DataMapper
-        module Base
-
-          def self.included(base)
-            base.send :include, Padrino::Admin::Adapters::Base
-            base.send :include, InstanceMethods
-            base.extend ClassMethods
-          end
-          
-          module InstanceMethods
-            # This method allow us to don't see deprecations
-            def new_record?; new?; end
-
-            # Returns a String, which Padrino uses for constructing an URL to this object. 
-            # The default implementation returns this record‘s id as a String, or nil if this record‘s unsaved.
-            def to_param
-              # We can't use alias_method here, because method 'id' optimizes itself on the fly.
-              (id = self.id) ? id.to_s : nil # Be sure to stringify the id for routes
-            end
-
-            # Update attributes is deprecated but for compatibility with AR we support them.
-            def update_attributes(attributes = {})
-              update(attributes)
-            end
-
-            # Method for get only fields with errors
-            def errors_keys
-              errors.keys
-            end
-
-          end
-
-          module ClassMethods
-            attr_accessor :_table_name
-
-            def self_and_descendants #:nodoc:
-              klass = self
-              classes = [klass]
-              while klass != klass.base_class  
-                classes << klass = klass.superclass
-              end
-              classes
-            rescue
-              # OPTIMIZE this rescue is to fix this test: ./test/cases/reflection_test.rb:56:in `test_human_name_for_column'
-              # Appearantly the method base_class causes some trouble.
-              # It now works for sure.
-              [self]
-            end
-
-            # 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"
-            # This used to be depricated in favor of humanize, but is now preferred, because it automatically uses the I18n
-            # module now.
-            # Specify +options+ with additional translating options.
-            def human_attribute_name(attribute_key_name, options = {})
-              defaults = self_and_descendants.map do |klass|
-                :"#{klass.name.underscore}.#{attribute_key_name}"
-              end
-              defaults << options[:default] if options[:default]
-              defaults.flatten!
-              defaults << attribute_key_name.to_s.humanize
-              options[:count] ||= 1
-              I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => [:model, :attributes]))
-            end
-
-            # Return the name of the sql table
-            def table_name
-              self.name.downcase.pluralize # storage_names[:default] this some times give an error
-            end
-
-            # Perform a basic fulltext search/ordering for the given columns
-            # 
-            # +params+ is an hash like that:
-            #   { :sort => "name", :dir => "ASC", :fields=>"name,surname,company", :query => 'daddye' }
-            # 
-            # In this example we search in columns name, surname, company the string daddye and then we order by
-            # column +name+
-            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 = {}
-
-              if params[:query].present? && params[:fields].present?
-                # Here we build some like: ["name LIKE ?", "surname LIKE ?"]
-                fields  = params[:fields].split(",").collect { |f| "#{f.strip.downcase} LIKE ?" }
-                # Here we build some like: ["name LIKE ? OR surname LIKE ?", "%foo%", "%foo%"]
-                query[:conditions] = [fields.join(" OR ")].concat(1.upto(fields.length).collect { "%#{params[:query]}%" })
-              end
-
-              # 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
-                query[:order] = [params[:sort].to_s.gsub(/#{table_name}\./i,'').to_sym.send(params[:dir].to_s.downcase)]
-              end
-
-              # 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
-
-              # Now we can perform ording/limiting
-              result.records = all(query)
-              result
-            end
-          end
-        end
-
-        # Here extension for account for DataMapper
-        module Account
-          # Extend our class when included
-          def self.included(base)
-            super
-            base.send :include, Padrino::Admin::Adapters::AccountUtils
-            base.send :include, DataMapper::Validate
-            base.send :attr_accessor, :password, :password_confirmation
-            # Properties
-            base.property :email,            String
-            base.property :crypted_password, String
-            base.property :salt,             String
-            base.property :role,             String
-            # Validations
-            base.validates_present      :email, :role
-            base.validates_present      :password,                          :if => :password_required
-            base.validates_present      :password_confirmation,             :if => :password_required
-            base.validates_length       :password, :min => 4, :max => 40,   :if => :password_required
-            base.validates_is_confirmed :password,                          :if => :password_required
-            base.validates_length       :email,    :min => 3, :max => 100
-            base.validates_is_unique    :email,    :case_sensitive => false
-            base.validates_format       :email,    :with => :email_address
-            base.validates_format       :role,     :with => /[A-Za-z]/
-            # Callbacks
-            base.before :save, :generate_password
-          end
-        end
-      end
-    end
-  end
-end