appoxy_rails 0.0.6 → 0.0.7

data/lib/appoxy_rails.rb

@@ -0,0 +1,4 @@
+require_relative 'appoxy_ui'
+require_relative 'appoxy_api'
+require_relative 'appoxy_sessions'
+require_relative 'ui/time_zoner'

data/lib/sessions/application_controller.rb

@@ -1,82 +1,99 @@
 module Appoxy
 
-    module Sessions
-        module ApplicationController
+  module Sessions
+    module ApplicationController
 
+      def self.included(base)
+        # Initialize module.
+        helper_method :logged_in?
+        helper_method :current_user
+        helper_method :base_url
+      end
 
-            def logout_keeping_session!
-                @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
 
+      protected
 
-            def logged_in?
-                #puts 'logged_in??'
-                #puts 'current_user=' + current_user.inspect
-                current_user
-            end
 
+      def logout_keeping_session!
+        @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
 
-            def current_user=(new_user)
-                session[:user_id] = new_user ? new_user.id : nil
-                @current_user = new_user
-            end
 
+      def logged_in?
+        #puts 'logged_in??'
+        #puts 'current_user=' + current_user.inspect
+        current_user
+      end
 
-            def current_user
-                @current_user ||= (login_from_session)
-                @current_user
-            end
 
+      def current_user=(new_user)
+        set_current_user(new_user)
+      end
 
-            def login_from_session
-                #puts 'Login from session=' + session[:user_id].inspect
-                ::User.find_by_id(session[:user_id]) if session[:user_id]
-            end
+      def set_current_user(user)
+        session[:user_id] = user.id if user
+        @current_user = user
+      end
 
-#
-#            helper_method :logged_in?
-#            helper_method :current_user
 
+      def current_user
+        @current_user ||= (login_from_session)
+        @current_user
+      end
 
-            protected
 
-            def random_string(length=10)
-                chars = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
-                password = ''
-                length.times { password << chars[rand(chars.size)] }
-                password
-            end
+      def login_from_session
+        #puts 'Login from session=' + session[:user_id].inspect
+        ::User.find_by_id(session[:user_id]) if session[:user_id]
+      end
 
-            def authenticate
-                if !logged_in?
-                    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])
-                        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
-                        end
-                    end
-                    redirect_to :controller=>"sessions", :action=>"new", :ac=>params[:ac]
-                end
-
-                after_authenticate
 
+      def base_url
+        r = "#{request.protocol}#{request.host}"
+        if request.port != 80
+          r << ":#{request.port}"
+        end
+        @base_url = r
+        r
+      end
+
+      def random_string(length=10)
+        chars    = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
+        password = ''
+        length.times { password << chars[rand(chars.size)] }
+        password
+      end
+
+      def authenticate
+        if !logged_in?
+          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])
+            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
             end
-            def after_authenticate
+          end
+          redirect_to :controller=>"sessions", :action=>"new", :ac=>params[:ac]
+        end
 
-            end
+        after_authenticate
 
+      end
 
+      def after_authenticate
+
+      end
 
-        end
 
     end
 
+  end
+
 end

data/lib/sessions/sessions_controller.rb

@@ -1,10 +1,14 @@
 module Appoxy
 
     module Sessions
+
+
         module SessionsController
 
+            # Todo: have a configuration block for this so user can set things like facebook_api_key and facebook_secret
+
             def new
-                
+
             end
 
             def create
@@ -12,8 +16,9 @@ module Appoxy
 
                 logout_keeping_session!
 
-                #puts 'params=' + params.inspect
-                @email = params[:email]
+#                logger.debug 'params=' + params.inspect
+
+                @email        = params[:email]
                 @has_password = params[:has_password]
                 #puts 'has_pass? ' + @has_password.inspect
 
@@ -28,12 +33,12 @@ module Appoxy
 #                    user = User.authenticate(@email, params[:password])
                     if user && user.authenticate(params[:password])
                         self.current_user = user
-                        flash[:info] = "Logged in successfully."
-                        orig_url = session[:return_to]
+                        flash[:info]      = "Logged in successfully."
+                        orig_url          = session[:return_to]
                         puts 'orig_url = ' + orig_url.to_s
                         session[:return_to] = nil
                         if !orig_url.nil?
-                            redirect_to orig_url  # if entered via a different url
+                            redirect_to orig_url # if entered via a different url
                         else
                             after_create
                         end
@@ -51,9 +56,13 @@ module Appoxy
 
             end
 
+
+
+
             def before_create
 
             end
+
             def after_create
 
             end
@@ -82,7 +91,7 @@ module Appoxy
                     return
                 end
 
-                @newpass = random_string(8)
+                @newpass       = random_string(8)
 
                 @user.password = @newpass
                 @user.save(:dirty=>true)

data/lib/sessions/user.rb

@@ -9,15 +9,19 @@ module Appoxy
             end
 
 
-            has_strings    :email,
-                           {:name => :password, :hashed=>true},
-                           :first_name,
-                           :last_name,
-                           :remember_me,
-                           :activation_code,
-                           :status # invited, active
+            has_strings :email,
+                        :open_id,
+                        {:name => :password, :hashed=>true},
+                        :first_name,
+                        :last_name,
+                        :remember_me,
+                        :activation_code,
+                        :status, # invited, active
+                        :oauth_access_key,
+                        :oauth_secret_key
 
-            has_dates :last_login
+            has_dates :last_login,
+                      :remember_me_expires
 
 
             def validate
@@ -25,6 +29,8 @@ module Appoxy
 
                 if status == "invited"
                     # doesn't need password
+                elsif open_id
+                    # doesn't need password
                 else
                     errors.add("password", "must be at least 6 characters long.") if password.blank?
                 end
@@ -41,7 +47,6 @@ module Appoxy
             end
 
 
-
             def set_activation_code
                 self.activation_code=Digest::SHA1.hexdigest(email.to_s+Time.now.to_s)
             end
@@ -49,11 +54,10 @@ module Appoxy
 
             def activate!
                 self.activation_code=nil
-                self.status = "active"
+                self.status         = "active"
             end
 
 
-
             def authenticate(password)
 
                 return nil if attributes["password"].blank? # if the user has no password (will this happen?  maybe for invites...)

data/lib/ui/application_helper.rb

@@ -1,35 +1,49 @@
 module Appoxy
 
-    module UI
+  module UI
 
-        module ApplicationHelper
+    module ApplicationHelper
 
-            def self.included(base)
+      def self.included(base)
 #                puts self.class.name + " included in " + base.class.name
-            end
+      end
 
 
-            def current_url
-                request.url
-            end
+      def current_url
+        request.url
+      end
 
-            def flash_messages
-                s = ""
-                flash.each_pair do |type, msg|
-                    if msg.is_a?(Array)
-                        msg.each do |m|
-                            s << content_tag(:div, m, :class => type)
-                        end
-                    else
-                        s << content_tag(:div, msg, :class => type)
-                    end
-                end
-                s.html_safe
+      def flash_messages
+        s = ""
+        flash.each_pair do |type, msg|
+          if msg.is_a?(Array)
+            msg.each do |m|
+              s << content_tag(:div, m, :class => type)
             end
-
+          else
+            s << content_tag(:div, msg, :class => type)
+          end
         end
+        s.html_safe
+      end
+
+      def error_messages_for
+        s = ""
+        flash.each_pair do |type, msg|
+          if msg.is_a?(Array)
+            msg.each do |m|
+              s << content_tag(:div, m, :class => type)
+            end
+          else
+            s << content_tag(:div, msg, :class => type)
+          end
+        end
+        s.html_safe
+      end
 
     end
 
+  end
+
 end
 

data/lib/ui/time_zoner.rb

@@ -0,0 +1,47 @@
+# adds a to_pst method to Time
+module TimePluginizer #  ActiveSupport::CoreExtensions::Time::Conversions
+
+    def self.included(base) #:nodoc:
+        base.class_eval do
+            #puts 'TP mixing'
+            # If we want to_s to ALWAYS be local, uncomment the below line
+            #alias_method :to_s, :to_local_s #
+        end
+    end
+
+    def to_pst
+        return in_time_zone('Pacific Time (US & Canada)')
+    end
+
+    def to_user_time(user = nil)
+        local = nil
+        if user && user.time_zone
+            local = in_time_zone(user.time_zone)
+        else
+            local = to_pst
+        end
+        local
+    end
+
+    def to_local_s(format = :default, user = nil)
+        #puts 'calling to_local_s on ' + self.class.name
+        zone = to_user_time(user)
+        return zone.to_formatted_s(format)
+    end
+
+end
+
+module StringTimezoner
+    def to_user_time(user)
+        tz = ActiveSupport::TimeZone.new(user.time_zone || 'Pacific Time (US & Canada)')
+#        puts 'tz=' + tz.inspect
+        t = tz.parse(self)
+        return t
+    end
+end
+
+Time.send :include, TimePluginizer
+DateTime.send :include, TimePluginizer
+#Date.send :include, TimePluginizer
+
+String.send :include, StringTimezoner

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -08:00
+date: 2010-12-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - lib/api/client_helper.rb
 - lib/api/signatures.rb
 - lib/appoxy_api.rb
+- lib/appoxy_rails.rb
 - lib/appoxy_sessions.rb
 - lib/appoxy_ui.rb
 - lib/sessions/application_controller.rb
@@ -52,6 +53,7 @@ files:
 - lib/sessions/user.rb
 - lib/sessions/users_controller.rb
 - lib/ui/application_helper.rb
+- lib/ui/time_zoner.rb
 - README.markdown
 has_rdoc: true
 homepage: http://www.appoxy.com