tiny_cms 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/app/views/tiny_cms/index.html.erb

@@ -1,6 +1,5 @@
 <div id='pages-tree'></div>
 <input type='button' id='new-node' value='<%= I18n.t 'pages.actions.new_page' %>' />
-<input type='button' id='new-section' value='<%= I18n.t 'pages.actions.new_section' %>' />
 <input type='button' id='destroy' value='<%= I18n.t 'pages.actions.destroy' %>' />
 
 <form id='page-creation' title='<%= I18n.t 'pages.actions.new_page' %>' style='display:none'>
@@ -10,11 +9,14 @@
   <input type='text' name='permalink' id='permalink' class='text ui-widget-content ui-corner-all' />
 </form>
 
+
 <script type='text/javascript' charset='utf-8'>
   jQuery(function(){
+    var translations = <%= I18n.t('pages', :default => {:actions => {}, :alerts => {}}).to_json %>
+    
     jQuery("#pages-tree").pagesTree({
       controller : "<%= url_for :controller => params[:controller] %>",
-      translations : <%= I18n.t('pages', :default => {:actions => {}, :alerts => {}}).to_json %>
+      translations : translations
     });
     
     jQuery("#page-creation").dialog({
@@ -23,17 +25,12 @@
     });
     
     jQuery("#new-node").click(function(){
-      jQuery.tree.focused().create({ data : "page", attributes : {rel : 'page'}}, jQuery.tree.focused().selected || -1);
-      return false;
-    });
-    
-    jQuery("#new-section").click(function(){
-      jQuery.tree.focused().create({ data : "section", attributes : {rel : ''}}, jQuery.tree.focused().selected || -1);
+      jQuery.tree.focused().create({ data : "page"}, jQuery.tree.focused().selected || -1);
       return false;
     });
     
     jQuery("#destroy").click(function(){
-      if (confirm(opts.translations.actions.confirm))
+      if (confirm(translations.alerts.confirm))
         jQuery.tree.focused().remove();
       return false;
     });

data/generators/tiny_cms/templates/migration.rb

@@ -6,7 +6,6 @@ class TinyCmsCreate<%= table_name.camelize %> < ActiveRecord::Migration
       t.integer  :position
       t.string   :title
       t.string   :content
-      t.boolean  :is_page
       
       t.timestamps
     end

data/generators/tiny_cms_assets/templates/javascripts/tiny_cms.js

@@ -33,24 +33,12 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
               label   : opts.translations.actions.new_page, 
               icon    : "create-page",
               visible : function (node, tree_obj) { 
-                if(node.length != 1 || node.attr('rel') == 'page') return false;
+                if(node.length != 1) return false;
                   return tree_obj.check("creatable", node); 
               }, 
               
               action  : function (node, tree_obj) {
-                tree_obj.create({ data : 'page', attributes : {rel : 'page'}}, tree_obj.get_node(node[0])); 
-              }
-            },
-
-            'create-section' : {
-              label   : opts.translations.actions.new_section, 
-              icon    : "create-secction",
-              visible : function (node, tree_obj) { 
-                if(node.length != 1 || node.attr('rel') == 'page') return false; 
-                return tree_obj.check("creatable", node); 
-              }, 
-              action  : function (node, tree_obj) { 
-                tree_obj.create({ data : 'section', attributes : {rel : ''}}, tree_obj.get_node(node[0])); 
+                tree_obj.create({data : 'page'}, tree_obj.get_node(node[0])); 
               }
             },
             
@@ -82,7 +70,7 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
               visible : function (node, tree_obj) { 
                 var ok = true; 
                 $.each(node, function () { 
-                  if(tree_obj.check("deletable", this) == false) {
+                  if(tree_obj.check("deletable", this) === false) {
                     ok = false; 
                     return false; 
                   }
@@ -95,22 +83,13 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
                   $.each(node, function () { 
                     tree_obj.remove(this); 
                   });
-                }; 
+                }
               } 
             }
           }
         }
       },
 
-      types : {
-        "page" : {
-          valid_children : "none",
-          icon : {
-            image : '/stylesheets/apple/file.png'
-          }
-        }
-      },
-
       data : {
         type  : 'json',
         async : true,
@@ -133,14 +112,15 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
             case 'inside':
             ref_node = $(ref);
             break;
-          };
+          }
                     
           var created_node = tree_obj.get(node);
           var page_data    = created_node.data;
           $.extend(page_data, created_node.attributes);
           
-          if (ref_node != -1)
+          if (ref_node != -1) {
             $.extend(page_data, {parent_id : ref_node.attr('data-node-id')});
+          }
 
           modalDialog = $('#page-creation');
           
@@ -208,8 +188,9 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
           });
           
           modalDialog.bind( "dialogclose", function(event, ui) {
-            if(!valid) 
+            if(!valid) {
               tree_obj.remove(node);
+            }
           }).dialog('open');
 
           return true;
@@ -218,7 +199,7 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
         onmove : function(node, ref, type, tree_obj, rollback){
           var ref_node, children, url, data;
           var child_ids = [];
-
+          
           switch(type)
           {
             case 'before':
@@ -228,7 +209,7 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
             case 'inside':
             ref_node = tree_obj.parent(node);
             break;
-          };
+          }
 
           if (ref_node == -1) {
             children = tree_obj.children(-1);
@@ -240,7 +221,7 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
             url      = opts.controller + "/" + ref_node.attributes['data-node-id'] + '.json';
             $.each(children, function(index, value){ child_ids.push(value.attributes['data-node-id']); });
           }
-
+          
           $.ajax({
             timeout : 3000,
             type : 'POST',
@@ -250,8 +231,9 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
                page : { child_ids : child_ids }
             }, 
             error : function(response, status){
-              if(response.status == 422)
+              if(response.status == 422) {
                 alert(opts.translations.alerts.duplicate_path);
+              }
               $.tree.rollback(rollback);
             },
             dataType : 'json'
@@ -291,8 +273,6 @@ document.write("<link rel='stylesheet' href='/stylesheets/apple/style.css' type=
         },
       
         onselect : function(node){
-          if( !($(node).attr('rel') == 'section') )
-            $('input#new-node, input#new-section').attr('disabled', true);
           $('input#destroy').removeAttr('disabled');
         },
         

data/lib/tiny_cms/node.rb

@@ -28,7 +28,6 @@ module TinyCMS
       }
       
       model.named_scope :roots,   :conditions => {:parent_id => nil}, :order => 'position'
-      model.named_scope :pages,   :conditions => {:is_page   => true}
       
       model.belongs_to :parent,   :class_name => model.to_s, :foreign_key => 'parent_id'
       model.has_many   :children, :class_name => model.to_s, :foreign_key => 'parent_id', :order => 'position', :dependent => :destroy
@@ -36,11 +35,12 @@ module TinyCMS
       model.validates_presence_of   :title
       model.validates_uniqueness_of :permalink, :scope  => [:parent_id]
 
-      model.validate :validates_no_children, :if => :is_page
       model.validates_associated :children
 
       model.before_validation :parameterize_permalink
       
+      model.send :attr_accessor, :rel # Does nothing but jstree sends attribute
+      
       model.send :define_method, :children_with_position= do |array|
         # TODO: Too unefficient
         transaction { array.each_with_index{ |child, index| child.update_attributes! :position => index, :parent_id => id } } rescue nil
@@ -48,10 +48,6 @@ module TinyCMS
       end
       model.alias_method_chain :children=, :position
     end
-
-    def rel= rel
-      self.is_page = rel == 'page'
-    end
   
     def siblings
       return [] unless parent_id
@@ -68,16 +64,11 @@ module TinyCMS
     end
     
     def to_hash
-      {:attributes => {'data-node-id' => id, :rel => is_page ? 'page' : 'section', 'data-permalink' => permalink, 'data-path' => path}, :data => title, :children => children.map{ |c| c.to_hash } }
+      {:attributes => {'data-node-id' => id, 'data-permalink' => permalink, 'data-path' => path}, :data => title, :children => children.map{ |c| c.to_hash } }
     end
     
     def to_json opts = {}
       self.to_hash.to_json
     end
-    
-    private
-    def validates_no_children
-      errors.add(:base, "A page cannot have children") unless children.blank? # Todo: localize
-    end
   end
 end

data/lib/tiny_cms/pages_controller.rb

@@ -1,5 +1,6 @@
 module TinyCMS
   class PagesController < ApplicationController
+    unloadable
     helper_method :resource
     
     def index
@@ -41,7 +42,7 @@ module TinyCMS
       respond_to do |format|
         if resource.update_attributes params[resource_name]
           format.html { redirect_to resource }
-          format.json { head :ok }
+          format.json { render :json => {} }
         else
           format.html { render 'tiny_cms/edit' }
           format.json { render :json => resource.errors, :status => :unprocessable_entity }
@@ -50,7 +51,11 @@ module TinyCMS
     end
     
     def reorder
-      klass.reorder(params[:page]['child_ids']) ? head(:ok) : head(:unprocessable_entity)
+      if klass.reorder params[:page]['child_ids']
+        render :json => {}
+      else
+        render :json => {}, :status => :unprocessable_entity
+      end
     end
     
     def destroy
@@ -59,7 +64,7 @@ module TinyCMS
       
       respond_to do |format|
         format.html { redirect_to :controller => params[:controller], :action => 'index'}
-        format.json { head :ok }
+        format.json { render :json => {} }
       end
     end
     

data/test/helper.rb

@@ -9,14 +9,9 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require 'factory_girl'
-
 require 'support/page_migration'
 
 Factory.define :page do |p|
   p.sequence(:title) { |i| "Node #{i}"}
   p.sequence(:permalink) { |i| "node_#{i}"}
-  p.is_page true
-end
-
-class Test::Unit::TestCase
 end

data/test/support/page_migration.rb

@@ -11,7 +11,6 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer  :position
     t.string   :title
     t.string   :content
-    t.boolean  :is_page
 
     t.timestamps
   end

data/test/test_node.rb

@@ -3,13 +3,6 @@ require 'helper'
 class PageTest < Test::Unit::TestCase
   should_belong_to :parent
   should_have_many :children
-  
-  context 'attributes' do
-    setup { @page = Factory :page, :rel => 'page' }
-    should 'set is_page' do
-      assert @page.is_page
-    end
-  end
 
   context 'children have positions' do
     setup do
@@ -64,7 +57,7 @@ class PageTest < Test::Unit::TestCase
     context 'invalid children' do
       setup do
         Page.destroy_all
-        @root  = Factory :page, :permalink => 'root',  :position  => 1, :is_page => false
+        @root  = Factory :page, :permalink => 'root',  :position  => 1
         @root2 = Factory :page, :permalink => 'child', :position  => 2
         @child = Factory :page, :permalink => 'child',  :parent_id => @root.id,  :position => 1
         @root.child_ids = [@root2.id, @child.id]
@@ -112,8 +105,8 @@ class PageTest < Test::Unit::TestCase
   context 'json generation' do
     setup do
       Page.destroy_all
-      root   = Factory.build :page, :is_page => false
-      @pages = (1..5).map{ |i| Factory.build :page, :is_page => i == 5 }
+      root   = Factory.build :page
+      @pages = (1..5).map{ |i| Factory.build :page }
 
       @pages.inject(root){ |parent, child| parent.children.push(child) and child }
       @pages.unshift root
@@ -124,7 +117,7 @@ class PageTest < Test::Unit::TestCase
 
     should 'override to json' do
       walk = lambda do |node|
-        {:attributes => {'data-node-id' => node.id, :rel => node.is_page ? 'page' : 'section', 'data-path' => node.path, 'data-permalink' => node.permalink}, :data => node.title, :children => node.children.map{ |c| walk.call(c) }}
+        {:attributes => {'data-node-id' => node.id, 'data-path' => node.path, 'data-permalink' => node.permalink}, :data => node.title, :children => node.children.map{ |c| walk.call(c) }}
       end
       tree = walk.call @first
       assert_equal tree.to_json, @first.to_json
@@ -134,12 +127,12 @@ class PageTest < Test::Unit::TestCase
   context 'paths' do
     setup do
       Page.destroy_all
-      root     = Factory :page, :is_page => false
-      @branch1 = (1..4).map{ |i| Factory :page, :is_page => i == 3 }
+      root     = Factory :page
+      @branch1 = (1..4).map{ |i| Factory :page}
       @branch1.inject(root){ |parent, child| parent.children.push(child) and child }
       @branch1.unshift root
 
-      @branch2 = (1..4).map{ |i| Factory :page, :is_page => i == 3 }
+      @branch2 = (1..4).map{ |i| Factory :page}
       @branch2.inject(root){ |parent, child| parent.children.push(child) and child }
       @branch2.unshift root
     end
@@ -223,18 +216,12 @@ class PageTest < Test::Unit::TestCase
   context 'validation' do
     should_validate_presence_of :title
 
-    should 'not allow children if is page' do
-      page = Factory.build :page, :is_page => true, :children => [Factory(:page)]
-      assert_equal false, page.valid?
-      assert_equal false, page.errors.on(:base).blank?
-    end
-
     context 'permalink uniqueness' do
       setup do
         Page.destroy_all
         @page1 = Factory.build :page, :permalink => 'same'
         @page2 = Factory.build :page, :permalink => 'same'
-        @page3 = Factory.build :page, :is_page   => false
+        @page3 = Factory.build :page
         @page1.save(false)
         @page2.save(false)
         @page3.save(false)
@@ -248,7 +235,7 @@ class PageTest < Test::Unit::TestCase
       end
 
       # should 'allow duplicate if path is the same but one is not page' do
-      #   @page1.update_attribute :is_page, false
+      #   @page1.update_attribute
       #   assert_equal @page1.path,      @page2.path
       #   assert_equal @page1.permalink, @page2.permalink
       #   @page1.save!
@@ -268,7 +255,7 @@ class PageTest < Test::Unit::TestCase
       end
 
       # should 'validate presence of permalink if is not page' do
-      #   page = Factory.build :page, :permalink => '', :is_page => false
+      #   page = Factory.build :page, :permalink => ''
       #   assert_equal false, page.valid?
       #   assert_equal false, page.errors.on(:permalink).blank?
       # end

data/test/test_pages_controller.rb

@@ -21,7 +21,7 @@ class PagesControllerTest < ActionController::TestCase
     context "as json" do
       setup do
         Page.destroy_all
-        Factory :page, :children => [Factory(:page)], :is_page => false
+        Factory :page, :children => [Factory(:page)]
         get :index, :format => 'json'
       end
 
@@ -56,7 +56,7 @@ class PagesControllerTest < ActionController::TestCase
     end
 
     # should 'raise active record not found when node is not a page' do
-    #   @page.update_attribute :is_page, false
+    #   @page.update_attribute
     #   assert_raises ActiveRecord::RecordNotFound do
     #     get :show, :path => @page.path.scan(/\w+/)
     #   end
@@ -203,7 +203,7 @@ class PagesControllerTest < ActionController::TestCase
     context 'bad attributes' do
       setup do
         Page.destroy_all
-        @root  = Factory :page, :permalink => 'root',  :position  => 1, :is_page => false
+        @root  = Factory :page, :permalink => 'root',  :position  => 1
         @root2 = Factory :page, :permalink => 'root2', :position  => 2
         @child = Factory :page, :permalink => 'root',  :parent_id => @root.id,  :position => 1
         

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Macario
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -05:00
+date: 2010-08-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency