caboose-cms 0.7.54 → 0.7.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77bfc7049d66aec7c82588b4ebc76a526a2c7c2
-  data.tar.gz: d30b6a71566969ecf0c813c2b72f2e7f9d0a7f88
+  metadata.gz: f95a7d0fdab94f7ee1bb8c66944ea56b473d5507
+  data.tar.gz: 658a745c061ea7742e6e631ff3f6483ba8ca3808
 SHA512:
-  metadata.gz: 28a87f329ba169a6fbe7e51f9e080146cc59f46a7e77341de1ba608a7fffaa026be8f1b65f6b357e55aa8f765117988b5db186b5c2d01eeec2712b500036a350
-  data.tar.gz: 4a39ed8d4e69925f9cd3de10dc4042e3d821fe58e19131762c01176cb7f788f770b71e2dcd47aa0039e518a5758539025c4e3e75e7767e0cc164d11d8dc1a19b
+  metadata.gz: 3283af7c66a5b2cd687ed64b6d8ea32ecfc718d4ac2c0174b27b533731780fd31e8c74cdecd6c8860513a373139da15750c9575b09c548930289ce97a91c51e9
+  data.tar.gz: cb3cf3faabf96f629ee86034d7b8d09662d7a310be2fc3c301fcf0685cce208232ad4950bce0049ba5b808e7542af3e12be2a66f74b827062d5e9b7d5f5aac77

data/app/controllers/caboose/application_controller.rb

@@ -124,21 +124,21 @@ module Caboose
       
     # Logs in a user
     def login_user(user, remember = false)
-      session["app_user"] = Caboose::StdClass.new(      
-        user.id         ,
-        user.site_id    ,
-        user.first_name ,
-        user.last_name  ,
-        user.username   ,
-        user.email      ,                             
-      )  
+      session["app_user"] = Caboose::StdClass.new({      
+        :id         => user.id         ,
+        :site_id    => user.site_id    ,
+        :first_name => user.first_name ,
+        :last_name  => user.last_name  ,
+        :username   => user.username   ,
+        :email      => user.email                             
+      })  
       cookies.permanent[:caboose_user_id] = user.id if remember
     end
     
     # Returns whether or not a user is logged in
     def logged_in?
       validate_token
-      validate_cookie
+      validate_cookie                                                                                                                                                          
       return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1 && session["app_user"].id != User::LOGGED_OUT_USER_ID     
       return false
     end
@@ -172,7 +172,7 @@ module Caboose
         return User.logged_out_user(@site.id)
       end
       #return nil if !logged_in?
-      return session["app_user"]
+      return Caboose::User.where(:id => session["app_user"].id).first
     end
     
     # DEPRECATED: Use user_is_allowed_to(action, resource)

data/app/models/caboose/comment_routes.rb

@@ -10,7 +10,8 @@ module Caboose
       classes = {'zzz_all_domains' => []}            
       Rails.application.config.paths['app/controllers'].each do |controller_path|
         #files = Dir.glob(Rails.root.join(controller_path, '*.rb'))        
-        files = controller ? Dir.glob(Rails.root.join(controller_path, "#{controller}_controller.rb")) : Dir.glob(Rails.root.join(controller_path, '**/*.rb'))        
+        #files = controller ? Dir.glob(Rails.root.join(controller_path, "#{controller}_controller.rb")) : Dir.glob(Rails.root.join(controller_path, '**/*.rb'))
+        files = controller ? Dir.glob(Rails.root.join(controller_path, "#{controller}_controller.rb")) : Dir.glob(Rails.root.join(controller_path, '*.rb'))        
         for file in files    
           f = Rails.root.join('app', 'controllers', file)
           f2 = File.open(f, "r")

data/app/models/caboose/order_reporter.rb

@@ -81,7 +81,7 @@ module Caboose
         and O.date_authorized < ?
         group by concat(SA.city, ', ', SA.state), SA.state, SA.city
         order by SA.state, SA.city",
-        site_id, 'authorized', 'captured', d1, d2]                        
+        site_id, 'authorized', 'captured', d1, d2]
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
       
       arr = []

data/app/models/caboose/user.rb

@@ -96,60 +96,4 @@ 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  
-
 end

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.54
+  version: 0.7.55
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -761,7 +761,6 @@ 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

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

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