caboose-cms 0.3.85 → 0.3.86

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDU1MDBlNzlkMzA1OTAyYTUzZGZmM2QwNGU3ZTg3ZTlkZWJjZTJiZg==
+    YTFiZmFkNWM5MDk2ZTIwOTk5MjMwNWJmMDYxZWEzZjVlNTU5OThmZA==
   data.tar.gz: !binary |-
-    YWE0MzMyMWRiZWUwZWNkOWEzNmEzMzMyNzExYjlmMTVmZmEwYWVjNA==
+    YjQ0NDAzNjc0YmE0ZjQ5ODUxYmQ5NWRiMDk3YTQ5ZDBjZTI3OTFmNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzdiMjZhOTY4MTE4NzI3OTE5YTQyY2FkY2NmODEwNjZiYTJhZjgzNDg1Mjhm
-    MmM2NWViNDRmZWVmOGJmODEyYmU0NDk5MDM1MDNiY2ZiNTM2MjVhNTVhZmVh
-    ZWRhNjVhNDZmZjVkZmM0Mjc2Nzc3MDYwMDZiMGJiNDZlYjU4NWI=
+    YzNmN2Y5NTdlMjMyNjNjYTYwZTRmODM1OTc4ZTM4NDhmYzc5YjI0YjQxZThh
+    OWM1OGM4ZGRhNTg3ZWNlOTdlZThmNGM1OWU5ZmU5MWFhNThhOGVlM2M4N2Jl
+    ODQ2NWYwMzJiZTUzZTczZDdjMDUzNDZlOGE0MGU5YmM2MzY4Zjg=
   data.tar.gz: !binary |-
-    ODZkODRjMWYxNDNmNTVjODY5Y2E3ZThmNjBhZjliNDhlNWEzNjJhMThmYjkx
-    ZGM5YWNhNmExN2IzOGY1YTEwZTRhNDQ0ZTRlMjI4ZmE5YzQ2MTJkOWNjMjhh
-    NjQzZGJlZjlkZjNjMTgwZGRhMjY2NWZkMGNhMjM2OGE2NGVjNTQ=
+    Y2IyMmY5MGEyNzBmMzk5YzU0MGM1NjBmYzk3MmUxMGQzMGM0ZWJmN2QxMTIx
+    Y2JjZDlhODA0ZGZhMjIyMWQwYzRhMmM3NTU1ZTE1MzQ0NjZkNGMzZTA2YjFi
+    ODQ5YTkyYzU0NGI1MmI3OGE1OTdlYzlmZGUwN2JlNzI2NTVhZmU=

data/app/controllers/caboose/login_controller.rb

@@ -31,9 +31,10 @@ module Caboose
           if login_resp.error
             resp.error = login_resp.error
           else
-            remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")
-            login_user(login_resp.user, remember)
+            remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")            
+            login_user(login_resp.user, remember)            
             resp.redirect = return_url
+            Caboose.plugin_hook('login_success')            
           end
         end
       end            

data/app/controllers/caboose/users_controller.rb

@@ -1,3 +1,4 @@
+require 'csv'
 
 module Caboose
   class UsersController < ApplicationController
@@ -71,6 +72,25 @@ module Caboose
     	@users = @gen.items
     end
     
+    # GET /admin/users
+    def index
+      return if !user_is_allowed('users', 'view')
+      
+      @gen = PageBarGenerator.new(params, {
+    		  'first_name_like' => '',
+    		  'last_name_like'	=> '',
+    		  'username_like'	  => '',
+    		  'email_like' 		  => '',
+    		},{
+    		  'model'          => 'Caboose::User',
+    	    'sort'			     => 'last_name, first_name',
+    		  'desc'			     => false,
+    		  'base_url'		   => '/admin/users',
+    		  'use_url_params' => false
+    	})
+    	@users = @gen.items
+    end
+    
     # GET /admin/users/new
     def new
       return if !user_is_allowed('users', 'add')
@@ -91,6 +111,79 @@ module Caboose
       @edituser = User.find(params[:id])
     end
     
+    # GET /admin/users/import
+    def import_form
+      return if !user_is_allowed('users', 'edit')      
+    end
+    
+    def random_string(length)
+      o = [('a'..'z'),('A'..'Z'),('0'..'9')].map { |i| i.to_a }.flatten
+      return (0...length).map { o[rand(o.length)] }.join
+    end
+          
+    # POST /admin/users/import
+    def import
+      return if !user_is_allowed('users', 'add')
+      
+      resp = StdClass.new
+      csv_data = params[:csv_data]
+      arr = []
+      good_count = 0
+      bad_count = 0            
+      csv_data.strip.split("\n").each do |line|        
+        data = CSV.parse_line(line)
+
+        if data.count < 3
+          arr << [line, true, "Too few columns"] 
+          bad_count = bad_count + 1
+          next
+        end
+        
+        first_name = data[0].nil? ? nil : data[0].strip
+        last_name  = data[1].nil? ? nil : data[1].strip
+        email      = data[2].nil? ? nil : data[2].strip.downcase
+        username   = data.count >= 4 && !data[3].nil? ? data[3].strip.downcase : nil
+        password   = data.count >= 5 && !data[4].nil? ? data[4].strip : random_string(8)
+        
+        first_name = data[0]
+        last_name  = data[1]
+        email      = data[2]
+        username   = data.count >= 4 ? data[3] : nil
+        password   = data.count >= 5 ? data[4] : random_string(8)
+
+        if first_name.nil? || first_name.length == 0
+          arr << [line, false, "Missing first name."]
+          bad_count = bad_count + 1
+        elsif last_name.nil? || last_name.length == 0
+          arr << [line, false, "Missing last name."]
+          bad_count = bad_count + 1          
+        elsif email.nil? || email.length == 0 || !email.include?('@')
+          arr << [line, false, "Email is invalid."]
+          bad_count = bad_count + 1          
+        elsif Caboose::User.where(:email => email).exists?
+          arr << [line, false, "Email already exists."]
+          bad_count = bad_count + 1                    
+        else                  
+          Caboose::User.create(
+            :first_name => first_name,
+            :last_name  => last_name,
+            :email      => email,
+            :username   => username,          
+            :password   => Digest::SHA1.hexdigest(Caboose::salt + password)
+          )
+          good_count = good_count + 1
+        end
+      end
+      
+      resp.success = "#{good_count} user#{good_count == 1 ? '' : 's'} were added successfully."     
+      if bad_count > 0
+        resp.success << "<br />#{bad_count} user#{bad_count == 1 ? '' : 's'} were skipped."
+        resp.success << "<br /><br />Please check the log below for more details."
+        resp.log = arr
+      end      
+      render :json => resp
+    end
+    
     # POST /admin/users
     def create
       return if !user_is_allowed('users', 'add')

data/app/models/caboose/schema.rb

@@ -14,7 +14,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::PageBlock => [:block_type, :value, :name],      
       Caboose::PageBlockField => [:model_binder_options],
       Caboose::AbValue => [:i, :text],
-      Caboose::AbOption => [:text]
+      Caboose::AbOption => [:text],
+      Caboose::User => [:utc_offset, :timezone]
     }
   end
   
@@ -44,7 +45,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :zip                  , :string     ],
         [ :phone                , :string     ],
         [ :fax                  , :string     ],
-        [ :utc_offset           , :float      , { :default => -5 }],        
+        #[ :utc_offset           , :float      , { :default => -5 }],
+        #[ :timezone             , :string     , { :default => 'America/Chicago' }],
+        [ :timezone_id          , :integer    , { :defualt => 381 }], # Defaults to 'America/Chicago'        
         [ :password             , :string     ], 
         [ :password_reset_id    , :string     ], 
         [ :password_reset_sent  , :datetime   ], 
@@ -178,7 +181,22 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Setting => [    
         [ :name  , :string ],
         [ :value , :text   ]
-      ]
+      ],
+      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  ]        
+      ]            
     }
 
   end

data/app/models/caboose/timezone.rb

@@ -0,0 +1,75 @@
+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

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

data/app/models/caboose/timezone_offset.rb

@@ -0,0 +1,5 @@
+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

data/app/views/caboose/users/import_form.html.erb

@@ -0,0 +1,54 @@
+<h1>Import Users</h1>
+
+<p>In the box below, paste CSV data in the following format:
+<p>"First Name","Last Name","Email","Username","Password"</p>
+
+<form action='/admin/users/import' method='post' id='csv_form'>
+<p><textarea name='csv_data' style='width: 100%; height: 200px'></textarea></p>
+<div id='message'></div>
+<p><input type='submit' value='Add Users' onclick="add_users(); return false;" /></p>
+</form>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+table.logs { margin: 0; padding: 0; border: 0; border-collapse: collapse; }
+table.logs td { margin: 0; padding: 4px; border: #fff 1px solid; }
+tr.good td { background: #009900; color: #fff; }
+tr.bad  td { background: #990000; color: #fff; }
+           
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+function add_users()
+{
+  $('#message').html("<p class='loading'>Adding users...</p>");
+  $.ajax({
+    url: '/admin/users/import',
+    type: 'post',
+    data: $('#csv_form').serialize(),
+    success: function(resp) {
+      $('#message').empty();
+      if (resp.error)   $('#message').append("<p class='note error'>" + resp.error + "</p>");
+      if (resp.success) $('#message').append("<p class='note success'>" + resp.success + "</p>");
+      if (resp.log)
+      {
+        var tbody = $('<tbody/>');
+        $(resp.log).each(function(i, arr) {
+          tbody.append(
+            $('<tr/>').addClass(arr[1] == true ? 'good' : 'bad')
+              .append($('<td/>').html(arr[2]))
+              .append($('<td/>').html(arr[0]))
+          );
+        });
+        $('#message').append($('<table/>').addClass('logs').append(tbody));
+      }
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

data/app/views/caboose/users/index.html.erb

@@ -7,6 +7,11 @@
 <input type='submit' value='Search' />
 </form>
 
+<p>
+<a href='/admin/users/new'>New User</a> |
+<a href='/admin/users/import'>Import CSV</a>
+</p>
+
 <table class='data' id='users_table'>
   <tr>
     <%= raw @gen.sortable_table_headings({

data/config/routes.rb

@@ -23,10 +23,12 @@ Caboose::Engine.routes.draw do
   
   get     "admin/users"                     => "users#index"  
   get     "admin/users/options"             => "users#options"
-  get     "admin/users/new"                 => "users#new"  
+  get     "admin/users/new"                 => "users#new"
+  get     "admin/users/import"              => "users#import_form"
+  post    "admin/users/import"              => "users#import"  
   get     "admin/users/:id/su"              => "users#admin_su"
   get     "admin/users/:id/edit-password"   => "users#edit_password"
-  get     "admin/users/:id/edit"            => "users#edit"
+  get     "admin/users/:id/edit"            => "users#edit"  
   put     "admin/users/:id"                 => "users#update"
   post    "admin/users"                     => "users#create"
   delete  "admin/users/:id"                 => "users#destroy"

data/lib/caboose.rb

@@ -55,4 +55,8 @@ module Caboose
   @@javascripts = []
   @@stylesheets = []
   
+  # API key for timezonedb.com/api
+  mattr_accessor :timezonedb_api_key
+  @@timezonedb_api_key = ''  
+  
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.85'
+  VERSION = '0.3.86'
 end

data/lib/sample_files/timezone_abbreviations.csv

@@ -0,0 +1,197 @@
+"ACDT","Australian Central Daylight Time"
+"ACST","Australian Central Standard Time"
+"ACT","ASEAN Common Time"
+"ADT","Atlantic Daylight Time"
+"AEDT","Australian Eastern Daylight Time"
+"AEST","Australian Eastern Standard Time"
+"AFT","Afghanistan Time"
+"AKDT","Alaska Daylight Time"
+"AKST","Alaska Standard Time"
+"AMST","Amazon Summer Time (Brazil)[1]"
+"AMST","Armenia Summer Time"
+"AMT","Amazon Time (Brazil)[2]"
+"AMT","Armenia Time"
+"ART","Argentina Time"
+"AST","Arabia Standard Time"
+"AST","Atlantic Standard Time"
+"AWDT","Australian Western Daylight Time"
+"AWST","Australian Western Standard Time"
+"AZOST","Azores Standard Time"
+"AZT","Azerbaijan Time"
+"BDT","Brunei Time"
+"BIOT","British Indian Ocean Time"
+"BIT","Baker Island Time"
+"BOT","Bolivia Time"
+"BRT","Brasilia Time"
+"BST","Bangladesh Standard Time"
+"BST","British Summer Time (British Standard Time from Feb 1968 to Oct 1971)"
+"BTT","Bhutan Time"
+"CAT","Central Africa Time"
+"CCT","Cocos Islands Time"
+"CDT","Central Daylight Time (North America)"
+"CDT","Cuba Daylight Time[3]"
+"CEDT","Central European Daylight Time"
+"CEST","Central European Summer Time (Cf. HAEC)"
+"CET","Central European Time"
+"CHADT","Chatham Daylight Time"
+"CHAST","Chatham Standard Time"
+"CHOT","Choibalsan"
+"ChST","Chamorro Standard Time"
+"CHUT","Chuuk Time"
+"CIST","Clipperton Island Standard Time"
+"CIT","Central Indonesia Time"
+"CKT","Cook Island Time"
+"CLST","Chile Summer Time"
+"CLT","Chile Standard Time"
+"COST","Colombia Summer Time"
+"COT","Colombia Time"
+"CST","Central Standard Time (North America)"
+"CST","China Standard Time"
+"CST","Central Standard Time (Australia)"
+"CST","Central Summer Time (Australia)"
+"CST","Cuba Standard Time"
+"CT","China time"
+"CVT","Cape Verde Time"
+"CWST","Central Western Standard Time (Australia) unofficial"
+"CXT","Christmas Island Time"
+"DAVT","Davis Time"
+"DDUT","Dumont d'Urville Time"
+"DFT","AIX specific equivalent of Central European Time[4]"
+"EASST","Easter Island Standard Summer Time"
+"EAST","Easter Island Standard Time"
+"EAT","East Africa Time"
+"ECT","Eastern Caribbean Time (does not recognise DST)"
+"ECT","Ecuador Time"
+"EDT","Eastern Daylight Time (North America)"
+"EEDT","Eastern European Daylight Time"
+"EEST","Eastern European Summer Time"
+"EET","Eastern European Time"
+"EGST","Eastern Greenland Summer Time"
+"EGT","Eastern Greenland Time"
+"EIT","Eastern Indonesian Time"
+"EST","Eastern Standard Time (North America)"
+"EST","Eastern Standard Time (Australia)"
+"FET","Further-eastern European Time"
+"FJT","Fiji Time"
+"FKST","Falkland Islands Standard Time"
+"FKST","Falkland Islands Summer Time"
+"FKT","Falkland Islands Time"
+"FNT","Fernando de Noronha Time"
+"GALT","Galapagos Time"
+"GAMT","Gambier Islands"
+"GET","Georgia Standard Time"
+"GFT","French Guiana Time"
+"GILT","Gilbert Island Time"
+"GIT","Gambier Island Time"
+"GMT","Greenwich Mean Time"
+"GST","South Georgia and the South Sandwich Islands"
+"GST","Gulf Standard Time"
+"GYT","Guyana Time"
+"HADT","Hawaii-Aleutian Daylight Time"
+"HAEC","Heure Avancée d'Europe Centrale francised name for CEST"
+"HAST","Hawaii-Aleutian Standard Time"
+"HKT","Hong Kong Time"
+"HMT","Heard and McDonald Islands Time"
+"HOVT","Khovd Time"
+"HST","Hawaii Standard Time"
+"ICT","Indochina Time"
+"IDT","Israel Daylight Time"
+"IOT","Indian Ocean Time"
+"IRDT","Iran Daylight Time"
+"IRKT","Irkutsk Time"
+"IRST","Iran Standard Time"
+"IST","Indian Standard Time"
+"IST","Irish Standard Time[5]"
+"IST","Israel Standard Time"
+"JST","Japan Standard Time"
+"KGT","Kyrgyzstan time"
+"KOST","Kosrae Time"
+"KRAT","Krasnoyarsk Time"
+"KST","Korea Standard Time"
+"LHST","Lord Howe Standard Time"
+"LHST","Lord Howe Summer Time"
+"LINT","Line Islands Time"
+"MAGT","Magadan Time"
+"MART","Marquesas Islands Time"
+"MAWT","Mawson Station Time"
+"MDT","Mountain Daylight Time (North America)"
+"MET","Middle European Time Same zone as CET"
+"MEST","Middle European Saving Time Same zone as CEST"
+"MHT","Marshall Islands"
+"MIST","Macquarie Island Station Time"
+"MIT","Marquesas Islands Time"
+"MMT","Myanmar Time"
+"MSK","Moscow Time"
+"MST","Malaysia Standard Time"
+"MST","Mountain Standard Time (North America)"
+"MST","Myanmar Standard Time"
+"MUT","Mauritius Time"
+"MVT","Maldives Time"
+"MYT","Malaysia Time"
+"NCT","New Caledonia Time"
+"NDT","Newfoundland Daylight Time"
+"NFT","Norfolk Time"
+"NPT","Nepal Time"
+"NST","Newfoundland Standard Time"
+"NT","Newfoundland Time"
+"NUT","Niue Time"
+"NZDT","New Zealand Daylight Time"
+"NZST","New Zealand Standard Time"
+"OMST","Omsk Time"
+"ORAT","Oral Time"
+"PDT","Pacific Daylight Time (North America)"
+"PET","Peru Time"
+"PETT","Kamchatka Time"
+"PGT","Papua New Guinea Time"
+"PHOT","Phoenix Island Time"
+"PHT","Philippine Time"
+"PKT","Pakistan Standard Time"
+"PMDT","Saint Pierre and Miquelon Daylight time"
+"PMST","Saint Pierre and Miquelon Standard Time"
+"PONT","Pohnpei Standard Time"
+"PST","Pacific Standard Time (North America)"
+"PYST","Paraguay Summer Time (South America)[6]"
+"PYT","Paraguay Time (South America)[7]"
+"RET","Réunion Time"
+"ROTT","Rothera Research Station Time"
+"SAKT","Sakhalin Island time"
+"SAMT","Samara Time"
+"SAST","South African Standard Time"
+"SBT","Solomon Islands Time"
+"SCT","Seychelles Time"
+"SGT","Singapore Time"
+"SLST","Sri Lanka Time"
+"SRT","Suriname Time"
+"SST","Samoa Standard Time"
+"SST","Singapore Standard Time"
+"SYOT","Showa Station Time"
+"TAHT","Tahiti Time"
+"THA","Thailand Standard Time"
+"TFT","Indian/Kerguelen"
+"TJT","Tajikistan Time"
+"TKT","Tokelau Time"
+"TLT","Timor Leste Time"
+"TMT","Turkmenistan Time"
+"TOT","Tonga Time"
+"TVT","Tuvalu Time"
+"UCT","Coordinated Universal Time"
+"ULAT","Ulaanbaatar Time"
+"UTC","Coordinated Universal Time"
+"UYST","Uruguay Summer Time"
+"UYT","Uruguay Standard Time"
+"UZT","Uzbekistan Time"
+"VET","Venezuelan Standard Time"
+"VLAT","Vladivostok Time"
+"VOLT","Volgograd Time"
+"VOST","Vostok Station Time"
+"VUT","Vanuatu Time"
+"WAKT","Wake Island Time"
+"WAST","West Africa Summer Time"
+"WAT","West Africa Time"
+"WEDT","Western European Daylight Time"
+"WEST","Western European Summer Time"
+"WET","Western European Time"
+"WST","Western Standard Time"
+"YAKT","Yakutsk Time"
+"YEKT","Yekaterinburg Time"
+"Z","Zulu Time (Coordinated Universal Time)"

data/lib/tasks/caboose.rake

@@ -56,6 +56,20 @@ namespace :caboose do
     `pg_restore --verbose --clean --no-acl --no-owner -h #{ddb['host']} -U #{ddb['username']} -d #{ddb['database']} #{dump_file}`
     
   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
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.85
+  version: 0.3.86
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -279,6 +279,9 @@ files:
 - app/models/caboose/setting.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
@@ -350,6 +353,7 @@ files:
 - app/views/caboose/station/index.html.erb
 - app/views/caboose/users/edit.html.erb
 - app/views/caboose/users/edit_password.html.erb
+- app/views/caboose/users/import_form.html.erb
 - app/views/caboose/users/index.html.erb
 - app/views/caboose/users/my_account.html.erb
 - app/views/caboose/users/new.html.erb
@@ -374,6 +378,7 @@ files:
 - lib/caboose.rb
 - lib/sample_files/layout_default.html.erb
 - lib/sample_files/login.css
+- lib/sample_files/timezone_abbreviations.csv
 - lib/sample_files/tinymce.yml
 - lib/tasks/caboose.rake
 - lib/tasks/sequences.rake