fesplugas-typus 0.9.5 → 0.9.6

data/README.rdoc

@@ -70,9 +70,10 @@ Typus and blog about Typus.
 - Anthony Underwood (Code) http://github.com/aunderwo
 - Felipe Talavera (Code) http://github.com/flype
 - Erik Tigerholm (Code) http://github.com/eriktigerholm
-- George Guimarães (Translation pt-br and code) http://github.com/georgeguimaraes
+- George Guimarães (Portuguese translation and code) http://github.com/georgeguimaraes
 - José Valim (Code) http://github.com/josevalim
 - Luqman Amjad (Code) http://github.com/snake
+- Alexey Noskov (Russian translation and code) http://github.com/alno
 
 == Acknowledgments
 

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/app/controllers/admin/master_controller.rb

@@ -47,6 +47,8 @@ class Admin::MasterController < ApplicationController
 
     @conditions, @joins = @resource[:class].build_conditions(params)
 
+    check_ownership_of_items if @resource[:class].typus_options_for(:only_user_items)
+
     respond_to do |format|
       format.html { generate_html }
       @resource[:class].typus_export_formats.each do |f|
@@ -256,6 +258,21 @@ private
 
   end
 
+  def check_ownership_of_items
+
+    # If current_user is a root user, by-pass.
+    return if @current_user.is_root?
+
+    # If current user is not root and @resource has a foreign_key which 
+    # is related to the logged user (Typus.user_fk) we only show the user 
+    # related items.
+    if @resource[:class].columns.map { |u| u.name }.include?(Typus.user_fk)
+      condition = { Typus.user_fk => @current_user }
+      @conditions = @resource[:class].merge_conditions(@conditions, condition)
+    end
+
+  end
+
   def set_fields
     @fields = case params[:action]
               when 'index'

data/app/helpers/admin/form_helper.rb

@@ -68,9 +68,10 @@ module Admin::FormHelper
   end
 
   def typus_boolean_field(attribute, klass = @resource[:class])
+    attribute_name = attribute.gsub(/\?$/,'')
     <<-HTML
-<li><label for="item_#{attribute}">#{klass.human_attribute_name(attribute)}</label>
-#{check_box :item, attribute} #{_('Checked if active')}</li>
+<li><label for="item_#{attribute_name}">#{klass.human_attribute_name(attribute)}</label>
+#{check_box :item, attribute_name} #{_('Checked if active')}</li>
     HTML
   end
 

data/app/helpers/admin/table_helper.rb

@@ -210,7 +210,7 @@ module Admin::TableHelper
                   item.class.typus_options_for(:nil) # Content is nil, so we show nil.
                 end
 
-    options = { :controller => item.class.name.tableize, :action => 'toggle', :field => attribute, :id => item.id }
+    options = { :controller => item.class.name.tableize, :action => 'toggle', :field => attribute.gsub(/\?$/,''), :id => item.id }
 
     content = if item.class.typus_options_for(:toggle) && !item.send(attribute).nil?
                 link_to link_text, params.merge(options), :confirm => _("Change {{attribute}}?", :attribute => item.class.human_attribute_name(attribute).downcase)

data/app/helpers/typus_helper.rb

@@ -90,7 +90,7 @@ module TypusHelper
     options = args.extract_options!
     template = [ 'admin', options[:resource], options[:location], "_#{options[:partial]}.html.erb" ].compact.join('/')
 
-    exists = ActionController::Base.view_paths.map { |vp| File.exists?("#{vp}/#{template}") }
+    exists = ActionController::Base.view_paths.map { |vp| File.exists?("#{Rails.root}/#{vp}/#{template}") }
 
     return unless exists.include?(true)
     render :partial => template.gsub('/_', '/')

data/config/locales/typus_hacks.yml

@@ -9,6 +9,11 @@ es:
       typus_user: "Typus user"
 
 pt-BR:
+  activerecord:
+    models:
+      typus_user: "Typus user"
+
+ru:
   activerecord:
     models:
       typus_user: "Typus user"

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

@@ -15,12 +15,14 @@ Typus::Configuration.options[:app_name] = '<%= application %>'
 
 # Model options which can also be defined by model on the yaml files.
 
-# Typus::Configuration.options[:index_after_save] = true
+# Typus::Configuration.options[:default_action_on_item] = 'edit'
 # Typus::Configuration.options[:end_year] = Time.now.year + 1
 # Typus::Configuration.options[:form_rows] = 10
 # Typus::Configuration.options[:icon_on_boolean] = false
+# Typus::Configuration.options[:index_after_save] = true
 # Typus::Configuration.options[:minute_step] = 5
 # Typus::Configuration.options[:nil] = 'nil'
+# Typus::Configuration.options[:only_user_items] = false
 # Typus::Configuration.options[:per_page] = 15
 # Typus::Configuration.options[:sidebar_selector] = 5
 # Typus::Configuration.options[:start_year] = Time.now.year - 10

data/generators/typus/templates/config/typus/application.yml

@@ -35,6 +35,7 @@
 #     index_after_save: false
 #     minute_step: 15
 #     nil: 'nil'
+#     only_user_items: false
 #     per_page: 5
 #     sidebar_selector: 5
 #     start_year: 1990

data/generators/typus/typus_generator.rb

@@ -67,7 +67,7 @@ class TypusGenerator < Rails::Generator::Base
                           model.reflect_on_all_associations(relationship).map { |i| i.name.to_s }
                         end.flatten.sort
 
-        configuration[:base] << <<-CODE
+        configuration[:base] << <<-RAW
 #{model}:
   fields:
     list: #{list.join(', ')}
@@ -89,15 +89,15 @@ class TypusGenerator < Rails::Generator::Base
   application: #{application}
   description:
 
-        CODE
+        RAW
 
-        configuration[:roles] << <<-CODE
+        configuration[:roles] << <<-RAW
   #{model}: create, read, update, delete
-        CODE
+        RAW
 
       end
 
-      Dir["#{Typus.root}/generators/typus/templates/config/typus/*"].each do |f|
+      Dir["#{Typus.path}/generators/typus/templates/config/typus/*"].each do |f|
         base = File.basename(f)
         m.template "config/typus/#{base}", "#{config_folder}/#{base}", 
                    :assigns => { :configuration => configuration }
@@ -124,7 +124,7 @@ class TypusGenerator < Rails::Generator::Base
       m.file 'public/stylesheets/admin/reset.css', 'public/stylesheets/admin/reset.css'
       m.file 'public/javascripts/admin/application.js', 'public/javascripts/admin/application.js'
 
-      Dir["#{Typus.root}/generators/typus/templates/public/images/admin/*"].each do |f|
+      Dir["#{Typus.path}/generators/typus/templates/public/images/admin/*"].each do |f|
         base = File.basename(f)
         m.file "public/images/admin/#{base}", "public/images/admin/#{base}"
       end

data/generators/typus_update_schema_to_01/typus_update_schema_to_01_generator.rb

@@ -5,7 +5,7 @@ class TypusUpdateSchemaTo01Generator < Rails::Generator::Base
     record do |m|
 
       config_folder = Typus::Configuration.options[:config_folder]
-      Dir["#{Typus.root}/generators/typus_update_schema_to_01/templates/config/*"].each do |f|
+      Dir["#{Typus.path}/generators/typus_update_schema_to_01/templates/config/*"].each do |f|
         base = File.basename(f)
         m.template "config/#{base}", "#{config_folder}/#{base}"
       end

data/lib/typus/active_record.rb

@@ -49,7 +49,6 @@ module Typus
             when /file_name/:       attribute_type = :file
             when /password/:        attribute_type = :password
             when 'position':        attribute_type = :position
-            when /\?/:              attribute_type = :boolean
           end
 
           if reflect_on_association(field)
@@ -185,9 +184,9 @@ module Typus
     # We are able to define how to display dates on Typus
     #
     def typus_date_format(attribute = :default)
-      date_format = Typus::Configuration.config[name]['fields']['options']['date_formats'][attribute.to_s] rescue nil
+      date_format = Typus::Configuration.config[name]['fields']['options']['date_formats'][attribute.to_s].to_sym rescue nil
       date_format = :db if date_format.nil?
-      return date_format.to_sym
+      return date_format
     end
 
     ##
@@ -246,7 +245,7 @@ module Typus
           condition = { key => value }
           conditions = merge_conditions(conditions, condition)
         when :has_and_belongs_to_many
-          condition = {  key => { :id => value } }
+          condition = { key => { :id => value } }
           conditions = merge_conditions(conditions, condition)
           joins << key.to_sym
         end

data/lib/typus/configuration.rb

@@ -3,7 +3,18 @@ module Typus
   module Configuration
 
     ##
-    # Default Typus options which can be overwritten from the initializer.
+    # Default Typus options which can be overwritten from the 
+    # initializer. Example:
+    #
+    #     Typus::Configuration.options[:recover_password]
+    #
+    # Special cases:
+    #
+    #     Typus::Configuration.options[:user_fk]
+    #     Typus.user_fk
+    #
+    #     Typus::Configuration.options[:user_class_name]
+    #     Typus.user_class
     #
     typus_options = { :app_name => 'Typus', 
                       :config_folder => 'config/typus', 
@@ -17,7 +28,10 @@ module Typus
                       :user_fk => 'typus_user_id' }
 
     ##
-    # Default model options which can be overwritten from the initializer.
+    # Default model options which can be overwritten from the 
+    # initializer. Example:
+    #
+    #    Model.typus_options_for(:default_action_on_item)
     #
     model_options = { :default_action_on_item => 'edit', 
                       :end_year => nil,
@@ -26,6 +40,7 @@ module Typus
                       :index_after_save => false, 
                       :minute_step => 5, 
                       :nil => 'nil', 
+                      :only_user_items => false, 
                       :per_page => 15, 
                       :sidebar_selector => 5, 
                       :start_year => nil, 

data/lib/typus/generator.rb

@@ -9,7 +9,7 @@ module Typus
     Dir.mkdir(admin_controllers_folder) unless File.directory?(admin_controllers_folder)
 
     # Get a list of all available app/controllers/admin
-    admin_controllers = Dir["#{Rails.root}/vendor/plugins/*/app/controllers/admin/*.rb", "#{Rails.root}/app/controllers/admin/*.rb"]
+    admin_controllers = Dir["#{Rails.root}/vendor/plugins/*/app/controllers/admin/*.rb", "#{admin_controllers_folder}/*.rb"]
     admin_controllers = admin_controllers.map { |i| File.basename(i) }
 
     # Create app/views/admin if doesn't exist.
@@ -17,13 +17,13 @@ module Typus
     Dir.mkdir(admin_views_folder) unless File.directory?(admin_views_folder)
 
     # Create test/functional/admin if doesn't exist.
+    admin_controller_tests_folder = "#{Rails.root}/test/functional/admin"
     if File.directory?("#{Rails.root}/test")
-      admin_controller_tests_folder = "#{Rails.root}/test/functional/admin"
       Dir.mkdir(admin_controller_tests_folder) unless File.directory?(admin_controller_tests_folder)
     end
 
     # Get a list of all available functional test for admin.
-    admin_controller_tests = Dir["#{Rails.root}/vendor/plugins/*/test/functional/admin/*.rb", "#{Rails.root}/test/functional/admin/*.rb"]
+    admin_controller_tests = Dir["#{Rails.root}/vendor/plugins/*/test/functional/admin/*.rb", "#{admin_controller_tests_folder}/*.rb"]
     admin_controller_tests = admin_controller_tests.map { |i| File.basename(i) }
 
     # Generate unexisting controllers for resources which are not tied to

data/lib/typus.rb

@@ -3,10 +3,10 @@ module Typus
   class << self
 
     def version
-      @@version ||= File.read("#{root}/VERSION").strip
+      @@version ||= File.read("#{path}/VERSION").strip
     end
 
-    def root
+    def path
       File.dirname(__FILE__) + '/../'
     end
 

data/rails/init.rb

@@ -1,14 +1,11 @@
 require 'typus'
-require 'sha1'
 
 if Typus.testing?
   Typus::Configuration.options[:config_folder] = 'vendor/plugins/typus/test/config/working'
 end
 
 ##
-# Typus.enable and run the generator unless we are testing the plugin.
-# Do not Typus.enable or generate files if we are running a rails 
-# generator.
+# Do not Typus.enable or Typus.generate if we are running a generator.
 #
 
 scripts = %w( script/generate script/destroy )

data/test/functional/admin/comments_controller_test.rb

@@ -105,13 +105,13 @@ class Admin::CommentsControllerTest < ActionController::TestCase
 
   def test_should_generate_csv
 
-    expected = <<-CSV
+    expected = <<-RAW
 Email,Post
 john@example.com,1
 me@example.com,1
 john@example.com,
 me@example.com,1
-     CSV
+     RAW
 
     get :index, :format => 'csv'
     assert_equal expected, @response.body

data/test/functional/admin/posts_controller_test.rb

@@ -215,25 +215,6 @@ class Admin::PostsControllerTest < ActionController::TestCase
     assert_match /datepicker_template_published_at/, @response.body
   end
 
-=begin
-
-  # FIXME
-
-  def test_should_add_back_to_params_for_comment_items
-
-    post_ = posts(:published)
-    get :edit, { :id => post_.id }
-    assert_response :success
-    back_to = "/posts/#{post_.id}/edit"
-    re = /<a href="\/typus\/assets\/1\/edit(.*)">This is the caption\.<\/a>/
-    params = re.match(@response.body)
-
-    assert_equal params[1], "?back_to=%2Ftypus%2Fposts%2F1%2Fedit&amp;resource=posts&amp;resource_id=#{post_.id}"
-
-  end
-
-=end
-
   def test_should_verify_root_can_edit_any_record
     Post.find(:all).each do |post|
       get :edit, { :id => post.id }

data/test/helper.rb

@@ -3,6 +3,12 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
 require 'test_help'
 require 'mocha'
+require 'time'
+
+def Time.today
+  t = now()
+  mktime( t.year, t.mon, t.day )
+end unless Time.respond_to?(:today)
 
 begin
   require 'redgreen'

data/test/helpers/admin/sidebar_helper_test.rb

@@ -69,9 +69,16 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     self.expects(:params).at_least_once.returns(params)
 
     output = export
-    expected = ["<a href=\"http://test.host/admin/custom_users.csv\">CSV</a>"]
 
-    assert_equal expected, output
+    # FIXME or OPTIMIZE
+
+    begin
+      expected = ["<a href=\"http://test.host/admin/custom_users.csv\">CSV</a>"]
+      assert_equal expected, output
+    rescue
+      expected = ["<a href=\"http://test.host/admin/custom_users?format=csv\">CSV</a>"]
+      assert_equal expected, output
+    end
 
   end
 

data/test/helpers/admin/table_helper_test.rb

@@ -185,22 +185,6 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=begin
-
-  # FIXME
-
-  def test_typus_table_position_field
-
-    category = categories(:first)
-    output = typus_table_position_field('position', category)
-    expected = ""
-
-    assert_equal expected, output
-
-  end
-
-=end
-
   def test_typus_table_datetime_field
 
     post = posts(:published)
@@ -235,7 +219,7 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     Typus::Configuration.stubs(:options).returns(options)
 
     post = posts(:published)
-    output = typus_table_boolean_field(:status, post)
+    output = typus_table_boolean_field('status', post)
     expected = <<-HTML
 <td align="center">True</td>
     HTML
@@ -243,7 +227,7 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     assert_equal expected, output
 
     post = posts(:unpublished)
-    output = typus_table_boolean_field(:status, post)
+    output = typus_table_boolean_field('status', post)
     expected = <<-HTML
 <td align="center">False</td>
     HTML

data/test/lib/configuration_test.rb

@@ -24,12 +24,14 @@ class ConfigurationTest < ActiveSupport::TestCase
   def test_should_verify_model_configuration_options
     initializer = "#{Rails.root}/config/initializers/typus.rb"
     return if File.exists?(initializer)
+    assert_equal 'edit', Typus::Configuration.options[:default_action_on_item]
     assert_equal nil, Typus::Configuration.options[:end_year]
     assert_equal 10, Typus::Configuration.options[:form_rows]
     assert_equal true, Typus::Configuration.options[:icon_on_boolean]
     assert_equal false, Typus::Configuration.options[:index_after_save]
     assert_equal 5, Typus::Configuration.options[:minute_step]
     assert_equal 'nil', Typus::Configuration.options[:nil]
+    assert_equal false, Typus::Configuration.options[:only_user_items]
     assert_equal 15, Typus::Configuration.options[:per_page]
     assert_equal 5, Typus::Configuration.options[:sidebar_selector]
     assert_equal nil, Typus::Configuration.options[:start_year]
@@ -64,7 +66,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     options = { :config_folder => 'vendor/plugins/typus/test/config/ordered' }
     Typus::Configuration.stubs(:options).returns(options)
     files = Dir["#{Rails.root}/#{Typus::Configuration.options[:config_folder]}/*_roles.yml"]
-    expected = files.collect { |file| File.basename(file) }
+    expected = files.collect { |file| File.basename(file) }.sort
     assert_equal expected, ['001_roles.yml', '002_roles.yml']
     expected = { 'admin' => { 'categories' => 'read' } }
     assert_equal expected, Typus::Configuration.roles!

data/test/lib/routes_test.rb

@@ -68,15 +68,4 @@ class RoutesTest < ActiveSupport::TestCase
 
   end
 
-=begin
-
-  # FIXME
-
-  def test_should_verify_generated_routes_for_resource_controller
-    assert_routing '/admin/watch_dog', :controller => 'admin/watch_dog', :action => 'index'
-    assert_routing '/admin/watch_dog/cleanup', { :controller => 'admin/watch_dog', :action => 'cleanup' }
-  end
-
-=end
-
 end

data/test/lib/typus_test.rb

@@ -2,6 +2,16 @@ require 'test/helper'
 
 class TypusTest < ActiveSupport::TestCase
 
+  def test_should_return_version
+    assert Typus.respond_to?(:version)
+    assert Typus.version.kind_of?(String)
+  end
+
+  def test_should_return_path
+    expected = Dir.pwd + '/lib/../'
+    assert_equal expected, Typus.path
+  end
+
   def test_should_return_locales
     initializer = "#{Rails.root}/config/initializers/typus.rb"
     return if File.exists?(initializer)
@@ -36,17 +46,6 @@ class TypusTest < ActiveSupport::TestCase
     assert Typus.respond_to?(:parent)
   end
 
-=begin
-
-  # FIXME
-
-  def test_should_verify_parent_for_module
-    assert Typus.parent(TypusUser.name, 'module').kind_of?(String)
-    assert_equal 'Typus', Typus.parent(TypusUser.name, 'module')
-  end
-
-=end
-
   def test_should_verify_parent_for_application
     assert Typus.parent(TypusUser, 'application').kind_of?(String)
     assert_equal 'Typus', Typus.parent(TypusUser, 'application')

data/test/unit/typus_user_test.rb

@@ -25,10 +25,10 @@ class TypusUserTest < ActiveSupport::TestCase
   end
 
   def test_should_verify_email_is_not_valid
-    email = <<-END
+    email = <<-RAW
 this_is_chelm@example.com
 <script>location.href="http://spammersite.com"</script>
-END
+    RAW
     @typus_user.email = email
     assert @typus_user.invalid?
     assert @typus_user.errors.invalid?(:email)
@@ -101,17 +101,6 @@ END
     assert @typus_user.invalid?
     assert @typus_user.errors.invalid?(:password)
 
-=begin
-
-    # FIXME
-
-    @typus_user.password = '12345678'
-    @typus_user.password_confirmation = nil
-    assert @typus_user.invalid?
-    assert @typus_user.errors.invalid?(:password)
-
-=end
-
     @typus_user.password = '12345678'
     @typus_user.password_confirmation = ''
     assert @typus_user.invalid?

data/test/vendor/paginator_test.rb

@@ -1,7 +1,5 @@
 require 'test/helper'
 
-# require 'paginator'
-
 class PaginatorTest < ActiveSupport::TestCase
 
   PER_PAGE = 10

data/typus.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-05-25}
+  s.date = %q{2009-05-30}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fesplugas-typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: []