typus 3.1.4 → 3.1.5

data/CHANGELOG

@@ -1,4 +1,14 @@
-= 3.2.0 (unreleased)
+= 3.1.5 (2011-12-10)
+
+ * [CHANGED] Association tables now contain a "show" link.
+
+ * [FIXED] Generators check if there's a database connection.
+
+ * [CHANGED] ActsAsList module now can only perform whitelisted actions.
+
+ * [CHANGED] ActsAsList hooks moved completely to it's module.
+
+ * [CHANGED] Repository moved again to http://github.com/fesplugas/typus
 
 = 3.1.4
 

data/Gemfile

@@ -52,18 +52,18 @@ gem "rack-cache", :require => "rack/cache"
 gem "paperclip", "~> 2.4.2"
 
 # MongoDB
-gem "mongoid", "~> 2.3.0"
-gem "bson_ext", "~> 1.4.0"
+gem "mongoid", "~> 2.3.4"
+gem "bson_ext", "~> 1.5.1"
 
 group :test do
-  gem "shoulda-context", "~> 1.0.0.beta1"
+  gem "shoulda-context", "~> 1.0.0"
   gem "mocha" # Make sure mocha is loaded at the end ...
 end
 
 # Remember to install the Chrome or Safari extension, otherwise it doesn't
 # make sense to have this here.
 group :development do
-  gem "guard-livereload"
+  # gem "guard-livereload"
   # gem "rb-fsevent"
   # gem "growl_notify"
 end

data/README.md

@@ -32,7 +32,7 @@ Add **Typus** to your `Gemfile`
     gem 'typus'
 
     # Bundle edge Typus instead:
-    # gem 'typus', :git => 'git://github.com/typus/typus.git'
+    # gem 'typus', :git => 'git://github.com/fesplugas/typus.git'
 
 Update your bundle, run the generator and start the application server:
 
@@ -46,7 +46,7 @@ and go to <http://0.0.0.0:3000/admin>.
 
 To test, clone the repo and run the following commands:
 
-    $ git clone git://github.com/typus/typus.git
+    $ git clone git://github.com/fesplugas/typus.git
     $ bundle install --path vendor/bundle
     $ bundle exec rake
 
@@ -60,15 +60,15 @@ user to be able to run tests.
 - [Documentation](http://docs.typuscmf.com/)
 - [RubyGems][typus_gem]
 - [Mailing List](http://groups.google.com/group/typus)
-- [Contributors List](http://github.com/typus/typus/contributors)
+- [Contributors List](http://github.com/fesplugas/typus/contributors)
 
 ## License
 
 **Typus** is released under the MIT license.
 
-[typus]: http://github.com/typus/typus
+[typus]: http://github.com/fesplugas/typus
 [typus_demo]: http://demo.typuscmf.com/
-[typus_locales]: https://github.com/typus/typus/tree/master/config/locales
+[typus_locales]: https://github.com/fesplugas/typus/tree/master/config/locales
 [typus_gem]: http://rubygems.org/gems/typus
 [paperclip]: http://rubygems.org/gems/paperclip
 [dragonfly]: http://rubygems.org/gems/dragonfly

data/app/controllers/admin/resources_controller.rb

@@ -5,7 +5,7 @@ class Admin::ResourcesController < Admin::BaseController
   include Typus::Controller::Format
   include Typus::Controller::Headless
 
-  Whitelist = [:edit, :update, :destroy, :toggle, :position, :relate, :unrelate]
+  Whitelist = [:edit, :update, :destroy, :toggle]
 
   before_filter :get_model
   before_filter :set_context

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

@@ -43,6 +43,7 @@ module Admin::Resources::DataTypes::HasManyHelper
 
   def set_has_many_resource_actions
     @resource_actions = [["Edit", { :action => "edit", :_popup => true }, { :class => 'iframe_with_page_reload' }],
+                         ["Show", { :action => "show", :_popup => true }, { :class => 'iframe'}],
                          ["Trash", { :action => "destroy" }, { :confirm => "Trash?" } ]]
   end
 

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

@@ -1,7 +1,7 @@
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= association_name.titleize.humanize.pluralize %>
+    <%= @model_to_relate.model_name.human.pluralize %>
     <small><%= add_new %></small>
   </h2>
 

data/config/locales/typus.es.yml

@@ -7,6 +7,7 @@ es:
   "Active": "Activo"
   "Add": "Añadir"
   "Add New": "Añadir nuevo"
+  "Add New %{resource}": "Añadir Nuevo %{resource}"
   "All": "Todos"
   "Are you sure?": "¿Estás seguro?"
   "Are you sure you want to sign out and end your session?": "¿Estás seguro que quieres salir y cerrar la sessión?"
@@ -16,6 +17,7 @@ es:
 
   "Dashboard": "Panel de control"
   "Down": "Bajar"
+  "Applications": "Applicaciones"
 
   "Edit": "Editar"
   "Edit %{resource}": "Editar %{resource}"
@@ -50,6 +52,9 @@ es:
   "Reset password": "Cambiar contraseña"
   "Resources": "Recursos"
 
+  "Save": "Guardar"
+  "Save and add another": "Guardar y añadir nuevo"
+  "Save and continue editing": "Guardar y seguir editando"
   "Save %{resource}": "Guardar %{resource}"
   "Search": "Buscar"
   "Show": "Mostrar"

data/lib/generators/typus/config_generator.rb

@@ -28,7 +28,7 @@ Description:
 
       def fields_for(model, *defaults)
         rejections = %w( ^id$ _type$ type created_at created_on updated_at updated_on deleted_at ).join("|")
-        fields = model.table_exists? ? model.columns.map(&:name) : defaults
+        fields = ActiveRecord::Base.connected? && model.table_exists? ? model.columns.map(&:name) : defaults
         fields.reject { |f| f.match(rejections) }.join(", ")
       end
 

data/lib/typus/controller/acts_as_list.rb

@@ -2,6 +2,11 @@ module Typus
   module Controller
     module ActsAsList
 
+      def self.included(base)
+        base.before_filter :get_object, :only => [:position]
+        base.before_filter :check_resource_ownership, :only => [:position]
+      end
+
       ##
       # This module is designed to work with `acts_as_list`.
       #
@@ -13,9 +18,13 @@ module Typus
       # - move_to_bottom
       #
       def position
-        @item.send(params[:go])
-        notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
-        redirect_to :back, :notice => notice
+        if %w(move_to_top move_higher move_lower move_to_bottom).include?(params[:go])
+          @item.send(params[:go])
+          notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
+          redirect_to :back, :notice => notice
+        else
+          not_allowed
+        end
       end
 
     end

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

@@ -56,24 +56,19 @@ module Typus
             self.preferences[:locale] = locale
           end
 
-          # Returns self if the password is correct, otherwise false.
           def authenticate(unencrypted_password)
-            if BCrypt::Password.new(password_digest) == unencrypted_password
-              self
-            else
-              false
-            end
+            equal = BCrypt::Password.new(password_digest) == unencrypted_password
+            equal ? self : false
           end
 
-          # Encrypts the password into the password_digest attribute.
           def password=(unencrypted_password)
             @password = unencrypted_password
             self.password_digest = BCrypt::Password.create(unencrypted_password)
           end
 
-          def password_must_be_strong
-            if password.present?
-              errors.add(:password, :too_short, :count => 7) unless password.size > 6
+          def password_must_be_strong(count = 6)
+            if password.present? && password.size < count
+              errors.add(:password, :too_short, :count => count)
             end
           end
 

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 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 -- doc/* Guardfile .travis.yml .gitignor .travis.yml .gitignore`.split("\n")
+ignores = `git ls-files -- doc/* Guardfile .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.4
+  version: 3.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70187560417180 !ruby/object:Gem::Requirement
+  requirement: &70133893099040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187560417180
+  version_requirements: *70133893099040
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70187560415940 !ruby/object:Gem::Requirement
+  requirement: &70133893112440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187560415940
+  version_requirements: *70133893112440
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70187560414840 !ruby/object:Gem::Requirement
+  requirement: &70133893109900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187560414840
+  version_requirements: *70133893109900
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70187560412760 !ruby/object:Gem::Requirement
+  requirement: &70133893108560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +54,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187560412760
+  version_requirements: *70133893108560
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -316,7 +315,6 @@ files:
 - vendor/assets/formalize/images/select_arrow.gif
 - vendor/assets/formalize/js/jquery.formalize.min.js
 - vendor/assets/jquery-searchField/jquery.searchField.js
-has_rdoc: true
 homepage: http://www.typuscmf.com/
 licenses: []
 post_install_message: 
@@ -331,8 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      segments_generated: true
-      hash: -737197900168303605
+      hash: -4534583435995700232
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -341,11 +338,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      segments_generated: true
-      hash: -737197900168303605
+      hash: -4534583435995700232
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.3.9.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold