caboose-cms 0.4.127 → 0.4.128

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjVjM2VjZjJkMDVhZDUxZjE4MzFhMmE4ZjE0NDhkZWRhZmViYWRiZQ==
+    NWYxNmY0YjZjYTJkMzBlMGIzNjE0NWI1ZGJlMjU0Njg1M2FmZDc1NA==
   data.tar.gz: !binary |-
-    OGUxNWE4MjgwZGJhYTBmZGI5NGJlZjAyYTgyZDhhZmFlYWVkMDYzNw==
+    MzU3ODgzMjM1MjQwNDQ5NTBkZDY2MjlkOWNjNTVhMmVlNjhhMGNjYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTExYjcxODUyZDRjNTk5NDFjYzk5MjE0OGUwZDIxNmYzMjc0ZWNjNWE0Mjll
-    MTU2NWZiNWM2N2ZiYzUxN2NmNzE4NzBiYTM0NmRhYThmN2UwMGYxNWU4ZTM2
-    ZDI4YjkzY2IzZTc2YzA1ZjcyMWQwOWMxZDU3N2I2ZjcxNTk4YjY=
+    MmJiZWExOTg4YjdjNWYyNzk3YjgwYTMyMzQ2YmRmMmIwYTBhYWNjYzg2Yjdi
+    MTkzODE2MGMyM2Q2ZDk0ZjY1ZTE4NzIyNTQxZTQzNDhiN2I3M2VjMDVlZWIw
+    YmM4MDk4ZDlhMzYxNWRiMDhjMGIzNGIzNzUzMWNhY2M3OGQ0YWQ=
   data.tar.gz: !binary |-
-    Mjk4ZjlmMzJiN2RiODg3MDRlNTVlY2FiZmVkYWYzZjc5YzY0NTFmNjE3YmMz
-    NjI0ZDZmZDk0ZDMwOTAxYWZkZTFlNTBkNTA2MWJmYjRhMTY1ZDQ5YTBhZDRl
-    ZjNkMzRmZDFmNzdhZjUwYWMxYTg5NzQ1NDAzNTY3NjBmOGIyNWM=
+    OTlkZWVlZjYyNTQ4ZWZjMWVmZDUzNmQxYjkwYWU5YjdlODkzZjJlMWE2M2Fm
+    NjExMTBhM2RhNDRhNGY4MDlkMTZlZjljNzUwNWY1ZjU0MzUwYTk3ZTJiNTk4
+    MTM5NzM2ZjMwYTkzMjc4ZDgzNmIzODdiMGJhZTcxNjFiYzQ5MmM=

data/app/controllers/caboose/pages_controller.rb

@@ -423,6 +423,15 @@ module Caboose
           Page.update_authorized_for_action(page.id, 'edit', value)
         when 'approvers'
           Page.update_authorized_for_action(page.id, 'approve', value)
+        when 'tags'
+          current_tags = page.page_tags.collect{ |t| t.tag }
+          new_tags = value.split(',').collect{ |v| v.strip.downcase }.reject{ |t| t.nil? || t.strip.length == 0 }          
+          
+          # Delete the tags not in new_tags
+          current_tags.each{ |t| PageTag.where(:page_id => page.id, :tag => t).destroy_all if !new_tags.include?(t) }
+          
+          # Add any new tags not in current_tags
+          new_tags.each{ |t| PageTag.create(:page_id => page.id, :tag => t) if !current_tags.include?(t) }
         end
       end
     

data/app/models/caboose/page.rb

@@ -7,6 +7,7 @@ class Caboose::Page < ActiveRecord::Base
   has_many :children, :class_name => 'Caboose::Page', :foreign_key => 'parent_id', :order => 'sort_order, title'
   has_many :page_permissions  
   has_many :blocks, :order => 'sort_order'
+  has_many :page_tags, :class_name => 'Caboose::PageTag', :dependent => :delete_all, :order => 'tag'
   attr_accessible :id      ,        
     :site_id               ,
     :parent_id             ,

data/app/models/caboose/page_tag.rb

@@ -0,0 +1,5 @@
+class Caboose::PageTag < ActiveRecord::Base
+  self.table_name = "page_tags"       
+  belongs_to :page  
+  attr_accessible :id, :page_id, :tag  
+end

data/app/models/caboose/schema.rb

@@ -27,8 +27,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Block => [:block_type],
       #Caboose::FieldType => [:model_binder_options],
       Caboose::AbValue => [:i, :text],
-      Caboose::AbOption => [:text],
-      Caboose::User => [:timezone],
+      Caboose::AbOption => [:text],      
       #Caboose::Field => [:child_block_id],
       Caboose::BlockType => [:layout_function],
       Caboose::CalendarEvent => [
@@ -233,6 +232,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :page_id , :integer  ],
         [ :action  , :string   ]
       ],
+      Caboose::PageTag => [        
+        [ :page_id , :integer  ],
+        [ :tag     , :string   ]
+      ],
       Caboose::PermanentRedirect => [
         [ :site_id  , :integer ],
         [ :priority , :integer , { :default => 0 }],
@@ -300,21 +303,6 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :authentication       , :string ], # :plain, :login, :cram_md5.
         [ :enable_starttls_auto , :boolean , { :default => true }]
       ],
-      Caboose::Timezone => [
-        [ :country_code , :string ],
-        [ :name         , :string ]
-      ],
-      Caboose::TimezoneAbbreviation => [
-        [ :abbreviation , :string  ],
-        [ :name         , :string  ]
-      ],
-      Caboose::TimezoneOffset => [
-        [ :timezone_id  , :integer  ],
-        [ :abbreviation , :string   ],
-        [ :time_start   , :integer  ],
-        [ :gmt_offset   , :integer  ],
-        [ :dst          , :boolean  ]
-      ],
       Caboose::User => [
         [ :first_name           , :string     ],
         [ :last_name            , :string     ],
@@ -326,10 +314,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :state                , :string     ],
         [ :zip                  , :string     ],
         [ :phone                , :string     ],
-        [ :fax                  , :string     ],
-        [ :utc_offset           , :float      , { :default => -5 }],
-        #[ :timezone             , :string     , { :default => 'America/Chicago' }],
-        [ :timezone_id          , :integer    , { :defualt => 381 }], # Defaults to 'America/Chicago'
+        [ :fax                  , :string     ],        
+        [ :timezone             , :string     , { :default => 'Central Time (US & Canada)' }],        
         [ :password             , :string     ],
         [ :password_reset_id    , :string     ],
         [ :password_reset_sent  , :datetime   ],

data/app/models/caboose/user.rb

@@ -12,7 +12,7 @@ class Caboose::User < ActiveRecord::Base
       :large => '600x800>'
     }
   do_not_validate_attachment_file_type :image
-  attr_accessible :id, :email, :first_name, :last_name, :username, :token, :password, :phone
+  attr_accessible :id, :email, :first_name, :last_name, :username, :token, :password, :phone, :timezone
   
   ADMIN_USER_ID = 1
   LOGGED_OUT_USER_ID = 2

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

@@ -1,15 +1,15 @@
 <%
-img       = block.child('image_src')
-img_style = block.child('image_style').value.to_sym
-link      = block.child('link').value
-align     = block.child('align').value
-width     = block.child('width').value
-height    = block.child('height').value
-mt        = block.child('margin_top').value.downcase
-mr        = block.child('margin_right').value.downcase
-mb        = block.child('margin_bottom').value.downcase
-ml        = block.child('margin_left').value.downcase
-url = img && img.image ? img.image.url(img_style.downcase.to_sym) : nil
+img       = block.child_value('image_src')
+img_style = block.child_value('image_style')
+link      = block.child_value('link')
+align     = block.child_value('align')
+width     = block.child_value('width')
+height    = block.child_value('height')
+mt        = block.child_value('margin_top').downcase
+mr        = block.child_value('margin_right').downcase
+mb        = block.child_value('margin_bottom').downcase
+ml        = block.child_value('margin_left').downcase
+url = img ? img.url(img_style.downcase.to_sym) : nil
 
 img = nil
 if url && !url.include?('missing.png')  

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

@@ -11,6 +11,7 @@
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_hide'                  ></div><span class='explanation'>Whether or not this page is displayed in the menu.</span></div>
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_custom_sort_children'  ></div><span class='explanation'>Sort child pages alphabetically or <a href='/admin/pages/<%= @page.id %>/child-order'>custom</a>.</span></div>
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_content_format'        ></div><span class='explanation'>Specify whether or not you want to embed ruby code in your page.</span></div>
+<div class='field_with_explanation'><div id='page_<%= @page.id %>_tags'                  ></div><span class='explanation'>Tags to help categorize your page. Use as many as you want, just separate by commas.</span></div>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
 
@@ -48,6 +49,9 @@ $(window).load(function() {
   modal = new CabooseModal(800);
 });
 
+<%
+tags = @page.page_tags.collect{ |t| t.tag }.join(', ') 
+%>
 $(document).ready(function() {
   m = new ModelBinder({
     name: 'Page',
@@ -55,15 +59,16 @@ $(document).ready(function() {
     update_url: '/admin/pages/<%= @page.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'title'                 , nice_name: 'Title'                , type: 'text'       , value: <%= raw Caboose.json(@page.title        ) %> , width: 400 },
-      { name: 'menu_title'            , nice_name: 'Menu title'           , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title   ) %> , width: 400 },
-      { name: 'parent_id'             , nice_name: 'Parent'               , type: 'select'     , value: <%= @page.parent_id %>                       , width: 400, after_update: function() { update_uri(<%= @page.id %>); }, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/admin/pages/sitemap-options' },           
-      { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug         ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
-      { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias        ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
-      { name: 'redirect_url'          , nice_name: 'Redirect URL'         , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url ) %> , width: 400 },
-      { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide %>                        , width: 400 },      
-      { name: 'custom_sort_children'  , nice_name: 'Custom sort children' , type: 'checkbox'   , value: <%= raw @page.custom_sort_children %>        , width: 400 },
-      { name: 'content_format'        , nice_name: 'Content format'       , type: 'select'     , value: <%= raw Caboose.json(@page.content_format) %>, width: 400, text: <%= raw Caboose.json(@page.content_format) %>, options_url: '/pages/format-options' },       
+      { name: 'title'                 , nice_name: 'Title'                , type: 'text'       , value: <%= raw Caboose.json(@page.title           ) %> , width: 400 },
+      { name: 'menu_title'            , nice_name: 'Menu title'           , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title      ) %> , width: 400 },
+      { name: 'parent_id'             , nice_name: 'Parent'               , type: 'select'     , value: <%= @page.parent_id                          %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); }, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/admin/pages/sitemap-options' },           
+      { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug            ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
+      { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias           ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
+      { name: 'redirect_url'          , nice_name: 'Redirect URL'         , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url    ) %> , width: 400 },
+      { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide                           %> , width: 400 },      
+      { name: 'custom_sort_children'  , nice_name: 'Custom sort children' , type: 'checkbox'   , value: <%= raw @page.custom_sort_children           %> , width: 400 },
+      { name: 'content_format'        , nice_name: 'Content format'       , type: 'select'     , value: <%= raw Caboose.json(@page.content_format  ) %> , width: 400, text: <%= raw Caboose.json(@page.content_format) %>, options_url: '/pages/format-options' },
+      { name: 'tags'                  , nice_name: 'Tags'                 , type: 'text'       , value: <%= raw Caboose.json(tags                  ) %> , width: 400 }
     ]
   });
 });

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

@@ -4,6 +4,7 @@
 <p><div id='page_<%= @page.id %>_seo_title'></div></p>
 <p><div id='page_<%= @page.id %>_meta_keywords'></div></p>
 <p><div id='page_<%= @page.id %>_meta_description'></div></p>
+<p id='widths'></p>
 <p><div id='page_<%= @page.id %>_meta_robots'></div></p>
 <p><div id='page_<%= @page.id %>_canonical_url'></div></p>
 <p><div id='page_<%= @page.id %>_fb_description'></div></p>
@@ -29,10 +30,34 @@ $(document).ready(function() {
       { name: 'meta_description'  , nice_name: 'Meta Description'     , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_description) %>, width: 580, height: 80 },
       { name: 'fb_description'    , nice_name: 'Facebook Description' , type: 'textarea'  , value: <%= raw Caboose.json(@page.fb_description)   %>, width: 580, height: 80 },
       { name: 'gp_description'    , nice_name: 'Google+ Description'  , type: 'textarea'  , value: <%= raw Caboose.json(@page.gp_description)   %>, width: 580, height: 80 }
-    ]
+    ],
+    on_load: function() {      
+      $('#page_<%= @page.id %>_meta_description').keyup(function() {
+        update_widths();        
+      });      
+      update_widths();
+    }
   });  
   modal = new CabooseModal(600, 540);
+  
 });
 
+function update_widths()
+{
+  var str = $('#page_<%= @page.id %>_meta_description').val();
+  var count = str.length;
+  var width = getTextWidth(str);
+  $('#widths').html('' + count + ' character' + (count == 1 ? '' : 's') + "<br />" + width + " pixel" + (width == 1 ? '' : 's'));
+}
+      
+function getTextWidth(text) 
+{  
+  var canvas = getTextWidth.canvas || (getTextWidth.canvas = document.createElement("canvas"));
+  var context = canvas.getContext("2d");
+  context.font = "18px arial";
+  var metrics = context.measureText(text);
+  return metrics.width;
+}
+
 </script>
 <% end %>

data/lib/caboose.rb

@@ -53,11 +53,7 @@ module Caboose
   # Define asset collections
   mattr_accessor :javascripts, :stylesheets
   @@javascripts = []
-  @@stylesheets = []
-  
-  # API key for timezonedb.com/api
-  mattr_accessor :timezonedb_api_key
-  @@timezonedb_api_key = ''
+  @@stylesheets = []    
 
   # Session length (in hours)
   mattr_accessor :session_length
@@ -65,6 +61,10 @@ module Caboose
 
   # Parse rich text blocks
   mattr_accessor :parse_richtext_blocks
-  @@parse_richtext_blocks = true  
+  @@parse_richtext_blocks = true
+
+  # Default timezone
+  mattr_accessor :timezone
+  @@timezone = 'Central Time (US & Canada)'  
   
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.127'
+  VERSION = '0.4.128'
 end

data/lib/tasks/caboose.rake

@@ -57,20 +57,6 @@ namespace :caboose do
     ActiveRecord::SessionStore::Session.delete_all(["updated_at < ?", Caboose::session_length.hours.ago])        
   end
   
-  desc "Loads and refreshes the timezones from timezonedb.com"
-  task :load_timezones => :environment do
-    Caboose::Timezone.load_zones('/Users/william/Sites/repconnex/tmp/timezones')
-  end
-  
-  desc "Loads and refreshes the timezones from timezonedb.com"
-  task :test_timezones => :environment do
-    
-    d = DateTime.strptime("04/01/2014 10:00 am -0500", "%m/%d/%Y %I:%M %P %Z")
-    puts d    
-    d = DateTime.strptime("04/01/2014 10:00 am -0700", "%m/%d/%Y %I:%M %P %Z")
-    puts d
-  end
-  
   desc "Removes duplicate users"
   task :remove_duplicate_users => :environment do    
     while true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.127
+  version: 0.4.128
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -323,6 +323,7 @@ files:
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
 - app/models/caboose/page_permission.rb
+- app/models/caboose/page_tag.rb
 - app/models/caboose/pager.rb
 - app/models/caboose/permanent_redirect.rb
 - app/models/caboose/permission.rb
@@ -340,9 +341,6 @@ files:
 - app/models/caboose/smtp_config.rb
 - app/models/caboose/states.rb
 - app/models/caboose/std_class.rb
-- app/models/caboose/timezone.rb
-- app/models/caboose/timezone_abbreviation.rb
-- app/models/caboose/timezone_offset.rb
 - app/models/caboose/user.rb
 - app/models/caboose/utilities/schema.rb
 - app/views/caboose/ab_variants/admin_edit.html.erb

data/app/models/caboose/timezone.rb

@@ -1,75 +0,0 @@
-require 'httparty'
-
-class Caboose::Timezone < ActiveRecord::Base
-  self.table_name = "timezones"
-  
-  has_many :timezone_offsets, :class_name => 'Caboose::TimezoneOffset'
-  attr_accessible :id, :country_code, :name
-  
-  def self.load_zones(temp_dir = '/tmp', country_codes = ['US'])
-    `curl -o #{temp_dir}/timezones.csv.zip http://timezonedb.com/files/timezonedb.csv.zip`
-    `unzip #{temp_dir}/timezones.csv.zip -d #{temp_dir}/timezones`
-
-    #Caboose::Timezone.destroy_all
-    #Caboose::TimezoneOffset.destroy_all
-    
-    File.foreach("#{temp_dir}/timezones/zone.csv") do |line|      
-      data = CSV.parse_line(line)
-      next if !country_codes.include?(data[1])
-      next if Caboose::Timezone.where(:id => data[0].to_i).exists?
-      Caboose::Timezone.create(
-        :id           => data[0].to_i,
-        :country_code => data[1], 
-        :name         => data[2]
-      )
-    end
-    
-    File.foreach("#{temp_dir}/timezones/timezone.csv") do |line|      
-      data = CSV.parse_line(line)
-      tz_id = data[0].to_i
-      next if !Caboose::Timezone.where(:id => tz_id).exists?
-      next if Caboose::TimezoneOffset.where(:timezone_id => tz_id, :time_start => data[2].to_i).exists?
-      Caboose::TimezoneOffset.create(
-        :timezone_id  => data[0].to_i,
-        :abbreviation => data[1],
-        :time_start   => data[2],
-        :gmt_offset   => data[3],
-        :dst          => data[4]        
-      )
-    end
-    
-    spec = Gem::Specification.find_by_name("caboose-cms")
-    gem_root = spec.gem_dir
-    
-    File.foreach(gem_root + '/lib/sample_files/timezone_abbreviations.csv') do |line|      
-      data = CSV.parse_line(line)      
-      next if Caboose::TimezoneAbbreviation.where(:abbreviation => data[0]).exists?      
-      Caboose::TimezoneAbbreviation.create(        
-        :abbreviation => data[0],
-        :name         => data[1]                
-      )
-    end        
-    
-    `rm -rf #{temp_dir}/timezones`
-    `rm -rf #{temp_dir}/timezones.csv.zip`
-    
-  end
-  
-  def local(utc_datetime)
-    tzo = self.timezone_offsets.where('time_start < ?', utc_datetime.to_i).reorder('time_start desc').first
-    return utc_datetime + tzo.gmt_offset.seconds
-  end
-  
-  def string_format(d = DateTime.now.utc)
-    tzo = self.timezone_offsets.where('time_start < ?', d.to_i).reorder('time_start desc').first
-    total = tzo.gmt_offset.abs
-    hours = (total/3600).floor
-    x = total - (hours*3600)
-    minutes = x > 0 ? (x/60).floor : 0
-    seconds = total - (hours*3600) - (minutes*60)
-    sign = tzo.gmt_offset >= 0 ? '+' : '-'    
-    hours = hours.to_s.rjust(2, '0')    
-    return "#{sign}#{hours}#{minutes}"
-  end
-  
-end

data/app/models/caboose/timezone_abbreviation.rb

@@ -1,5 +0,0 @@
-
-class Caboose::TimezoneAbbreviation < ActiveRecord::Base
-  self.table_name = "timezone_abbreviations" 
-  attr_accessible :id, :abbreviation, :name      
-end

data/app/models/caboose/timezone_offset.rb

@@ -1,5 +0,0 @@
-class Caboose::TimezoneOffset < ActiveRecord::Base
-  self.table_name = "timezone_offsets"
-  belongs_to :timezone
-  attr_accessible :id, :timezone_id, :abbreviation, :time_start, :gmt_offset, :dst
-end