typus 3.1.0.rc17 → 3.1.0.rc18

data/README.md

@@ -32,7 +32,7 @@ Add **Typus** to your `Gemfile`
     gem 'typus', '~> 3.1.0.rc'
 
     # Bundle edge typus instead:
-    # gem 'typus', :git => 'git://github.com/typus/typus.git', :branch => '3-1-unstable'
+    # gem 'typus', :git => 'git://github.com/typus/typus.git'
 
 Update your bundle, run the generator and start the application server:
 

data/Rakefile

@@ -22,15 +22,8 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-RUBIES = %w[1.8.7 ree 1.9.2 jruby].join(",")
-
 namespace :setup do
 
-  desc "Setup test environment"
-  task :test_environment do
-    system "rvm install #{RUBIES}"
-  end
-
   desc "Setup CI Joe"
   task :cijoe do
     system "git config --replace-all cijoe.runner 'rake test:rubies'"
@@ -38,10 +31,69 @@ namespace :setup do
 
 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 #{RUBIES} rake"
+    system "rvm ruby rake DB=sqlite3"
+    system "rvm ruby rake DB=postgresql"
+    system "rvm ruby rake DB=mysql"
   end
 
 end

data/app/assets/stylesheets/typus/sidebar.css

@@ -18,6 +18,14 @@
   padding-left: 0.5em;
 }
 
+#sidebar ul li a {
+  color: white;
+}
+
+#sidebar ul ul li a {
+  color: black;
+}
+
 #sidebar a {
   text-decoration: none;
 }

data/app/helpers/admin/resources/data_types/date_helper.rb

@@ -2,7 +2,7 @@ module Admin::Resources::DataTypes::DateHelper
 
   def date_filter(filter)
     values = %w(today last_few_days last_7_days last_30_days)
-    items = [[Typus::I18n.t("Show all dates"), ""]]
+    items = [[@resource.human_attribute_name(filter).capitalize, ""]]
     items += values.map { |v| [Typus::I18n.t(v.humanize), v] }
   end
 

data/app/helpers/admin/resources/data_types/string_helper.rb

@@ -11,7 +11,7 @@ module Admin::Resources::DataTypes::StringHelper
   alias_method :display_text, :display_string
 
   def string_filter(filter)
-    values = set_context.send(filter.to_s).to_a
+    values = set_context.send(filter.to_s.pluralize).to_a
 
     items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]
     array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }

data/app/helpers/admin/resources/form_helper.rb

@@ -63,7 +63,7 @@ module Admin::Resources::FormHelper
   end
 
   def save_options_for_user_class
-    return unless Typus.user_class == @resource && admin_user.is_not_root?
+    return unless !defined?(Typus.user_class) && Typus.user_class == @resource && admin_user.is_not_root?
     { "_continue" => "Save and continue editing" }
   end
 

data/app/views/admin/resources/new.html.erb

@@ -9,6 +9,7 @@
     <small><%= list_actions %></small>
   </h2>
 
+  <%= display_flash_message %>
   <%= render 'new' %>
 
   <%= render :partial => 'form',

data/app/views/admin/templates/_selector.html.erb

@@ -10,5 +10,5 @@
 
 <li id="<%= attribute_id %>">
   <%= form.label attribute, "#{label_text} <small>#{message}</small>".html_safe %>
-  <%= form.select attribute, @resource.send(attribute), options, html_options %>
+  <%= form.select attribute, @resource.send(attribute.pluralize), options, html_options %>
 </li>

data/lib/generators/templates/view.html.erb

@@ -1,9 +1,13 @@
-<!-- Sidebar -->
+<% content_for :main_grid do %>
+  <h2><%= resource.titleize %></h2>
 
-<%= sidebar -%>
+  <p>Find me in app/views/<%= resource.underscore %>/index.html.erb</p>
+<% end %>
 
-<!-- Content -->
+<div class="grid_2">
+  <%= sidebar %>
+</div>
 
-<h2><%= resource.titleize %></h2>
-
-<p>Find me in app/views/<%= resource.underscore %>/index.html.erb</p>
+<div class="grid_8">
+  <%= yield :main_grid %>
+</div>

data/lib/support/active_record.rb

@@ -10,9 +10,11 @@ class ActiveRecord::Base
   # On a model:
   #
   #     class Post < ActiveRecord::Base
-  #       STATUS = {  t("Published") => "published",
-  #                   t("Pending") => "pending",
-  #                   t("Draft") => "draft" }
+  #       def self.statuses
+  #         { t("Published") => "published",
+  #           t("Pending") => "pending",
+  #           t("Draft") => "draft" }
+  #       end
   #     end
   #
   #     >> Post.first.status
@@ -26,7 +28,7 @@ class ActiveRecord::Base
   #++
   def mapping(attribute)
     klass = self.class
-    values = klass.send(attribute)
+    values = klass.send(attribute.to_s.pluralize)
 
     array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
 
@@ -34,7 +36,7 @@ class ActiveRecord::Base
     value ? value.first : send(attribute)
   end
 
-  def to_label
+  def to_str
     if respond_to?(:name) && send(:name).present?
       send(:name)
     else
@@ -42,4 +44,6 @@ class ActiveRecord::Base
     end
   end
 
+  alias_method :to_label, :to_str
+
 end

data/lib/typus.rb

@@ -22,6 +22,7 @@ module Typus
   module Controller
     autoload :Actions, "typus/controller/actions"
     autoload :ActsAsList, "typus/controller/acts_as_list"
+    autoload :Ancestry, "typus/controller/ancestry"
     autoload :Associations, "typus/controller/associations"
     autoload :Autocomplete, "typus/controller/autocomplete"
     autoload :Bulk, "typus/controller/bulk"

data/lib/typus/authentication/session.rb

@@ -7,7 +7,9 @@ module Typus
       include Base
 
       def authenticate
-        session[:typus_user_id] ? admin_user : redirect_to(new_admin_session_path)
+        unless session[:typus_user_id] && admin_user && admin_user.active?
+          deauthenticate
+        end
       end
 
       def deauthenticate
@@ -21,12 +23,6 @@ module Typus
       #++
       def admin_user
         @admin_user ||= Typus.user_class.find_by_id(session[:typus_user_id])
-
-        if !@admin_user || !Typus::Configuration.roles.has_key?(@admin_user.role) || !@admin_user.status
-          deauthenticate
-        end
-
-        @admin_user
       end
 
       #--

data/lib/typus/controller/ancestry.rb

@@ -0,0 +1,30 @@
+module Typus
+  module Controller
+    module Ancestry
+
+      def index
+        items = []
+
+        @resource.roots.each do |item|
+          items << item
+          if item.has_children?
+            item.children.each do |child|
+              items << child
+              if child.has_children?
+                child.children.each do |child|
+                  items << child
+                end
+              end
+            end
+          end
+        end
+
+        @items = Kaminari.paginate_array(items).page(params[:page]).per(1000)
+
+        add_resource_action(default_action.titleize, {:action => default_action}, {})
+        add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
+      end
+
+    end
+  end
+end

data/lib/typus/controller/format.rb

@@ -1,9 +1,4 @@
-if RUBY_VERSION >= '1.9'
-  require 'csv'
-else
-  require 'fastercsv'
-  CSV = FasterCSV
-end
+require 'csv'
 
 module Typus
   module Controller

data/lib/typus/orm/active_record/class_methods.rb

@@ -22,91 +22,86 @@ module Typus
         # Form and list fields
         def typus_fields_for(filter)
           ActiveSupport::OrderedHash.new.tap do |fields_with_type|
-            data = read_model_config['fields']
-
-            ##
-            # Let's say for example we want to get the fields for actions
-            # related with editing stuff.
-            #
-
-            fields = case filter.to_sym
-                     when :list, :form
-                       # TODO: This statement is for backwards compatibility
-                       #       with the current tests, so can be removed in
-                       #       the near future.
-                       data[filter.to_s] || data['default'] || ""
-                     when :index
-                       data['index'] || data['list'] || data['default'] || ""
-                     when :new, :create
-                       data['new'] || data['form'] || data['default'] || ""
-                     when :edit, :update, :toggle
-                       data['edit'] || data['form'] || data['default'] || ""
-                     else
-                       data[filter.to_s] || data['default'] || ""
-                     end
-
-            virtual_fields = instance_methods.map { |i| i.to_s } - model_fields.keys.map { |i| i.to_s }
-
-            fields.extract_settings.map { |f| f.to_sym }.each do |field|
-              if reflect_on_association(field)
-                fields_with_type[field.to_s] = reflect_on_association(field).macro
-                next
+            get_typus_fields_for(filter).each do |field|
+              [:virtual, :custom, :association, :selector, :dragonfly, :paperclip].each do |attribute|
+                if (value = send("#{attribute}_attribute?", field))
+                  fields_with_type[field.to_s] = value
+                end
               end
+              fields_with_type[field.to_s] ||= model_fields[field]
+            end
+          end
+        end
 
-              if typus_field_options_for(:selectors).include?(field)
-                fields_with_type[field.to_s] = :selector
-                next
-              end
+        def get_typus_fields_for(filter)
+          data = read_model_config['fields']
+          fields = case filter.to_sym
+                   when :index                  then data['index'] || data['list']
+                   when :new, :create           then data['new'] || data['form']
+                   when :edit, :update, :toggle then data['edit'] || data['form']
+                   else
+                     data[filter.to_s]
+                   end
+
+          fields ||= data['default'] || typus_default_fields_for(filter)
+          fields = fields.extract_settings if fields.is_a?(String)
+          fields.map { |f| f.to_sym }
+        end
 
-              dragonfly = respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map { |i| i.attribute }.include?(field)
-              paperclip = respond_to?(:attachment_definitions) && attachment_definitions.try(:has_key?, field)
+        def typus_default_fields_for(filter)
+          filter.to_sym.eql?(:index) ? ['id'] : model_fields.keys
+        end
 
-              if respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map { |i| i.attribute }.include?(field)
-                fields_with_type[field.to_s] = :dragonfly
-                next
-              end
+        def virtual_fields
+          instance_methods.map { |i| i.to_s } - model_fields.keys.map { |i| i.to_s }
+        end
 
-              if respond_to?(:attachment_definitions) && attachment_definitions.try(:has_key?, field)
-                fields_with_type[field.to_s] = :paperclip
-                next
-              end
+        def virtual_attribute?(field)
+          :virtual if virtual_fields.include?(field.to_s)
+        end
 
-              # TODO: This is not tested!
-              if virtual_fields.include?(field.to_s)
-                fields_with_type[field.to_s] = :virtual
-              end
+        def dragonfly_attribute?(field)
+          if respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map { |i| i.attribute }.include?(field)
+            :dragonfly
+          end
+        end
+
+        def paperclip_attribute?(field)
+          if respond_to?(:attachment_definitions) && attachment_definitions.try(:has_key?, field)
+            :paperclip
+          end
+        end
 
-              fields_with_type[field.to_s] = case field.to_s
-                                             when 'parent', 'parent_id' then :tree
-                                             when /password/            then :password
-                                             when 'position'            then :position
-                                             when /\./                  then :transversal
-                                             else
-                                               if fields_with_type[field.to_s]
-                                                 fields_with_type[field.to_s]
-                                               else
-                                                 model_fields[field]
-                                               end
-                                             end
+        def selector_attribute?(field)
+          :selector if typus_field_options_for(:selectors).include?(field)
+        end
 
-            end
+        def association_attribute?(field)
+          reflect_on_association(field).macro if reflect_on_association(field)
+        end
+
+        def custom_attribute?(field)
+          case field.to_s
+          when 'parent', 'parent_id' then :tree
+          when /password/            then :password
+          when 'position'            then :position
+          when /\./                  then :transversal
           end
         end
 
         def typus_filters
           ActiveSupport::OrderedHash.new.tap do |fields_with_type|
-            if data = read_model_config['filters']
-              data.extract_settings.map { |i| i.to_sym }.each do |field|
-                attribute_type = model_fields[field.to_sym]
-                if reflect_on_association(field.to_sym)
-                  attribute_type = reflect_on_association(field.to_sym).macro
-                end
-                fields_with_type[field.to_s] = attribute_type
-              end
+            get_typus_filters.each do |field|
+              fields_with_type[field.to_s] = association_attribute?(field) || model_fields[field.to_sym]
             end
           end
         end
 
+        def get_typus_filters
+          data = read_model_config['filters'] || ""
+          data.extract_settings.map { |i| i.to_sym }
+        end
+
       end
     end
   end

data/lib/typus/orm/active_record/user/class_methods.rb

@@ -13,11 +13,11 @@ module Typus
             user.save ? user : false
           end
 
-          def role
+          def roles
             Typus::Configuration.roles.keys.sort
           end
 
-          def locale
+          def locales
             Typus::I18n.available_locales
           end
 

data/lib/typus/orm/active_record/user/instance_methods.rb

@@ -47,6 +47,10 @@ module Typus
             !is_root?
           end
 
+          def active?
+            status && Typus::Configuration.roles.has_key?(role)
+          end
+
           def locale
             (preferences && preferences[:locale]) ? preferences[:locale] : ::I18n.default_locale
           end

data/lib/typus/orm/mongo/class_methods.rb

@@ -5,6 +5,9 @@ module Typus
 
         include Typus::Orm::Base
 
+        def table_name
+          self.collection_name
+        end
       end
     end
   end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc17"
+  VERSION = "3.1.0.rc18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc17
+  version: 3.1.0.rc18
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-17 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-08-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2160603900 !ruby/object:Gem::Requirement
+  requirement: &70096177538180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2160603900
+  version_requirements: *70096177538180
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2160603360 !ruby/object:Gem::Requirement
+  requirement: &70096175063500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160603360
+  version_requirements: *70096175063500
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2160602800 !ruby/object:Gem::Requirement
+  requirement: &70096175063040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160602800
+  version_requirements: *70096175063040
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2160602300 !ruby/object:Gem::Requirement
+  requirement: &70096175062620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160602300
+  version_requirements: *70096175062620
 - !ruby/object:Gem::Dependency
   name: rails-trash
-  requirement: &2160601740 !ruby/object:Gem::Requirement
+  requirement: &70096175062120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2160601740
+  version_requirements: *70096175062120
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2160601260 !ruby/object:Gem::Requirement
+  requirement: &70096175061700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160601260
+  version_requirements: *70096175061700
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2160600680 !ruby/object:Gem::Requirement
+  requirement: &70096175061240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160600680
+  version_requirements: *70096175061240
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2160600000 !ruby/object:Gem::Requirement
+  requirement: &70096175060740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +98,10 @@ dependencies:
         version: 3.1.0.rc.2
   type: :runtime
   prerelease: false
-  version_requirements: *2160600000
+  version_requirements: *70096175060740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160599380 !ruby/object:Gem::Requirement
+  requirement: &70096175060240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +109,7 @@ dependencies:
         version: 3.1.0.rc4
   type: :runtime
   prerelease: false
-  version_requirements: *2160599380
+  version_requirements: *70096175060240
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -270,6 +269,7 @@ files:
 - lib/typus/configuration.rb
 - lib/typus/controller/actions.rb
 - lib/typus/controller/acts_as_list.rb
+- lib/typus/controller/ancestry.rb
 - lib/typus/controller/associations.rb
 - lib/typus/controller/autocomplete.rb
 - lib/typus/controller/bulk.rb
@@ -383,7 +383,6 @@ files:
 - config/locales/typus.ru.yml
 - config/locales/typus.zh-CN.models.yml
 - config/locales/typus.zh-CN.yml
-has_rdoc: true
 homepage: http://core.typuscms.com/
 licenses: []
 post_install_message: 
@@ -404,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold