caboose-cms 0.4.35 → 0.4.36

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjc3MDVlNjJiYmQzM2YwMmJlMjg2NmE3NDZmYTBlN2M2MGQ4ODAyZQ==
+    YTk2NTdlOTliOGZiMDJmOWY1M2JlODc4NzdlODgzY2NmMzU4ZmM4ZQ==
   data.tar.gz: !binary |-
-    MzQ5ZWRmNDdlZGNjZDAyNTRjMDEzMzM1N2UyZjQ1ODVjZDVmZDdjOA==
+    ZjRmNWEyZDdhMzg1YjNmODY0MDE3MGU3ZjI4NWYyYmMyNWY0MGVmNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2ZjN2ZhMmY0YzQ4ODVlMTczYWU3YjIyNmI5OGEzYjNmNmI5NTRmYzY0ZWQx
-    M2NjNDcwN2Q0YjZkYWI5NzcxODZlM2RmNWY3MWVlOTg2YzhkZDViYWRjMzY3
-    MzY5ZDBlMzQwZDIxZjM2ODlkN2U2Y2Q4MDAzZTJjMmRhZjk4ZmQ=
+    ZmJmZmE5YmY0MjZhOGZkNDg2OTIwMDgyZDZjZjg2MjE1Y2U0YTU4ZjEzMTM2
+    ZDM2MDQzNjZkYzI1MTZmMzljM2YwOTNkYzFiYzhmOWQ5ZDM0MmM3YzFlYjUz
+    YWFiYWIzNzZmZjAzOWUxOTVmY2FkZjgxMzFkZjhhMzAyNWI3Nzg=
   data.tar.gz: !binary |-
-    MzAwZGVmNjkzODhkZjY3MzgxZmVlNTg3MDlkNzRmNjdiYjQ2NDA4NjFjYWYx
-    ZDA0ODgwODFlNjczNzU3Yjc0ZjllNzY3ZWEwOWMzN2IzNWViMDI3NGQ2NjE4
-    YTEzNGRiMzJmNDQxOTMyYzUxYjk1ODA0MDM0MjI4NzQ4ZDRjZjQ=
+    OGIyNTlmYTkzYWIzMmRhMmFkOTdjMzI3MGZlNTExNTBjYjhmZDg1Y2M2YmJi
+    OThmMDIwNDU0OWZmNjEwNjljODBmZDFlMTBhMGRhOTUwM2M3NzRmNTEwNjFi
+    NGZiZDE5N2E5ODYwMDhhMTNhMmU4Mjk4MTA0MzdjNGM3Y2JlOTc=

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

@@ -471,3 +471,14 @@ Page Bar Generator
 #content2 {
   margin-left: 220px; 
 }
+
+#crumbtrail {
+  position: absolute;
+  top: -36px;
+  left: 54px;
+  color: #fff;
+}
+
+#crumbtrail a {
+  color: #fff; 
+}

data/app/controllers/caboose/block_type_sources_controller.rb

@@ -40,7 +40,7 @@ module Caboose
       bts.save      
       
       # Send back the response
-      resp.redirect = "/admin/block-type-sources/#{bts.id}/edit"
+      resp.redirect = "/admin/block-types/store/sources/#{bts.id}/edit"
       render :json => resp
     end
     

data/app/models/caboose/block_type.rb

@@ -78,16 +78,20 @@ class Caboose::BlockType < ActiveRecord::Base
     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)
+    if h['children'].nil?
+      Caboose::BlockType.where("parent_id = ? and name is not null", self.id).destroy_all
+    else
+      new_child_names = h['children'].collect { |h2| h2['name'] }      
+      Caboose::BlockType.where("parent_id = ? and name is not null and name not in (?)", self.id, new_child_names).destroy_all
     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)
+    if h['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(h2)
+      end
     end
     
   end

data/app/models/caboose/block_type_source.rb

@@ -31,7 +31,7 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
     
     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 = Caboose::BlockTypeSummary.create(:block_type_source_id => self.id) if s.nil?
       s.parse_api_hash(h)
       s.save
     end
@@ -65,7 +65,7 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
       Caboose.log("Response body isn't valid JSON.")
       return false
     end     
-    
+    #Caboose.log(h)
     # Update the block type
     bt.parse_api_hash(h)
     

data/app/models/caboose/block_type_summary.rb

@@ -1,7 +1,7 @@
 require 'httparty'
 
 class Caboose::BlockTypeSummary < ActiveRecord::Base
-  self.table_name = "block_type_summary"
+  self.table_name = "block_type_summaries"
         
   belongs_to :block_type_source
   attr_accessible :id,

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

@@ -1,6 +1,12 @@
 <%
 bts = @block_type_source
 %>
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a> >
+  <a href='/admin/block-types/store'>Store</a> >
+  <a href='/admin/block-types/store/sources'>Sources</a>
+</div>
 
 <h1>Edit Source</h1>
 <p><div id='blocktypesource_<%= bts.id %>_name'     ></div></p>
@@ -46,7 +52,7 @@ function refresh_block_types(bts_id)
 {  
   $('#message').empty().append($('<p/>').addClass('loading').html('Refreshing block types from source...'));
   $.ajax({
-    url: '/admin/block-type/store/sources/' + bts_id + '/refresh',
+    url: '/admin/block-types/store/sources/' + bts_id + '/refresh',
     type: 'get',
     success: function(resp) {
       if (resp.error) $('#message').empty().append($('<p/>').addClass('note error').html(resp.error));

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

@@ -1,3 +1,9 @@
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a> >
+  <a href='/admin/block-types/store'>Store</a>
+</div>
+
 <h1>Block Type Sources</h1>
 
 <p><a href='/admin/block-types/store/sources/new'>New Source</a></p>

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

@@ -1,3 +1,9 @@
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a> >
+  <a href='/admin/block-types/store'>Store</a> >
+  <a href='/admin/block-types/store/sources'>Sources</a>  
+</div>
 
 <h1>New Source</h1>
 <form action='/admin/block-types/store/sources' method='post' id='new_source_form'>

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

@@ -2,7 +2,8 @@
 bts = @block_type_summary
 %>
 <div id='crumbtrail'>
-  <a href='/admin/block-types'>Page Block Types</a> > 
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a> >
   <a href='/admin/block-types/store'>Store</a>
 </div>
 
@@ -10,5 +11,36 @@ bts = @block_type_summary
 
 <p>Name: <%= bts.name %></p>
 <p>Description: <%= bts.description %></p>
-<p>Status: 
-<p><a href='/admin/block-types/store'>< Back</a></p>
+<div id='message'></div> 
+<p>
+<input type='button' value='< Back' onclick="window.location='/admin/block-types/store';" />
+<input type='button' value='Download from Source' onclick="download_block_type(<%= bts.id %>);" />
+</p>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+function download_block_type(summary_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append('Are you sure you want to download the block type?<br />')
+      .append($('<input/>').attr('type', 'button').val('Yes').click(function() { download_block_type(summary_id, true); })).append(' ')
+      .append($('<input/>').attr('type', 'button').val('No').click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').html("<p class='loading'>Downloading block type...</p>");
+  $.ajax({
+    url: '/admin/block-types/store/' + summary_id + '/download',
+    type: 'get',
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.success) $('#message').html("<p class='note success'>" + resp.success + "</p>");
+    }
+  });
+}
+
+</script>
+<% end %>

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

@@ -1,3 +1,8 @@
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a>  
+</div>
+
 <h1>Block Type Store</h1>
 
 <p><a href='/admin/block-types/store/sources'>Store Sources</a></p>

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

@@ -1,6 +1,10 @@
 <%
 bt = @block_type
 %>
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a>
+</div>
 
 <h1>Edit Block Type</h1>
 <p><div id='blocktype_<%= bt.id %>_description'></div></p>

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

@@ -1,3 +1,8 @@
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  Block Types
+</div>
+
 <h1>Block Types</h1>
 
 <p>  

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

@@ -1,3 +1,8 @@
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a>
+  New Block Type
+</div>
 
 <h1>New Block Type</h1>
 <form action='/admin/block-types' method='post' id='new_block_type_form'>

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.35
+  version: 0.4.36
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails