caboose-cms 0.7.53 → 0.7.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c25efdd92fb196e5661e1c86472abaf5e79e16
-  data.tar.gz: 13b850bc5278f2830e4f161dcb0daeaf6e7fa04e
+  metadata.gz: e77bfc7049d66aec7c82588b4ebc76a526a2c7c2
+  data.tar.gz: d30b6a71566969ecf0c813c2b72f2e7f9d0a7f88
 SHA512:
-  metadata.gz: 06cfd11597bc1334919febeb206504ffef3ea4642b4f3a8821ae7b41898a41548aece70d8c3f9e6f5ce014b1f911cb3c7c4d5558e0e36bec812b0e26f4ba1e7d
-  data.tar.gz: 88880a095e686f5e7a6e5fe26d72522dbe0adf73426d9922709f3f89fe07554514e02a785ca2ac590497f4a54daab25cb17ec0bf9a75c0363afd113a5c681833
+  metadata.gz: 28a87f329ba169a6fbe7e51f9e080146cc59f46a7e77341de1ba608a7fffaa026be8f1b65f6b357e55aa8f765117988b5db186b5c2d01eeec2712b500036a350
+  data.tar.gz: 4a39ed8d4e69925f9cd3de10dc4042e3d821fe58e19131762c01176cb7f788f770b71e2dcd47aa0039e518a5758539025c4e3e75e7767e0cc164d11d8dc1a19b

data/app/controllers/caboose/application_controller.rb

@@ -124,7 +124,14 @@ module Caboose
       
     # Logs in a user
     def login_user(user, remember = false)
-      session["app_user"] = user
+      session["app_user"] = Caboose::StdClass.new(      
+        user.id         ,
+        user.site_id    ,
+        user.first_name ,
+        user.last_name  ,
+        user.username   ,
+        user.email      ,                             
+      )  
       cookies.permanent[:caboose_user_id] = user.id if remember
     end
     

data/app/models/caboose/#user.rb#

@@ -0,0 +1,155 @@
+class Caboose::User < ActiveRecord::Base
+  self.table_name = "users"
+
+  belongs_to :site, :class_name => 'Caboose::Site'    
+  has_many :role_memberships
+  has_many :roles, :through => :role_memberships
+  has_attached_file :image, 
+    :path => ':caboose_prefixusers/:id_:style.:extension',    
+    :default_url => 'http://placehold.it/300x300',    
+    :styles => {
+      :tiny  => '150x200>',
+      :thumb => '300x400>',
+      :large => '600x800>'
+    }
+  do_not_validate_attachment_file_type :image
+  attr_accessible :id, :site_id, :email, :first_name, :last_name, :username, :token, :password, :phone, :timezone
+  
+  validates :email, :presence => true
+  
+  ADMIN_USER_ID = 1
+  LOGGED_OUT_USER_ID = 2
+  
+  before_save do
+    self.email = self.email.downcase if self.email
+  end
+  
+  def self.logged_out_user(site_id)
+    return self.where(:site_id => site_id, :username => 'elo').first
+    #return self.where(:id => self::LOGGED_OUT_USER_ID).first
+  end
+  
+  def self.logged_out_user_id(site_id)
+    return self.where(:site_id => site_id, :username => 'elo').limit(1).pluck(:id)[0]
+    #return self::LOGGED_OUT_USER_ID
+  end
+  
+  def is_logged_out_user?
+    return self.id == Caboose::User.logged_out_user_id(self.site_id)    
+  end
+  
+  def is_allowed(resource, action)          
+    elo = Caboose::Role.logged_out_role(self.site_id)
+    elo_is_allowed = elo.is_allowed(resource, action)    
+    return true if elo_is_allowed
+    return false if !elo_is_allowed && self.is_logged_out_user?     
+    eli = Caboose::Role.logged_in_role(self.site_id)
+    return true if self.id != elo.id && eli.is_allowed(resource, action)
+    for role in roles
+      #Caboose.log("Checking permissions for #{role.name} role")
+      if role.is_allowed(resource, action)
+        #Caboose.log("Role #{role.name} is allowed to view page")
+        return true
+      else
+        #Caboose.log("Role #{role.name} is not allowed to view page")
+      end
+      #return true if role.is_allowed(resource, action)
+    end
+    return false;
+  end
+  
+  def self.validate_token(token)
+    user = self.where('token' => token).first
+    return user 
+  end
+  
+  def add_to_role_with_name(role_name)
+    r = Caboose::Role.where(:name => role_name).first
+    return false if r.nil?
+    return add_to_role(r.id)
+  end
+  
+  def add_to_role(role_id)
+    r = Caboose::Role.find(role_id)
+    return false if r.nil?
+    
+    if (!is_member?(r.id))
+      roles.push r
+      save
+    end
+    return true
+  end
+  
+  def is_member?(role_id)
+    roles.each do |r|
+      return true if (r.id == role_id)
+    end
+    return false
+  end
+  
+  def self.user_for_reset_id(reset_id)          
+    return nil if reset_id.nil?          
+    d = DateTime.now - 3.days
+    if self.where("password_reset_id = ? and password_reset_sent > ?", reset_id, d).exists?
+      return self.where("password_reset_id = ? and password_reset_sent > ?", reset_id, d).first
+    end
+    return nil
+  end
+
+  #def marshal_dump      
+  #  [ 
+  #    self.id                   ,
+  #    self.site_id              ,
+  #    self.first_name           ,
+  #    self.last_name            ,
+  #    self.username             ,
+  #    self.email                ,
+  #    self.address              ,
+  #    self.address2             ,
+  #    self.city                 ,
+  #    self.state                ,
+  #    self.zip                  ,
+  #    self.phone                ,
+  #    self.fax                  ,
+  #    self.timezone             ,        
+  #    self.password             ,
+  #    self.password_reset_id    ,
+  #    self.password_reset_sent  ,
+  #    self.token                ,
+  #    self.date_created         ,
+  #    self.image                ,
+  #    self.is_guest             ,
+  #    self.customer_profile_id  ,
+  #    self.payment_profile_id   ,
+  #    self.locked               
+  #  ]
+  #end
+  #
+  #def marshal_load array    
+  #  self.id                   ,
+  #  self.site_id              ,
+  #  self.first_name           ,
+  #  self.last_name            ,
+  #  self.username             ,
+  #  self.email                ,
+  #  self.address              ,
+  #  self.address2             ,
+  #  self.city                 ,
+  #  self.state                ,
+  #  self.zip                  ,
+  #  self.phone                ,
+  #  self.fax                  ,
+  #  self.timezone             ,        
+  #  self.password             ,
+  #  self.password_reset_id    ,
+  #  self.password_reset_sent  ,
+  #  self.token                ,
+  #  self.date_created         ,
+  #  self.image                ,
+  #  self.is_guest             ,
+  #  self.customer_profile_id  ,
+  #  self.payment_profile_id   ,
+  #  self.locked = array
+  #end  
+
+end

data/app/models/caboose/user.rb

@@ -96,60 +96,60 @@ class Caboose::User < ActiveRecord::Base
     return nil
   end
 
-  def marshal_dump      
-    [
-      self.id                   ,
-      self.site_id              ,
-      self.first_name           ,
-      self.last_name            ,
-      self.username             ,
-      self.email                ,
-      self.address              ,
-      self.address2             ,
-      self.city                 ,
-      self.state                ,
-      self.zip                  ,
-      self.phone                ,
-      self.fax                  ,
-      self.timezone             ,        
-      self.password             ,
-      self.password_reset_id    ,
-      self.password_reset_sent  ,
-      self.token                ,
-      self.date_created         ,
-      self.image                ,
-      self.is_guest             ,
-      self.customer_profile_id  ,
-      self.payment_profile_id   ,
-      self.locked               
-    ]
-  end
-
-  def marshal_load array    
-    self.id                   ,
-    self.site_id              ,
-    self.first_name           ,
-    self.last_name            ,
-    self.username             ,
-    self.email                ,
-    self.address              ,
-    self.address2             ,
-    self.city                 ,
-    self.state                ,
-    self.zip                  ,
-    self.phone                ,
-    self.fax                  ,
-    self.timezone             ,        
-    self.password             ,
-    self.password_reset_id    ,
-    self.password_reset_sent  ,
-    self.token                ,
-    self.date_created         ,
-    self.image                ,
-    self.is_guest             ,
-    self.customer_profile_id  ,
-    self.payment_profile_id   ,
-    self.locked = array
-  end  
+  #def marshal_dump      
+  #  [
+  #    self.id                   ,
+  #    self.site_id              ,
+  #    self.first_name           ,
+  #    self.last_name            ,
+  #    self.username             ,
+  #    self.email                ,
+  #    self.address              ,
+  #    self.address2             ,
+  #    self.city                 ,
+  #    self.state                ,
+  #    self.zip                  ,
+  #    self.phone                ,
+  #    self.fax                  ,
+  #    self.timezone             ,        
+  #    self.password             ,
+  #    self.password_reset_id    ,
+  #    self.password_reset_sent  ,
+  #    self.token                ,
+  #    self.date_created         ,
+  #    self.image                ,
+  #    self.is_guest             ,
+  #    self.customer_profile_id  ,
+  #    self.payment_profile_id   ,
+  #    self.locked               
+  #  ]
+  #end
+  #
+  #def marshal_load array    
+  #  self.id                   ,
+  #  self.site_id              ,
+  #  self.first_name           ,
+  #  self.last_name            ,
+  #  self.username             ,
+  #  self.email                ,
+  #  self.address              ,
+  #  self.address2             ,
+  #  self.city                 ,
+  #  self.state                ,
+  #  self.zip                  ,
+  #  self.phone                ,
+  #  self.fax                  ,
+  #  self.timezone             ,        
+  #  self.password             ,
+  #  self.password_reset_id    ,
+  #  self.password_reset_sent  ,
+  #  self.token                ,
+  #  self.date_created         ,
+  #  self.image                ,
+  #  self.is_guest             ,
+  #  self.customer_profile_id  ,
+  #  self.payment_profile_id   ,
+  #  self.locked = array
+  #end  
 
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.53'
+  VERSION = '0.7.54'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.53
+  version: 0.7.54
 platform: ruby
 authors:
 - William Barry
@@ -761,6 +761,7 @@ files:
 - app/mailers/caboose/caboose_mailer.rb
 - app/mailers/caboose/login_mailer.rb
 - app/mailers/caboose/orders_mailer.rb
+- app/models/caboose/#user.rb#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb