typus 3.1.0 → 3.1.1

data/CHANGELOG

@@ -1,6 +1,27 @@
 = 3.2.0 (unreleased)
 
-= 3.1.0 (unreleased)
+= 3.1.1 (unreleased)
+
+ * [CHANGED] Removed user guide. Docs can now be found at http://docs.typuscmf.com/
+
+ * [NEW] New configuration setting which allows serving Typus from a subdomain. (42b5d8ae)
+
+ * [FIXED] HABTM associations were not working as expected when using namespaced
+   models.
+
+ * [CHANGED] Configuration can be read from subfolders so you can organize better
+   your models. I'm starting to use a file per model and I'd recommend you start
+   using it ... (8a3fc09f)
+
+ * [FIXED] Helper Method `display_virtual` was not defined. (2b7e1948)
+
+ * [FIXED] Do not show Trash link when user can't edit items.
+
+ * [CHANGED] Updated Rubies list for Travis-CI.
+
+ * [CHANGED] Default development/test database is now **Postgresql**.
+
+= 3.1.0
 
  * [NEW] Filter with scopes.
 

data/Gemfile

@@ -67,3 +67,5 @@ group :development do
   # gem "rb-fsevent"
   # gem "growl_notify"
 end
+
+gem "SystemTimer", :platform => :ruby_18

data/README.md

@@ -48,9 +48,14 @@ To test clone the git repo and run the following commands:
     $ bundle install --path vendor/bundle
     $ bundle exec rake
 
+**Note:** In `OSX Lion` it's possible you need to create a `postgres`
+user to be able to run tests.
+
+    CREATE USER postgres SUPERUSER;
+
 ## Links
 
-- [Documentation](https://github.com/typus/typus/wiki)
+- [Documentation](https://docs.typuscmf.com/)
 - [Issues](https://github.com/typus/typus/issues)
 - [Source Code][typus] and [RubyGems][typus_gem]
 - [Mailing List](http://groups.google.com/group/typus)
@@ -63,7 +68,6 @@ Typus is released under the MIT license.
 
 [typus]: http://github.com/typus/typus
 [typus_demo]: http://demo.typuscmf.com/
-[typus_demo_code]: https://github.com/typus/demo
 [typus_locales]: https://github.com/typus/typus/tree/master/config/locales
 [typus_gem]: http://rubygems.org/gems/typus
 [paperclip]: http://rubygems.org/gems/paperclip

data/Rakefile

@@ -18,12 +18,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  # t.pattern = 'test/**/*_test.rb'
-  t.test_files = FileList['test/app/controllers/**/*_test.rb',
-                          'test/app/models/**/*_test.rb',
-                          'test/app/mailers/**/*_test.rb',
-                          'test/config/*_test.rb',
-                          'test/lib/**/*_test.rb']
+  t.test_files = FileList['test/**/*_test.rb']
   t.verbose = false
 end
 

data/app/assets/javascripts/typus/jquery.application.js

@@ -21,7 +21,6 @@ $(document).ready(function() {
         'centerOnScroll': true,
         'scrolling': false,
         onClosed: function() {
-            // console.log(arguments);
             var attribute = Typus.resource_attribute;
             var text = Typus.resource_to_label;
             var value = Typus.resource_id;

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

@@ -22,3 +22,12 @@
 .search-choice span {
   color: black!important;
 }
+
+/* frikin' forms hacks */
+
+.chzn-search input {
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ height:1em;
+}

data/app/controllers/admin/base_controller.rb

@@ -9,8 +9,6 @@ class Admin::BaseController < ActionController::Base
   helper_method :admin_user
   helper_method :current_role
 
-  def user_guide; end
-
   protected
 
   def reload_config_and_roles

data/app/controllers/admin/resources_controller.rb

@@ -17,7 +17,7 @@ class Admin::ResourcesController < Admin::BaseController
     get_objects
 
     custom_actions_for(:index).each do |action|
-      prepend_resources_action(action.titleize, {:action => action, :id => nil}, {})
+      prepend_resources_action(action.titleize, {:action => action, :id => nil})
     end
 
     respond_to do |format|
@@ -64,7 +64,7 @@ class Admin::ResourcesController < Admin::BaseController
 
   def edit
     custom_actions_for(:edit).each do |action|
-      prepend_resources_action(action.titleize, {:action => action, :id => @item}, {})
+      prepend_resources_action(action.titleize, {:action => action, :id => @item})
     end
   end
 
@@ -72,7 +72,7 @@ class Admin::ResourcesController < Admin::BaseController
     check_resource_ownership if @resource.typus_options_for(:only_user_items)
 
     if admin_user.can?('edit', @resource)
-      prepend_resources_action("Edit", {:action => 'edit', :id => @item}, {})
+      prepend_resources_action("Edit", {:action => 'edit', :id => @item})
     end
 
     respond_to do |format|
@@ -215,7 +215,7 @@ class Admin::ResourcesController < Admin::BaseController
   def set_default_action
     default_action = @resource.typus_options_for(:default_action_on_item)
     action = admin_user.can?('edit', @resource.model_name) ? default_action : "show"
-    add_resource_action(action.titleize, {:action => action}, {})
+    prepend_resource_action(action.titleize, {:action => action})
   end
 
   def custom_actions_for(action)

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

@@ -7,12 +7,12 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
   alias_method :table_has_many_field, :table_has_and_belongs_to_many_field
 
   def typus_has_and_belongs_to_many_field(attribute, form)
-    klass = attribute.singularize.capitalize.constantize
-    resource_ids = "#{attribute.singularize}_ids"
+    klass = @resource.reflect_on_association(attribute.to_sym).class_name.constantize
 
+    resource_ids = "#{attribute.singularize}_ids"
     html_options = { :disabled => attribute_disabled?(resource_ids.to_sym) }
-
-    options = { :attribute => "#{@resource.name.downcase}_#{attribute}" }
+    model = @resource.name.downcase.gsub("::", "_")
+    options = { :attribute => "#{model}_#{attribute}" }
 
     label_text = @resource.human_attribute_name(attribute)
     if (text = build_label_text_for_has_and_belongs_to_many(klass, html_options, options))
@@ -20,10 +20,10 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
     end
 
     locals = { :attribute => attribute,
-               :attribute_id => "#{@resource.table_name}_#{attribute}",
+               :attribute_id => "#{model}_#{attribute}",
                :related_klass => klass,
                :related_items => klass.all,
-               :related_ids => "#{@resource.name.downcase}[#{resource_ids}][]",
+               :related_ids => "#{model}[#{resource_ids}][]",
                :values => @item.send(attribute),
                :form => form,
                :label_text => label_text.html_safe,

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

@@ -9,6 +9,7 @@ module Admin::Resources::DataTypes::StringHelper
   alias_method :display_integer, :display_string
   alias_method :display_position, :display_string
   alias_method :display_text, :display_string
+  alias_method :display_virtual, :display_string
 
   def string_filter(filter)
     values = set_context.send(filter.to_s.pluralize).to_a

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

@@ -50,7 +50,7 @@ module Admin::Resources::TableHelper
     resource_actions.map do |body, url, options, proc|
       next if proc && proc.respond_to?(:call) && proc.call(item) == false
       { :message => Typus::I18n.t(body),
-        :url => params.dup.cleanup.merge(url).merge(:controller => "/admin/#{model.to_resource}", :id => item.id),
+        :url => { :controller => "/admin/#{model.to_resource}", :id => item.id }.merge(params.dup.cleanup.merge(url)),
         :options => options }
     end
   end

data/app/views/admin/dashboard/_sidebar.html.erb

@@ -2,11 +2,11 @@
 
 <%
   mailing_list = link_to('mailing list', 'http://groups.google.com/group/typus')
-  user_guide = link_to('user guide', admin_user_guide_path)
+  user_guide = link_to('user guide', 'http://docs.typuscmf.com/')
 %>
 
 <p>If you need help don't hesitate in joining the <%= mailing_list %> or use
-the provided <%= user_guide %>.</p>
+the <%= user_guide %>.</p>
 
 <p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code>
 on the <code>app/views/admin/dashboard</code> folder.</p>

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

@@ -1,11 +1,11 @@
-<li id="<%= attribute_id %>">
+<li id="<%= attribute_id %>_field">
   <%= form.label attribute, label_text %>
   <% if related_items.any? %>
     <%= hidden_field_tag related_ids %>
     <%= select_tag related_ids,
                    options_from_collection_for_select(related_items, "id", "to_label", values.map(&:id)),
                    html_options.merge(:multiple => true,
-                                      :id => "#{@resource.name.downcase}_#{attribute}",
+                                      :id => attribute_id,
                                       :class => "chzn-select",
                                       :style => "width: 550px;",
                                       "data-placeholder" => Typus::I18n.t("Select Some Options")) %>

data/config/routes.rb

@@ -1,14 +1,13 @@
 Rails.application.routes.draw do
 
-  scope "admin", :module => :admin, :as => "admin" do
+  routes_block = lambda do
 
-    match "/" => redirect("/admin/dashboard")
+    dashboard = Typus.subdomain ? "/dashboard" : "/admin/dashboard"
 
+    match "/" => redirect(dashboard)
     match "dashboard" => "dashboard#index", :as => "dashboard_index"
     match "dashboard/:application" => "dashboard#show", :as => "dashboard"
 
-    match "user_guide" => "base#user_guide"
-
     if Typus.authentication == :session
       resource :session, :only => [:new, :create], :controller => :session do
         get :destroy, :as => "destroy"
@@ -29,7 +28,13 @@ Rails.application.routes.draw do
     Typus.resources.map { |i| i.underscore }.each do |resource|
       match "#{resource}(/:action(/:id))(.:format)", :controller => resource
     end
-
   end
 
+  if Typus.subdomain
+    constraints :subdomain => Typus.subdomain do
+      namespace :admin, :path => "", &routes_block
+    end
+  else
+    scope "admin", {:module => :admin, :as => "admin"}, &routes_block
+  end
 end

data/lib/generators/templates/config/initializers/typus.rb

@@ -29,6 +29,9 @@ Typus.setup do |config|
   # config.username = "admin"
   # config.password = "columbia"
 
+  # Define subdomain to use instead of additional path
+  # config.subdomain = "admin"
+
   # Pagination options: These options are passed to `kaminari`.
   # config.pagination = { :previous_label => "← " + Typus::I18n.t("Previous"),
   #                       :next_label => Typus::I18n.t("Next") + " →" }

data/lib/typus.rb

@@ -65,6 +65,9 @@ module Typus
   mattr_accessor :username
   @@username = "admin"
 
+  mattr_accessor :subdomain
+  @@subdomain = nil
+
   ##
   # Pagination options passed to Kaminari helper.
   #
@@ -220,14 +223,14 @@ module Typus
     end
 
     def model_configuration_files
-      app = Typus.root.join("*.yml")
-      plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "*.yml")
+      app = Typus.root.join("**", "*.yml")
+      plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "**", "*.yml")
       Dir[app, plugins].reject { |f| f.match(/_roles.yml/) }.sort
     end
 
     def role_configuration_files
-      app = Typus.root.join("*_roles.yml")
-      plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "*_roles.yml")
+      app = Typus.root.join("**", "*_roles.yml")
+      plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "**", "*_roles.yml")
       Dir[app, plugins].sort
     end
 

data/lib/typus/configuration.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module Typus
   module Configuration
 
@@ -6,7 +8,7 @@ module Typus
       @@config = {}
 
       Typus.model_configuration_files.each do |file|
-        if data = YAML::load_file(file)
+        if data = YAML::load(ERB.new(File.read(file)).result)
           @@config.merge!(data)
         end
       end
@@ -20,7 +22,7 @@ module Typus
       @@roles = {}
 
       Typus.role_configuration_files.each do |file|
-        if data = YAML::load_file(file)
+        if data = YAML::load(ERB.new(File.read(file)).result)
           data.compact.each do |key, value|
             @@roles[key] ? @@roles[key].merge!(value) : (@@roles[key] = value)
           end
@@ -32,4 +34,4 @@ module Typus
     @@roles = {}
 
   end
-end
+end

data/lib/typus/controller/headless.rb

@@ -10,12 +10,12 @@ module Typus
       end
 
       def set_resources_action_for_headless_on_index
-        add_resources_action("Add New", {:action => "new"}, {})
+        add_resources_action("Add New", {:action => "new"})
       end
       private :set_resources_action_for_headless_on_index
 
       def set_resources_action_for_headless
-        add_resources_action("All Entries", {:action => 'index', :id => nil}, {})
+        add_resources_action("All Entries", {:action => 'index', :id => nil})
       end
       private :set_resources_action_for_headless
 

data/lib/typus/controller/trash.rb

@@ -13,7 +13,9 @@ module Typus
       end
 
       def set_predefined_filter_for_trash
-        add_predefined_filter("Trash", "trash", "deleted")
+        if admin_user.can?('edit', @resource.model_name)
+          add_predefined_filter("Trash", "trash", "deleted")
+        end
       end
       private :set_predefined_filter_for_trash
 

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/typus.gemspec

@@ -7,7 +7,7 @@ require "typus/version"
 
 files = `git ls-files`.split("\n")
 test_files = `git ls-files -- test/*`.split("\n")
-ignores = `git ls-files -- script/*`.split("\n")
+ignores = `git ls-files -- doc/* Guardfile .travis.yml .gitignor .travis.yml .gitignore`.split("\n")
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70152604331140 !ruby/object:Gem::Requirement
+  requirement: &70333450722940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152604331140
+  version_requirements: *70333450722940
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70152604330700 !ruby/object:Gem::Requirement
+  requirement: &70333450722120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152604330700
+  version_requirements: *70333450722120
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70152604330180 !ruby/object:Gem::Requirement
+  requirement: &70333450720960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152604330180
+  version_requirements: *70333450720960
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -52,11 +52,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
 - CHANGELOG
 - Gemfile
-- Guardfile
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -111,7 +108,6 @@ files:
 - app/mailers/admin/mailer.rb
 - app/views/admin/account/forgot_password.html.erb
 - app/views/admin/account/new.html.erb
-- app/views/admin/base/user_guide.html.erb
 - app/views/admin/dashboard/_sidebar.html.erb
 - app/views/admin/dashboard/index.html.erb
 - app/views/admin/dashboard/styles.html.erb
@@ -320,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4352251271305818957
+      hash: 431185922972537498
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -329,10 +325,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4352251271305818957
+      hash: 431185922972537498
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.8.9
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold

data/.gitignore

@@ -1,15 +0,0 @@
-.bundle/
-log/*.log
-pkg/
-
-test/dummy/config/email.yml
-test/dummy/config/mongoid.yml
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/public/system/
-test/dummy/tmp/
-
-vendor/bundle
-
-# This is a RubyGem so there's no need to keep the `Gemfile.lock`.
-Gemfile.lock

data/.travis.yml

@@ -1,12 +0,0 @@
-rvm:
-  - 1.8.7
-  - ree
-  - 1.9.2
-
-notifications:
-  recipients:
-    - support@typuscms.com
-
-branches:
-  only:
-    - master

data/Guardfile

@@ -1,11 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'livereload' do
-  watch(%r{app/.+\.(erb|haml)})
-  watch(%r{app/helpers/.+\.rb})
-  watch(%r{(public/|app/assets).+\.(css|js|html)})
-  watch(%r{(app/assets/.+\.css)\.s[ac]ss}) { |m| m[1] }
-  watch(%r{(app/assets/.+\.js)\.coffee}) { |m| m[1] }
-  watch(%r{config/locales/.+\.yml})
-end

data/app/views/admin/base/user_guide.html.erb

@@ -1,87 +0,0 @@
-<%
-  rails = "http://rubyonrails.org/"
-  typus = "http://core.typuscmf.com/"
-%>
-
-<% content_for :main_grid do %>
-  <a name="introduction"></a>
-
-  <h2>Introduction</h2>
-
-  <p>This website is powered by <%= link_to "Ruby on Rails", rails %> and
-  <%= link_to "Typus", typus %>.</p>
-
-  <p>With <%= link_to "Typus", typus %>, also known as the application backend
-  or admin interface, you'll be able to update your application contents and
-  perform the most common operations for the site maintenance.</p>
-
-  <p>You can get more information at <%= link_to typus, typus %>.</p>
-
-  <a name="basics"></a>
-
-  <h2>Basic Actions</h2>
-
-  <h3>Create Entries</h3>
-
-  <p>To create a new entry:</p>
-
-  <ul>
-    <li>Click on entries tab.</li>
-    <li>Click "Add New" sub tab.</li>
-    <li>Start filling in the blanks.</li>
-    <li>When you are ready, click "Save Entry".</li>
-  </ul>
-
-  <h3>Editing &amp; Updating Entries</h3>
-
-  <p>To edit entries:</p>
-
-  <ul>
-    <li>Click on entries tab.</li>
-    <li>You'll see a list of entries, if you have already create some.</li>
-    <li>Click on "Edit".</li>
-    <li>Edit the entry.</li>
-    <li>When you are ready, click "Update Entry".</li>
-  </ul>
-
-  <h3>Removing Entries</h3>
-
-  <p>To remove entries:</p>
-
-  <ul>
-    <li>Click on entries tab.</li>
-    <li>You'll see a list of entries, if you have already create some.</li>
-    <li>Click on "Trash".</li>
-    <li>Click "Ok" on the dialog to confirm you want to remove the entry.</li>
-  </ul>
-
-  <p>Removing entries will be only available if you have permissions to do so.</p>
-
-  <a name="registered-users"></a>
-
-  <h2>Registered Users</h2>
-
-  <p>Registered users can do a variety of different things on a <strong>Typus</strong>
-  driven site. The various elements available to the user are determined by their
-  user level.</p>
-
-  <p>When <code>:session</code> authentication is enabled <strong>Typus</strong>
-  will enable a a default role which will allow registered users perform all kind
-  of operations on entries: create, read, update and destroy.</p>
-
-  <p>It's usually recommended having an extra role which some restrictions.</p>
-<% end %>
-
-<div class="grid_2">
-  <h2>User Guide</h2>
-
-  <ul>
-    <li><%= link_to "Introduction", "#introduction" %></li>
-    <li><%= link_to "Basics", "#basics" %></li>
-    <li><%= link_to "Registered Users", "#registered-users" %></li>
-  </ul>
-</div>
-
-<div class="grid_8">
-  <%= yield :main_grid %>
-</div>