typus 3.0.6 → 3.0.7

data/lib/generators/typus/controller_generator.rb

@@ -1,7 +1,5 @@
 module Typus
-
   module Generators
-
     class ControllerGenerator < Rails::Generators::NamedBase
 
       source_root File.expand_path("../../templates", __FILE__)
@@ -23,7 +21,5 @@ Description:
       end
 
     end
-
   end
-
 end

data/lib/generators/typus/initializers_generator.rb

@@ -0,0 +1,22 @@
+module Typus
+  module Generators
+    class InitializersGenerator < Rails::Generators::Base
+
+      source_root File.expand_path("../../templates", __FILE__)
+
+      class_option :admin_title, :default => Rails.root.basename
+
+      desc <<-MSG
+Description:
+  Copies all Typus initializers into your application.
+
+      MSG
+
+      def generate_initializers
+        template "config/initializers/typus.rb", "config/initializers/typus.rb"
+        template "config/initializers/typus_resources.rb", "config/initializers/typus_resources.rb"
+      end
+
+    end
+  end
+end

data/lib/generators/typus/migration_generator.rb

@@ -2,9 +2,7 @@ require "rails/generators/migration"
 require "generators/typus/controller_generator"
 
 module Typus
-
   module Generators
-
     class MigrationGenerator < Rails::Generators::Base
 
       include Rails::Generators::Migration
@@ -97,7 +95,5 @@ Examples:
       end
 
     end
-
   end
-
 end

data/lib/generators/typus/typus_generator.rb

@@ -1,11 +1,12 @@
 require "rails/generators/migration"
-require "generators/typus/controller_generator"
+
 require "generators/typus/assets_generator"
+require "generators/typus/config_generator"
+require "generators/typus/controller_generator"
+require "generators/typus/initializers_generator"
 
 module Typus
-
   module Generators
-
     class TypusGenerator < Rails::Generators::Base
 
       include Rails::Generators::Migration
@@ -14,8 +15,6 @@ module Typus
 
       namespace "typus"
 
-      class_option :admin_title, :default => Rails.root.basename
-
       desc <<-DESC
 Description:
   This generator creates required files to enable an admin panel which allows
@@ -25,16 +24,11 @@ Description:
 
       DESC
 
-      def copy_config_readme
-        copy_file "config/typus/README"
-      end
-
-      def generate_initializer
-        template "config/initializers/typus.rb", "config/initializers/typus.rb"
-        template "config/initializers/typus_resources.rb", "config/initializers/typus_resources.rb"
+      def generate_initializers
+        Typus::Generators::InitializersGenerator.new.invoke_all
       end
 
-      def copy_assets
+      def generate_assets
         Typus::Generators::AssetsGenerator.new.invoke_all
       end
 
@@ -45,19 +39,11 @@ Description:
       end
 
       def generate_config
-        if (@configuration = generate_yaml_files)[:base].present?
-          %w(application.yml application_roles.yml).each do |file|
-            template "config/typus/#{file}", "config/typus/#{timestamp}_#{file}"
-          end
-        end
+        Typus::Generators::ConfigGenerator.new.invoke_all
       end
 
       protected
 
-      def configuration
-        @configuration
-      end
-
       def resource
         @resource
       end
@@ -66,85 +52,6 @@ Description:
         @sidebar
       end
 
-      def timestamp
-        Time.zone.now.to_s(:number)
-      end
-
-      private
-
-      def generate_yaml_files
-        Typus.reload!
-
-        configuration = { :base => "", :roles => "" }
-
-        Typus.application_models.sort { |x,y| x <=> y }.each do |model|
-
-          next if Typus.models.include?(model)
-
-          klass = model.constantize
-
-          # Detect all relationships except polymorphic belongs_to using reflection.
-          relationships = [ :belongs_to, :has_and_belongs_to_many, :has_many, :has_one ].map do |relationship|
-                            klass.reflect_on_all_associations(relationship).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
-                          end.flatten.sort
-
-          ##
-          # Model fields for:
-          #
-          # - Default
-          # - Form
-          #
-
-          rejections = %w( ^id$
-                           created_at created_on updated_at updated_on deleted_at
-                           salt crypted_password
-                           password_salt persistence_token single_access_token perishable_token
-                           _type$ type
-                           _file_size$ )
-
-          default_rejections = (rejections + %w( password password_confirmation )).join("|")
-          form_rejections = (rejections + %w( position )).join("|")
-
-          fields = klass.columns.map(&:name)
-          default = fields.reject { |f| f.match(default_rejections) }
-          form = fields.reject { |f| f.match(form_rejections) }
-
-          # Model defaults.
-          order_by = "position" if default.include?("position")
-          filters = "created_at" if fields.include?("created_at")
-          search = ( %w(name title) & default ).join(", ")
-
-          # We want attributes of belongs_to relationships to be shown in our
-          # field collections if those are not polymorphic.
-          [ default, form ].each do |fields|
-            fields << klass.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
-            fields.flatten!
-          end
-
-          configuration[:base] << <<-RAW
-#{klass}:
-  fields:
-    default: #{default.join(", ")}
-    form: #{form.join(", ")}
-  order_by: #{order_by}
-  relationships: #{relationships.join(", ")}
-  filters: #{filters}
-  search: #{search}
-  application: #{options[:admin_title]}
-
-          RAW
-
-          configuration[:roles] << <<-RAW
-  #{klass}: create, read, update, delete
-          RAW
-
-        end
-
-        configuration
-      end
-
     end
-
   end
-
 end

data/lib/generators/typus/views_generator.rb

@@ -1,7 +1,5 @@
 module Typus
-
   module Generators
-
     class ViewsGenerator < Rails::Generators::Base
 
       source_root File.expand_path("../../../../app", __FILE__)
@@ -17,7 +15,5 @@ Description:
       end
 
     end
-
   end
-
 end

data/lib/support/active_record.rb

@@ -37,11 +37,17 @@ class ActiveRecord::Base
   def mapping(attribute)
     values = self.class::const_get(attribute.to_s.upcase).to_a
     array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
-    array.rassoc(send(attribute)).first
+
+    value = array.rassoc(send(attribute))
+    value ? value.first : send(attribute)
   end
 
   def to_label
-    respond_to?(:name) ? send(:name) : [self.class, id].join("#")
+    if respond_to?(:name) && send(:name).present?
+      send(:name)
+    else
+      [self.class, id].join("#")
+    end
   end
 
 end

data/lib/support/fake_user.rb

@@ -24,9 +24,11 @@ class FakeUser
     ::I18n.locale
   end
 
+=begin
   def resources
     Typus::Configuration.roles[role].compact
   end
+=end
 
   def applications
     Typus.applications

data/lib/support/hash.rb

@@ -6,7 +6,7 @@ class Hash
 
   def cleanup
     whitelist = %w(controller action id
-                   CKEditor CKEditorFuncNum langCode
+                   input
                    layout
                    resource resource_id resource_action
                    selected

data/lib/support/string.rb

@@ -19,7 +19,7 @@ class String
   def action_mapper
     case self
     when "index" then :list
-    when "new", "create", "edit", "update" then :form
+    when "new", "create", "edit", "update", "toggle" then :form
     else self
     end
   end
@@ -28,9 +28,9 @@ class String
     case self
     when "new", "create"
       "create"
-    when "index", "show"
+    when "index", "show", "autocomplete"
       "read"
-    when "edit", "update", "position", "toggle", "relate", "unrelate", "detach"
+    when "edit", "update", "position", "toggle", "relate", "unrelate"
       "update"
     when "destroy", "trash"
       "delete"

data/lib/tasks/typus.rake

@@ -3,7 +3,7 @@ namespace :typus do
   desc "List current roles."
   task :roles => :environment do
     Typus::Configuration.roles.each do |role|
-      puts "#{role.first.capitalize} role has access to:"
+      puts "'#{role.first}' role has access to:"
       role.last.each { |k, v| puts "- #{k}: #{v}" }
     end
   end

data/lib/typus.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- encoding: utf-8 -*-
 
 require "support/active_record"
 require "support/hash"
@@ -8,7 +8,7 @@ require "support/string"
 require "typus/engine"
 require "typus/i18n"
 require "typus/orm/active_record"
-require "typus/user"
+require "typus/regex"
 require "typus/version"
 
 require "render_inheritable"
@@ -21,9 +21,15 @@ module Typus
   autoload :Configuration, "typus/configuration"
   autoload :Resources, "typus/resources"
 
-  autoload :Actions, "typus/actions"
-  autoload :Filters, "typus/filters"
-  autoload :Format, "typus/format"
+  module Controller
+
+    autoload :Actions, "typus/controller/actions"
+    autoload :Associations, "typus/controller/associations"
+    autoload :Autocomplete, "typus/controller/autocomplete"
+    autoload :Filters, "typus/controller/filters"
+    autoload :Format, "typus/controller/format"
+
+  end
 
   module Authentication
     autoload :Base, "typus/authentication/base"
@@ -32,6 +38,9 @@ module Typus
     autoload :Session, "typus/authentication/session"
   end
 
+  mattr_accessor :autocomplete
+  @@autocomplete = 100
+
   mattr_accessor :admin_title
   @@admin_title = "Typus"
 
@@ -96,7 +105,7 @@ module Typus
   @@image_preview_size = 'x450'
 
   mattr_accessor :image_thumb_size
-  @@image_thumb_size = '75x75#'
+  @@image_thumb_size = '150x150#'
 
   ##
   # Defines the default relationship table.

data/lib/typus/controller/actions.rb

@@ -0,0 +1,69 @@
+##
+# FIXME: Somehow I want to cleanup this module, for the moment has tests and
+#        works as expected, but there's a lot of duplication here.
+#
+
+module Typus
+  module Controller
+    module Actions
+
+      protected
+
+      ##
+      # @resource_actions is used to customize the actions which appear under
+      # each item on the tables. This is really a nice feature because allows
+      # us to enable actions for items without much effort. For example adding
+      # a "Recover from Trash" action:
+      #
+      #     def index
+      #       add_resource_action('Recover', {:action => 'untrash'}, {:confirm => Typus::I18n.t("Recover %{resource}?", :resource => @resource.model_name.human)})
+      #       super
+      #     end
+      #
+
+      def add_resource_action(*args)
+        @resource_actions ||= []
+        @resource_actions << args unless args.empty?
+      end
+
+      def prepend_resource_action(*args)
+        @resource_actions ||= []
+        @resource_actions = @resource_actions.unshift(args) unless args.empty?
+      end
+
+      def append_resource_action(*args)
+        @resource_actions ||= []
+        @resource_actions = @resource_actions.concat([args]) unless args.empty?
+      end
+
+      ##
+      # @resources_actions is used to build a list of custom actions which will
+      # be appended beside "<h2></h2>" all the actions.
+      #
+      # Let's say for example that I want to be able to run the application
+      # without sidebars and headers (headless mode). In this case I need to
+      # somehow add custom actions to the page so I can navigate.
+      #
+      # Instead of having this code here, maybe it's better to duplicate the
+      # actions on the pages. So for example: Admin::PostsController#index will
+      # show a link to add new in the sidebar and beside the "<h2>" header.
+      #
+
+      def add_resources_action(*args)
+        @resources_actions ||= []
+        @resources_actions << args unless args.empty?
+      end
+
+      def prepend_resources_action(*args)
+        @resources_actions ||= []
+        @resources_actions = @resources_actions.unshift(args) unless args.empty?
+      end
+
+      def append_resources_action(*args)
+        @resources_actions ||= []
+        @resources_actions = @resources_actions.concat([args]) unless args.empty?
+      end
+
+    end
+  end
+end

data/lib/typus/controller/associations.rb

@@ -0,0 +1,82 @@
+module Typus
+  module Controller
+    module Associations
+
+      protected
+
+      ##
+      #     >> Order.relationship_with(Invoice)
+      #     => :has_one
+      #
+      def set_has_one_association(item_class, options)
+        association_name = item_class.model_name.underscore.to_sym
+        options.merge!(:action => 'edit', :id => @item.send(association_name).id)
+        notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
+
+        redirect_to options, :notice => notice
+      end
+
+      ##
+      #     >> Entry.relationship_with(Comment)
+      #     => :has_many
+      #
+      def set_has_many_association(item_class, options)
+        item = item_class.find(params[:resource_id])
+        association_name = @resource.model_name.tableize.to_sym
+
+        if item.send(association_name).push(@item)
+          notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
+        else
+          alert = @item.errors.full_messages
+        end
+
+        options.merge!(:action => 'edit', :id => item.id)
+
+        redirect_to options, :notice => notice, :alert => alert
+      end
+
+      ##
+      #     >> Entry.relationship_with(Category)
+      #     => :has_and_belongs_to_many
+      #
+      def set_has_and_belongs_to_many_association(item_class, options)
+        # In this case we DO need to get the remote item to make to association.
+        item = item_class.find(params[:resource_id])
+        association_name = @resource.model_name.tableize.to_sym
+        options.merge!(:action => 'edit', :id => item.id)
+
+        if item.send(association_name).push(@item)
+          notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
+        else
+          alert = @item.errors.full_messages
+        end
+
+        redirect_to options, :notice => notice, :alert => alert
+      end
+
+      ##
+      #     >> Invoice.relationship_with(Order)
+      #     => :belongs_to
+      #
+      def set_belongs_to_association(item_class, options)
+        association_name = item_class.model_name.tableize.to_sym
+        foreign_key = @resource.reflect_on_association(association_name).primary_key_name
+
+        if params[:resource_id]
+          item = item_class.find(params[:resource_id])
+          options.merge!(:action => 'edit', :id => item.id)
+          if @item.send(association_name).push(item)
+            notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
+          else
+            alert = @item.errors.full_messages
+          end
+        else
+          options.merge!(:action => 'new', foreign_key => @item.id)
+        end
+
+        redirect_to options, :notice => notice, :alert => alert
+      end
+
+    end
+  end
+end