appoxy_rails 0.0.17 → 0.0.18

data/lib/sessions/oauth_token.rb

@@ -1,12 +1,12 @@
-class OauthToken < SimpleRecord::Base
-
-    belongs_to :user
-
-    has_strings :type, # request or access
-                :site,
-                :token,
-                :secret
-
-#    has_clobs :access_token
-
-end
+class OauthToken < SimpleRecord::Base
+
+    belongs_to :user
+
+    has_strings :type, # request or access
+                :site,
+                :token,
+                :secret
+
+#    has_clobs :access_token
+
+end

data/lib/sessions/sessions_controller.rb

@@ -65,7 +65,7 @@ module Appoxy
           user.last_login   = Time.now
           user.save(:dirty=>true)
           flash[:info] = "Logged in successfully."
-
+          after_create
         else
           flash[:error] = "Invalid email or password. Please try again."
           render :action => 'new'

data/lib/ui/binding_hack.rb

@@ -1,14 +1,14 @@
-module Appoxy
-  module UI
-    class BindingHack
-
-      def initialize(hash)
-        @options = hash
-      end
-
-      def get_binding
-        binding
-      end
-    end
-  end
+module Appoxy
+  module UI
+    class BindingHack
+
+      def initialize(hash)
+        @options = hash
+      end
+
+      def get_binding
+        binding
+      end
+    end
+  end
 end

data/lib/ui/test.rb

@@ -1,7 +1,7 @@
-require 'erb'
-require_relative 'binding_hack'
-
-options = Appoxy::UI::BindingHack.new(:x=>"hi")
-template = ERB.new(File.read(File.join(File.dirname(__FILE__), '_geo_location_finder.html.erb')))
-ret      = template.result(options.get_binding)
-p ret
+require 'erb'
+require_relative 'binding_hack'
+
+options = Appoxy::UI::BindingHack.new(:x=>"hi")
+template = ERB.new(File.read(File.join(File.dirname(__FILE__), '_geo_location_finder.html.erb')))
+ret      = template.result(options.get_binding)
+p ret

data/lib/ui/visualizations.rb

@@ -2,24 +2,28 @@ module Appoxy
   module UI
     class Visualizations
 
+
+      def add_tooltip
+        "
+          tooltip: {
+             formatter: function() {
+                return '<b>'+ this.point.name +'</b>: '+ this.y;
+             }
+          },
+    "
+      end
+
       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>
+        @type    = 'pie'
 
-    <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
-          },
+        @options = options
+        common_values(options)
+
+        s = ""
+        s << add_div()
+        s << add_chart_start()
+        s << "
         plotOptions: {
              pie: {
                 allowPointSelect: true,
@@ -35,49 +39,123 @@ module Appoxy
                 showInLegend: true
              }
           },
-        EOF
-        if options[:title]
-          s << "title: {
-             text: '#{options[:title]}'
-          },"
-        end
+        "
+        s << add_title
 
-        s << "
-          tooltip: {
-             formatter: function() {
-                return '<b>'+ this.point.name +'</b>: '+ this.y;
-             }
-          },
-    "
+        s << add_tooltip()
 
-        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
+        unless @options[:series]
+          # make the default series
+          serieses = [{:name=>options[:title, :data=>options[:data]]}]
+          @options[:series] = serieses
         end
-        s << "]
-          }]
+
+        if @options[:series]
+          s << add_series
+        else
+          # todo: DELETE THIS SECTION
+          # Single set of data
+#          s << "
+#           series: [{
+#             type: '#{@type}',
+#             name: '#{options[:title]}',
+#             data: [
+#    "
+#          s << add_data
+#          s << "]
+#          }]"
+        end
+        s << "
        });
     });
     </script>\n"
         s.html_safe
 
       end
+
+      def add_series
+        s      = "series: [
+"
+        series = @options[:series]
+        series.each_with_index do |ser, i|
+          # each series is a hash
+          s << "{
+             type: '#{@type}',
+             name: '#{ser[:name]}',
+             data: ["
+          s << add_data(ser[:data])
+          s << "
+          }
+          "
+          if i < series.size - 1
+            s << ",\n"
+          end
+        end
+        s
+      end
+
+      def add_data(data)
+        s    = ""
+#        data ||= @options[:data]
+        if data.is_a?(Array)
+          data.each_with_index do |d, i|
+            if d.is_a?(Array)
+              s << "['#{d[0]}', #{d[1]}]"
+            elsif d.is_a?(Hash)
+              s << "
+                  {
+                         name: '#{d[:name]}',
+                         y: #{d[:y]}
+                         // sliced: #{d[:sliced]},
+                         // selected: #{d[:selected]}
+                      }"
+            else
+              raise "Expected array or hash for data series elements."
+            end
+            if i < data.size - 1
+              s << ",\n"
+            end
+          end
+        end
+        s
+      end
+
+
+      def add_div
+        "<div id=\"#{@div_id}\" style=\"width:#{@width}; #{@height ? 'height:' + @height : ""}\"></div>"
+      end
+
+      def add_chart_start
+        "<script type=\"text/javascript\">
+    var #{@id}_chart;
+    $(document).ready(function() {
+       #{@id}_chart = new Highcharts.Chart({
+          chart: {
+             renderTo: '#{@div_id}',
+             plotBackgroundColor: null,
+             plotBorderWidth: null,
+             plotShadow: false,
+             defaultSeriesType: '#{@type}'
+          },
+"
+      end
+
+      def add_title
+        s= ""
+        if @options[:title]
+          s << "title: {
+             text: '#{@options[:title]}'
+          },"
+        end
+        ""
+      end
+
+      def common_values(options)
+        @id     = options[:title].underscore
+        @div_id = "#{@id}_div" || "#{@type}_div"
+        @width  = options[:width] || "100%"
+        @height = options[:height] || nil
+      end
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -08:00
+date: 2011-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency