typus 1.0.0.pre → 1.0.0.pre2

data/Gemfile

@@ -14,4 +14,3 @@ gem "acts_as_list"
 gem "paperclip"
 gem "shoulda"
 gem "mocha"
-gem "redgreen"

data/Gemfile.lock

@@ -70,7 +70,6 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    redgreen (1.2.2)
     shoulda (2.11.3)
     sqlite3-ruby (1.3.1)
     thor (0.14.0)
@@ -91,6 +90,5 @@ DEPENDENCIES
   paperclip
   pg
   rails (= 3.0.0)
-  redgreen
   shoulda
   sqlite3-ruby

data/app/controllers/admin/account_controller.rb

@@ -1,4 +1,4 @@
-class Admin::AccountController < AdminController
+class Admin::AccountController < Admin::BaseController
 
   layout 'admin/session'
 

data/app/controllers/{admin_controller.rb → admin/base_controller.rb}

@@ -1,6 +1,6 @@
 require "typus/authentication"
 
-class AdminController < ActionController::Base
+class Admin::BaseController < ActionController::Base
 
   unloadable
 

data/app/controllers/admin/dashboard_controller.rb

@@ -1,4 +1,4 @@
-class Admin::DashboardController < AdminController
+class Admin::DashboardController < Admin::BaseController
 
   def show
     raise "Run `rails generate typus` to create configuration files." if Typus.applications.empty?

data/app/controllers/admin/resource_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ResourceController < AdminController
+class Admin::ResourceController < Admin::BaseController
 
   before_filter :check_if_user_can_perform_action_on_resource
 

data/app/controllers/admin/resources_controller.rb

@@ -1,6 +1,6 @@
 require "typus/format"
 
-class Admin::ResourcesController < AdminController
+class Admin::ResourcesController < Admin::BaseController
 
   include Typus::Format
 

data/app/controllers/admin/session_controller.rb

@@ -1,4 +1,4 @@
-class Admin::SessionController < AdminController
+class Admin::SessionController < Admin::BaseController
 
   skip_before_filter :reload_config_and_roles
   skip_before_filter :set_preferences

data/app/helpers/admin/base_helper.rb

@@ -0,0 +1,60 @@
+module Admin
+
+  module BaseHelper
+
+    def typus_block(resource = @resource.to_resource, partial = params[:action])
+      partials_path = "admin/#{resource}"
+      resources_partials_path = "admin/resources"
+
+      partials = ActionController::Base.view_paths.map do |view_path|
+        Dir["#{view_path}/#{partials_path}/*"].map { |f| File.basename(f, '.html.erb') }
+      end.flatten
+      resources_partials = Dir[Rails.root.join("app/views/#{resources_partials_path}/*").to_s].map do |file|
+                             File.basename(file, ".html.erb")
+                           end
+
+      path = if partials.include?("_#{partial}") then partials_path
+             elsif resources_partials.include?(partial) then resources_partials_path
+             end
+
+      render "#{path}/#{partial}" if path
+    end
+
+    def title(page_title)
+      content_for(:title) { page_title }
+    end
+
+    def header
+      render "admin/helpers/header"
+    end
+
+    def apps
+      render "admin/helpers/apps"
+    end
+
+    def login_info(user = @current_user)
+      return if user.kind_of?(Admin::FakeUser)
+
+      admin_edit_typus_user_path = { :controller => "/admin/#{Typus.user_class.to_resource}",
+                                     :action => 'edit',
+                                     :id => user.id }
+
+      message = _("Are you sure you want to sign out and end your session?")
+
+      user_details = if user.can?('edit', Typus.user_class_name)
+                       link_to user.name, admin_edit_typus_user_path
+                     else
+                       user.name
+                     end
+
+      render "admin/helpers/login_info", :message => message, :user_details => user_details
+    end
+
+    def display_flash_message(message = flash)
+      return if message.empty?
+      render "admin/helpers/flash_message", :flash_type => message.keys.first, :message => message
+    end
+
+  end
+
+end

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

@@ -18,7 +18,7 @@
     </li>
 
     <li>
-      <%= submit_tag _("Sign in"), :class => "button" %> <%= link_to _("Recover password"), forgot_password_admin_account_index_path if Rails.env.development? || Typus.mailer_sender %>
+      <%= submit_tag _("Sign in"), :class => "button" %> <%= link_to _("Recover password"), forgot_password_admin_account_index_path if Typus.mailer_sender %>
     </li>
 
   </ul>

data/lib/generators/templates/public/admin/javascripts/jquery.rails.js

@@ -23,18 +23,19 @@ jQuery(function ($) {
          */
         callRemote: function () {
             var el      = this,
-                data    = el.is('form') ? el.serializeArray() : [],
                 method  = el.attr('method') || el.attr('data-method') || 'GET',
-                url     = el.attr('action') || el.attr('href');
+                url     = el.attr('action') || el.attr('href'),
+                dataType  = el.attr('data-type')  || 'script';
 
             if (url === undefined) {
               throw "No URL specified for remote call (action or href must be present).";
             } else {
                 if (el.triggerAndReturn('ajax:before')) {
+                    var data = el.is('form') ? el.serializeArray() : [];
                     $.ajax({
                         url: url,
                         data: data,
-                        dataType: 'script',
+                        dataType: dataType,
                         type: method.toUpperCase(),
                         beforeSend: function (xhr) {
                             el.trigger('ajax:loading', xhr);
@@ -104,23 +105,28 @@ jQuery(function ($) {
     /**
      * disable-with handlers
      */
-    var disable_with_input_selector = 'input[data-disable-with]';
-    var disable_with_form_selector = 'form[data-remote]:has(' + disable_with_input_selector + ')';
+    var disable_with_input_selector           = 'input[data-disable-with]';
+    var disable_with_form_remote_selector     = 'form[data-remote]:has('       + disable_with_input_selector + ')';
+    var disable_with_form_not_remote_selector = 'form:not([data-remote]):has(' + disable_with_input_selector + ')';
 
-    $(disable_with_form_selector).live('ajax:before', function () {
+    var disable_with_input_function = function () {
         $(this).find(disable_with_input_selector).each(function () {
             var input = $(this);
             input.data('enable-with', input.val())
-                 .attr('value', input.attr('data-disable-with'))
-                 .attr('disabled', 'disabled');
+                .attr('value', input.attr('data-disable-with'))
+                .attr('disabled', 'disabled');
         });
-    });
+    };
+
+    $(disable_with_form_remote_selector).live('ajax:before', disable_with_input_function);
+    $(disable_with_form_not_remote_selector).live('submit', disable_with_input_function);
 
-    $(disable_with_form_selector).live('ajax:after', function () {
+    $(disable_with_form_remote_selector).live('ajax:complete', function () {
         $(this).find(disable_with_input_selector).each(function () {
             var input = $(this);
             input.removeAttr('disabled')
                  .val(input.data('enable-with'));
         });
     });
-});
+
+});

data/lib/generators/templates/public/admin/stylesheets/screen.css

@@ -169,6 +169,7 @@ a:hover { color: #333; text-decoration: underline; }
   height: 50px;
   position: absolute;
   width: 100%;
+  z-index: -100;
 }
 
 #footer { font-size: 0.9em; padding: 20px; }

data/lib/generators/typus/migration_generator.rb

@@ -31,7 +31,7 @@ Examples:
       DESC
 
       def self.next_migration_number(path)
-        Time.now.utc.to_s(:number)
+        Time.zone.now.utc.to_s(:number)
       end
 
       def generate_migration

data/lib/generators/typus/typus_generator.rb

@@ -24,7 +24,7 @@ Description:
       DESC
 
       def self.next_migration_number(path)
-        Time.now.utc.to_s(:number)
+        Time.zone.now.utc.to_s(:number)
       end
 
       def copy_config_readme
@@ -87,7 +87,7 @@ Description:
       end
 
       def timestamp
-        Time.now.utc.to_s(:number)
+        Time.zone.now.utc.to_s(:number)
       end
 
       private

data/lib/typus/format.rb

@@ -39,7 +39,7 @@ module Typus
         csv = CSV
       end
 
-      filename = Rails.root.join("tmp", "export-#{@resource.to_resource}-#{Time.now.utc.to_s(:number)}.csv")
+      filename = Rails.root.join("tmp", "export-#{@resource.to_resource}-#{Time.zone.now.to_s(:number)}.csv")
 
       options = { :conditions => @conditions, :batch_size => 1000 }
 

data/lib/typus/orm/active_record.rb

@@ -122,12 +122,11 @@ module Typus
       end
 
       def typus_search_fields
-        data = Typus::Configuration.config[name]["search"]
-        return [] if data.nil?
+        data = typus_defaults_for(:search)
 
         search = {}
 
-        data.extract_settings.each do |field|
+        data.each do |field|
           if field.starts_with?("=")
             field.slice!(0)
             search[field] = "="
@@ -140,7 +139,6 @@ module Typus
         end
 
         return search
-
       end
 
       #--
@@ -301,10 +299,10 @@ module Typus
             conditions = merge_conditions(conditions, condition)
           when :datetime
             interval = case value
-                       when 'today'         then Time.new.midnight..Time.new.midnight.tomorrow
-                       when 'last_few_days' then 3.days.ago.midnight..Time.new.midnight.tomorrow
-                       when 'last_7_days'   then 6.days.ago.midnight..Time.new.midnight.tomorrow
-                       when 'last_30_days'  then Time.new.midnight.prev_month..Time.new.midnight.tomorrow
+                       when 'today'         then Time.zone.now.beginning_of_day..Time.zone.now.beginning_of_day.tomorrow
+                       when 'last_few_days' then 3.days.ago.beginning_of_day..Time.zone.now.beginning_of_day.tomorrow
+                       when 'last_7_days'   then 6.days.ago.beginning_of_day..Time.zone.now.beginning_of_day.tomorrow
+                       when 'last_30_days'  then Time.zone.now.beginning_of_day.prev_month..Time.zone.now.beginning_of_day.tomorrow
                        end
             condition = ["#{key} BETWEEN ? AND ?", interval.first.to_s(:db), interval.last.to_s(:db)]
             conditions = merge_conditions(conditions, condition)
@@ -329,7 +327,7 @@ module Typus
               interval = case value
                          when 'today'         then nil
                          when 'last_few_days' then 3.days.ago.to_date..Date.tomorrow
-                         when 'last_7_days'   then 6.days.ago.midnight..Date.tomorrow
+                         when 'last_7_days'   then 6.days.ago.beginning_of_day..Date.tomorrow
                          when 'last_30_days'  then (Date.today << 1)..Date.tomorrow
                          end
               if interval

data/lib/typus/user.rb

@@ -20,7 +20,7 @@ module Typus
         validates_uniqueness_of :email
 
         validates_confirmation_of :password, :if => :password_required?
-        validates_length_of :password, :within => 8..40, :if => :password_required?
+        validates_length_of :password, :within => 6..40, :if => :password_required?
         validates_presence_of :password, :if => :password_required?
 
         validates_presence_of :role
@@ -152,7 +152,7 @@ module Typus
       end
 
       def initialize_salt
-        self.salt = generate_hash("--#{Time.now.utc.to_s(:number)}--#{email}--") if new_record?
+        self.salt = generate_hash("--#{Time.zone.now.to_s(:number)}--#{email}--") if new_record?
       end
 
       def initialize_token
@@ -160,7 +160,7 @@ module Typus
       end
 
       def generate_token
-        self.token = encrypt("--#{Time.now.utc.to_s(:number)}--#{password}--").first(12)
+        self.token = encrypt("--#{Time.zone.now.to_s(:number)}--#{password}--").first(12)
       end
 
       def password_required?

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.pre2"
 end

data/test/fixtures/rails_app/config/routes.rb

@@ -1,8 +1,5 @@
-RailsApp::Application.routes.draw do |map|
+RailsApp::Application.routes.draw do
 
-  map.connect "admin/delayed/tasks/:action/:id(.:format)", :controller => "admin/delayed/tasks"
-
-  # Typus::Routes.draw(map)
   root :to => "welcome#index"
 
 end