tolaria 1.0.2 → 1.1.0

data/lib/tolaria/default_config.rb

@@ -26,8 +26,8 @@ Tolaria.configure do |config|
   config.display_name_methods = %i[
     admin_name
     display_name
-    title
     name
+    title
     label
     username
     login

data/lib/tolaria/managed_class.rb

@@ -36,7 +36,7 @@ module Tolaria
 
     # A factory method that registers a new model in Tolaria and configures
     # its menu and param settings. Developers should use `ActiveRecord::Base.manage_with_tolaria`
-    def self.create(klass, icon:"file-o", permit_params:[], priority:10, category:"Settings", default_order:"id DESC", paginated:true, allowed_actions:[:index, :show, :new, :create, :edit, :update, :destroy])
+    def self.create(klass, icon:"file-o", permit_params:[], priority:10, category:"Settings", default_order:"id DESC", paginated:true, allowed_actions:%i[index show new create edit update destroy])
 
       managed_class = self.new
       managed_class.klass = klass
@@ -51,7 +51,7 @@ module Tolaria
       managed_class.allowed_actions = allowed_actions.freeze
 
       # Set auto-generated attributes
-      managed_class.controller_name = "#{managed_class.model_name.name.pluralize}Controller".freeze
+      managed_class.controller_name = "#{managed_class.model_name.collection.camelize}Controller".freeze
       managed_class.param_key = managed_class.model_name.singular.to_sym
 
       return managed_class

data/lib/tolaria/version.rb

@@ -2,7 +2,7 @@ module Tolaria
 
   # Returns Tolaria’s version number
   def self.version
-    Gem::Version.new("1.0.2")
+    Gem::Version.new("1.1.0")
   end
 
   module VERSION

data/test/demo/app/views/admin/blog_posts/_form.html.erb

@@ -3,7 +3,7 @@
 <%= f.hint "The title of this post. The title is featured prominently across the site and used to construct the page URL. A good title is both summarizing and enticing, much like a newspaper headline." %>
 
 <%= f.label :published_at, "Publishing Date" %>
-<%= f.timestamp_field :published_at %>
+<%= f.timestamp_field :published_at, class:"short" %>
 <%= f.hint %{
   The date this post should be published.
   Published posts with a date set in the future will be scheduled to appear on that date.

data/test/integration/router_test.rb

@@ -46,7 +46,7 @@ class RouterTest < ActionDispatch::IntegrationTest
   test "correctly draws uncountable routes" do
 
     ActiveSupport::Inflector.inflections do |inflect|
-      inflect.uncountable << "pokemon"
+      inflect.uncountable "pokemon"
     end
 
     class ::Pokemon < ActiveRecord::Base
@@ -63,6 +63,7 @@ class RouterTest < ActionDispatch::IntegrationTest
     assert_equal "/admin/pokemon", admin_pokemon_index_path
     assert_equal "/admin/pokemon/1", admin_pokemon_path(1)
     assert_equal "/admin/pokemon/1/edit", edit_admin_pokemon_path(1)
+    assert Admin::PokemonController
 
     # Unseat the class so that it doesn't leak out of this test
     assert Tolaria.discard_managed_class(Pokemon), "should discard class"
@@ -70,4 +71,32 @@ class RouterTest < ActionDispatch::IntegrationTest
 
   end
 
+  test "correctly draws uncommon collective routes" do
+
+    ActiveSupport::Inflector.inflections do |inflect|
+      inflect.plural "hero", "heroes"
+    end
+
+    class ::BraveHero < ActiveRecord::Base
+      manage_with_tolaria using:{
+        icon: "key",
+      }
+    end
+
+    # Re-draw the routes
+    Rails.application.routes.draw do
+      Tolaria.draw_routes(self)
+    end
+
+    assert_equal "/admin/brave_heroes", admin_brave_heroes_path
+    assert_equal "/admin/brave_heroes/1", admin_brave_hero_path(1)
+    assert_equal "/admin/brave_heroes/1/edit", edit_admin_brave_hero_path(1)
+    assert Admin::BraveHeroesController
+
+    # Unseat the class so that it doesn't leak out of this test
+    assert Tolaria.discard_managed_class(BraveHero), "should discard class"
+    Object.send(:remove_const, :BraveHero)
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolaria
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Corey Csuhta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -427,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails CMS framework for making people happy.