caboose-cms 0.4.34 → 0.4.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzI0MzU1NTgyNDUwYWJmNDIwYzI4YWVjZTNmMTNlMmUwYjFiMmRkMQ==
+    Zjc3MDVlNjJiYmQzM2YwMmJlMjg2NmE3NDZmYTBlN2M2MGQ4ODAyZQ==
   data.tar.gz: !binary |-
-    M2Y1NzIwYWY5ZTJjMjc4YjM3MGM1ZmYxNDY3MDljNzA2N2RhNzNmYg==
+    MzQ5ZWRmNDdlZGNjZDAyNTRjMDEzMzM1N2UyZjQ1ODVjZDVmZDdjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Njk4ZDkyZGY3NjJlZTQ0NzI4YjdkZDU0NmQ1YTYyODYyYTNmZTNhNjRjM2E2
-    YmNjYjMxNjAyMDIxY2E4YzU4MmVkMjBiOTRlMTAyODQ2ZjcxMzExN2ViOGE2
-    ZDJlMGNmODAzYjA5ZTA5ODVmNGRlNmY4ZmRjODFmNWJiMDNlNWE=
+    M2ZjN2ZhMmY0YzQ4ODVlMTczYWU3YjIyNmI5OGEzYjNmNmI5NTRmYzY0ZWQx
+    M2NjNDcwN2Q0YjZkYWI5NzcxODZlM2RmNWY3MWVlOTg2YzhkZDViYWRjMzY3
+    MzY5ZDBlMzQwZDIxZjM2ODlkN2U2Y2Q4MDAzZTJjMmRhZjk4ZmQ=
   data.tar.gz: !binary |-
-    MDA5MjgxOTJkMjlmY2ViYjc3MWVkZjVlZmZiMmQwODhkZDA1YjFlN2RmMDUz
-    MGYxYTE4NDM5NWMzYWViYzIyM2RkYWVmNTI2ZDdlNTk0M2JjZjM5MWY0NWEy
-    MjEzMTg4ODk2N2RhNTNmOTI1YWYzYWM1YTE5ZTVjMDhiZDU0MTU=
+    MzAwZGVmNjkzODhkZjY3MzgxZmVlNTg3MDlkNzRmNjdiYjQ2NDA4NjFjYWYx
+    ZDA0ODgwODFlNjczNzU3Yjc0ZjllNzY3ZWEwOWMzN2IzNWViMDI3NGQ2NjE4
+    YTEzNGRiMzJmNDQxOTMyYzUxYjk1ODA0MDM0MjI4NzQ4ZDRjZjQ=

data/app/controllers/caboose/block_type_sources_controller.rb

@@ -71,7 +71,7 @@ module Caboose
       return unless user_is_allowed('blocktypesources', 'delete')                  
       BlockTypeSource.find(params[:id]).destroy            
       resp = StdClass.new({
-        'redirect' => "/admin/block-type-sources"
+        'redirect' => "/admin/block-types/store/sources"
       })
       render :json => resp
     end
@@ -83,7 +83,7 @@ module Caboose
       resp = StdClass.new
 
       bts = BlockTypeSource.find(params[:id])           
-      if bts.refresh            
+      if bts.refresh_summaries
         resp.success = "Block types from the source have been refreshed successfully."
       else
         resp.error = "There was an error refreshing block types from the source."

data/app/controllers/caboose/block_type_store_controller.rb

@@ -0,0 +1,42 @@
+
+module Caboose
+  class BlockTypeStoreController < ApplicationController
+        
+    # GET /admin/block-types/store
+    def admin_index
+      return unless user_is_allowed('blocktypestore', 'add')
+      @pager = PageBarGenerator.new(params, {
+    		  'block_type_source_id' => '',
+    		  'name_like'	           => '',
+    		  'description_like'	   => ''    		  
+    		},{
+    		  'model'          => 'Caboose::BlockTypeSummary',
+    	    'sort'			     => 'block_type_source_id, name',
+    		  'desc'			     => false,
+    		  'base_url'		   => '/admin/block-types/store',
+    		  'use_url_params' => false
+    	})
+    	@block_type_summaries = @pager.items
+    	render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/block-types/store/:block_type_summary_id
+    def admin_details
+      return unless user_is_allowed('blocktypestore', 'add')
+      @block_type_summary = BlockTypeSummary::find(params[:block_type_summary_id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/block-types/store/:block_type_summary_id/download
+    def admin_download
+      return unless user_is_allowed('blocktypestore', 'add')
+
+      bts = BlockTypeSummary::find(params[:block_type_summary_id])
+      bts.source.refresh(bts.name)
+
+      resp = StdClass.new('success' => 'The block type has been downloaded successfully.')
+      render :json => resp
+    end
+		
+  end  
+end

data/app/controllers/caboose/block_types_controller.rb

@@ -159,6 +159,46 @@ module Caboose
       end      
     end
     
+    #===========================================================================
+    # Store Actions
+    #===========================================================================
+    
+    # GET /admin/block-types/store
+    def admin_store_index
+      return unless user_is_allowed('blocktypestore', 'add')
+      @pager = PageBarGenerator.new(params, {
+    		  'block_type_source_id' => '',
+    		  'name_like'	           => '',
+    		  'description_like'	   => ''    		  
+    		},{
+    		  'model'          => 'Caboose::BlockTypeSummary',
+    	    'sort'			     => 'block_type_source_id, name',
+    		  'desc'			     => false,
+    		  'base_url'		   => '/admin/block-types/store',
+    		  'use_url_params' => false
+    	})
+    	@block_type_summaries = @pager.items
+    	render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/block-types/store/:block_type_summary_id
+    def admin_store_details
+      return unless user_is_allowed('blocktypestore', 'add')
+      @block_type_summary = BlockTypeSummary::find(params[:block_type_summary_id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/block-types/store/:block_type_summary_id/download
+    def admin_store_download
+      return unless user_is_allowed('blocktypestore', 'add')
+
+      bts = BlockTypeSummary::find(params[:block_type_summary_id])
+      bts.source.refresh(bts.name)
+
+      resp = StdClass.new('success' => 'The block type has been downloaded successfully.')
+      render :json => resp
+    end
+    
     #===========================================================================
     # Public Repo Actions
     #===========================================================================

data/app/models/caboose/block_type.rb

@@ -29,6 +29,10 @@ class Caboose::BlockType < ActiveRecord::Base
     return eval(self.options_function)    
   end
   
+  def child(name)
+    Caboose::BlockType.where("parent_id = ? and name = ?", self.id, name).first
+  end
+  
   def api_hash
     return {
       :name                            => self.name,
@@ -71,6 +75,20 @@ class Caboose::BlockType < ActiveRecord::Base
     self.options                         = h['options']
     self.options_function                = h['options_function']
     self.options_url                     = h['options_url']
+    self.save
+    
+    # Remove any named children that don't exist in the given hash
+    new_child_names = h['children'].collect { |h2| h2['name'] }
+    Caboose::BlockType.where(:parent_id => self.id).all.each do |bt|
+      bt.destroy if bt.name && bt.name.strip.length > 0 && !new_child_names.include?(bt.name)
+    end
+    
+    # Now add/update all the children
+    h['children'].each do |h2|
+      bt = self.child(h2['name'])
+      bt = Caboose::BlockType.create(:parent_id => self.id) if bt.nil?
+      bt.parse_api_hash(h)
+    end
+    
   end
-
 end

data/app/models/caboose/block_type_source.rb

@@ -12,7 +12,7 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
     :active    
 
   # Just get the names and descriptions of all block types from the source
-  def refresh_names
+  def refresh_summaries
     resp = nil
     begin                             
       resp = HTTParty.get("#{self.url}/caboose/block-types?token=#{self.token}")
@@ -21,17 +21,19 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
       return false
     end
     
-    block_types = nil
+    summaries = nil
     begin
-      block_types = JSON.parse(resp.body)
+      summaries = JSON.parse(resp.body)
     rescue
       Caboose.log("Response body isn't valid JSON.")
       return false
     end
     
-    block_types.each do |h|      
-      next if Caboose::BlockType.where(:name => bt.name).exists?
-      Caboose::BlockType.create(:name => h['name'], :description => h['description'])      
+    summaries.each do |h|      
+      s = Caboose::BlockTypeSummary.where(:block_type_source_id => self.id, :name => h['name']).first
+      s = Caboose::BlockTypeSummary.create(:block_type_source_id => self.id)
+      s.parse_api_hash(h)
+      s.save
     end
     
     return true
@@ -64,26 +66,10 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
       return false
     end     
     
-    # Grab all the fields from the hash for the top-level block
+    # Update the block type
     bt.parse_api_hash(h)
-    bt.save
-    
-    # Now add all the children
-    h['children'].each do |h2|
-      recursive_add(h2, bt.id)
-    end
     
     return true
   end
   
-  def self.recursive_add(h, parent_id = nil)
-    bt = Caboose::BlockType.new(:parent_id => parent_id)
-    bt.parse_api_hash(h)
-    bt.save
-          
-    h['children'].each do |h2|
-      self.recursive_add(h2, bt.id)
-    end
-    return bt
-  end
 end

data/app/models/caboose/block_type_summary.rb

@@ -0,0 +1,21 @@
+require 'httparty'
+
+class Caboose::BlockTypeSummary < ActiveRecord::Base
+  self.table_name = "block_type_summary"
+        
+  belongs_to :block_type_source
+  attr_accessible :id,
+    :block_type_source_id,
+    :name,
+    :description
+
+  def source
+    self.block_type_source
+  end
+  
+  def parse_api_hash(h)    
+    self.name        = h['name']
+    self.description = h['description']                
+  end
+  
+end

data/app/models/caboose/core_plugin.rb

@@ -26,8 +26,7 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'        , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'      , 'view')
     item['children'] << { 'id' => 'blocktypes'       , 'text' => 'AB Test Variants'   , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'       , 'view')
     item['children'] << { 'id' => 'variables'        , 'text' => 'Variables'          , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'         , 'view')
-    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'        , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'       , 'view')
-    item['children'] << { 'id' => 'blocktypesources' , 'text' => 'Block Type Sources' , 'href' => '/admin/block-type-sources' , 'modal' => false } if user.is_allowed('blocktypesources' , 'view')    
+    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'        , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'       , 'view')        
         
     nav << item if item['children'].count > 0
     

data/app/models/caboose/schema.rb

@@ -165,6 +165,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :priority   , :integer, { :default => 0 }],
         [ :active     , :boolean, { :default => true }],
       ],
+      Caboose::BlockTypeSummary => [      
+        [ :block_type_source_id , :integer ],
+        [ :name                 , :string  ],
+        [ :description          , :string  ]                
+      ],
       Caboose::Post => [  
         [ :title                , :text       ],  		 	 
         [ :body                 , :text 		   ],  	 

data/app/views/caboose/block_type_sources/admin_edit.html.erb

@@ -11,8 +11,8 @@ bts = @block_type_source
         
 <div id='message'></div>
 <p>
-<input type='button' value='< Back' onclick="window.location='/admin/block-type-sources';" />
-<input type='button' value='Refresh Block Types' onclick="refresh_block_types(<%= bts.id %>);" />
+<input type='button' value='< Back' onclick="window.location='/admin/block-types/store/sources';" />
+<input type='button' value='Refresh Block Type Summaries' onclick="refresh_block_types(<%= bts.id %>);" />
 <input type='button' value='Delete Source' onclick="delete_block_type_source(<%= bts.id %>);" />
 </p>
 
@@ -33,7 +33,7 @@ function delete_block_type_source(bts_id, confirm)
   }
   $('#message').empty().append($('<p/>').addClass('loading').html('Deleting source...'));
   $.ajax({
-    url: '/admin/block-type-sources/' + bts_id,
+    url: '/admin/block-types/store/sources/' + bts_id,
     type: 'delete',
     success: function(resp) {
       if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
@@ -46,7 +46,7 @@ function refresh_block_types(bts_id)
 {  
   $('#message').empty().append($('<p/>').addClass('loading').html('Refreshing block types from source...'));
   $.ajax({
-    url: '/admin/block-type-sources/' + bts_id + '/refresh',
+    url: '/admin/block-type/store/sources/' + bts_id + '/refresh',
     type: 'get',
     success: function(resp) {
       if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));
@@ -59,7 +59,7 @@ $(document).ready(function() {
   m = new ModelBinder({
     name: 'BlockTypeSource',
     id: <%= bts.id %>,
-    update_url: '/admin/block-type-sources/<%= bts.id %>',
+    update_url: '/admin/block-types/store/sources/<%= bts.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
       { name: 'name'     , nice_name: 'Name'      , type: 'text'     , value: <%= raw Caboose.json(bts.name)      %>, width: 400 }, 

data/app/views/caboose/block_type_sources/admin_index.html.erb

@@ -1,6 +1,6 @@
 <h1>Block Type Sources</h1>
 
-<p><a href='/admin/block-type-sources/new'>New Source</a></p>
+<p><a href='/admin/block-types/store/sources/new'>New Source</a></p>
 
 <% if (@block_type_sources.count > 0) %>
 
@@ -10,7 +10,7 @@
       <th>URL</th>      
     </tr>
   <% @block_type_sources.each do |bts| %>
-    <tr onclick="window.location='/admin/block-type-sources/<%= bts.id %>/edit';">
+    <tr onclick="window.location='/admin/block-types/store/sources/<%= bts.id %>/edit';">
       <td><%= bts.name  %></td>
       <td><%= bts.url   %></td>    
     </tr>

data/app/views/caboose/block_type_sources/admin_new.html.erb

@@ -1,11 +1,11 @@
 
 <h1>New Source</h1>
-<form action='/admin/block-type-sources' method='post' id='new_source_form'>
+<form action='/admin/block-types/store/sources' method='post' id='new_source_form'>
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
 <p><input type='text' id='name' name='name' placeholder='Name' /></p>
 <div id='message'></div>
 <p>
-<input type='button' value='< Back' onclick="window.location='/admin/block-type-sources';" />
+<input type='button' value='< Back' onclick="window.location='/admin/block-types/store/sources';" />
 <input type='button' value='Add Source' onclick="add_block_type_source();" />
 </p>
 </form>
@@ -17,7 +17,7 @@ function add_block_type_source()
 {
   $('#message').empty().append($('<p/>').addClass('loading').html('Adding source...'));
   $.ajax({
-    url: '/admin/block-type-sources',
+    url: '/admin/block-types/store/sources',
     type: 'post',
     data: $('#new_source_form').serialize(),          
     success: function(resp) {

data/app/views/caboose/block_type_store/admin_details.html.erb

@@ -0,0 +1,14 @@
+<%
+bts = @block_type_summary
+%>
+<div id='crumbtrail'>
+  <a href='/admin/block-types'>Page Block Types</a> > 
+  <a href='/admin/block-types/store'>Store</a>
+</div>
+
+<h1>Block Type Details</h1>
+
+<p>Name: <%= bts.name %></p>
+<p>Description: <%= bts.description %></p>
+<p>Status: 
+<p><a href='/admin/block-types/store'>< Back</a></p>

data/app/views/caboose/block_type_store/admin_index.html.erb

@@ -0,0 +1,39 @@
+<h1>Block Type Store</h1>
+
+<p><a href='/admin/block-types/store/sources'>Store Sources</a></p>
+
+<form action='/admin/block-types/store' method='get'>
+<table>
+<tr><td>Source:</td><td>
+  <select name='block_type_source_id'>
+    <option value=''>-- Any Source --</option>
+    <% Caboose::BlockTypeSource.reorder(:name).all.each do |bts| %><option value='<%= bts.id %>'><%= bts.name %></option><% end %>
+  </select></td></tr>
+<tr><td><p>Name:        </td><td><input type='name_like' value="<%= @pager.params['name_like'] %>" /></td></tr>
+<tr><td><p>Description: </td><td><input type='name_like' value="<%= @pager.params['name_like'] %>" /></td></tr>
+</table>
+<p><input type='submit' value='Search' /></p>
+</form>
+
+<% if (@block_type_summaries.count > 0) %>
+
+  <table class='data'>
+    <tr>
+      <th>Source</th>
+      <th>Name</th>
+      <th>Description</th>      
+    </tr>
+  <% @block_type_summaries.each do |bts| %>
+    <tr onclick="window.location='/admin/block-types/store/<%= bts.id %>';">
+      <td><%= bts.source.name %></td>
+      <td><%= bts.name        %></td>
+      <td><%= bts.description %></td>    
+    </tr>
+  <% end %>
+  </table>  
+
+<% else %>
+
+  <p>There are no block types from any sources.</p>
+
+<% end %>

data/app/views/caboose/block_types/admin_index.html.erb

@@ -1,6 +1,9 @@
-<h1>Page Block Types</h1>
+<h1>Block Types</h1>
 
-<p><a href='/admin/block-types/new'>New Block Type</a></p>
+<p>  
+  <a href='/admin/block-types/store'>Block Type Store</a> |
+  <a href='/admin/block-types/new'>New Block Type</a>
+</p>
 
 <% if (@block_types.count > 0) %>
 

data/config/routes.rb

@@ -123,6 +123,19 @@ Caboose::Engine.routes.draw do
   #post    "admin/blocks/:id/image"                 => "fields#admin_update_image"
   #post    "admin/blocks/:id/file"                  => "fields#admin_update_file"    
   
+  get     "admin/block-types/store/sources"              => "block_type_sources#admin_index"
+  get     "admin/block-types/store/sources/new"          => "block_type_sources#admin_new"
+  get     "admin/block-types/store/sources/options"      => "block_type_sources#admin_options"
+  get     "admin/block-types/store/sources/:id/edit"     => "block_type_sources#admin_edit"    
+  get     "admin/block-types/store/sources/:id/refresh"  => "block_type_sources#admin_refresh"
+  post    "admin/block-types/store/sources"              => "block_type_sources#admin_create"
+  put     "admin/block-types/store/sources/:id"          => "block_type_sources#admin_update"
+  delete  "admin/block-types/store/sources/:id"          => "block_type_sources#admin_delete"
+  
+  get     "admin/block-types/store/:block_type_summary_id/download"  => "block_type_store#admin_download"  
+  get     "admin/block-types/store/:block_type_summary_id"           => "block_type_store#admin_details"  
+  get     "admin/block-types/store"                                  => "block_type_store#admin_index"
+      
   get     "admin/block-types/field-type-options"   => "block_types#admin_field_type_options"
   get     "admin/block-types/tree-options"         => "block_types#admin_tree_options"
   get     "admin/block-types/options"              => "block_types#admin_options"
@@ -137,16 +150,7 @@ Caboose::Engine.routes.draw do
   delete  "admin/block-types/:id"                  => "block_types#admin_delete"
   
   get     "admin/block-type-categories/tree-options" => "block_type_categories#admin_tree_options"
-  
-  get     "admin/block-type-sources"              => "block_type_sources#admin_index"
-  get     "admin/block-type-sources/new"          => "block_type_sources#admin_new"
-  get     "admin/block-type-sources/options"      => "block_type_sources#admin_options"
-  get     "admin/block-type-sources/:id/edit"     => "block_type_sources#admin_edit"    
-  get     "admin/block-type-sources/:id/refresh"  => "block_type_sources#admin_refresh"
-  post    "admin/block-type-sources"              => "block_type_sources#admin_create"
-  put     "admin/block-type-sources/:id"          => "block_type_sources#admin_update"
-  delete  "admin/block-type-sources/:id"          => "block_type_sources#admin_delete"
-
+    
   get     "posts"                                 => "posts#index"
   get     "posts/:id"                             => "posts#detail"
   get     "admin/posts/category-options"          => "posts#admin_category_options"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.34'
+  VERSION = '0.4.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.34
+  version: 0.4.35
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -249,6 +249,7 @@ files:
 - app/controllers/caboose/application_controller.rb
 - app/controllers/caboose/block_type_categories_controller.rb
 - app/controllers/caboose/block_type_sources_controller.rb
+- app/controllers/caboose/block_type_store_controller.rb
 - app/controllers/caboose/block_types_controller.rb
 - app/controllers/caboose/blocks_controller.rb
 - app/controllers/caboose/login_controller.rb
@@ -279,6 +280,7 @@ files:
 - app/models/caboose/block_type.rb
 - app/models/caboose/block_type_category.rb
 - app/models/caboose/block_type_source.rb
+- app/models/caboose/block_type_summary.rb
 - app/models/caboose/caboose_plugin.rb
 - app/models/caboose/core_plugin.rb
 - app/models/caboose/database_session.rb
@@ -311,6 +313,8 @@ files:
 - app/views/caboose/block_type_sources/admin_edit.html.erb
 - app/views/caboose/block_type_sources/admin_index.html.erb
 - app/views/caboose/block_type_sources/admin_new.html.erb
+- app/views/caboose/block_type_store/admin_details.html.erb
+- app/views/caboose/block_type_store/admin_index.html.erb
 - app/views/caboose/block_types/admin_edit.html.erb
 - app/views/caboose/block_types/admin_index.html.erb
 - app/views/caboose/block_types/admin_new.html.erb