caboose-cms 0.5.200 → 0.5.201

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQwYWQxZGViMmI1ODlkNjNkMjJjODc3ZmE3NjZhYWY0NjViYTAwNA==
+    NWFhNjhhZjc5NGZjNDE4MWI2OGQzZTEyNWUwZTRkYTAyODllMzY5Mw==
   data.tar.gz: !binary |-
-    MDcwMDA0Y2M4MTRmMWI3Y2NiN2Q1N2U3YTM5MzAzZWQ3NzI0NjgyNQ==
+    ZTMwNzVmY2RhZWFlMTI2YTMwNmU4YjU4OWNkYWQyOTU5Yzk5Yjc2Mg==
 SHA512:
   metadata.gz: !binary |-
-    NTUxNTM5MjEyYmM2OWJiYTZiZjEzODQ1YmUxOTE4MTY0NTRkYjg3MjliNjIx
-    OGJlY2JkYTVmNTRlMWQ3ZTYzZDYwMWE2ZDMwMDEzZDIyZjliMzI0ZDk3MThk
-    ODViZjRlYTQ2NGZhZjZkNWYwYTQwNGVlN2ZmZGIxOWYzZjg3MDQ=
+    OTI0Yjg1YWRjOGFmOGY2NjMzYzc3ODc0MGE0NjVmYjNkN2I2OGQxODNlZGI3
+    MGQ1ZTFmYWRkOGY5YTg5YjQyMDdkNjBhMmMxNmU5YTZkMzZlNjQyOWQ4MWNm
+    NmE4NjNhMDc3NTBmYjFlNTQ3YmI0NzUxOGU4MDA0ZTRjMDNiMjI=
   data.tar.gz: !binary |-
-    MmRiMWViNTgzYmFmMDE0NTQyOTMwMDJhOGRkZmZlNDAxZmY1MjExN2FmZTU3
-    NTNjZmY4NzdlYmEyODI1YjczYWY3MDI1ZTkzM2ZmNDRhYTk4NjliY2M4M2I0
-    NDZjYjM3MjM5M2EwNjg1OTFkZjQ4NzVjODI5NmQxYTFmN2VlYmY=
+    ODdjM2MzNzM1MWQ2ZTQzYTUwZmRmZDE2NWQ4MzI5ZGZkOTJjODMyNTQ1ZDgy
+    MWRjYTkwNTE4ZjVjNWJiYjUyODI0ZWZhZmMzYzQ1NzMzZjI0MGE1ODAyMDJh
+    NGQ5ZDZmMWRjMGZmNjQ0MjVkYjBiMjY5MTQ4ZTgyNWM3ZGU3ZGY=

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

@@ -0,0 +1,32 @@
+
+var google_spreadsheets = false;
+
+function google_csv_data(spreadsheet_id, col, row)
+{
+  var csv_array = false;
+  if (!google_spreadsheets) google_spreadsheets = {};
+  if (!google_spreadsheets[spreadsheet_id])  
+  {    
+    $.ajax({
+      url: "/google-spreadsheets/" + spreadsheet_id + "/csv",
+      type: 'get',
+      success: function(arr){ google_spreadsheets[spreadsheet_id] = arr; },           
+      async: false               
+    });
+  }
+  var arr = google_spreadsheets[spreadsheet_id];
+  var c = column_name_to_int(col);    
+  return arr[parseInt(row)-1][c];        
+}
+  
+function column_name_to_int(col)
+{  
+  var c = 0;
+  if (col.length > 0)
+  {
+    var l = col.length;
+    for (var i=l-1; i >=0; i--)      
+      c += Math.pow(25, l-i-1) * (col.charCodeAt(i) - 65);
+  }
+  return c;  
+}  

data/app/controllers/caboose/google_spreadsheets_controller.rb

@@ -0,0 +1,16 @@
+require 'httparty'
+
+module Caboose
+  class GoogleSpreadsheetsController < Caboose::ApplicationController
+    
+    # GET /google-spreadsheets/:spreadsheet_id/csv
+    def csv_data           
+      spreadsheet_id = params[:spreadsheet_id]                                                                                                              
+      url = "https://docs.google.com/spreadsheets/d/#{spreadsheet_id}/export?format=csv&id=#{spreadsheet_id}&gid=0"             
+      resp = HTTParty.get(url)
+      arr = CSV.parse(resp.body)                    
+      render :json => arr
+    end
+
+  end
+end

data/app/models/caboose/block.rb

@@ -4,6 +4,7 @@ class Caboose::Block < ActiveRecord::Base
   
   #after_find :get_master_value # TODO
   
+  belongs_to :post
   belongs_to :page
   belongs_to :block_type
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::Block'   
@@ -21,7 +22,8 @@ class Caboose::Block < ActiveRecord::Base
     }
   do_not_validate_attachment_file_type :image
   
-  attr_accessible :id, 
+  attr_accessible :id,
+    :post_id,
     :page_id, 
     :parent_id,
     :block_type_id,

data/app/views/caboose/blocks/_google_spreadsheet_cell_value.html.erb

@@ -0,0 +1,26 @@
+<%
+spreadsheet_id = block.child_value('spreadsheet_id')
+row = block.child_value('row')
+col = block.child_value('column')
+%>
+<div id='block_<%= block.id %>'>
+  <% if editing && (spreadsheet_id.nil? || spreadsheet_id.strip.length == 0) %>
+    [Empty spreadsheet ID]
+  <% elsif editing && (row.nil? || row.strip.length == 0) %>
+    [Empty spreadsheet row]
+  <% elsif editing && (col.nil? || col.strip.length == 0) %>
+    [Empty spreadsheet column]
+  <% elsif !editing && spreadsheet_id && row && col %><% end %>        
+</div>
+<% if spreadsheet_id && row && col %>
+  <%= content_for :js do %>
+    <%= javascript_include_tag('caboose/google_spreadsheets') %>
+    <script type='text/javascript'>
+    $(document).ready(function() {      
+      var str = google_csv_data("<%= raw spreadsheet_id %>", "<%= raw col %>", <%= raw row %>);      
+      $('#block_<%= block.id %>').html(str);
+    });
+    </script>
+  <% end %>
+<% end %>
+    

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

@@ -54,7 +54,6 @@ g = @event.calendar_event_group
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
-<%= javascript_include_tag "jquery-ui/datepicker" %>
 <script type="text/javascript">
 
 var modal = false;
@@ -79,7 +78,7 @@ $(document).ready(function() {
       { name: 'all_day'     , nice_name: 'All day'      , type: 'checkbox' , value: <%= raw e.all_day ? 1 : 0 %>, width: 100, after_update: after_all_day_update },
       { name: 'repeats'     , nice_name: 'Repeats'      , type: 'checkbox' , value: <%= raw e.repeats ? 1 : 0 %>, width: 100, after_update: after_repeats_update }      
     ],
-    on_load: function() { modal.autosize(); }    
+    on_load: function() { modal.autosize(); console.log('Testing'); }    
   });  
   new ModelBinder({
     name: 'CalendarEventGroup',

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

@@ -16,6 +16,7 @@
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
+var modal = false;
 $(window).load(function() {
   modal = new CabooseModal(460);
 });

data/config/routes.rb

@@ -343,6 +343,12 @@ Caboose::Engine.routes.draw do
   post    "admin/posts"                           => "posts#admin_add"  
   delete  "admin/posts/:id"                       => "posts#admin_delete"
   
+  #=============================================================================
+  # Google Spreadsheets
+  #=============================================================================
+  
+  get     "google-spreadsheets/:spreadsheet_id/csv" => "google_spreadsheets#csv_data"
+      
   #=============================================================================
   # Calendar
   #=============================================================================

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.200'
+  VERSION = '0.5.201'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.200
+  version: 0.5.201
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -415,6 +415,7 @@ files:
 - app/assets/javascripts/caboose/checkout_payment.js
 - app/assets/javascripts/caboose/checkout_shipping.js
 - app/assets/javascripts/caboose/date_format.js
+- app/assets/javascripts/caboose/google_spreadsheets.js
 - app/assets/javascripts/caboose/imageZoom.js
 - app/assets/javascripts/caboose/jquery.datetimepicker.js
 - app/assets/javascripts/caboose/jquery.detect.js
@@ -530,6 +531,7 @@ files:
 - app/controllers/caboose/event_groups_controller.rb
 - app/controllers/caboose/events_controller.rb
 - app/controllers/caboose/gift_cards_controller.rb
+- app/controllers/caboose/google_spreadsheets_controller.rb
 - app/controllers/caboose/images_controller.rb
 - app/controllers/caboose/line_items_controller.rb
 - app/controllers/caboose/login_controller.rb
@@ -684,6 +686,7 @@ files:
 - app/views/caboose/blocks/_checkbox.html.erb
 - app/views/caboose/blocks/_controller_view_content.html.erb
 - app/views/caboose/blocks/_file.html.erb
+- app/views/caboose/blocks/_google_spreadsheet_cell_value.html.erb
 - app/views/caboose/blocks/_heading.html.erb
 - app/views/caboose/blocks/_html.html.erb
 - app/views/caboose/blocks/_image.html.erb