typus 3.1.6 → 3.1.7

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 CHANGELOG
 =========
 
+3.1.8 (unreleased)
+------------------
+
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.7...master>
+
+
+3.1.7 (2012-01-25)
+------------------
+
+ * [FIXED] Require ActiveRecord extension only if ActiveRecord is defined.
+
+ * [NEW] Show association name on related tables.
+
+ * [FIXED] Fixed gemspec to add compatibility with Rails 3.2.0
+
+Changes: <https://github.com/fesplugas/typus/compare/v3.1.6...v3.1.7>
+
+
 3.1.6 (2012-01-02)
 ------------------
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2011 Francesc Esplugas Marti
+Copyright (c) 2007-2012 Francesc Esplugas Marti
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/admin/resources_controller.rb

@@ -166,7 +166,7 @@ class Admin::ResourcesController < Admin::BaseController
      else
        not_allowed
      end
-   end
+    end
   end
 
   def set_wheres

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

@@ -5,7 +5,7 @@
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= @model_to_relate.model_name.human.pluralize %>
+    <%= @resource.human_attribute_name(association_name) %>
     <small><%= add_new %></small>
   </h2>
 

data/app/views/helpers/admin/resources/_table.html.erb

@@ -1,4 +1,4 @@
-<% yield_name = "table_headers_#{model}" %>
+<% yield_name = "table_headers_#{model}_#{rand(100)}" %>
 
 <% content_for yield_name do %>
   <thead>

data/lib/support/object.rb

@@ -7,7 +7,7 @@ class Object
   # Probably there's a better way to verify if a model responds to an STI
   # pattern.
   def self.is_sti?
-    superclass.superclass == ActiveRecord::Base
+    (name != base_class.name) && base_class.descends_from_active_record?
   end
 
 end

data/lib/typus.rb

@@ -1,4 +1,4 @@
-require "support/active_record"
+require "support/active_record" if defined?(ActiveRecord)
 require "support/hash"
 require "support/object"
 require "support/string"

data/lib/typus/controller/acts_as_list.rb

@@ -1,3 +1,6 @@
+##
+# Module designed to work with `acts_as_list`.
+#
 module Typus
   module Controller
     module ActsAsList
@@ -7,16 +10,6 @@ module Typus
         base.before_filter :check_resource_ownership, :only => [:position]
       end
 
-      ##
-      # This module is designed to work with `acts_as_list`.
-      #
-      # Available positions are:
-      #
-      # - move_to_top
-      # - move_higher
-      # - move_lower
-      # - move_to_bottom
-      #
       def position
         if %w(move_to_top move_higher move_lower move_to_bottom).include?(params[:go])
           @item.send(params[:go])

data/lib/typus/controller/trash.rb

@@ -1,8 +1,5 @@
 ##
-# This module is designed to work with `rails-trash`. Add it to your `Gemfile`
-# if you have plans to use it:
-#
-#     gem "rails-trash", "~> 1.1.1"
+# Module designed to work with `rails-trash`.
 #
 module Typus
   module Controller

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.6"
+  VERSION = "3.1.7"
 end

data/typus.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "bcrypt-ruby", "~> 3.0.0"
   s.add_dependency "jquery-rails"
   s.add_dependency "kaminari", "~> 0.12.4"
-  s.add_dependency "rails", "~> 3.1.3"
+  s.add_dependency "rails", ">= 3.1.3"
 
   # Development dependencies are defined in the `Gemfile`.
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70213462925800 !ruby/object:Gem::Requirement
+  requirement: &70093502726560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213462925800
+  version_requirements: *70093502726560
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70213462924980 !ruby/object:Gem::Requirement
+  requirement: &70093502724380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213462924980
+  version_requirements: *70093502724380
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70213462921200 !ruby/object:Gem::Requirement
+  requirement: &70093502721740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +43,18 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70213462921200
+  version_requirements: *70093502721740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70213462939560 !ruby/object:Gem::Requirement
+  requirement: &70093502737120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70213462939560
+  version_requirements: *70093502737120
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -138,7 +138,7 @@ files:
 - app/views/admin/resources/_show.html.erb
 - app/views/admin/resources/edit.html.erb
 - app/views/admin/resources/edit/_actions.html.erb
-- app/views/admin/resources/edit/_rencently_edited.html.erb
+- app/views/admin/resources/edit/_recently_edited.html.erb
 - app/views/admin/resources/index.html.erb
 - app/views/admin/resources/new.html.erb
 - app/views/admin/resources/show.html.erb
@@ -333,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3351687569820403912
+      hash: 3514957204800588845
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -342,10 +342,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3351687569820403912
+      hash: 3514957204800588845
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold