typus 3.1.5 → 3.1.6

data/{CHANGELOG → CHANGELOG.md}

@@ -1,4 +1,23 @@
-= 3.1.5 (2011-12-10)
+CHANGELOG
+=========
+
+3.1.6 (2012-01-02)
+------------------
+
+ * [FIXED] "Save and continue editing" button was shown even when the
+   user didn't have acess to it.
+
+ * [CHANGED] Improved MongoDB support.
+
+ * [NEW] We can now filter by integer.
+
+ * [FIXED] Independent paginators when showing associations.
+
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.5...v3.1.6>
+
+
+3.1.5 (2011-12-10)
+------------------
 
  * [CHANGED] Association tables now contain a "show" link.
 
@@ -10,11 +29,19 @@
 
  * [CHANGED] Repository moved again to http://github.com/fesplugas/typus
 
-= 3.1.4
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.4...v3.1.5>
+
+
+3.1.4
+-----
 
  * [FIXED] Belongs to helper was not creating properly class ids.
 
-= 3.1.3
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.3...v3.1.4>
+
+
+3.1.3
+-----
 
  * [CHANGED] Added `Typus.chosen` so we can disable "Chosen". This will
    be in Typus until "Chosen" supports remote data calls.
@@ -37,14 +64,20 @@
 
  * [FIXED] Detaching a Paperclip was not working.
 
-= 3.1.2
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.2...v3.1.3>
+
+
+3.1.2
+-----
 
  * [CHANGED] Images, links and belongs_to associations do not have links
    when popup mode. This will avoid an "Inception" problem.
 
  * [FIXED] Problems on HABTM associations when generating association names.
 
-= 3.1.1
+
+3.1.1
+-----
 
  * [CHANGED] Removed user guide. Docs can now be found at http://docs.typuscmf.com/
 
@@ -65,7 +98,9 @@
 
  * [CHANGED] Default development/test database is now **Postgresql**.
 
-= 3.1.0
+
+3.1.0
+-----
 
  * [NEW] Filter with scopes.
 
@@ -146,27 +181,37 @@
 
  * [CHANGED] Configuration files are now generated by model not by groups.
 
-= 3.0.12
+
+3.0.12
+------
 
  * [FIXED] Use will_paginate 3.0.0.
 
-= 3.0.9
+
+3.0.9
+-----
 
  * [NEW] Refactored and renamed `User` extensions to `AdminUserV1`.
 
  * [NEW] `AdminUserV2` which uses `bcrypt` and it's simpler. This will be the
    default authentication mechanism for my new apps.
 
-= 3.0.8 (unreleased)
+
+3.0.8
+-----
 
  * [FIXED] Missing alias. (Commit 2af7d4cfd98bb0)
 
-= 3.0.7
 
- *[CHANGED] Updated assets. Please run the `typus:assets` generator in order
-  to create the new files on the new location.
+3.0.7
+-----
+
+ * [CHANGED] Updated assets. Please run the `typus:assets` generator in order
+   to create the new files on the new location.
 
-= 3.0.3
+
+3.0.3
+-----
 
  * [NEW] Support for has many through relationships. [jmeiss]
 
@@ -247,7 +292,9 @@
 
  * [NEW] Better application templates.
 
-= 3.0.2
+
+3.0.2
+-----
 
  * [FIXED] Use Arel to get the data on lists. After moving to will_paginate I
    broke the data method, on each list we where "selecting ALL on the table of
@@ -257,25 +304,31 @@
    to Rails caching mechanism this was not affecting to the performance. Now we
    only see the @current_user once. (As it should be.)
 
-= 3.0.1
+
+3.0.1
+-----
 
  * [FIXED] After moving from a vendored paginator to will_paginate I removed
    some stuff which shouldn't be removed, so the 3.0.0 gem is totally broken.
 
  * [FIXED] Force query with postgresql adapter to not be case sensitive [jmeiss]
 
-= 3.0.0
+
+3.0.0
+-----
 
  * [NEW] New gem version compatible with Rails 3.
 
-= Previously
+
+Previously
+----------
 
 Why a 3.0.0 version? After considering the work done for the Rails 3 transition
 I though it would be a good idea to keep versions syncronized with Rails.
 
-Typus will have the same version numbers as Rails as I considered it's pretty
-tied to it. With each release of Rails, we will take the latest features into
-Typus.
+**Typus** will have the same version numbers as Rails as I considered it's
+pretty tied to it. With each release of Rails, we will take the latest features
+into **Typus**.
 
 Pending stuff that someday will be done, donations and collaborations are
 accepted.
@@ -289,5 +342,3 @@ accepted.
 * Nested models.
 
 * Contextual content depending on the role logged.
-
-* Replace typus authentication by devise.

data/Gemfile

@@ -8,9 +8,9 @@ gemspec
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
+  gem 'sass-rails',   '~> 3.1.5'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
 end
 
 # Database adapters
@@ -31,7 +31,7 @@ end
 # And this stuff needed for the demo application.
 gem "acts_as_list"
 gem "acts_as_tree"
-gem "factory_girl_rails", "~> 1.1.0"
+gem "factory_girl_rails", "~> 1.4.0"
 gem "rails-permalink", "~> 1.0.0"
 gem "rails-trash", "~> 1.1.2"
 
@@ -42,14 +42,14 @@ gem "jquery-rails"
 gem "ckeditor-rails", "0.0.2"
 
 # Alternative authentication
-gem "devise", "~> 1.4.7"
+gem "devise", "~> 1.5.2"
 
 # Asset Management with Dragonfly
 gem "dragonfly", "~> 0.9.8"
 gem "rack-cache", :require => "rack/cache"
 
 # Asset Management with Paperclip
-gem "paperclip", "~> 2.4.2"
+gem "paperclip", "~> 2.4.5"
 
 # MongoDB
 gem "mongoid", "~> 2.3.4"

data/README.md

@@ -1,6 +1,6 @@
 # Typus: Admin Panel for Ruby on Rails applications
 
-[![Build Status](https://secure.travis-ci.org/typus/typus.png)](http://travis-ci.org/typus/typus)
+[![Build Status](https://secure.travis-ci.org/fesplugas/typus.png)](http://travis-ci.org/fesplugas/typus)
 
 **Typus** is a control panel for [Ruby on Rails][rails] applications to
 allow trusted users edit structured content.

data/app/controllers/admin/resources_controller.rb

@@ -149,7 +149,7 @@ class Admin::ResourcesController < Admin::BaseController
     set_wheres
     set_joins
     check_resources_ownership if @resource.typus_options_for(:only_user_items)
-    set_order
+    set_order if @resource.respond_to?(:order)
     set_eager_loading
   end
 

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

@@ -0,0 +1,10 @@
+module Admin::Resources::DataTypes::IntegerHelper
+
+  def integer_filter(filter)
+    values = set_context.send(filter.to_s.pluralize).to_a
+    items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]
+    array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
+    items += array
+  end
+
+end

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

@@ -10,7 +10,7 @@ module Admin::Resources::DataTypes::PositionHelper
 
       unless first_item || last_item
         options = { :controller => "/admin/#{item.class.to_resource}", :action => "position", :id => item.id, :go => key }
-        locals[:html_position] << link_to(Typus::I18n.t(value), params.merge(options))
+        locals[:html_position] << link_to(Typus::I18n.t(value), params.merge(options), { :class => Typus::I18n.t(value).downcase })
       end
     end
 

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

@@ -5,7 +5,8 @@ module Admin::Resources::FiltersHelper
       locals = {}
 
       locals[:filters] = typus_filters.map do |key, value|
-                           { :key => set_filter(key, value), :value => send("#{value}_filter", key) }
+                           { :key => set_filter(key, value),
+                             :value => send("#{value}_filter", key) }
                          end
 
       rejections = %w(controller action locale utf8 sort_order order_by) + locals[:filters].map { |f| f[:key] }

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

@@ -59,9 +59,13 @@ module Admin::Resources::FormHelper
   end
 
   def save_options
-    { "_addanother" => "Save and add another",
-      "_continue" => "Save and continue editing",
-      "_save" => "Save" }
+    options = {}
+    options["_addanother"] = "Save and add another"
+    if admin_user.can?('edit', @resource.model_name)
+      options["_continue"] = "Save and continue editing"
+    end
+    options["_save"] = "Save"
+    options
   end
 
   def save_options_for_headless_mode

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

@@ -11,7 +11,8 @@ module Admin::Resources::RelationshipsHelper
   def build_pagination
     items_per_page = @model_to_relate.typus_options_for(:per_page)
     data = @item.send(@field).order(@model_to_relate.typus_order_by).where(set_conditions)
-    @items = data.page(params[:page]).per(items_per_page)
+    page = params["#{@association_name}_page"]
+    @items = data.page(page).per(items_per_page)
   end
 
   def build_relationship_table

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

@@ -1,3 +1,7 @@
+<%
+  param_name = "#{association_name}_page"
+%>
+
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
@@ -7,7 +11,7 @@
 
   <% if @items.any? -%>
     <%= table %>
-    <%= paginate(@items, Typus.pagination.merge(:anchor => association_name)) %>
+    <%= paginate(@items, Typus.pagination.merge(:anchor => association_name, :param_name => param_name)) %>
   <% else %>
     <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.humanize.downcase.pluralize) %></p>
   <% end %>

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

@@ -1,5 +1,5 @@
 <%= item.position %>
 
-<div class="actions">
+<div class="actions position">
   <%= html_position.join(connector).html_safe %>
 </div>

data/config/routes.rb

@@ -21,13 +21,9 @@ Rails.application.routes.draw do
       end
     end
 
-    Typus.models.map(&:to_resource).each do |resource|
-      match "#{resource}(/:action(/:id))(.:format)", :controller => resource
-    end
+    controllers = Typus.models.map(&:to_resource) + Typus.resources.map(&:underscore)
+    controllers.each { |c| match "#{c}(/:action(/:id))(.:format)", :controller => c }
 
-    Typus.resources.map(&:underscore).each do |resource|
-      match "#{resource}(/:action(/:id))(.:format)", :controller => resource
-    end
   end
 
   if Typus.subdomain
@@ -37,4 +33,5 @@ Rails.application.routes.draw do
   else
     scope "admin", {:module => :admin, :as => "admin"}, &routes_block
   end
+
 end

data/lib/typus.rb

@@ -4,11 +4,14 @@ require "support/object"
 require "support/string"
 
 require "typus/engine"
-require "typus/orm/base"
-require "typus/orm/active_record"
 require "typus/regex"
 require "typus/version"
 
+require "typus/orm/base/class_methods"
+require "typus/orm/base/search"
+require "typus/orm/active_record"
+require "typus/orm/mongoid"
+
 require "kaminari"
 
 autoload :FakeUser, "support/fake_user"

data/lib/typus/controller/format.rb

@@ -27,7 +27,7 @@ module Typus
           options = { :conditions => @conditions, :batch_size => 1000 }
 
           ::CSV.open(filename, 'w') do |csv|
-            csv << fields.keys
+            csv << fields.keys.map { |k| @resource.human_attribute_name(k) }
             @resource.find_in_batches(options) do |records|
               records.each do |record|
                 csv << fields.map do |key, value|

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

@@ -3,7 +3,7 @@ module Typus
     module ActiveRecord
       module ClassMethods
 
-        include Typus::Orm::Base
+        include Typus::Orm::Base::ClassMethods
 
         # Model fields as an <tt>ActiveSupport::OrderedHash</tt>.
         def model_fields
@@ -51,10 +51,6 @@ module Typus
           filter.to_sym.eql?(:index) ? ['id'] : model_fields.keys
         end
 
-        def virtual_fields
-          instance_methods.map(&:to_s) - model_fields.keys.map(&:to_s)
-        end
-
         def virtual_attribute?(field)
           :virtual if virtual_fields.include?(field.to_s)
         end
@@ -79,15 +75,6 @@ module Typus
           reflect_on_association(field).macro if reflect_on_association(field)
         end
 
-        def custom_attribute?(field)
-          case field.to_s
-          when 'parent', 'parent_id' then :tree
-          when /password/            then :password
-          when 'position'            then :position
-          when /\./                  then :transversal
-          end
-        end
-
         def typus_filters
           ActiveSupport::OrderedHash.new.tap do |fields_with_type|
             get_typus_filters.each do |field|
@@ -101,6 +88,10 @@ module Typus
           data.extract_settings.map(&:to_sym)
         end
 
+        def typus_user_id?
+          columns.map(&:name).include?(Typus.user_foreign_key)
+        end
+
       end
     end
   end

data/lib/typus/orm/active_record/search.rb

@@ -3,6 +3,8 @@ module Typus
     module ActiveRecord
       module Search
 
+        include Typus::Orm::Base::Search
+
         def build_search_conditions(key, value)
           Array.new.tap do |search|
             query = ::ActiveRecord::Base.connection.quote_string(value.downcase)
@@ -25,76 +27,10 @@ module Typus
           end.join(" OR ")
         end
 
-        def build_boolean_conditions(key, value)
-          { key => (value == 'true') ? true : false }
-        end
-
-        def build_datetime_conditions(key, value)
-          tomorrow = Time.zone.now.beginning_of_day.tomorrow
-
-          interval = case value
-                     when 'today'         then 0.days.ago.beginning_of_day..tomorrow
-                     when 'last_few_days' then 3.days.ago.beginning_of_day..tomorrow
-                     when 'last_7_days'   then 6.days.ago.beginning_of_day..tomorrow
-                     when 'last_30_days'  then 30.days.ago.beginning_of_day..tomorrow
-                     end
-
-          build_filter_interval(interval, key)
-        end
-
-        def build_date_conditions(key, value)
-          tomorrow = 0.days.ago.tomorrow.to_date
-
-          interval = case value
-                     when 'today'         then 0.days.ago.to_date..tomorrow
-                     when 'last_few_days' then 3.days.ago.to_date..tomorrow
-                     when 'last_7_days'   then 6.days.ago.to_date..tomorrow
-                     when 'last_30_days'  then 30.days.ago.to_date..tomorrow
-                     end
-
-          build_filter_interval(interval, key)
-        end
-
         def build_filter_interval(interval, key)
           ["#{table_name}.#{key} BETWEEN ? AND ?", interval.first.to_s(:db), interval.last.to_s(:db)]
         end
 
-        def build_string_conditions(key, value)
-          { key => value }
-        end
-
-        alias_method :build_integer_conditions, :build_string_conditions
-        alias_method :build_belongs_to_conditions, :build_string_conditions
-
-        # TODO: Detect the primary_key for this object.
-        def build_has_many_conditions(key, value)
-          ["#{key}.id = ?", value]
-        end
-
-        ##
-        # To build conditions we reject all those params which are not model
-        # fields.
-        #
-        # Note: We still want to be able to search so the search param is not
-        #       rejected.
-        #
-        def build_conditions(params)
-          Array.new.tap do |conditions|
-            query_params = params.dup
-
-            query_params.reject! do |k, v|
-              !model_fields.keys.include?(k.to_sym) &&
-              !model_relationships.keys.include?(k.to_sym) &&
-              !(k.to_sym == :search)
-            end
-
-            query_params.compact.each do |key, value|
-              filter_type = model_fields[key.to_sym] || model_relationships[key.to_sym] || key
-              conditions << send("build_#{filter_type}_conditions", key, value)
-            end
-          end
-        end
-
         def build_my_joins(params)
           query_params = params.dup
           query_params.reject! { |k, v| !model_relationships.keys.include?(k.to_sym) }