typus 3.1.0.rc12 → 3.1.0.rc13

data/app/controllers/admin/base_controller.rb

@@ -2,7 +2,6 @@ class Admin::BaseController < ActionController::Base
 
   include Typus::Authentication::const_get(Typus.authentication.to_s.classify)
 
-  before_filter :set_models_constantized
   before_filter :reload_config_and_roles
   before_filter :authenticate
   before_filter :set_locale
@@ -14,12 +13,8 @@ class Admin::BaseController < ActionController::Base
 
   protected
 
-  def set_models_constantized
-    Typus::Configuration.models_constantized!
-  end
-
   def reload_config_and_roles
-    Typus.reload! unless Rails.env.production?
+    Typus.reload! if Rails.env.development?
   end
 
   def set_locale

data/app/controllers/admin/resources_controller.rb

@@ -211,7 +211,7 @@ class Admin::ResourcesController < Admin::BaseController
     # call the related method.
     #
     if params[:_saveandassign]
-      item_class = params[:resource].typus_constantize
+      item_class = params[:resource].constantize
       # For some reason we are forced to set the /admin prefix to the controller
       # when working with namespaced stuff.
       options = { :controller => "/admin/#{item_class.to_resource}" }

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

@@ -6,7 +6,7 @@ module Admin::Resources::DataTypes::BelongsToHelper
     related = if defined?(set_belongs_to_context)
                 set_belongs_to_context.send(attribute.pluralize.to_sym)
               else
-                association.class_name.typus_constantize
+                association.class_name.constantize
               end
     related_fk = association.foreign_key
 
@@ -70,7 +70,7 @@ module Admin::Resources::DataTypes::BelongsToHelper
   def belongs_to_filter(filter)
     att_assoc = @resource.reflect_on_association(filter.to_sym)
     class_name = att_assoc.options[:class_name] || filter.capitalize.camelize
-    resource = class_name.typus_constantize
+    resource = class_name.constantize
 
     items = [[Typus::I18n.t("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize), ""]]
     items += resource.order(resource.typus_order_by).map { |v| [v.to_label, v.id] }

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

@@ -3,7 +3,7 @@ module Admin::Resources::DataTypes::HasManyHelper
   def has_many_filter(filter)
     att_assoc = @resource.reflect_on_association(filter.to_sym)
     class_name = att_assoc.options[:class_name] || filter.classify
-    resource = class_name.typus_constantize
+    resource = class_name.constantize
 
     items = [[Typus::I18n.t("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize), ""]]
     items += resource.order(resource.typus_order_by).map { |v| [v.to_label, v.id] }

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

@@ -17,7 +17,7 @@ module Admin::Resources::DisplayHelper
       @resource.typus_defaults_for(:relationships).each do |relationship|
         association = @resource.reflect_on_association(relationship.to_sym)
         next if association.macro == :belongs_to
-        next if admin_user.cannot?('read', association.class_name.typus_constantize)
+        next if admin_user.cannot?('read', association.class_name.constantize)
         html << send("typus_form_#{association.macro}", relationship)
       end
     end.html_safe

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

@@ -27,7 +27,7 @@ module Admin::Resources::FiltersHelper
 
     att_assoc = @resource.reflect_on_association(key.to_sym)
     class_name = att_assoc.options[:class_name] || key.capitalize.camelize
-    resource = class_name.typus_constantize
+    resource = class_name.constantize
     att_assoc.foreign_key
   end
 

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

@@ -2,7 +2,7 @@ module Admin::Resources::RelationshipsHelper
 
   def setup_relationship(field)
     @field = field
-    @model_to_relate = @resource.reflect_on_association(field.to_sym).class_name.typus_constantize
+    @model_to_relate = @resource.reflect_on_association(field.to_sym).class_name.constantize
     @model_to_relate_as_resource = @model_to_relate.to_resource
     @reflection = @resource.reflect_on_association(field.to_sym)
     @association_name = @reflection.name.to_s

data/app/helpers/admin/resources_helper.rb

@@ -16,7 +16,7 @@ module Admin::ResourcesHelper
     app_name = @resource.typus_application
 
     admin_user.application(app_name).each do |resource|
-      klass = resource.typus_constantize
+      klass = resource.constantize
       resources[resource] = [sidebar_all_resource(klass), sidebar_add_new(klass)].compact
     end
 

data/app/themes/default/views/admin/dashboard/_applications.html.erb

@@ -8,7 +8,7 @@
       </tr>
     </thead>
 
-    <% admin_user.application(app).map { |i| i.typus_constantize }.each do |klass| %>
+    <% admin_user.application(app).map { |i| i.constantize }.each do |klass| %>
       <tr class="<%= cycle("even", "odd") %>">
         <td>
           <%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %>

data/app/themes/default/views/helpers/admin/resources/_sidebar.html.erb

@@ -1,6 +1,6 @@
 <% resources.each do |resource, actions| %>
 
-  <% klass = resource.typus_constantize %>
+  <% klass = resource.constantize %>
 
   <%= link_to :controller => "/admin/#{klass.to_resource}" do %>
     <h3><%= klass.model_name.human.pluralize %></h3>

data/lib/generators/templates/config/typus/typus.yml

@@ -6,12 +6,12 @@
   fields:
     default: first_name, last_name, role, email, locale
     list: email, role, status
-    form: first_name, last_name, role, email, password, password_confirmation, locale
+    form: first_name, last_name, role, email, password, password_confirmation, locale, status
     options:
       selectors: role, locale
       booleans:
         status: Active, Inactive
   filters: status, role
-  search: first_name, last_name, email
+  search: first_name, last_name, email, role
   application: Admin
   description: Users Administration

data/lib/support/string.rb

@@ -9,11 +9,7 @@ class String
   end
 
   def extract_class
-    remove_prefix.classify.typus_constantize
-  end
-
-  def typus_constantize
-    Typus::Configuration.models_constantized[self]
+    remove_prefix.classify.constantize
   end
 
   def acl_action_mapper

data/lib/typus.rb

@@ -184,7 +184,7 @@ module Typus
     end
 
     def user_class
-      user_class_name.typus_constantize
+      user_class_name.constantize
     end
 
     def reload!

data/lib/typus/configuration.rb

@@ -17,10 +17,6 @@ module Typus
     mattr_accessor :config
     @@config = {}
 
-    def self.register_config(config)
-      @@config.merge!(config)
-    end
-
     # Read roles from files <tt>config/typus/*_roles.yml</tt>.
     def self.roles!
       files = Dir[File.join(Typus.config_folder, "*_roles.yml").to_s].sort
@@ -39,15 +35,5 @@ module Typus
     mattr_accessor :roles
     @@roles = {}
 
-    def self.register_roles(roles)
-      @@roles.merge!(roles)
-    end
-
-    def self.models_constantized!
-      @@models_constantized = config.map { |i| i.first }.inject({}) { |result, model| result[model] = model.constantize; result }
-    end
-
-    mattr_accessor :models_constantized
-
   end
 end

data/lib/typus/controller/associations.rb

@@ -26,7 +26,7 @@ module Typus
       #   => ...
       #
       def relate
-        resource_class = params[:resource].typus_constantize
+        resource_class = params[:resource].constantize
         association_name = resource_class.table_name
 
         item = resource_class.find(params[:resource_id])
@@ -45,7 +45,7 @@ module Typus
       #   - has_one
       #
       def unrelate
-        item_class = params[:resource].typus_constantize
+        item_class = params[:resource].constantize
         item = item_class.find(params[:resource_id])
 
         case item_class.relationship_with(@resource)

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc12"
+  VERSION = "3.1.0.rc13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc12
+  version: 3.1.0.rc13
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2152822480 !ruby/object:Gem::Requirement
+  requirement: &2153129580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2152822480
+  version_requirements: *2153129580
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2152821960 !ruby/object:Gem::Requirement
+  requirement: &2153129140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152821960
+  version_requirements: *2153129140
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2152821460 !ruby/object:Gem::Requirement
+  requirement: &2153128580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152821460
+  version_requirements: *2153128580
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2152821020 !ruby/object:Gem::Requirement
+  requirement: &2153127680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152821020
+  version_requirements: *2153127680
 - !ruby/object:Gem::Dependency
   name: rails-trash
-  requirement: &2152820440 !ruby/object:Gem::Requirement
+  requirement: &2153125960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2152820440
+  version_requirements: *2153125960
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2152819720 !ruby/object:Gem::Requirement
+  requirement: &2153125020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152819720
+  version_requirements: *2153125020
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2152818880 !ruby/object:Gem::Requirement
+  requirement: &2153124140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152818880
+  version_requirements: *2153124140
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152817080 !ruby/object:Gem::Requirement
+  requirement: &2153123580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 3.1.0.rc4
   type: :runtime
   prerelease: false
-  version_requirements: *2152817080
+  version_requirements: *2153123580
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email: