typus 3.1.9 → 3.1.10

data/CHANGELOG.md

@@ -1,10 +1,90 @@
 CHANGELOG
 =========
 
-3.1.10 (unrelased)
+3.2.0 (unrelased)
 ------------------
 
-Changes: <https://github.com/fesplugas/typus/compare/v3.1.9...master>
+ * [CHANGED] Dropped support for Ruby 1.8.7. This doesn't mean Typus will
+   not run willith that version of Ruby, but I don't longer have plans to
+   test against that version.
+
+ * [CHANGED] We do not longer look for Typus configuration files in the
+   plugins folder. Store them in `config/typus` or `lib/*/config/typus`.
+   Rails 4 will not support plugins and Rails 3.2 marks them as deprecated
+   so doesn't make sense to support them anymore.
+
+ * [CHANGED] Require at least `Rails 3.2.2`.
+
+ * [FIXED] Documentation about exporting data.
+
+ * [CHANGED] `login_info` helper becomes `admin_login_info`.
+
+ * [CHANGED] `search` helper becomes `admin_search`.
+
+ * [CHANGED] `title` helper becomes `admin_title` (and merged methods).
+
+ * [CHANGED] `apps` helper becomes `admin_apps`.
+
+ * [CHANGED] We do not longer detect if the application has a `root_path`
+   defined. A new setting `Typus.admin_title_link` has been added so we have
+   more control on which URL we want to use. This is useful because we don't
+   always want to link to the main site.
+
+ * [CHANGED] `display_flash_message` becomes `admin_display_flash_message`.
+
+ * [CHANGED] "Add New" becomes "Add".
+
+ * [FIXED] `return_to` now works as expected so now it's easier to send links to
+    the admin interface.
+
+ * [CHANGED] "Applications" in dashboard is now "Site administration".
+
+ * [FIXED] Model names in Trash module.
+
+ * [CHANGED] Removed `generate_html` alias method and use `get_paginated_data`.
+   This also fixes the usage of `ctags`.
+
+ * [CHANGED] Do not show "Add" link on the sidebar because it's confusing,
+   duplicated. We also have plans to remove the sidebar, so consider this as an
+   starting point. (Sidebar will be replaced by a drop down menu.)
+
+ * [CHANGED] No need to confirm when pressing "Sign out".
+
+ * [CHANGED] Instead of settings the session to `nil` when login out, we are
+   now removing it using `session.delete(:typus_user_id)`.
+
+ * [CHANGED] `TypusClass#to_label` now returns the email.
+
+ * [CHANGED] Session and account forms are now using `Typus.user_class`.
+
+ * [CHANGED] Extracted `account` and `session` forms into a partial.
+
+ * [CHANGED] `not_allowed` now accepts an param so we can give better feedback
+   to the user when an action is not allowed.
+
+ * [FIXED] Filter scopes so we can only run those scopes defined in configuration
+   files.
+
+ * [NEW] `Model.typus_scopes` to detect defined scopes.
+
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.10...master>
+
+
+3.1.11 (unrelased)
+-------------------
+
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.10...3-1-stable>
+
+
+3.1.10 (2012-03-27)
+-------------------
+
+ * [FIXED] Filter scopes so we can only run those scopes defined in configuration
+   files.
+
+ * [NEW] `Model.typus_scopes` to detect defined scopes.
+
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.9...v3.1.10>
 
 
 3.1.9 (2012-03-08)

data/app/controllers/admin/resources_controller.rb

@@ -167,12 +167,12 @@ class Admin::ResourcesController < Admin::BaseController
   helper_method :fields
 
   def set_scope
-    if (scope = params[:scope])
-     if @resource.respond_to?(scope)
-       @resource = @resource.send(scope)
-     else
-       not_allowed
-     end
+    return unless params[:scope]
+
+    if @resource.typus_scopes.include?(params[:scope])
+      @resource = @resource.send(params[:scope])
+    else
+      not_allowed("Requested scope not defined on your whitelist.")
     end
   end
 

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

@@ -28,8 +28,4 @@ module Admin::Resources::ListHelper
     build_table(model, fields, items, link_options, association, association_name)
   end
 
-  def scopes
-    @resource.typus_defaults_for(:scopes).reject { |s| !@resource.respond_to?(s) }
-  end
-
 end

data/app/views/admin/resources/index.html.erb

@@ -20,7 +20,7 @@
       <%= "(#{resource.count})" if @resource.typus_options_for(:counters) %>
     </li>
 
-    <% scopes.each do |scope| %>
+    <% @resource.typus_scopes.each do |scope| %>
       <li>
         <%= link_to Typus::I18n.t(scope.humanize), :scope => scope %>
         <%= "(#{@resource.send(scope).count})" if @resource.typus_options_for(:counters)  %>

data/lib/typus/orm/base/class_methods.rb

@@ -30,6 +30,10 @@ module Typus
           read_model_config[filter.to_s].try(:extract_settings) || []
         end
 
+        def typus_scopes
+          typus_defaults_for(:scopes).reject { |s| !respond_to?(s) }
+        end
+
         def typus_search_fields
           Hash.new.tap do |search|
             typus_defaults_for(:search).each do |field|

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.9"
+  VERSION = "3.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70175438311080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70175438311080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70175438309000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175438309000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70175438307180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70175438307180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.3
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -323,7 +338,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2790734658814501466
+      hash: 4061502594870613970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -332,10 +347,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2790734658814501466
+      hash: 4061502594870613970
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold