caboose-cms 0.2.104 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGU3N2VjMjlhNDkxY2Y4YjkxNTMwMjVlYjQ5MzZjZDJlZTMwMjMwNQ==
+    ZDIzNzA4ZDY1OGM5YmNjOWRiMGU4NjQxYjE1OWQ1YmJlNGRlNTA5ZA==
   data.tar.gz: !binary |-
-    NjFmZDQ0ZTViMjIwYWUxMzlmNDliODkzZDgwMmQyNGUyOTNhMmI0Nw==
+    NWYxODMxNTQ0YzE1ZWQ2MjkwY2I4NWE0ZWM3Y2M4Yzg0MTAyN2E1OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDY2Nzg4NmJhZWM3NjFlNDYyMTI5ZWNmZWIxYWRmZjRkOGFlZTNkM2EwMjZm
-    OWI5NDQ2ZmNlNjNiNWZmMDBhZmZkMDQ1ZGY1ZjE2NTk2MTViNjljYjI3ZDcz
-    NjNlNDE2MDNlOWM4MDA2ZmIxOGFjMjgxNDZhMTNkZjdjYTk1Y2E=
+    YmMyNjFmZDYxYjcyMWM3ZmQyZTE0NWQ0ZDljODkwMjQ2ZmUyZDNmZDE5ZTg3
+    YThlN2VlNWNlMDc4NWM0YjlkYWNlODZjNzBmNzE5ODVjNTRiNzBkOWNjNWE4
+    NDZiNzIyMjU5NjYwNDgyZmMyMjY5MTMzZmIyMjIzZDA2MjE2M2M=
   data.tar.gz: !binary |-
-    ZGEzZGRiNmUzMjU0ZDQ5ZmRhZGQ4NTQwNjVmN2EwMzE2OWZmMTQ5NjZlM2Nk
-    NzU0NGI1NmM1ZjhlZjA3YmY5MmEzY2QwNmI1MjA3OWFkY2I5ZjEwMGI0YjI0
-    MjhiMmZmMjZjMTM5MGFjYmQ5ZWY2NDM2ODM2YmE5YzIxNjljNmE=
+    NTgxYjgxMDM2ZWQwZGVkNTg2NjdjMDg3ZGM3ZjliMmJlNDIyMmYyODE0ZWU2
+    ZTU3NDY5OThhNjhhMDZiZTdlZGQ2NWM3ZjZmOWY3ODBlMTUxMDM0NWVkYzhk
+    MjY4M2M2ZDFjOTM4NTU1YTFmNzEwNTJhZTA2NjI3OGExZTMxZmE=

data/app/models/caboose/page.rb

@@ -5,11 +5,11 @@ class Caboose::Page < ActiveRecord::Base
   belongs_to :parent, :class_name => "Page"
   has_many :children, :class_name => "Page", :foreign_key => 'parent_id'    
   has_many :page_permissions
-  has_many :page_blocks
+  has_many :page_blocks, :order => 'sort_order'
   attr_accessible :parent_id, 
     :title, 
     :menu_title, 
-    :content,
+    # :content, # Changed from column in pages to blocks
     :blocks,
     :slug, 
     :alias, 
@@ -38,6 +38,14 @@ class Caboose::Page < ActiveRecord::Base
     return title unless title.nil?
     return ""
   end
+  
+  def blocks
+    self.page_blocks
+  end
+  
+  def content
+    self.blocks.collect { |b| b.content }.join("\n")     
+  end
     
   def self.find_with_fields(page_id, fields)
     return self.where(:id => page_id).select(fields).first

data/app/models/caboose/page_block.rb

@@ -3,6 +3,68 @@ class Caboose::PageBlock < ActiveRecord::Base
   self.table_name = "page_blocks"
   
   belongs_to :page  
-  attr_accessible :id, :page_id, :type, :sort_order, :name, :value    
+  attr_accessible :id, :page_id, :block_type, :sort_order, :name, :value
+  
+  def render
+    return self["render_#{self.block_type.downcase}".to_sym]
+  end
+  
+  def render_richtext() return self.value               end
+  def render_p()        return "<p>#{self.value}</p>"   end
+  def render_h1()       return "<h1>#{self.value}</h1>" end
+  def render_h2()       return "<h2>#{self.value}</h2>" end
+  def render_h3()       return "<h3>#{self.value}</h3>" end
+  def render_h4()       return "<h4>#{self.value}</h4>" end
+  def render_h5()       return "<h5>#{self.value}</h5>" end
+  def render_h6()       return "<h6>#{self.value}</h6>" end
+    
+  def render_posts    
+    obj = Caboose::StdClass(JSON.parse(self.value))
+    defaults = {
+      'limit' => 10,
+      'no_posts_message' => "<p>There are no posts right now.</p>",
+      'invalid_category_message' => "<p>Invalid post category.</p>",
+      'body_character_limit' => 0        
+    }
+    defaults.each { |k,v| obj[k] = v if obj[k].nil? }
+    
+    return obj.invalid_category_message if !Caboose::PostCategory.exists?(obj.category_id)
+    cat = Caboose::PostCategory.find(obj.category_id)            
+    posts = obj.limit == 0 ? cat.posts.reorder('created_at DESC') : cat.posts.reorder('created_at DESC').limit(obj.limit)      
+    return obj.no_posts_message posts.nil? || posts.count == 0
+    
+    str = ""
+    posts.each do |p|
+      str = "<div class='post'>"
+      str << "<h2>#{raw p.title}</h2>"
+      str << "<div class='created_at'>#{p.created_at.strftime('%F %T')}</div>"
+      str << "<div class='post_content'>"
+      str << obj.body_character_limit > 0 ? Caboose.teaser_text(p.body, obj.body_character_limit) : p.body
+      str << "</div>"
+      str << "</div>"
+    end
+  end
+      
+      assoc = cat
+      if Caboose
+      
+      
+      if Caboose::PostCategoryMembership.exists?(:post_category_id => cat.id)
+        Caboose::PostCategoryMembership.where(:post_category_id => cat.id)
+     
+  end
+
+end
+
+
+    @_renderer = "Caboose::PageBlock#{self.block_type.upcase}Renderer".constantize.new
+      @_renderer.page_block = self
+      @_renderer.page_block = self
+      
+    self.renderer.render
+  end 
+  
+  @_renderer = "Caboose::PageBlock#{self.block_type.upcase}Renderer".constantize.new
+      @_renderer.page_block = self
 
 end

data/app/models/caboose/page_block_renderer.rb

@@ -0,0 +1,12 @@
+
+class Caboose::PageBlockRenderer
+  
+  @page_block = nil
+  
+  # Renders the view for the given page block  
+  def self.render(block)
+    return "" if @page_block.nil?
+    return @page_block.value    
+  end
+  
+end

data/app/models/caboose/page_block_renderer_richtext.rb

@@ -0,0 +1,68 @@
+
+class Caboose::PageBlockRendererRichtext
+  
+  self.table_name = "page_blocks"
+  
+  belongs_to :page  
+  attr_accessible :id, :page_id, :block_type, :sort_order, :name, :value
+  
+  @_renderer  
+  def renderer
+    if @_renderer.nil?
+      @_renderer = "Caboose::PageBlock#{self.block_type.upcase}Renderer".constantize.new
+      @_renderer.page_block = self
+    end
+    return @_renderer       
+  end
+  
+  def render
+    self.renderer.render
+  end
+  
+  def content
+    a = self.name.nil? || self.name.length == 0 ? '' : "<a name='#{self.name}'></a>"
+    return "#{a}#{self.value}"          if self.block_type == 'richtext'
+    return "#{a}<p>#{self.value}</p>"   if self.block_type == 'p'
+    return "#{a}<h1>#{self.value}</h1>" if self.block_type == 'h1'
+    return "#{a}<h2>#{self.value}</h2>" if self.block_type == 'h2'
+    return "#{a}<h3>#{self.value}</h3>" if self.block_type == 'h3'
+    return "#{a}<h4>#{self.value}</h4>" if self.block_type == 'h4'
+    return "#{a}<h5>#{self.value}</h5>" if self.block_type == 'h5'
+    return "#{a}<h6>#{self.value}</h6>" if self.block_type == 'h6'
+    
+    if self.block_type == 'posts'
+      obj = Caboose::StdClass(JSON.parse(self.value))
+      defaults = {
+        'limit' => 10,
+        'no_posts_message' => "<p>There are no posts right now.</p>",
+        'invalid_category_message' => "<p>Invalid post category.</p>",
+        'body_character_limit' => 0        
+      }
+      defaults.each { |k,v| obj[k] = v if obj[k].nil? }
+      
+      return obj.invalid_category_message if !Caboose::PostCategory.exists?(obj.category_id)
+      cat = Caboose::PostCategory.find(obj.category_id)            
+      posts = obj.limit == 0 ? cat.posts.reorder('created_at DESC') : cat.posts.reorder('created_at DESC').limit(obj.limit)      
+      return obj.no_posts_message posts.nil? || posts.count == 0
+      
+      str = ""
+      posts.each do |p|
+        str = "<div class='post'>"
+        str << "<h2>#{raw p.title}</h2>"
+        str << "<div class='created_at'>#{p.created_at.strftime('%F %T')}</div>"
+        str << "<div class='post_content'>"
+        str << obj.body_character_limit > 0 ? Caboose.teaser_text(p.body, obj.body_character_limit) : p.body
+        str << "</div>"
+        str << "</div>"
+      end
+      
+      assoc = cat
+      if Caboose
+      
+      
+      if Caboose::PostCategoryMembership.exists?(:post_category_id => cat.id)
+        Caboose::PostCategoryMembership.where(:post_category_id => cat.id)
+     
+  end
+
+end

data/app/models/caboose/schema.rb

@@ -87,7 +87,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::PageBlock => [        
         [ :page_id               , :integer ], 
-        [ :type                  , :string  , :default => 'p' ],
+        [ :block_type            , :string  , :default => 'p' ],
         [ :sort_order            , :integer , :default => 0   ],
         [ :name                  , :string  ],
         [ :value                 , :text    ]        
@@ -127,7 +127,15 @@ class Caboose::Schema < Caboose::Utilities::Schema
   end
   
   # Loads initial data into the database
-  def self.load_data    
+  def self.load_data
+
+    c = ActiveRecord::Base.connection    
+    if c.column_exists?(:pages, :content)
+      Caboose::Page.reorder(:id).all.each do |p|
+        Caboose::PageBlock.create( :page_id => p.id, :block_type => 'richtext', :value => p.content )        
+      end      
+      c.remove_column(:pages, :content)
+    end
     
     admin_user = nil
     if !Caboose::User.exists?(:username => 'admin')

data/app/models/caboose/user.rb

@@ -3,7 +3,7 @@ class Caboose::User < ActiveRecord::Base
   #has_and_belongs_to_many :roles
   has_many :role_memberships
   has_many :roles, :through => :role_memberships  
-  attr_accessible :email, :first_name, :last_name, :username, :token, :password
+  attr_accessible :email, :first_name, :last_name, :username, :token, :password, :phone
 
   before_save do
     self.email = self.email.downcase if self.email

data/app/models/caboose/utilities/schema.rb

@@ -6,6 +6,11 @@ class Caboose::Utilities::Schema
     return nil
   end
   
+  # Columns (in order) that were renamed in the development of the gem.
+  def self.renamed_columns
+    return nil
+  end
+  
   # Columns (in order) that were removed in the development of the gem.
   def self.removed_columns
     return nil
@@ -34,7 +39,8 @@ class Caboose::Utilities::Schema
   def self.create_schema
     return if self.schema.nil?
     
-    rename_tables    
+    rename_tables
+    rename_columns    
     
     c = ActiveRecord::Base.connection
     self.schema.each do |model, columns|
@@ -91,6 +97,19 @@ class Caboose::Utilities::Schema
     end
   end
   
+  # Renames a set of columns 
+  def self.rename_columns
+    return if self.renamed_columns.nil?
+    c = ActiveRecord::Base.connection
+    self.renamed_columns.each do |model, cols|
+      next if !c.table_exists? model.table_name
+      cols.each do |old_name, new_name|
+        next if !c.column_exists? model.table_name, old_name
+        c.rename_column model.table_name, old_name, new_name
+      end
+    end
+  end
+  
   # Removes a set of tables 
   def self.remove_columns
     return if self.removed_columns.nil?

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

@@ -1,9 +1,27 @@
 
 <%= render :partial => 'caboose/pages/admin_header' %>
 
-<p><div id='page_<%= @page.id %>_content'></div></p>
+<p><input type='button' value='Add Block' onclick="add_block_at_beginning();" /></p>
+  
+<% @page.blocks.each do |b| %>
+  <div class='page_block'>   
+    <div id='pageblock_<%= b.id %>_name'></div>
+    <div id='pageblock_<%= b.id %>_value'></div>
+    <div id='page_block_<%= b.id %>_message'></div>
+    <p><input type='button' value='Delete Block' class='delete' onclick="delete_block(<%= b.id %>);" /></p>
+  </div>
+  <p><input type='button' value='Add Block' onclick="add_block_after(<%= b.id %>);" /></p>
+<% end %>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+div.page_block { padding: 20px; border: #ccc 1px solid; background: #efefef; }
+div.page_block p { padding-bottom: 0; margin-bottom: 0; }
+
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
@@ -12,19 +30,22 @@ $(window).load(function() {
   modal = new CabooseModal(800);
 });
 
-$(document).ready(function() {
-  m = new ModelBinder({
-    name: 'Page',
-    id: <%= @page.id %>,
-    update_url: '/admin/pages/<%= @page.id %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [
-      { name: 'content', nice_name: 'Page Content', type: 'richtext', value: <%= raw Caboose.json(@page.content) %>, width: 800, height: 500 }             
-    ]
-  });
+$(document).ready(function() {  
+  <% @page.blocks.each do |b| %>
+    m = new ModelBinder({
+      name: 'PageBlock',
+      id: <%= b.id %>,
+      update_url: '/admin/page-blocks/<%= b.id %>',
+      authenticity_token: '<%= form_authenticity_token %>',
+      attributes: [
+        { name: 'name' , nice_name: 'Name'   , type: 'text'    , value: <%= raw Caboose.json(b.name)  %>, width: 784 },
+        { name: 'value', nice_name: 'Content', type: 'richtext', value: <%= raw Caboose.json(b.value) %>, width: 800, height: 300 }             
+      ]
+    });
+  <% end %>
 });
 
 </script>
 <%= tinymce_assets %>
-<%= tinymce :caboose, width: '800px', height:'400px' %>
+<%= tinymce :caboose, width: '800px', height:'300px' %>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.104'
+  VERSION = '0.3.1'
 end

data/lib/tasks/sequences.rake

@@ -0,0 +1,27 @@
+
+namespace :caboose do    
+  desc "Corrects any sequences in tables"
+  task :correct_sequences => :environment do
+    
+    c = ActiveRecord::Base.connection
+    c.tables.each do |tbl|      
+      next if !c.column_exists? tbl, :id
+      
+      rows = c.execute("select max(id) from #{tbl}")      
+      max = rows[0]['max']
+      max = max.to_i if !max.nil?
+      
+      rows = c.execute("select nextval('#{tbl}_id_seq')")
+      nextval = rows[0]['nextval']
+      nextval = nextval.to_i if !nextval.nil?
+      
+      next if max.nil? || nextval.nil?
+      next if nextval >= max
+      
+      # If nextval is lower than the max id, then fix it.
+      puts "Correcting sequence for #{tbl}..."
+      c.execute("select setval('#{tbl}_id_seq', (select max(id) from #{tbl}))")
+      
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.104
+  version: 0.3.1
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,6 +187,8 @@ files:
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
 - app/models/caboose/page_block.rb
+- app/models/caboose/page_block_renderer.rb
+- app/models/caboose/page_block_renderer_richtext.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/pager.rb
 - app/models/caboose/permission.rb
@@ -270,6 +272,7 @@ files:
 - lib/sample_files/login.css
 - lib/sample_files/tinymce.yml
 - lib/tasks/caboose.rake
+- lib/tasks/sequences.rake
 - MIT-LICENSE
 - Rakefile
 - README.md