appoxy_rails 0.0.23 → 0.0.24

data/lib/sessions/application_controller.rb

@@ -13,6 +13,8 @@ module Appoxy
         base.before_filter :clear_sdb_stats
 
         base.helper_method :facebook_oauth_url
+        base.helper_method :is_mobile_device?
+        base.helper_method :is_device?
 
       end
 
@@ -29,7 +31,7 @@ module Appoxy
 
 
       def logout_keeping_session!
-        @current_user     = nil # not logged in, and don't do it for me
+        @current_user = nil # not logged in, and don't do it for me
         session[:user_id] = nil # keeps the session but kill our variable
       end
 
@@ -59,15 +61,26 @@ module Appoxy
 
       def login_from_session
         #puts 'Login from session=' + session[:user_id].inspect
-        u = nil
+        user = nil
         if session[:user_id]
           begin
-            u = ::User.find(session[:user_id])
+            user = ::User.find(session[:user_id])
           rescue => ex
             puts 'User not found: ' + ex.message
           end
         end
-        u
+        unless user
+          # else try with cookie
+          if cookies[:auth_token]
+            # todo: should this also check a user_id cookie too?
+            user = ::User.find_by_remember_token(cookies[:auth_token])
+          end
+          if user && !user.remember_token_expires.nil? && Time.now < user.remember_token_expires
+            @current_user = user
+            session[:user_id] = user.id
+          end
+        end
+        user
       end
 
       def current_url
@@ -90,14 +103,14 @@ module Appoxy
 
       def authenticate
         if !logged_in?
-          flash[:warning]     = "You need to login to access this page."
+          flash[:warning] = "You need to login to access this page."
           session[:return_to] = request.request_uri # return to after logging in
           puts "ac=" + params[:ac].inspect
           if params[:user_id] && params[:ac]
             # todo: should we store ac in cookie?  Make it easier to pass around
             cookies[:ac] = params[:ac]
             # then from an invite
-            user         = ::User.find(params[:user_id])
+            user = ::User.find(params[:user_id])
             if user && user.password.blank? # is this the best way to decide of user has not logged in? Could also check status.
               redirect_to :controller=>"users", :action=>"new", :email=>user.email, :ac=>params[:ac]
               return

data/lib/sessions/sessions_controller.rb

@@ -438,7 +438,7 @@ module Appoxy
           return false
         else
           set_user_cookies(user)
-          after_create
+#          after_create
           return user
         end
       end
@@ -469,8 +469,8 @@ module Appoxy
 
       def set_user_cookies(user)
         set_current_user(user)
-        response.set_cookie('user_id', :value => user.id, :expires => user.remember_expires)
-        response.set_cookie('rme', :value=>user.remember_me, :expires => user.remember_expires)
+        response.set_cookie('user_id', :value => user.id, :expires => user.remember_expires.to_time)
+        response.set_cookie('rme', :value=>user.remember_token, :expires => user.remember_expires.to_time)
       end
 
 

data/lib/ui/application_helper.rb

@@ -81,7 +81,7 @@ module Appoxy
       def date_format(date, options={})
         format = options[:format] || :long
 #        puts 'date_format on ' + date.class.name + " --- " + date.inspect
-        user   ||= @current_user
+        user ||= @current_user
         return '' if date.nil?
         date = Time.parse(date) if date.is_a?(String)
         if date.is_a?(Date) && !date.is_a?(DateTime) && !date.is_a?(Time)
@@ -90,17 +90,25 @@ module Appoxy
         return date.to_local_s(user, :format=>format)
       end
 
-      def flash_messages
+      def flash_messages(options={})
         if flash.size > 0
-          s  = "<div class=\"flash_messages_container\">"
+          s = "<div class=\"flash_messages_container\">"
           s2 = ""
           flash.each_pair do |type, msg|
+            clazz = "flash #{type}"
+            if options[:theme] == :jquery
+              if type == "error"
+                clazz << " ui-state-error"
+              elsif type == "highlight"
+                clazz << " ui-state-highlight"
+              end
+            end
             if msg.is_a?(Array)
               msg.each do |m|
-                s2 << content_tag(:div, m, :class => "flash #{type}")
+                s2 << content_tag(:div, m, :class =>clazz)
               end
             else
-              s2 << content_tag(:div, msg, :class => "flash #{type}")
+              s2 << content_tag(:div, msg, :class =>clazz)
             end
           end
           s << s2
@@ -109,10 +117,10 @@ module Appoxy
         end
       end
 
-      def error_messages_for(ob)
+      def error_messages_for(ob, options={})
         return '' if ob.nil?
         if ob.errors.size > 0
-          s  = "<div class=\"error_message_for_container\">"
+          s = "<div class=\"error_message_for_container\">"
           s2 = ""
           ob.errors.full_messages.each do |msg|
             s2 << content_tag(:div, msg, :class => "error_message_for")
@@ -130,9 +138,9 @@ module Appoxy
       def appoxy_geo_finder(options={})
 #        ret = File.read('_geo_location_finder.html.erb')
         options.merge!({:current_user=>current_user})
-        options  = Appoxy::UI::BindingHack.new(options)
+        options = Appoxy::UI::BindingHack.new(options)
         template = ERB.new(File.read(File.join(File.dirname(__FILE__), '_geo_location_finder.html.erb')))
-        ret      = template.result(options.get_binding)
+        ret = template.result(options.get_binding)
         ret.html_safe
       end
 
@@ -141,7 +149,7 @@ module Appoxy
       #   :div_id => default is "news_feed"
       def latest_news(feed_url, options={})
         div_id = options[:div_id] || "news_feed"
-                s = <<-EOF
+        s = <<-EOF
 <div id="#{div_id}"></div>
 
 <script type="text/javascript">
@@ -166,7 +174,7 @@ module Appoxy
       }
       google.setOnLoadCallback(#{div_id}_init);
 </script>
-EOF
+        EOF
         s.html_safe
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoxy_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &22864584 !ruby/object:Gem::Requirement
+  requirement: &22818252 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22864584
+  version_requirements: *22818252
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &27807300 !ruby/object:Gem::Requirement
+  requirement: &22817964 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27807300
+  version_requirements: *22817964
 - !ruby/object:Gem::Dependency
   name: ruby-openid
-  requirement: &27807012 !ruby/object:Gem::Requirement
+  requirement: &22817676 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27807012
+  version_requirements: *22817676
 - !ruby/object:Gem::Dependency
   name: appoxy_api
-  requirement: &27806724 !ruby/object:Gem::Requirement
+  requirement: &22817388 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27806724
+  version_requirements: *22817388
 - !ruby/object:Gem::Dependency
   name: mini_fb
-  requirement: &27806436 !ruby/object:Gem::Requirement
+  requirement: &22817100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27806436
+  version_requirements: *22817100
 - !ruby/object:Gem::Dependency
   name: simple_record
-  requirement: &27806148 !ruby/object:Gem::Requirement
+  requirement: &22816812 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27806148
+  version_requirements: *22816812
 description: Appoxy API Helper gem description...
 email: travis@appoxy.com
 executables: []