typus 0.9.18 → 0.9.19

data/generators/typus/typus_generator.rb

@@ -99,17 +99,23 @@ class TypusGenerator < Rails::Generator::Base
 
       [ 'public/stylesheets/admin', 
         'public/javascripts/admin', 
-        'public/images/admin' ].each { |f| Dir.mkdir(f) unless File.directory?(f) }
+        'public/images/admin', 
+        'public/images/admin/fancyzoom' ].each { |f| Dir.mkdir(f) unless File.directory?(f) }
 
       [ 'public/stylesheets/admin/screen.css', 
         'public/stylesheets/admin/reset.css', 
-        'public/javascripts/admin/application.js' ].each { |f| m.file f, f }
+        'public/images/admin/ui-icons.png' ].each { |f| m.file f, f }
 
-      Dir["#{Typus.root}/generators/typus/templates/public/images/admin/*"].each do |f|
-        file = "public/images/admin/#{File.basename(f)}"
+      %w( application builder controls dragdrop effects fancyzoom prototype scriptaculous slider sound ).each do |f|
+        file = "public/javascripts/admin/#{f}.js"
         m.file file, file
       end
 
+      %w( bl bm br closebox ml mr tl tm tr ).each do |image|
+        file = "public/images/admin/fancyzoom/#{image}"
+        %w( gif png ).each { |e| m.file "#{file}.#{e}", "#{file}.#{e}" }
+      end
+
       # Migration file
 
       m.migration_template 'db/create_typus_users.rb', 'db/migrate', 

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

@@ -9,6 +9,4 @@ TypusUser:
   filters: status, role
   search: first_name, last_name, email, role
   application: Typus
-  description: System Users Administration
-  options:
-    icon_on_boolean: false
+  description: System Users Administration

data/lib/typus/configuration.rb

@@ -6,6 +6,7 @@ module Typus
     typus_options = { :app_name => 'Typus', 
                       :config_folder => 'config/typus', 
                       :email => 'admin@example.com', 
+                      :image_preview_size => 'typus', 
                       :locales => [ [ "English", :en ] ], 
                       :recover_password => false, 
                       :root => 'admin', 
@@ -18,7 +19,6 @@ module Typus
     model_options = { :default_action_on_item => 'edit', 
                       :end_year => nil,
                       :form_rows => 10, 
-                      :icon_on_boolean => true, 
                       :index_after_save => false, 
                       :minute_step => 5, 
                       :nil => 'nil', 

data/lib/typus/generator.rb

@@ -4,17 +4,13 @@ module Typus
 
   def self.generator
 
-    # Create app/controllers/admin if doesn't exist.
+    # Create needed folders if doesn't exist.
     admin_controllers_folder = "#{Rails.root}/app/controllers/admin"
-    Dir.mkdir(admin_controllers_folder) unless File.directory?(admin_controllers_folder)
-
-    # Get a list of controllers under `app/controllers/admin`.
-    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.
     admin_views_folder = "#{Rails.root}/app/views/admin"
-    Dir.mkdir(admin_views_folder) unless File.directory?(admin_views_folder)
+
+    [ admin_controllers_folder, admin_views_folder ].each do |folder|
+      Dir.mkdir(folder) unless File.directory?(folder)
+    end
 
     # Create test/functional/admin if doesn't exist.
     admin_controller_tests_folder = "#{Rails.root}/test/functional/admin"
@@ -22,6 +18,10 @@ module Typus
       Dir.mkdir(admin_controller_tests_folder) unless File.directory?(admin_controller_tests_folder)
     end
 
+    # Get a list of controllers under `app/controllers/admin`.
+    admin_controllers = Dir["#{Rails.root}/vendor/plugins/*/app/controllers/admin/*.rb", "#{admin_controllers_folder}/*.rb"]
+    admin_controllers = admin_controllers.map { |i| File.basename(i) }
+
     # Get a list of functional tests under `test/functional/admin`.
     admin_controller_tests = Dir["#{admin_controller_tests_folder}/*.rb"]
     admin_controller_tests = admin_controller_tests.map { |i| File.basename(i) }

data/lib/typus/preview.rb

@@ -0,0 +1,13 @@
+module Typus
+
+  module InstanceMethods
+
+    def typus_preview
+      return "<img src=\"#{asset.url(Typus::Configuration.options[:image_preview_size])}\" />"
+    end
+
+  end
+
+end
+
+ActiveRecord::Base.send :include, Typus::InstanceMethods

data/lib/typus.rb

@@ -104,6 +104,7 @@ module Typus
       require 'typus/format'
       require 'typus/generator'
       require 'typus/locale'
+      require 'typus/preview'
       require 'typus/reloader'
       require 'typus/quick_edit'
       require 'typus/user'

data/test/config/default/typus.yml

@@ -9,6 +9,4 @@ TypusUser:
   filters: status, role
   search: first_name, last_name, email, role
   application: Typus
-  description: System Users Administration
-  options:
-    icon_on_boolean: false
+  description: System Users Administration

data/test/config/working/typus.yml

@@ -9,6 +9,4 @@ TypusUser:
   filters: status, role
   search: first_name, last_name, email, role
   application: Typus
-  description: System Users Administration
-  options:
-    icon_on_boolean: false
+  description: System Users Administration

data/test/functional/admin/comments_controller_test.rb

@@ -75,7 +75,7 @@ class Admin::CommentsControllerTest < ActionController::TestCase
   def test_should_show_trash_item_image_and_link_in_index
     get :index
     assert_response :success
-    assert_match /trash.gif/, @response.body
+    assert_match /Trash/, @response.body
   end
 
   def test_should_not_show_remove_item_link_in_index
@@ -85,7 +85,7 @@ class Admin::CommentsControllerTest < ActionController::TestCase
 
     get :index
     assert_response :success
-    assert_no_match /trash.gif/, @response.body
+    assert_no_match /Trash/, @response.body
 
   end
 

data/test/helpers/admin/form_helper_test.rb

@@ -72,8 +72,8 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
     output = typus_boolean_field('test')
 
     expected = <<-HTML
-<li><label for="item_test">Test</label>
-<input name="item[test]" type="hidden" value="0" /><input id="item_test" name="item[test]" type="checkbox" value="1" /> Checked if active</li>
+<li><label>Test</label>
+<input name="item[test]" type="hidden" value="0" /><input id="item_test" name="item[test]" type="checkbox" value="1" /> <label class=\"inline_label\" for=\"item_test\">Checked if active</label></li>
                HTML
 
     assert_equal expected, output

data/test/helpers/admin/table_helper_test.rb

@@ -24,9 +24,9 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     output = typus_table_header(TypusUser, fields)
     expected = <<-HTML
 <tr>
-<th><a href="http://test.host/admin/typus_users?order_by=email"><div class="">Email</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=role"><div class="">Role</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=status"><div class="">Status</div></a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=email">Email </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=role">Role </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=status">Status </a></th>
 <th>&nbsp;</th>
 </tr>
     HTML
@@ -48,9 +48,9 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     output = typus_table_header(TypusUser, fields)
     expected = <<-HTML
 <tr>
-<th><a href="http://test.host/admin/typus_users?order_by=email&search=admin"><div class="">Email</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=role&search=admin"><div class="">Role</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=status&search=admin"><div class="">Status</div></a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=email&search=admin">Email </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=role&search=admin">Role </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=status&search=admin">Status </a></th>
 <th>&nbsp;</th>
 </tr>
     HTML
@@ -72,9 +72,9 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     output = typus_table_header(TypusUser, fields)
     expected = <<-HTML
 <tr>
-<th><a href="http://test.host/admin/typus_users?order_by=email"><div class="">Email</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=role"><div class="">Role</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=status"><div class="">Status</div></a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=email">Email </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=role">Role </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=status">Status </a></th>
 </tr>
     HTML
 
@@ -95,9 +95,9 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     output = typus_table_header(TypusUser, fields)
     expected = <<-HTML
 <tr>
-<th><a href="http://test.host/admin/typus_users?order_by=email&search=admin"><div class="">Email</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=role&search=admin"><div class="">Role</div></a></th>
-<th><a href="http://test.host/admin/typus_users?order_by=status&search=admin"><div class="">Status</div></a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=email&search=admin">Email </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=role&search=admin">Role </a></th>
+<th><a href="http://test.host/admin/typus_users?order_by=status&search=admin">Status </a></th>
 </tr>
     HTML
 
@@ -156,7 +156,7 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     post = posts(:published)
     output = typus_table_string_field(:title, post, :title)
     expected = <<-HTML
-<td><a href="http://test.host/admin/posts/edit/#{post.id}">#{post.title}</a></td>
+<td>#{post.title}</td>
     HTML
 
     assert_equal expected, output
@@ -215,7 +215,7 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   def test_typus_table_boolean_field
 
-    options = { :icon_on_boolean => false, :toggle => false }
+    options = { :toggle => false }
     Typus::Configuration.stubs(:options).returns(options)
 
     post = posts(:published)

data/test/lib/configuration_test.rb

@@ -12,6 +12,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'Typus', Typus::Configuration.options[:app_name]
     assert_equal 'vendor/plugins/typus/test/config/working', Typus::Configuration.options[:config_folder]
     assert_equal 'admin@example.com', Typus::Configuration.options[:email]
+    assert_equal 'typus', Typus::Configuration.options[:image_preview_size]
     assert_equal [ [ "English", :en] ], Typus::Configuration.options[:locales]
     assert_equal false, Typus::Configuration.options[:recover_password]
     assert_equal 'admin', Typus::Configuration.options[:root]
@@ -27,7 +28,6 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'edit', Typus::Configuration.options[:default_action_on_item]
     assert_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]

data/typus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.18"
+  s.version = "0.9.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-08-21}
+  s.date = %q{2009-08-25}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [
@@ -59,13 +59,35 @@ Gem::Specification.new do |s|
      "generators/typus/templates/config/typus/typus.yml",
      "generators/typus/templates/config/typus/typus_roles.yml",
      "generators/typus/templates/db/create_typus_users.rb",
-     "generators/typus/templates/public/images/admin/arrow_down.gif",
-     "generators/typus/templates/public/images/admin/arrow_up.gif",
-     "generators/typus/templates/public/images/admin/spinner.gif",
-     "generators/typus/templates/public/images/admin/status_false.gif",
-     "generators/typus/templates/public/images/admin/status_true.gif",
-     "generators/typus/templates/public/images/admin/trash.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/bl.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/bl.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/bm.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/bm.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/br.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/br.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/closebox.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/closebox.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/ml.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/ml.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/mr.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/mr.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/tl.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/tl.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/tm.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/tm.png",
+     "generators/typus/templates/public/images/admin/fancyzoom/tr.gif",
+     "generators/typus/templates/public/images/admin/fancyzoom/tr.png",
+     "generators/typus/templates/public/images/admin/ui-icons.png",
      "generators/typus/templates/public/javascripts/admin/application.js",
+     "generators/typus/templates/public/javascripts/admin/builder.js",
+     "generators/typus/templates/public/javascripts/admin/controls.js",
+     "generators/typus/templates/public/javascripts/admin/dragdrop.js",
+     "generators/typus/templates/public/javascripts/admin/effects.js",
+     "generators/typus/templates/public/javascripts/admin/fancyzoom.js",
+     "generators/typus/templates/public/javascripts/admin/prototype.js",
+     "generators/typus/templates/public/javascripts/admin/scriptaculous.js",
+     "generators/typus/templates/public/javascripts/admin/slider.js",
+     "generators/typus/templates/public/javascripts/admin/sound.js",
      "generators/typus/templates/public/stylesheets/admin/reset.css",
      "generators/typus/templates/public/stylesheets/admin/screen.css",
      "generators/typus/typus_generator.rb",
@@ -83,6 +105,7 @@ Gem::Specification.new do |s|
      "lib/typus/hash.rb",
      "lib/typus/locale.rb",
      "lib/typus/object.rb",
+     "lib/typus/preview.rb",
      "lib/typus/quick_edit.rb",
      "lib/typus/reloader.rb",
      "lib/typus/string.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 +02:00
+date: 2009-08-25 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -65,13 +65,35 @@ files:
 - generators/typus/templates/config/typus/typus.yml
 - generators/typus/templates/config/typus/typus_roles.yml
 - generators/typus/templates/db/create_typus_users.rb
-- generators/typus/templates/public/images/admin/arrow_down.gif
-- generators/typus/templates/public/images/admin/arrow_up.gif
-- generators/typus/templates/public/images/admin/spinner.gif
-- generators/typus/templates/public/images/admin/status_false.gif
-- generators/typus/templates/public/images/admin/status_true.gif
-- generators/typus/templates/public/images/admin/trash.gif
+- generators/typus/templates/public/images/admin/fancyzoom/bl.gif
+- generators/typus/templates/public/images/admin/fancyzoom/bl.png
+- generators/typus/templates/public/images/admin/fancyzoom/bm.gif
+- generators/typus/templates/public/images/admin/fancyzoom/bm.png
+- generators/typus/templates/public/images/admin/fancyzoom/br.gif
+- generators/typus/templates/public/images/admin/fancyzoom/br.png
+- generators/typus/templates/public/images/admin/fancyzoom/closebox.gif
+- generators/typus/templates/public/images/admin/fancyzoom/closebox.png
+- generators/typus/templates/public/images/admin/fancyzoom/ml.gif
+- generators/typus/templates/public/images/admin/fancyzoom/ml.png
+- generators/typus/templates/public/images/admin/fancyzoom/mr.gif
+- generators/typus/templates/public/images/admin/fancyzoom/mr.png
+- generators/typus/templates/public/images/admin/fancyzoom/tl.gif
+- generators/typus/templates/public/images/admin/fancyzoom/tl.png
+- generators/typus/templates/public/images/admin/fancyzoom/tm.gif
+- generators/typus/templates/public/images/admin/fancyzoom/tm.png
+- generators/typus/templates/public/images/admin/fancyzoom/tr.gif
+- generators/typus/templates/public/images/admin/fancyzoom/tr.png
+- generators/typus/templates/public/images/admin/ui-icons.png
 - generators/typus/templates/public/javascripts/admin/application.js
+- generators/typus/templates/public/javascripts/admin/builder.js
+- generators/typus/templates/public/javascripts/admin/controls.js
+- generators/typus/templates/public/javascripts/admin/dragdrop.js
+- generators/typus/templates/public/javascripts/admin/effects.js
+- generators/typus/templates/public/javascripts/admin/fancyzoom.js
+- generators/typus/templates/public/javascripts/admin/prototype.js
+- generators/typus/templates/public/javascripts/admin/scriptaculous.js
+- generators/typus/templates/public/javascripts/admin/slider.js
+- generators/typus/templates/public/javascripts/admin/sound.js
 - generators/typus/templates/public/stylesheets/admin/reset.css
 - generators/typus/templates/public/stylesheets/admin/screen.css
 - generators/typus/typus_generator.rb
@@ -89,6 +111,7 @@ files:
 - lib/typus/hash.rb
 - lib/typus/locale.rb
 - lib/typus/object.rb
+- lib/typus/preview.rb
 - lib/typus/quick_edit.rb
 - lib/typus/reloader.rb
 - lib/typus/string.rb