typus 3.1.0.rc18 → 3.1.0.rc19

data/.gitignore

@@ -1,12 +1,15 @@
-# Bundler stuff
-.bundle
-vendor/gems
-Gemfile.lock
-
-# Generated stuff
-*.gem
-db/*.sqlite3
+.bundle/
 log/*.log
-test/fixtures/rails_app/public/system/*
-test/fixtures/rails_app/tmp/*
-tmp/**/*
+pkg/
+
+test/dummy/config/email.yml
+test/dummy/config/mongoid.yml
+test/dummy/db/*.sqlite3
+test/dummy/log/*.log
+test/dummy/public/system/
+test/dummy/tmp/
+
+vendor/bundle
+
+# This is a RubyGem so there's no need to keep the `Gemfile.lock`.
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,12 @@
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+
+notifications:
+  recipients:
+    - support@typuscms.com
+
+branches:
+  only:
+    - master

data/CHANGELOG

@@ -0,0 +1,253 @@
+= 3.2.0 (unreleased)
+
+ * [PLANNED] Models without a controller defined should use the "Resources"
+   controller.
+
+ * [PLANNED] New theme and theme support.
+
+= 3.1.0 (unreleased)
+
+ * [PLANNED] Block changing uploaded files.
+
+ * [PLANNED] Use roles when using `:none` authentication.
+
+ * [PLANNED] Fix bulk actions combo separator. (UI)
+
+ * [PLANNED] Remove "Versions" stuff from demo sidebar.
+
+ * [PLANNED] Fix selector UI problems.
+
+ * [PLANNED] Reload data on forms only if data has changed. (UI)
+
+ * [PLANNED] Take back "Add New" on "BelongsTo" associations.
+
+ * [PLANNED] Document: `text_with_ckeditor_with_assets`.
+
+ * [PLANNED] Document: Migrate from `3.0` to `3.1`.
+
+ * [PLANNED] Document: How to test an admin controller?
+
+ * [PLANNED] Namespace filters to avoid collision with model attributes.
+
+ * [PLANNED] Helpers for `display_dragonfly` and `display_paperclip`.
+
+ * [NEW] Mountable apps support!
+
+ * [NEW] Filter with scopes.
+
+ * [NEW] Three different actions to save a record.
+
+ * [CHANGED] Now we have a dashboard for every installed application.
+
+ * [CHANGED] Associations are now cleaner. No more "relate" and "unrelate".
+
+ * [NEW] 960.gs (http://960.gs/)
+
+ * [NEW] Formalize (http://formalize.me/)
+
+ * [NEW] Chosen (http://harvesthq.github.com/chosen/)
+
+ * [CHANGED] We now support data types, which is basically a cleaner way to
+   add support to future data models. (Eg. CarrierWave)
+
+ * [CHANGED] Dragonfly attachments now also show details. (Size, date ...)
+
+ * [CHANGED] Improved usability by using Fancybox to add new related records.
+
+ * [NEW] Bulk actions.
+
+ * [CHANGED] Controllers are now splitted into modules so we can have a library
+   of common use cases.
+
+ * [CHANGED] WillPaginate has been replaced by Kaminari.
+
+ * [CHANGED] TypusCMS becomes TypusCMF.
+
+ * [NEW] Applications tabs can be sorted!
+
+ * [NEW] Models can be hidden from sidebars and dashboard.
+
+ * [NEW] Module to enable Trash functionality. Need the rails-trash plugin.
+
+ * [FIXED] We should be able to use namespaced models with more than 2 levels
+   of namespace.
+
+ * [CHANGED] We can't longer set models as "Read Only" from the configuration
+   files, this was interesting but not really usefull as anyone could mass-assign
+   attributes. Now to set an attribute as "Read Only" you only need to protect
+   it using "attr_protected".
+
+ * [NEW] Detect "attr_protected" roles.
+
+ * [NEW] Asset pipeline usage. (Yes, we are in Rails 3.1)
+
+ * [CHANGED] Removed "Autocomplete" module.
+
+ * [NEW] Typus is now tested with Travis-CI.
+
+ * [NEW] Improved MongoDB support.
+
+ * [NEW] Improved Devise support out of the box.
+
+ * [CHANGED] Improved how exporters work. Exporting only works if we define it
+   on the model, otherwise will raise a 422 error.
+
+ * [CHANGED] Updated mailer templates and renamed them. We are using the
+   templates provided by Devise.
+
+ * [CHANGED] We can set image sizes.
+
+ * [CHANGED] Moved demo application to "test/dummy" following "enginex"
+   conventions.
+
+ * [CHANGED] We are not longer using FasterCSV on Ruby 1.8.7.
+
+ * [NEW] Introduced the concept of "Widgets". Dashboard is now a "Widget".
+ 
+ * [CHANGED] Custom actions are back!
+
+= 3.0.12
+
+ * [FIXED] Use will_paginate 3.0.0.
+
+= 3.0.9
+
+ * [NEW] Refactored and renamed `User` extensions to `AdminUserV1`.
+
+ * [NEW] `AdminUserV2` which uses `bcrypt` and it's simpler. This will be the
+   default authentication mechanism for my new apps.
+
+= 3.0.8 (unreleased)
+
+ * [FIXED] Missing alias. (Commit 2af7d4cfd98bb0)
+
+= 3.0.7
+
+ *[CHANGED] Updated assets. Please run the `typus:assets` generator in order
+  to create the new files on the new location.
+
+= 3.0.3
+
+ * [NEW] Support for has many through relationships. [jmeiss]
+
+ * [CHANGED] Removed typus pagination module and use `will_paginate` one.
+   Pagination options can be configure overriding `Typus.pagination` variable.
+
+ * [FIXED] Queries are now using the table name. [tyx]
+
+ * [NEW] All queries are `unscoped` so we can separate completely the frontend
+   from the backend.
+
+ * [NEW] We can disable sortable tables.
+
+ * [FIXED] Url generation bug when using namespaced STI models. [masone]
+
+ * [NEW] Raise an exception if config for model cannot be found. [masone]
+
+ * [FIXED] Minor bug fixes and re-styling ...
+
+ * [NEW] Layouts contain metatag with generator information.
+
+ * [NEW] Added missing csrf_meta_tag in `session.html.erb` layout.
+
+ * [NEW] Added constrain to database to avoid duplicated emails.
+
+ * [FIXED] Dates on tables are localized.
+
+ * [FIXED] `@resource.classify.constantize` becomes `@resource.constantize`.
+
+ * [CHANGED] Updated `typus_preview` to display original filaname when file is
+   not an image.
+
+ * [NEW] Support for Dragonfly attachments. Template for this kind of attribute
+   is `_dragonfly.html.erb`.
+
+ * [CHANGED] Paperclip attachments are detected as `:paperclip` thus the form
+   template is not `_paperclip.html.erb`.
+
+ * [NEW] 中文 (zh-CN) translation. [ZoOL]
+
+ * [CHANGED] `action_after_save` by default is `index`. This has been changed
+   after a usability test with a client.
+
+ * [NEW] Greek (el) translation. [Spyros Livathinos]
+
+ * [CHANGED] Updated jQuery to v1.4.4
+
+ * [CHANGED] Updated fancybox to v1.3.4
+
+ * [NEW] New generator: `rails generate typus:assets`.
+
+ * [NEW] Created UserVoice (http://typuscms.uservoice.com/)
+
+ * [CHANGED] Table of contents on documentation for easier access.
+
+ * [CHANGED] Display `—` where no content is available.
+
+ * [NEW] `Admin::ResourcesController` includes `Typus::Extensions` if available.
+
+ * [CHANGED] Removed `remove_filter_link` helper in favour of predefined links
+   to filters.
+
+ * [NEW] Custom actions can be injected into table actions. This needs some
+   refector to be more powerful (roles) but it works for now.
+
+ * [CHANGED] `current_user` is now `admin_user`.
+
+ * [CHANGED] All available locales are shown to the user.
+
+ * [CHANGED] All the I18n stuff of `typus` is now under Typus::I18n namespace.
+
+ * [CHANGED] `/admin/help` is now `/admin/user_guide`.
+
+ * [NEW] Link to `/admin/user_guide` from the sidebar.
+
+ * [CHANGED] AdminUser::LANGUAGES becomes AdminUser::LOCALE so you'll have to
+   update your AdminUser.
+
+ * [NEW] Better application templates.
+
+= 3.0.2
+
+ * [FIXED] Use Arel to get the data on lists. After moving to will_paginate I
+   broke the data method, on each list we where "selecting ALL on the table of
+   the current model" (Really ugly bug) [Reported by NateW]
+
+ * [FIXED]* If @current_user was being set many times on each request, thanks
+   to Rails caching mechanism this was not affecting to the performance. Now we
+   only see the @current_user once. (As it should be.)
+
+= 3.0.1
+
+ * [FIXED] After moving from a vendored paginator to will_paginate I removed
+   some stuff which shouldn't be removed, so the 3.0.0 gem is totally broken.
+
+ * [FIXED] Force query with postgresql adapter to not be case sensitive [jmeiss]
+
+= 3.0.0
+
+ * [NEW] New gem version compatible with Rails 3.
+
+= Previously
+
+Why a 3.0.0 version? After considering the work done for the Rails 3 transition
+I though it would be a good idea to keep versions syncronized with Rails.
+
+Typus will have the same version numbers as Rails as I considered it's pretty
+tied to it. With each release of Rails, we will take the latest features into
+Typus.
+
+Pending stuff that someday will be done, donations and collaborations are
+accepted.
+
+* Add AJAX, specially when removing and adding new relationships.
+
+* Transversal search and full models search.
+
+* Test the helpers and add some functional testing.
+
+* Nested models.
+
+* Contextual content depending on the role logged.
+
+* Replace typus authentication by devise.

data/Gemfile

@@ -0,0 +1,69 @@
+source 'http://rubygems.org'
+
+# Declare your gem's dependencies in typus.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
+  gem 'uglifier'
+end
+
+# Database adapters
+platforms :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+  gem 'activerecord-jdbcsqlite3-adapter'
+
+  gem 'jruby-openssl' # JRuby limited openssl loaded. http://jruby.org/openssl
+end
+
+platforms :ruby do
+  gem 'mysql2'
+  gem 'pg'
+  gem 'sqlite3'
+end
+
+# And this stuff needed for the demo application.
+gem "acts_as_list"
+gem "acts_as_tree"
+gem "factory_girl_rails", "~> 1.1.0"
+gem "rails-permalink", "~> 1.0.0"
+gem "rails-trash", "~> 1.1.2"
+
+# For some reason I also need to define the `jquery-rails` gem here.
+gem "jquery-rails"
+
+# Rich Text Editor
+gem "ckeditor-rails", "0.0.2"
+
+# Alternative authentication
+gem "devise", "~> 1.4.3"
+
+# Asset Management with Dragonfly
+gem "dragonfly", "~> 0.9"
+gem "rack-cache", :require => "rack/cache"
+
+# Asset Management with Paperclip
+gem "paperclip", "~> 2.3.16"
+
+# MongoDB
+gem "mongoid", "~> 2.1"
+gem "bson_ext", "~> 1.3"
+
+group :test do
+  gem "shoulda-context", "~> 1.0.0.beta1"
+  gem "mocha" # Make sure mocha is loaded at the end ...
+end
+
+# Remember to install the Chrome or Safari extension, otherwise it doesn't
+# make sense to have this here.
+group :development do
+  gem "guard-livereload"
+  gem "rb-fsevent"
+  gem "growl_notify"
+end

data/Guardfile

@@ -0,0 +1,11 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'livereload' do
+  watch(%r{app/.+\.(erb|haml)})
+  watch(%r{app/helpers/.+\.rb})
+  watch(%r{(public/|app/assets).+\.(css|js|html)})
+  watch(%r{(app/assets/.+\.css)\.s[ac]ss}) { |m| m[1] }
+  watch(%r{(app/assets/.+\.js)\.coffee}) { |m| m[1] }
+  watch(%r{config/locales/.+\.yml})
+end

data/README.md

@@ -22,16 +22,14 @@ You can try a demo [here][typus_demo].
 - Customizable and extensible templates.
 - Integrated [paperclip][paperclip] and [dragonfly][dragonfly] attachments viewer.
 - Works with `Rails 3.1.X`.
-- Tested with latest Rubies. (`1.8.7-p352`, `ree-1.8.7-2011.03`, `1.9.2-p290`, `jruby-1.6.3`)
-- Tested with `SQLite`, `MySQL` and `PostgreSQL`.
 
 ## Installing
 
 Add **Typus** to your `Gemfile`
 
-    gem 'typus', '~> 3.1.0.rc'
+    gem 'typus'
 
-    # Bundle edge typus instead:
+    # Bundle edge Typus instead:
     # gem 'typus', :git => 'git://github.com/typus/typus.git'
 
 Update your bundle, run the generator and start the application server:
@@ -42,6 +40,14 @@ Update your bundle, run the generator and start the application server:
 
 and go to <http://0.0.0.0:3000/admin>.
 
+## Testing
+
+To test clone the git repo and run the following commands:
+
+    $ git clone git://github.com/typus/typus.git
+    $ bundle install --path vendor/bundle
+    $ bundle exec rake
+
 ## Links
 
 - [Documentation](https://github.com/typus/typus/wiki)
@@ -49,32 +55,14 @@ and go to <http://0.0.0.0:3000/admin>.
 - [Source Code][typus] and [RubyGems][typus_gem]
 - [Mailing List](http://groups.google.com/group/typus)
 - [Contributors List](http://github.com/typus/typus/contributors)
+- [Travis Builds](http://travis-ci.org/#!/typus/typus)
 
-## MIT License
-
-    Copyright (c) 2007-2011 Francesc Esplugas Marti
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
+## License
 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Typus is released under the MIT license.
 
 [typus]: http://github.com/typus/typus
-[typus_demo]: http://demo.typuscms.com/
+[typus_demo]: http://demo.typuscmf.com/
 [typus_demo_code]: https://github.com/typus/demo
 [typus_locales]: https://github.com/typus/typus/tree/master/config/locales
 [typus_gem]: http://rubygems.org/gems/typus

data/Rakefile

@@ -1,114 +1,38 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'rdoc/task'
+begin
+  require 'bundler/setup'
+  require 'bundler/gem_tasks'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
 
-task :default => :test
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  # t.pattern = 'test/**/*_test.rb'
   t.test_files = FileList['test/app/controllers/**/*_test.rb',
                           'test/app/models/**/*_test.rb',
                           'test/app/mailers/**/*_test.rb',
                           'test/config/*_test.rb',
                           'test/lib/**/*_test.rb']
-  t.verbose = true
+  t.verbose = false
 end
 
-RDoc::Task.new do |rdoc|
+task :default => :test
+
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Typus'
-  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-namespace :setup do
-
-  desc "Setup CI Joe"
-  task :cijoe do
-    system "git config --replace-all cijoe.runner 'rake test:rubies'"
-  end
-
-end
-
-namespace :install do
-
-  desc "Install REE on Mac OS X Lion"
-  task :ree_on_lion do
-    system "rvm remove ree"
-    system "export CC=/usr/bin/gcc-4.2"
-    system "rvm install --force ree"
-  end
-
-  desc "Install JRuby and update Rubygems to latest version."
-  task :jruby_on_lion do
-    system "rvm remove jruby"
-    system "rvm install --force jruby"
-    system "rvm use jruby"
-    system "gem install rubygems-update"
-    system "update_rubygems"
-    system "gem update --system"
-  end
-
-  desc "Install common Rubies"
-  task :rubies do
-    system "rvm install 1.8.7,ree,1.9.2,jruby"
-  end
-
-  desc "Install latest Rubygems"
-  task :latest_rubygems do
-    system "rvm ruby gem update --system"
-  end
-
-  desc "Install bundler and rake"
-  task :bundler_and_rake do
-    system "rvm ruby gem install --no-ri --no-rdoc bundler rake"
-  end
-
-  desc "Run bundle in all Ruby versions."
-  task :gems do
-    system "rvm ruby bundle install --gemfile=test/fixtures/rails_app/Gemfile"
-  end
-
-end
-
-namespace :test do
-
-  # Typus should be compatible with Ruby 1.8.7 and 1.9.2. Currently tests only
-  # pass when using 1.9.2 because on 1.8.7 we get an error because `fastercsv`
-  # is not loaded. This is because I've not added that library in the Gemfile.
-  desc "Test officially supported Ruby versions and database adapters"
-  task :supported do
-    system "rvm 1.9.2 rake test DB=sqlite3"
-    system "rvm 1.9.2 rake test DB=postgresql"
-    system "rvm 1.9.2 rake test DB=mysql"
-  end
-
-  # We want to test Typus with all supported databases:
-  #
-  # - Postgresql
-  # - MySQL
-  # - SQLite3
-  #
-  task :rubies do
-    system "rvm ruby rake DB=sqlite3"
-    system "rvm ruby rake DB=postgresql"
-    system "rvm ruby rake DB=mysql"
-  end
-
-end
-
-namespace :submodules do
-
-  desc "Update submodules"
-  task :update do
-    system "git pull && git submodule update --init"
-  end
-
-  desc "Upgrade submodules"
-  task :upgrade do
-    system "git submodule foreach 'git pull origin master'"
-    system "git ci -m 'Updated submodules' ."
-  end
-
-end