typus 0.9.29 → 0.9.30

data/lib/typus/preview.rb

@@ -2,9 +2,73 @@ module Typus
 
   module InstanceMethods
 
-    def typus_preview(attachment)
+    include ActionView::Helpers::UrlHelper
+
+    # OPTIMIZE
+    def typus_preview_on_table(attribute)
+
+      attachment = attribute.split('_file_name').first
       file_preview = Typus::Configuration.options[:file_preview]
-      return "<img src=\"#{send(attachment).url(file_preview)}\" />"
+      file_thumbnail = Typus::Configuration.options[:file_thumbnail]
+
+      if send(attachment).styles.member?(file_preview) && send("#{attachment}_content_type") =~ /^image\/.+/
+        <<-HTML
+<script type="text/javascript" charset="utf-8">
+  $(document).ready(function() { $("##{to_dom}").fancybox(); });
+</script>
+<a id="#{to_dom}" href="#{send(attachment).url(file_preview)}">#{send(attribute)}</a>
+        HTML
+      else
+        <<-HTML
+<a href="#{send(attachment).url}">#{send(attribute)}</a>
+        HTML
+      end
+    end
+
+    # OPTIMIZE
+    def typus_preview(attribute)
+
+      attachment = attribute.split('_file_name').first
+
+      case send("#{attachment}_content_type")
+      when /^image\/.+/
+        file_preview = Typus::Configuration.options[:file_preview]
+        file_thumbnail = Typus::Configuration.options[:file_thumbnail]
+        if send(attachment).styles.member?(file_preview) && send(attachment).styles.member?(file_thumbnail)
+          <<-HTML
+<script type="text/javascript" charset="utf-8">
+  $(document).ready(function() { $("##{to_dom}").fancybox(); });
+</script>
+<a id="#{to_dom}" href="#{send(attachment).url(file_preview)}" title="#{typus_name}">
+<img src="#{send(attachment).url(file_thumbnail)}" />
+        </a>
+          HTML
+        elsif send(attachment).styles.member?(file_thumbnail)
+          <<-HTML
+<a href="#{send(attachment).url}" title="#{typus_name}">
+<img src="#{send(attachment).url(file_thumbnail)}" />
+        </a>
+          HTML
+        elsif send(attachment).styles.member?(file_preview)
+          <<-HTML
+<script type="text/javascript" charset="utf-8">
+  $(document).ready(function() { $("##{to_dom}").fancybox(); });
+</script>
+<a id="#{to_dom}" href="#{send(attachment).url(file_preview)}" title="#{typus_name}">
+#{send(attribute)}
+        </a>
+          HTML
+        else
+          <<-HTML
+<a href="#{send(attachment).url}">#{send(attribute)}</a>
+          HTML
+        end
+      else
+        <<-HTML
+<a href="#{send(attachment).url}">#{send(attribute)}</a>
+        HTML
+      end
+
     end
 
   end

data/tasks/typus_tasks.rake

@@ -1,5 +1,3 @@
-# require 'spec/tasks/rails'
-
 namespace :typus do
 
   desc 'Install acts_as_list, acts_as_tree and paperclip.'

data/test/config/working/application.yml

@@ -44,6 +44,8 @@ Post:
     list: title, created_at, status
     form: title, body, created_at, status, published_at
     relationship: title, created_at
+    csv: title, status
+    xml: title, status
     options:
       selectors: status
       read_only: permalink
@@ -52,7 +54,7 @@ Post:
         created_at: post_short
       templates:
         published_at: datepicker
-  relationships: assets, categories
+  relationships: assets, categories, comments, views
   actions:
     index: cleanup
     edit: send_as_newsletter, preview
@@ -60,9 +62,13 @@ Post:
   search: title
   order_by: title, -created_at
   application: Blog
+  export: csv, xml
 
 CustomUser:
   fields:
     list: first_name, last_name, email
-    csv: first_name, last_name, email
-  export: csv
+
+View:
+  fields:
+    list: ip, post
+    form: ip, post

data/test/config/working/application_roles.yml

@@ -8,6 +8,7 @@ admin:
   Post: create, read, update, delete
   Status: index
   WatchDog: index, cleanup
+  View: create, read, update, delete
 
 editor:
   Category: create, read, update
@@ -15,8 +16,9 @@ editor:
   Git: index
   Post: create, read, update
   TypusUser: read, update
+  View: create, read, update, delete
 
 designer:
   Category: read, update
   Comment: read
-  Post: read
+  Post: read, update

data/test/functional/admin/{assets_controller_test.rb → master_controller_assets_relationships.rb}

@@ -1,18 +1,22 @@
 require 'test/helper'
 
-# Test polimorphic relationships using the relate & unrelate actions.
-
 class Admin::AssetsControllerTest < ActionController::TestCase
 
   def setup
-    typus_user = typus_users(:admin)
-    @request.session[:typus_user_id] = typus_user.id
+    @request.session[:typus_user_id] = typus_users(:admin).id
   end
 
   def test_should_test_polymorphic_relationship_message
+
     post_ = posts(:published)
-    get :new, { :back_to => "/admin/posts/#{post_.id}/edit", :resource => post_.class.name, :resource_id => post_.id }
-    assert_match "You're adding a new Asset to Post.", @response.body
+    get :new, { :back_to => "/admin/posts/#{post_.id}/edit", 
+                :resource => post_.class.name, :resource_id => post_.id }
+
+    assert_select 'body div#flash' do
+      assert_select 'p', "You're adding a new Asset to Post. Do you want to cancel it?"
+      assert_select 'a', "Do you want to cancel it?"
+    end
+
   end
 
   def test_should_create_a_polymorphic_relationship
@@ -20,21 +24,28 @@ class Admin::AssetsControllerTest < ActionController::TestCase
     post_ = posts(:published)
 
     assert_difference('post_.assets.count') do
-      post :create, { :back_to => "/admin/posts/edit/#{post_.id}", :resource => post_.class.name, :resource_id => post_.id }
+      post :create, { :back_to => "/admin/posts/edit/#{post_.id}", 
+                      :resource => post_.class.name, :resource_id => post_.id }
     end
 
     assert_response :redirect
     assert_redirected_to '/admin/posts/edit/1#assets'
-    assert flash[:success]
     assert_equal "Asset successfully assigned to Post.", flash[:success]
 
   end
 
-  def test_should_test_polymorphic_relationship_edit_message
+  def test_should_render_edit_and_verify_message_on_polymorphic_relationship
+
     post_ = posts(:published)
-    asset_ = assets(:first)
-    get :edit, { :id => asset_.id, :back_to => "/admin/posts/#{post_.id}/edit", :resource => post_.class.name, :resource_id => post_.id }
-    assert_match "You're updating a Asset for Post.", @response.body
+    get :edit, { :id => assets(:first).id, 
+                 :back_to => "/admin/posts/#{post_.id}/edit", 
+                 :resource => post_.class.name, :resource_id => post_.id }
+
+    assert_select 'body div#flash' do
+      assert_select 'p', "You're updating a Asset for Post. Do you want to cancel it?"
+      assert_select 'a', "Do you want to cancel it?"
+    end
+
   end
 
   def test_should_return_to_back_to_url
@@ -48,7 +59,6 @@ class Admin::AssetsControllerTest < ActionController::TestCase
     post :update, { :back_to => "/admin/posts/#{post_.id}/edit", :resource => post_.class.name, :resource_id => post_.id, :id => asset_.id }
     assert_response :redirect
     assert_redirected_to '/admin/posts/1/edit#assets'
-    assert flash[:success]
     assert_equal "Asset successfully updated.", flash[:success]
 
   end

data/test/functional/admin/master_controller_categories_lists_test.rb

@@ -0,0 +1,64 @@
+require 'test/helper'
+
+class Admin::CategoriesControllerTest < ActionController::TestCase
+
+  def setup
+    @request.session[:typus_user_id] = typus_users(:admin).id
+  end
+
+  def test_should_verify_items_are_sorted_by_position_on_list
+    get :index
+    assert_response :success
+    assert_equal [ 1, 2, 3 ], assigns['items'].items.map(&:position)
+    assert_equal [ 2, 3, 1 ], Category.find(:all, :order => "id ASC").map(&:position)
+  end
+
+  if defined?(ActiveRecord::Acts::List)
+
+    def test_should_position_item_one_step_down
+
+      first_category = categories(:first)
+      assert_equal 1, first_category.position
+      second_category = categories(:second)
+      assert_equal 2, second_category.position
+
+      get :position, { :id => first_category.id, :go => 'move_lower' }
+      assert_response :redirect
+      assert_redirected_to admin_dashboard_path
+
+      assert_equal "Record moved lower.", flash[:success]
+      assert_equal 2, first_category.reload.position
+      assert_equal 1, second_category.reload.position
+
+    end
+
+    def test_should_position_item_one_step_up
+      first_category = categories(:first)
+      assert_equal 1, first_category.position
+      second_category = categories(:second)
+      assert_equal 2, second_category.position
+      get :position, { :id => second_category.id, :go => 'move_higher' }
+      assert_equal "Record moved higher.", flash[:success]
+      assert_equal 2, first_category.reload.position
+      assert_equal 1, second_category.reload.position
+    end
+
+    def test_should_position_top_item_to_bottom
+      first_category = categories(:first)
+      assert_equal 1, first_category.position
+      get :position, { :id => first_category.id, :go => 'move_to_bottom' }
+      assert_equal "Record moved to bottom.", flash[:success]
+      assert_equal 3, first_category.reload.position
+    end
+
+    def test_should_position_bottom_item_to_top
+      third_category = categories(:third)
+      assert_equal 3, third_category.position
+      get :position, { :id => third_category.id, :go => 'move_to_top' }
+      assert_equal "Record moved to top.", flash[:success]
+      assert_equal 1, third_category.reload.position
+    end
+
+  end
+
+end

data/test/functional/admin/master_controller_posts_before_test.rb

@@ -0,0 +1,10 @@
+require 'test/helper'
+
+class Admin::PostsControllerTest < ActionController::TestCase
+
+  def setup
+    @typus_user = typus_users(:admin)
+    @request.session[:typus_user_id] = @typus_user.id
+  end
+
+end

data/test/functional/admin/master_controller_posts_crud_test.rb

@@ -0,0 +1,97 @@
+require 'test/helper'
+
+class Admin::PostsControllerTest < ActionController::TestCase
+
+  ##
+  # Actions related to index.
+  ##
+
+  def test_should_index_items
+    get :index
+    assert_response :success
+    assert_template 'index'
+  end
+
+  ##
+  # Actions related to new.
+  ##
+
+  def test_should_new_an_item
+    get :new
+    assert_response :success
+    assert_template 'new'
+  end
+
+  ##
+  # Actions related to create.
+  ##
+
+  def test_should_create_an_item
+
+    assert_difference 'Post.count' do
+      post :create, { :item => { :title => 'This is another title', :body => 'Body' } }
+      assert_response :redirect
+      assert_redirected_to :controller => 'admin/posts', :action => 'edit', :id => Post.last
+    end
+
+  end
+
+  def test_should_create_an_item_and_redirect_to_index
+
+    options = Typus::Configuration.options.merge(:index_after_save => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
+    assert_difference 'Post.count' do
+      post :create, { :item => { :title => 'This is another title', :body => 'Body' } }
+      assert_response :redirect
+      assert_redirected_to :action => 'index'
+    end
+
+  end
+
+  ##
+  # Actions related to show.
+  ##
+
+  def test_should_show_an_item
+    post_ = posts(:published)
+    get :show, { :id => post_.id }
+    assert_response :success
+    assert_template 'show'
+  end
+
+  ##
+  # Actions related to edit.
+  ##
+
+  def test_should_edit_an_item
+    get :edit, { :id => posts(:published) }
+    assert_response :success
+    assert_template 'edit'
+  end
+
+  ##
+  # Actions related to update.
+  ##
+
+  def test_should_update_an_item
+
+    post_ = posts(:published)
+    post :update, { :id => post_.id, :title => 'Updated' }
+    assert_response :redirect
+    assert_redirected_to :controller => 'admin/posts', :action => 'edit', :id => post_.id
+
+  end
+
+  def test_should_update_an_item_and_redirect_to_index
+
+    options = Typus::Configuration.options.merge(:index_after_save => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
+    post :update, { :id => posts(:published), :title => 'Updated' }
+    assert_response :redirect
+    assert_redirected_to :action => 'index'
+
+  end
+
+end

data/test/functional/admin/master_controller_posts_formats_test.rb

@@ -0,0 +1,59 @@
+require 'test/helper'
+
+class Admin::PostsControllerTest < ActionController::TestCase
+
+  def test_should_generate_xml
+
+    assert @typus_user.is_root?
+
+    expected = <<-RAW
+<?xml version="1.0" encoding="UTF-8"?>
+<posts type="array">
+  <post>
+    <status type="boolean">false</status>
+    <title>Owned by admin</title>
+  </post>
+  <post>
+    <status type="boolean">false</status>
+    <title>Owned by editor</title>
+  </post>
+  <post>
+    <status type="boolean">true</status>
+    <title>Title One</title>
+  </post>
+  <post>
+    <status type="boolean">false</status>
+    <title>Title Two</title>
+  </post>
+</posts>
+    RAW
+
+    get :index, :format => 'xml'
+    assert_equal expected, @response.body
+
+  end
+
+  def test_should_generate_csv
+
+    assert @typus_user.is_root?
+
+    begin
+      require 'fastercsv'
+    rescue LoadError
+      return
+    end
+
+    expected = <<-RAW
+Title,Status
+Owned by admin,false
+Owned by editor,false
+Title One,true
+Title Two,false
+     RAW
+
+    get :index, :format => 'csv'
+    assert_equal expected, @response.body
+
+  end
+
+end