appoxy_rails 0.0.7 → 0.0.8

data/lib/appoxy_api.rb

@@ -3,8 +3,8 @@ require 'digest/hmac'
 require 'net/http'
 require 'base64'
   
-require File.join(File.dirname(__FILE__), "api", "api_controller")
-require File.join(File.dirname(__FILE__), "api", "client_helper")
-require File.join(File.dirname(__FILE__), "api", "signatures")
-require File.join(File.dirname(__FILE__), "api", "client")
+require_relative "api/api_controller"
+require_relative "api/client_helper"
+require_relative "api/signatures"
+require_relative "api/client"
 

data/lib/appoxy_rails.rb

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

data/lib/appoxy_sessions.rb

@@ -1,6 +1,7 @@
 require 'simple_record'
-require File.join(File.dirname(__FILE__), "sessions", "user")
-require File.join(File.dirname(__FILE__), "sessions", "application_controller")
-require File.join(File.dirname(__FILE__), "sessions", "sessions_controller")
-require File.join(File.dirname(__FILE__), "sessions", "users_controller")
-require File.join(File.dirname(__FILE__), "sessions", "shareable")
+require_relative "sessions/user"
+require_relative "sessions/application_controller"
+require_relative "sessions/sessions_controller"
+require_relative "sessions/users_controller"
+require_relative "sessions/shareable"
+

data/lib/appoxy_ui.rb

@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), "ui", "application_helper")
+require_relative "ui/application_helper"
 

data/lib/sessions/application_controller.rb

@@ -5,9 +5,9 @@ module Appoxy
 
       def self.included(base)
         # Initialize module.
-        helper_method :logged_in?
-        helper_method :current_user
-        helper_method :base_url
+#        helper_method :logged_in?
+#        helper_method :current_user
+#        helper_method :base_url
       end
 
 

data/lib/sessions/sessions_controller.rb

@@ -2,7 +2,6 @@ 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
@@ -14,9 +13,14 @@ module Appoxy
             def create
                 before_create
 
-                logout_keeping_session!
+                # recaptchas should be optional
+#                unless verify_recaptcha
+#                    flash[:error] = "You are not human! Please try again."
+#                    render :action=>"forgot_password"
+#                    return
+#                end
 
-#                logger.debug 'params=' + params.inspect
+                logout_keeping_session!
 
                 @email        = params[:email]
                 @has_password = params[:has_password]
@@ -50,15 +54,10 @@ module Appoxy
                     end
                 else
                     # new user
-
                     redirect_to (new_user_path + "?email=#{@email}")
                 end
-
             end
 
-
-
-
             def before_create
 
             end
@@ -67,15 +66,9 @@ module Appoxy
 
             end
 
-
             def reset_password
                 before_reset_password
 
-                unless verify_recaptcha
-                    flash[:error] = "You are not human! Please try again."
-                    render :action=>"forgot_password"
-                    return
-                end
 
                 @email = params[:email]
                 unless User.email_is_valid? @email

data/lib/ui/application_helper.rb

@@ -13,34 +13,42 @@ module Appoxy
         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)
+        puts 'FLASH MESSAGE!'
+        if flash.size > 0
+          s = "<div class=\"flash_messages_container\">"
+          s2 = ""
+          flash.each_pair do |type, msg|
+            if msg.is_a?(Array)
+              msg.each do |m|
+                s2 << content_tag(:div, m, :class => type)
+              end
+            else
+              s2 << content_tag(:div, msg, :class => type)
             end
-          else
-            s << content_tag(:div, msg, :class => type)
           end
+          s << s2
+          s << "</div>"
+          s.html_safe
         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)
+      def error_messages_for(ob)
+
+        if ob.errors.size > 0
+          s  = "<div class=\"error_message_for_container\">"
+          s2 = ""
+          ob.errors.full_messages.each do |msg|
+            s2 << content_tag(:div, msg, :class => "error_message_for")
           end
+          s << s2
+          s << "</div>"
+          s.html_safe
         end
-        s.html_safe
       end
 
+
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Travis Reeder