forgeos_core 1.9.5.rc1 → 1.9.5.rc2

data/Gemfile

@@ -1,2 +1,8 @@
 source "http://rubygems.org"
 gemspec
+
+group(:test) do
+  gem 'sqlite3', '1.3.4'
+  gem 'mysql2'
+  gem 'pg'
+end

data/README.textile

@@ -1,4 +1,5 @@
 h1. Introduction
+"!https://secure.travis-ci.org/webpulser/forgeos_core.png!":http://travis-ci.org/webpulser/forgeos_core
 
 ForgeosCore is the core of Forgeos project "http://www.forgeos.com":http://www.forgeos.com
 

data/app/helpers/application_helper.rb

@@ -4,10 +4,11 @@ module ApplicationHelper
     current_user
   end
 
-  def build_menu(menu = Forgeos::Menu,options = { :menu => :menu}, html_options = {})
+  def build_menu(menu = {}, options = { :menu => :menu}, html_options = {})
     menu_name = options.delete(:menu)
-    menu.each do |tab|
-      content_for menu_name, menu_item(tab.dup)
+    menu.each do |k, v|
+      v[:title] ||= k
+      content_for menu_name, menu_item(v.dup)
     end
   end
 
@@ -16,8 +17,8 @@ module ApplicationHelper
   end
 
   def menu_item(tab)
-    html_options = tab[:html] ? tab[:html].dup : {}
-    tab_name = (tab.delete(:i18n) ? I18n.t(*tab[:title]) : tab[:title])
+    html_options = tab[:html] || {}
+    tab_name = I18n.t(tab[:title], :scope => [:back_office, :menu])
     html_options[:class] = '' unless html_options[:class]
     urls = tab.delete(:url)
 

data/app/models/administrator.rb

@@ -10,6 +10,6 @@ class Administrator < Person
     :association_foreign_key => 'category_id'
 
   def access_path?(controller,action)
-    rights.find_by_controller_name_and_action_name(controller,action)
+    rights.find_by_controller_name_and_action_name(controller,action).present?
   end
 end

data/app/models/attachment.rb

@@ -31,7 +31,8 @@ class Attachment < ActiveRecord::Base
   end
 
   def self.options_for(target = class_name)
-    (Setting.current.attachments[target] || {}).symbolize_keys
+    return {}# unless ActiveRecord::Base.connection.tables.include?(Setting.table_name) or Setting.current
+    #(Setting.current.attachments[target] || {}).symbolize_keys
   end
 
   define_index do

data/app/models/person.rb

@@ -1,6 +1,6 @@
 class Person < ActiveRecord::Base
   acts_as_authentic do |c|
-    c.merge_validates_uniqueness_of_email_field_options( :if => :skip_uniquess_of_email? )
+    c.merge_validates_uniqueness_of_email_field_options( :unless => :skip_uniqueness_of_email? )
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
   end
   acts_as_tagger
@@ -13,8 +13,8 @@ class Person < ActiveRecord::Base
   accepts_nested_attributes_for :address
   accepts_nested_attributes_for :avatar, :reject_if => proc { |attributes| attributes['uploaded_data'].blank? }
 
-  validates_presence_of :lastname, :if => :skip_presence_of_lastname?
-  validates_presence_of :firstname, :if => :skip_presence_of_firstname?
+  validates_presence_of :lastname, :unless => :skip_presence_of_lastname?
+  validates_presence_of :firstname, :unless => :skip_presence_of_firstname?
 
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
@@ -22,17 +22,22 @@ class Person < ActiveRecord::Base
     :civility, :country_id, :birthday, :phone, :other_phone, :email_confirmation,
     :avatar_attributes, :lang, :time_zone, :address_attributes
 
-  define_index do
-    indexes firstname, :sortable => true
-    indexes lastname, :sortable => true
-    indexes email, :sortable => true
-    set_property :delta => true
-  end
+  #define_index do
+  #  indexes firstname, :sortable => true
+  #  indexes lastname, :sortable => true
+  #  indexes email, :sortable => true
+  #  set_property :delta => true
+  #end
 
   def fullname
     "#{lastname} #{firstname}"
   end
 
+  def name
+    "#{firstname} #{lastname}"
+  end
+
+
   # Disactivates the user in the database.
   def disactivate
     update_attribute(:active, false)
@@ -45,15 +50,15 @@ class Person < ActiveRecord::Base
 
   protected
 
-  def skip_uniquess_of_email?
-    true
+  def skip_uniqueness_of_email?
+    false
   end
 
   def skip_presence_of_lastname?
-    true
+    false
   end
 
   def skip_presence_of_firstname?
-    true
+    false
   end
 end

data/app/views/layouts/admin.html.haml

@@ -12,10 +12,10 @@
     #container.container_16
       .grid_16
         %ul#submenu.backgrounds
-          - build_menu(Forgeos::AdminSubMenu, :menu => :submenu)
+          - build_menu(Forgeos::MENU_HASH[:forgeos][:admin][:submenu], :menu => :submenu)
           = yield :submenu
         %ul#menu.backgrounds
-          - build_menu(Forgeos::AdminMenu)
+          - build_menu(Forgeos::MENU_HASH[:forgeos][:admin][:menu])
           = yield :menu
         .backgrounds.menu-bottom
         #notifications.grid_16

data/config/forgeos_admin_menu.yml

@@ -0,0 +1,51 @@
+forgeos:
+  admin:
+    menu:
+      dashboard:
+        url: /admin/dashboard
+        html:
+          class: left first
+      users:
+        url: /admin/users
+        html:
+         class: left
+      statistics:
+        url: /admin/statistics
+        html:
+          class: right
+
+    submenu:
+      administration:
+        url:
+          - /admin/administrators
+          - /admin/roles
+          - /admin/rights
+        html:
+          class: left first
+      settings:
+        url: /admin/setting
+        html:
+          class: left
+      library:
+        url:
+          - /admin/library
+          - /admin/images/attachments
+          - /admin/pdf/attachments
+          - /admin/audio/attachments
+          - /admin/video/attachments
+          - /admin/media/attachments
+          - /admin/doc/attachments
+        html:
+          class: left
+      accounts:
+        url: /admin/account
+        html:
+          class: left
+      logout:
+        url: /admin/logout
+        html:
+          class: right
+      support:
+        url: http://www.webpulser.com
+        html:
+          class: right first

data/config/initializers/forgeos_menu_hash.rb

@@ -0,0 +1,10 @@
+@menu ||= {}
+Rails.application.railties.engines.each do |engine|
+  if path = engine.paths['forgeos_admin_menu']
+    path.expanded.each do |file|
+      @menu.deep_merge! YAML.load_file(file)
+    end
+  end
+end
+
+Forgeos::MENU_HASH = HashWithIndifferentAccess.new(@menu)

data/db/migrate/20091103220541_migrate_from_restful_authentication_to_authlogic.rb

@@ -1,10 +1,11 @@
 class MigrateFromRestfulAuthenticationToAuthlogic < ActiveRecord::Migration
-  def self.up
+  def change
     change_table :people do |t|
       t.rename :salt, :password_salt
       t.change :password_salt, :string, :limit => 128
       t.change :crypted_password, :string, :limit => 128
-      t.string :persistence_token, :null => false
+      t.string :persistence_token, :null => false, :default => ''
+      t.string :people, :perishable_token, :string, :null => :false, :default => ''
       t.integer :login_count,
         :failed_login_count,
         :null => false,
@@ -21,27 +22,4 @@ class MigrateFromRestfulAuthenticationToAuthlogic < ActiveRecord::Migration
         :activated_at
     end
   end
-
-  def self.down
-    change_table :people do |t|
-      t.rename :password_salt,:salt
-      t.change :salt, :string, :limit => 40
-      t.change :crypted_password, :string, :limit => 40
-      t.remove :persistence_token,
-        :login_count,
-        :failed_login_count,
-        :last_request_at,
-        :current_login_at,
-        :last_login_at,
-        :current_login_ip,
-        :last_login_ip,
-        :active
-      t.string :remember_token,
-        :activation_code,
-        :limit => 40
-      t.datetime :remember_token_expires_at,
-        :activated_at
-    end
-
-  end
 end

data/lib/forgeos.rb

@@ -24,66 +24,6 @@ module Forgeos
     url.squeeze(sep).gsub(/(^#{sep}+|#{sep}+$)/,'').downcase
   end
 
-  AdminMenu = [
-    { :title => 'back_office.menu.dashboard',
-      :url => '/admin/dashboard',
-      :i18n => true,
-      :html => { :class => 'left first'}
-    },
-    { :title => 'back_office.menu.users',
-      :url => '/admin/users',
-      :i18n => true,
-      :html => { :class => 'left'}
-    },
-    { :title => 'back_office.menu.statistics',
-      :url => '/admin/statistics',
-      :i18n => true,
-      :html => { :class => 'right' }
-    }
-  ]
-
-  AdminSubMenu = [
-    { :title => 'back_office.menu.administration',
-      :i18n => true,
-      :url => [
-        '/admin/administrators',
-        '/admin/roles',
-        '/admin/rights'
-      ],
-      :html => { :class => 'left first'}
-    },
-    { :title => 'back_office.menu.settings',
-      :i18n => true,
-      :url => '/admin/setting',
-      :html => { :class => 'left' }
-    },
-    { :title => 'back_office.menu.library',
-      :i18n => true,
-      :url => [
-        '/admin/library',
-        '/admin/images/attachments',
-        '/admin/pdf/attachments',
-        '/admin/audio/attachments',
-        '/admin/video/attachments',
-        '/admin/media/attachments',
-        '/admin/doc/attachments'
-      ],
-      :html => { :class => 'left' }
-    },
-    { :title => 'back_office.menu.accounts',
-      :i18n => true,
-      :url => '/admin/account',
-      :html => { :class => 'left' }
-    },
-    { :title => 'back_office.menu.logout',
-      :i18n => true,
-      :url => '/admin/logout',
-      :html => { :class => 'right' }
-    },
-    { :title => 'back_office.menu.support',
-      :i18n => true,
-      :url => 'http://www.webpulser.com',
-      :html => { :class => 'right first' }
-    }
-  ]
+  AdminMenu = []
+  AdminSubMenu = []
 end

data/lib/forgeos/core.rb

@@ -1,10 +1,5 @@
-require 'forgeos'
 require 'forgeos/core/engine'
-
-module Forgeos
-  module Core
-  end
-end
+require 'forgeos'
 
 require File.join(File.dirname(__FILE__), '..', 'sphinx_globalize')
 require File.join(File.dirname(__FILE__), '..', 'sortable_attachments')

data/lib/forgeos/core/engine.rb

@@ -18,6 +18,7 @@ module Forgeos
     class Engine < Rails::Engine
       paths["config/locales"] << 'config/locales/**'
       paths["app/assets"] << 'vendor/assets'
+      paths["forgeos_admin_menu"] = 'config/forgeos_admin_menu.yml'
     end
   end
 end

data/lib/forgeos/core/version.rb

@@ -1,5 +1,5 @@
 module Forgeos
   module Core
-    VERSION = "1.9.5.rc1"
+    VERSION = "1.9.5.rc2"
   end
 end

data/test/before_travis.sh

@@ -0,0 +1,9 @@
+# Create a database.yml for the right database
+echo "Setting up database.yml for $DB"
+cp "test/files/database.yml.$DB" "test/dummy/config/database.yml"
+
+# Set up database
+echo "Creating databases for $DB and loading schema"
+cd "test/dummy"
+bundle exec rake db:create
+bundle exec rake db:schema:load

data/test/dummy/config/application.rb

@@ -2,7 +2,14 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require *Rails.groups(:assets => %w(development test))
+  # If you want your assets lazily compiled in production, use this line
+  Bundler.require(:default, :assets, Rails.env)
+end
+
+require 'sass-rails'
 require "forgeos_core"
 
 module Dummy

data/test/dummy/config/database.yml

@@ -1,25 +1,5 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
+  database: 'db/test.sqlite3'
   pool: 5
   timeout: 5000

data/test/dummy/config/initializers/in_memory_database.rb

@@ -0,0 +1,8 @@
+def in_memory_database?
+  Rails.env == "test" and Rails.configuration.database_configuration['test']['database'] == ':memory:'
+end
+
+if in_memory_database?
+  puts "creating sqlite in memory database"
+  load "#{Rails.root}/db/schema.rb"
+end

data/test/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/test/dummy/db/schema.rb

@@ -0,0 +1,256 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20111024101878) do
+
+  create_table "addresses", :force => true do |t|
+    t.string   "address"
+    t.string   "address_2"
+    t.string   "zip_code"
+    t.string   "city"
+    t.string   "type"
+    t.integer  "country_id"
+    t.integer  "person_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "attachment_links", :force => true do |t|
+    t.integer "attachment_id"
+    t.integer "element_id"
+    t.integer "position"
+    t.string  "element_type"
+    t.string  "attachment_type"
+  end
+
+  create_table "attachments", :force => true do |t|
+    t.string   "content_type"
+    t.string   "name"
+    t.string   "filename"
+    t.string   "alternative"
+    t.string   "thumbnail"
+    t.string   "type"
+    t.integer  "height"
+    t.integer  "width"
+    t.integer  "size"
+    t.integer  "parent_id"
+    t.integer  "person_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "description"
+    t.string   "alt"
+  end
+
+  create_table "categories", :force => true do |t|
+    t.string   "type",       :limit => 45
+    t.integer  "parent_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "position",                 :default => 0
+  end
+
+  add_index "categories", ["id", "type"], :name => "index_categories_on_id_and_type", :unique => true
+
+  create_table "categories_elements", :id => false, :force => true do |t|
+    t.integer "category_id"
+    t.integer "element_id"
+    t.integer "position",    :default => 0, :null => false
+  end
+
+  add_index "categories_elements", ["category_id", "element_id"], :name => "index_categories_elements_on_category_id_and_element_id", :unique => true
+
+  create_table "category_translations", :force => true do |t|
+    t.integer  "category_id"
+    t.string   "locale"
+    t.string   "url"
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "category_translations", ["category_id"], :name => "index_category_translations_on_category_id"
+
+  create_table "comments", :force => true do |t|
+    t.string   "title",            :limit => 50, :default => ""
+    t.text     "comment"
+    t.integer  "commentable_id"
+    t.string   "commentable_type"
+    t.integer  "person_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "comments", ["person_id"], :name => "fk_comments_person"
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0
+    t.integer  "attempts",   :default => 0
+    t.text     "handler"
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "geo_zones", :force => true do |t|
+    t.string  "iso"
+    t.string  "iso3"
+    t.string  "name"
+    t.string  "printable_name"
+    t.string  "type"
+    t.integer "numcode"
+    t.integer "parent_id"
+  end
+
+  create_table "import_sets", :force => true do |t|
+    t.text     "fields"
+    t.text     "parser_options"
+    t.boolean  "ignore_first_row", :default => true, :null => false
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "meta_info_translations", :force => true do |t|
+    t.integer  "meta_info_id"
+    t.string   "locale"
+    t.string   "title"
+    t.text     "description"
+    t.text     "keywords"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "meta_info_translations", ["meta_info_id"], :name => "index_meta_info_translations_on_meta_info_id"
+
+  create_table "meta_infos", :force => true do |t|
+    t.integer "target_id"
+    t.string  "target_type"
+  end
+
+  create_table "people", :force => true do |t|
+    t.string   "email"
+    t.string   "firstname"
+    t.string   "lastname"
+    t.string   "type"
+    t.string   "phone"
+    t.string   "other_phone"
+    t.string   "lang"
+    t.string   "time_zone"
+    t.string   "crypted_password",   :limit => 128
+    t.string   "password_salt",      :limit => 128
+    t.integer  "avatar_id"
+    t.integer  "country_id"
+    t.integer  "role_id"
+    t.date     "birthday"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "civility"
+    t.string   "persistence_token",                 :default => "",    :null => false
+    t.string   "people",                            :default => ""
+    t.string   "perishable_token",                  :default => ""
+    t.string   "string",                            :default => ""
+    t.integer  "login_count",                       :default => 0,     :null => false
+    t.integer  "failed_login_count",                :default => 0,     :null => false
+    t.datetime "last_request_at"
+    t.datetime "current_login_at"
+    t.datetime "last_login_at"
+    t.string   "current_login_ip"
+    t.string   "last_login_ip"
+    t.boolean  "active",                            :default => false, :null => false
+    t.boolean  "delta",                             :default => true,  :null => false
+  end
+
+  create_table "rights", :force => true do |t|
+    t.string "name"
+    t.string "controller_name"
+    t.string "action_name"
+  end
+
+  create_table "rights_roles", :id => false, :force => true do |t|
+    t.integer "right_id"
+    t.integer "role_id"
+  end
+
+  create_table "roles", :force => true do |t|
+    t.string   "name"
+    t.boolean  "active",     :default => true, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "rules", :force => true do |t|
+    t.text    "conditions"
+    t.text    "description"
+    t.text    "variables"
+    t.integer "use",         :default => 0,    :null => false
+    t.integer "max_use",     :default => 0,    :null => false
+    t.string  "name"
+    t.string  "type"
+    t.string  "code"
+    t.boolean "active",      :default => true, :null => false
+    t.integer "parent_id"
+  end
+
+  create_table "search_keywords", :force => true do |t|
+    t.string   "keyword"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "settings", :force => true do |t|
+    t.string  "name"
+    t.string  "lang"
+    t.string  "time_zone"
+    t.string  "phone_number"
+    t.string  "fax_number"
+    t.string  "email"
+    t.text    "mailer",            :null => false
+    t.text    "smtp_settings",     :null => false
+    t.text    "sendmail_settings", :null => false
+    t.integer "address_id"
+    t.text    "attachments"
+  end
+
+  create_table "statistic_counters", :force => true do |t|
+    t.string  "type"
+    t.date    "date"
+    t.integer "counter",      :default => 1
+    t.integer "element_id"
+    t.string  "element_type"
+  end
+
+  create_table "taggings", :force => true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context"
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
+end