appoxy_rails 0.0.15 → 0.0.16

data/lib/sessions/sessions_controller.rb

@@ -22,7 +22,7 @@ module Appoxy
       end
 
       def create
-        before_create
+        return if before_create == false
 
         # recaptchas should be optional
 #                unless verify_recaptcha
@@ -34,41 +34,52 @@ module Appoxy
         logout_keeping_session!
 
         @email        = params[:email]
+        if @email.blank?
+          flash[:error] = "You must enter a valid email address."
+          render :action=>"new"
+          return
+        end
+
         @has_password = params[:has_password]
         #puts 'has_pass? ' + @has_password.inspect
+        @az_style     = params[:az_style]
 
-        if params[:has_password].blank?
-          flash[:error] = "Please click the radio button to let us know if you have a password or not."
-          render :action=>"new"
-          return
+        if @az_style
+          if params[:has_password].blank?
+            flash[:error] = "Please click the radio button to let us know if you have a password or not."
+            render :action=>"new"
+            return
+          end
+          if @has_password == "true"
+
+          else
+            # new user
+            redirect_to (new_user_path + "?email=#{@email}")
+          end
         end
 
-        if @has_password == "true"
-          user = ::User.find_by_email(@email)
+        user = ::User.find_by_email(@email)
 #                    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]
-            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
-            else
-              after_create
-            end
-            user.last_login = Time.now
-            user.save(:dirty=>true)
+        if user && user.authenticate(params[:password])
+          self.current_user = user
+          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
           else
-            flash[:info] = "Invalid email or password. Please try again."
-            render :action => 'new'
+            after_create
           end
+          user.last_login = Time.now
+          user.save(:dirty=>true)
         else
-          # new user
-          redirect_to (new_user_path + "?email=#{@email}")
+          flash[:error] = "Invalid email or password. Please try again."
+          render :action => 'new'
         end
       end
 
+      # Return false to stop before creating.
       def before_create
 
       end

data/lib/ui/application_helper.rb

@@ -1,4 +1,6 @@
 require_relative 'binding_hack'
+require_relative 'visualizations'
+
 
 module Appoxy
 
@@ -25,12 +27,13 @@ module Appoxy
         r
       end
 
+
+      # todo: add themes support http://www.stemkoski.com/jquery-ui-1-7-2-themes-list-at-google-code/
       def appoxy_javascripts
-        ' <script type="text/javascript" src="http://www.google.com/jsapi?key=ABQIAAAAhes0f80sBcwL-h5xCNkkgxQBmiBpQeSpIciQPfZ5Ss-a60KXIRQOVvqzsNpqzhmG9tjky_5rOuaeow"></script>
+        '<script type="text/javascript" src="http://www.google.com/jsapi?key=ABQIAAAAhes0f80sBcwL-h5xCNkkgxQBmiBpQeSpIciQPfZ5Ss-a60KXIRQOVvqzsNpqzhmG9tjky_5rOuaeow"></script>
         <script type="text/javascript">
             google.load("jquery", "1");
             google.load("jqueryui", "1");
-
         </script>
       '.html_safe
       end
@@ -95,10 +98,10 @@ module Appoxy
           flash.each_pair do |type, msg|
             if msg.is_a?(Array)
               msg.each do |m|
-                s2 << content_tag(:div, m, :class => type)
+                s2 << content_tag(:div, m, :class => "flash #{type}")
               end
             else
-              s2 << content_tag(:div, msg, :class => type)
+              s2 << content_tag(:div, msg, :class => "flash #{type}")
             end
           end
           s << s2
@@ -168,6 +171,9 @@ EOF
         s.html_safe
       end
 
+      def visualizations
+        Visualizations.new
+      end
 
     end
 

data/lib/ui/visualizations.rb

@@ -0,0 +1,86 @@
+module Appoxy
+  module UI
+    class Visualizations
+
+      def pie(options={})
+
+         div_id = options[:title].underscore || "pie_div"
+    width  = options[:width] || "100%"
+    height = options[:height] || nil
+        s      = <<-EOF
+    <div id="#{div_id}" style="width:#{200}; #{height ? 'height:' + height : ""}"></div>
+
+    <script type="text/javascript">
+    var age_pie_chart;
+    $(document).ready(function() {
+       age_pie_chart = new Highcharts.Chart({
+          chart: {
+             renderTo: '#{div_id}',
+             plotBackgroundColor: null,
+             plotBorderWidth: null,
+             plotShadow: false
+          },
+        plotOptions: {
+             pie: {
+                allowPointSelect: true,
+                cursor: 'pointer',
+                dataLabels: {
+                   enabled: false,
+                   color: '#000000',
+                   connectorColor: '#000000',
+                   formatter: function() {
+                      return '<b>'+ this.point.name +'</b>: '+ this.y +' %';
+                   }
+                },
+                showInLegend: true
+             }
+          },
+        EOF
+        if options[:title]
+          s << "title: {
+             text: '#{options[:title]}'
+          },"
+        end
+
+        s << "
+          tooltip: {
+             formatter: function() {
+                return '<b>'+ this.point.name +'</b>: '+ this.y;
+             }
+          },
+    "
+
+        s << "
+           series: [{
+             type: 'pie',
+             name: '#{options[:title]}',
+             data: [
+    "
+        data = options[:data]
+        data.each_with_index do |d, i|
+          # todo: should check for hash and allow like:
+          #  {
+          #               name: 'Chrome',
+          #               y: 12.8,
+          #               sliced: true,
+          #               selected: true
+          #            },
+          s << "['#{d[0]}', #{d[1]}]"
+          if i < data.size - 1
+            s << ",\n"
+          end
+        end
+        s << "]
+          }]
+       });
+    });
+    </script>\n"
+        s.html_safe
+
+      end
+    end
+
+  end
+
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -08:00
+date: 2011-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,6 +110,7 @@ files:
 - lib/ui/binding_hack.rb
 - lib/ui/test.rb
 - lib/ui/time_zoner.rb
+- lib/ui/visualizations.rb
 - README.markdown
 has_rdoc: true
 homepage: http://www.appoxy.com