caboose-cms 0.5.28 → 0.5.30

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjgwMGEzMGQ2YTFmZWI2OWUzZGQ0NzZlY2MyOTllNjk4MmQ1ZDg0Mg==
+    YmJiNzg3OTk5YWQxNWNmM2NhMTU0ZTMzN2FjNDMxODk4NjgwZTVkMw==
   data.tar.gz: !binary |-
-    N2Q4ZTJhZGQ2NjJjZWFmZjY3NjI3ZTI5MWEwZmY4N2Y2Zjg5MGM3Yw==
+    YjA0MWM2Mjc5YzNkOWE0MjEyYTFiMzBkYzc5MzliOTYxNjQ1Y2I3ZA==
 SHA512:
   metadata.gz: !binary |-
-    NzQxZjliY2RlMGNkNzA5NWY5NmRjNjE5MjRlNDVkZDM5YWQ1ODVmNTEyNjcz
-    NTdmNWE5MGE1ODk5N2M5NTUxZjY3YzE5ZGZhMTJjMTk4NzBkOTAwMTVhYzk4
-    YTQ3MDAxNmM3NzJiYWVkMTg3ZWQ5ZTk3NzIwZjZmMWIzNjAyZGE=
+    MmE1ZWFkYzk1NjM1NDYxY2MzODJkMmMwNzJiOTg3NzIzZDk1NDBiNGQwZjg1
+    ODI1NjMyOWZkZDVkYTMwMjA1NWZhZWVkMTE1NDNhY2QwOGJiYTBmYTQzMDli
+    ZjFhMjgyMGZlYmMwOTQyY2Q3YTk3MjYwNjlmYTQ0MWYwNDRjZmQ=
   data.tar.gz: !binary |-
-    NzdhZGFkZmNmYWZkZjJjY2VlMGViNjUwZDE3MTdmYzEyNzE3NWFiNmMwY2Uw
-    NDM1Yzc0N2JlZGE5YWQxYzlmYmQ5YmQyMjJlMDk3Y2IzYWEzNDI1MjVmY2Q4
-    MTQ0ZTU4YzgwMDIzMDE4OWM1YTE4NzM2Yjk3Y2EzY2RkZWYwZjU=
+    MjQwNzc0M2E3NjVlMTZiMDQ1NmVhZjIyOTRlZjc3NjQzZjY2ODY5NGZhZDc2
+    ZmE3ZjA3YzBkOGFmZThjNTYwNTZjNTQ5YTVmODZmZGU0ZTYyMmE0ZGVlODBk
+    ODQ4YmVlOTY0YWQ1ZjYzNzc3YWY3NzQzZGZhZjgzOWJlMDdmYzU=

data/Rakefile

@@ -1,38 +1,23 @@
 #!/usr/bin/env rake
 begin
-  require 'bundler/setup'
+  require 'bundler/setup'; Bundler.setup(:default, :development)
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Caboose'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task :default => :test
+#task :default => :test
+task :default => :spec
+task :test => :spec

data/app/assets/javascripts/caboose/admin_page_edit_content.js

@@ -19,45 +19,45 @@ PageContentController.prototype = {
   
   sortable_blocks: function()
   { 
-    var that = this;
-    $('.sortable').sortable({
-      //hoverClass: "ui-state-active",
-      placeholder: 'sortable-placeholder',
-      forcePlaceholderSize: true,
-      handle: '.sort_handle',
-      receive: function(e, ui) {      
-        that.new_block_type_id = ui.item.attr('id').replace('new_block_', '');    
-      },
-      update: function(e, ui) {        
-        if (that.new_block_type_id)
-        {
-          $.ajax({
-            url: '/admin/pages/' + that.page_id + '/blocks',
-            type: 'post',
-            data: { block_type_id: that.new_block_type_id, index: ui.item.index() },
-            success: function(resp) { that.render_blocks(function() { that.edit_block(resp.block.id); }); }
-          });                    
-          that.new_block_type_id = false;
-        }
-        else
-        {
-          var ids = [];
-          $.each($(e.target).children(), function(i, el) {
-            var id = $(el).attr('id');            
-            if (id && id.substr(0, 6) == 'block_') ids.push(id.substr(6));
-          });          
-            
-          $.ajax({
-            url: '/admin/pages/' + that.page_id + '/block-order',
-            type: 'put',
-            data: {
-              block_ids: ids,
-            },
-            success: function(resp) {}
-          });
-        }
-      }
-    });
+    //var that = this;
+    //$('.sortable').sortable({
+    //  //hoverClass: "ui-state-active",
+    //  placeholder: 'sortable-placeholder',
+    //  forcePlaceholderSize: true,
+    //  handle: '.sort_handle',
+    //  receive: function(e, ui) {      
+    //    that.new_block_type_id = ui.item.attr('id').replace('new_block_', '');    
+    //  },
+    //  update: function(e, ui) {        
+    //    if (that.new_block_type_id)
+    //    {
+    //      $.ajax({
+    //        url: '/admin/pages/' + that.page_id + '/blocks',
+    //        type: 'post',
+    //        data: { block_type_id: that.new_block_type_id, index: ui.item.index() },
+    //        success: function(resp) { that.render_blocks(function() { that.edit_block(resp.block.id); }); }
+    //      });                    
+    //      that.new_block_type_id = false;
+    //    }
+    //    else
+    //    {
+    //      var ids = [];
+    //      $.each($(e.target).children(), function(i, el) {
+    //        var id = $(el).attr('id');            
+    //        if (id && id.substr(0, 6) == 'block_') ids.push(id.substr(6));
+    //      });          
+    //        
+    //      $.ajax({
+    //        url: '/admin/pages/' + that.page_id + '/block-order',
+    //        type: 'put',
+    //        data: {
+    //          block_ids: ids,
+    //        },
+    //        success: function(resp) {}
+    //      });
+    //    }
+    //  }
+    //});
   },
   
   draggable_blocks: function() 
@@ -129,6 +129,30 @@ PageContentController.prototype = {
     }
     that.render_blocks();
   },
+  
+  move_block_up: function(block_id)
+  {
+    var that = this;                   
+    $.ajax({
+      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/move-up',
+      type: 'put',      
+      success: function(resp) {
+        if (resp.success) that.render_blocks();      
+      }
+    });    
+  },
+  
+  move_block_down: function(block_id)
+  {
+    var that = this;                   
+    $.ajax({
+      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/move-down',
+      type: 'put',      
+      success: function(resp) {
+        if (resp.success) that.render_blocks();      
+      }
+    });    
+  },
     
   /*****************************************************************************
   Block Rendering
@@ -148,7 +172,7 @@ PageContentController.prototype = {
         that.selected_block_ids = [];
       }
     });
-  },
+  },                                                                                                                               
          
   set_clickable: function()
   {        
@@ -168,9 +192,10 @@ PageContentController.prototype = {
     var that = this;
         
     $('#block_' + b.id)      
-      .prepend($('<a/>').attr('id', 'block_' + b.id + '_select_handle'  ).addClass('select_handle' ).append($('<span/>').addClass('ui-icon ui-icon-check'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.select_block(b.id); }))
-      .prepend($('<a/>').attr('id', 'block_' + b.id + '_sort_handle'    ).addClass('sort_handle'   ).append($('<span/>').addClass('ui-icon ui-icon-arrow-2-n-s')).click(function(e) { e.preventDefault(); e.stopPropagation(); }))
-      .prepend($('<a/>').attr('id', 'block_' + b.id + '_delete_handle'  ).addClass('delete_handle' ).append($('<span/>').addClass('ui-icon ui-icon-close'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(b.id); }));
+      .prepend($('<a/>').attr('id', 'block_' + b.id + '_select_handle'    ).addClass('select_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-check'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.select_block(b.id);    }))      
+      .prepend($('<a/>').attr('id', 'block_' + b.id + '_move_up_handle'   ).addClass('move_up_handle'   ).append($('<span/>').addClass('ui-icon ui-icon-arrow-1-n'  )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.move_block_up(b.id);   }))
+      .prepend($('<a/>').attr('id', 'block_' + b.id + '_move_down_handle' ).addClass('move_down_handle' ).append($('<span/>').addClass('ui-icon ui-icon-arrow-1-s'  )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.move_block_down(b.id); }))
+      .prepend($('<a/>').attr('id', 'block_' + b.id + '_delete_handle'    ).addClass('delete_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-close'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(b.id);    }));
       
     if (parent_allows_child_blocks && (!b.name || b.name.length == 0))
     {            

data/app/assets/stylesheets/caboose/admin_page_edit_content.css

@@ -11,15 +11,24 @@
 #blocks .ui-selected  { background: #fff799; }
 #blocks .sortable-placeholder { height: 40px; background: #fff799; border: #ccc 1px solid; }
 
-#blocks li .select_handle { display: none; }
-#blocks li .sort_handle   { display: none; }
-#blocks li .delete_handle { display: none; }
-#blocks li:hover .select_handle { position: absolute; top: 0; right: 44px; display: block; width: 20px; height: 20px; background-color: #ccc; }
-#blocks li:hover .sort_handle   { position: absolute; top: 0; right: 22px; display: block; width: 20px; height: 20px; background-color: #ccc; }
-#blocks li:hover .delete_handle { position: absolute; top: 0; right:  0px; display: block; width: 20px; height: 20px; background-color: #ccc; }
-#blocks li:hover .select_handle span { margin: 2px 1px; }
-#blocks li:hover .sort_handle   span { margin: 2px 1px; }
-#blocks li:hover .delete_handle span { margin: 2px 1px; }
+/*
+#blocks li .sort_handle      { display: none; }
+#blocks li:hover .sort_handle      { position: absolute; top: 0; right: 22px; display: block; width: 20px; height: 20px; background-color: #ccc; }
+#blocks li:hover .sort_handle      span { margin: 2px 1px; }
+*/
+
+#blocks li .select_handle    { display: none; }
+#blocks li .move_up_handle   { display: none; }
+#blocks li .move_down_handle { display: none; }
+#blocks li .delete_handle    { display: none; }
+#blocks li:hover .select_handle    { position: absolute; top: 0; right: 66px; display: block; width: 20px; height: 20px; background-color: #ccc; }
+#blocks li:hover .move_up_handle   { position: absolute; top: 0; right: 44px; display: block; width: 20px; height: 20px; background-color: #ccc; }
+#blocks li:hover .move_down_handle { position: absolute; top: 0; right: 22px; display: block; width: 20px; height: 20px; background-color: #ccc; }
+#blocks li:hover .delete_handle    { position: absolute; top: 0; right:  0px; display: block; width: 20px; height: 20px; background-color: #ccc; }
+#blocks li:hover .select_handle    span { margin: 2px 1px; }
+#blocks li:hover .move_up_handle   span { margin: 2px 1px; }
+#blocks li:hover .move_down_handle span { margin: 2px 1px; }
+#blocks li:hover .delete_handle    span { margin: 2px 1px; }
 
 .sortable_placeholder {
   background: #ccc;

data/app/controllers/caboose/blocks_controller.rb

@@ -353,27 +353,34 @@ module Caboose
       
       resp = StdClass.new
       b = Block.find(params[:id])
-      if b.sort_order == 0
+      changed = b.move_up
+      if !changed
         resp.error = "The block is already at the top."
       else
-        b2 = nil
-        
-        new_sort_order = b.sort_order - 1
-        while new_sort_order > 0 do
-          b2 = Block.where("parent_id = ? and sort_order = ?", b.parent_id, new_sort_order).first
-          break if b2
-          new_sort_order = new_sort_order - 1
-        end
-        if b2
-          b2.sort_order = new_sort_order + 1
-          b2.save
-        else
-          new_sort_order = 1
-        end
-        b.sort_order = new_sort_order
-        b.save
         resp.success = "The block has been moved up successfully."
       end
+        
+      #if b.sort_order == 0
+      #  resp.error = "The block is already at the top."
+      #else
+      #  b2 = nil
+      #  
+      #  new_sort_order = b.sort_order - 1
+      #  while new_sort_order > 0 do
+      #    b2 = Block.where("parent_id = ? and sort_order = ?", b.parent_id, new_sort_order).first
+      #    break if b2
+      #    new_sort_order = new_sort_order - 1
+      #  end
+      #  if b2
+      #    b2.sort_order = new_sort_order + 1
+      #    b2.save
+      #  else
+      #    new_sort_order = 1
+      #  end
+      #  b.sort_order = new_sort_order
+      #  b.save
+      #  resp.success = "The block has been moved up successfully."
+      #end
 
       render :json => resp
     end

data/app/models/caboose/block.rb

@@ -29,29 +29,24 @@ class Caboose::Block < ActiveRecord::Base
     :name,
     :value        
     
-  after_initialize do |b|
-    # Do whatever we need to do to set the value to be correct for the field type we have.
-    # Most field types are fine with the raw value in the database
-    if b.block_type.nil?
+  after_initialize :caste_value
+  before_save :caste_value
+  
+  def caste_value
+    if self.block_type.nil?
       bt = Caboose::BlockType.where(:field_type => 'text').first
-      b.block_type_id = bt.id
+      if bt.nil?
+        bt = Caboose::BlockType.create(:name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
+      end      
+      self.block_type_id = bt.id
     end
-    if b.block_type.field_type.nil?
-      b.block_type.field_type = 'text'
-      b.save
+    if self.block_type.field_type.nil?
+      self.block_type.field_type = 'text'      
     end
-    case b.block_type.field_type
-      when 'checkbox' then b.value = (b.value == 1 || b.value == '1' || b.value == true ? true : false)
-    end
-  end
-  
-  before_save :caste_value
-  def caste_value  
-    case self.block_type.field_type
+    v = self.value
+    case self.block_type.field_type      
       when 'checkbox'
-        if self.value.nil? then self.value = false
-        else self.value = (self.value == 1 || self.value == '1' || self.value == true ? 1 : 0)
-        end
+        self.value = v ? (v == 1 || v == '1' || v == true ? 1 : 0) : 0        
     end
   end
   
@@ -359,5 +354,45 @@ class Caboose::Block < ActiveRecord::Base
     end
     return current_value.join('|')
   end
+  
+  # Move a block up
+  def move_up    
+    siblings = Caboose::Block.where(:parent_id => self.parent_id).reorder(:sort_order).all        
+    siblings.each_with_index do |b2, i|      
+      b2.sort_order = i
+      b2.save
+    end
+    changed = false
+    siblings.each_with_index do |b2, i|      
+      if i > 0 && b2.id == self.id                
+        siblings[i-1].sort_order = i
+        siblings[i-1].save        
+        b2.sort_order = i - 1
+        b2.save
+        changed = true
+      end      
+    end
+    return changed            
+  end
+  
+  # Move a block down
+  def move_down
+    siblings = Caboose::Block.where(:parent_id => self.parent_id).reorder(:sort_order).all        
+    siblings.each_with_index do |b2, i|      
+      b2.sort_order = i
+      b2.save
+    end
+    changed = false
+    siblings.each_with_index do |b2, i|      
+      if i < (siblings.count-1) && b2.id == self.id                
+        siblings[i+1].sort_order = i
+        siblings[i+1].save        
+        b2.sort_order = i + 1
+        b2.save
+        changed = true
+      end      
+    end
+    return changed            
+  end
 
 end

data/app/models/caboose/user.rb

@@ -14,6 +14,8 @@ class Caboose::User < ActiveRecord::Base
   do_not_validate_attachment_file_type :image
   attr_accessible :id, :email, :first_name, :last_name, :username, :token, :password, :phone, :timezone
   
+  validates :email, :presence => true
+  
   ADMIN_USER_ID = 1
   LOGGED_OUT_USER_ID = 2
   

data/app/views/caboose/pages/admin_edit_content.html.erb

@@ -23,15 +23,18 @@
   padding: 16px 10px;  
 }
 .block_over { background: #e3e3e3; }
-.select_handle { display: none; }
-.sort_handle   { display: none; }
-.delete_handle { display: none; }
-.block_over > .select_handle { display: block; position: relative; }
-.block_over > .sort_handle   { display: block; position: relative; }
-.block_over > .delete_handle { display: block; position: relative; }
-.block_over > .select_handle span { position: absolute; top: 0; right: 36px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
-.block_over > .sort_handle   span { position: absolute; top: 0; right: 18px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
-.block_over > .delete_handle span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.select_handle    { display: none; }
+.move_up_handle   { display: none; }
+.move_down_handle { display: none; }
+.delete_handle    { display: none; }
+.block_over > .select_handle    { display: block; position: relative; }
+.block_over > .move_up_handle   { display: block; position: relative; }
+.block_over > .move_down_handle { display: block; position: relative; }
+.block_over > .delete_handle    { display: block; position: relative; }
+.block_over > .select_handle    span { position: absolute; top: 0; right: 54px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over > .move_up_handle   span { position: absolute; top: 0; right: 36px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over > .move_down_handle span { position: absolute; top: 0; right: 18px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over > .delete_handle    span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 
 .selected { background: #fff799; }
 

data/lib/caboose.rb

@@ -1,6 +1,10 @@
 require "caboose/engine"
 
 module Caboose
+  
+  def self.root
+    File.expand_path '../..', __FILE__
+  end
       
   mattr_accessor :salt
   @@salt = "This needs to be changed pronto."

data/lib/caboose/engine.rb

@@ -209,7 +209,16 @@ module Caboose
         '*/css/application.js'
         
       ]      
-    end   
+    end
+    
+    # Configure rspec
+    config.generators do |g|
+      g.test_framework :rspec, :fixture => false
+      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.assets false
+      g.helper false        
+    end
+    
   end
 end