highcharts 0.0.2 → 0.0.3

data/README.markdown

@@ -1,6 +1,6 @@
 ## Information
 
-Highcharts Gem to allow for easily extending other classes in your application to create highchart's json
+Highcharts Gem to allow for easily extending other classes in your application to create highchart's json.  Highcharts the javascript library is located here: http://www.highcharts.com/ (this library is not affiliated with Highcharts in anyway, it helps ruby developers use the Highcharts javascript library)
 
 ## Installation
 
@@ -8,11 +8,24 @@ Highcharts Gem to allow for easily extending other classes in your application t
 
 ## Using
 
-do a include in your class, example below:
+do an include in your class, example below:
 
-class Object
-  include Highcharts::Charting
-end
+    class Object
+      include Highcharts::Charting
+    end
+
+you can call a couple other methods:
+
+		Object.new.x_choices (all possible choices this gem can provide)
+		Object.new.style_choices (all possible style choices highcharts provides)
+		Object.new.humanize_categories (provides human readable category labels for datetimes)
+
+## Roadmap
+
+- Give examples of html forms
+- Give examples of javascript functions
+- Provide function to include highcharts javascript automatically at any version within html
+- Provide function to include javascript functions for this data model automatically
 
 ## Contributing
 

data/highcharts.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'activesupport', '~>3.1.1'
+  s.add_runtime_dependency 'ice_cube', '0.7.7'
 end

data/lib/highcharts.rb

@@ -1,12 +1,16 @@
 require "highcharts/version"
 
+require 'ice_cube'
+require 'time'
+require 'date'
+
 module Highcharts
 	module Charting
-		attr_accessor :title, :subtitle, :drilldown, :start, :end, :style, :x, :y, :maximum, :minimum, :sla, :series, :categories
+		attr_accessor :title, :subtitle, :drilldown, :start, :end, :style, :x, :y, :maximum, :minimum, :sla, :series, :categories, :color
 
 		def initialize(user_supplied_hash={})
 			standard_hash = { title:"", subtitle:"", drilldown:"", start:"", end:"", style:"",
-				x:"", y:"", maximum:"", minimum:"", sla:9999999, series:[], categories:[] }
+				x:"", y:"", maximum:"", minimum:"", sla:0, series:[], categories:[], color:"" }
 
 			user_supplied_hash = standard_hash.merge(user_supplied_hash)
 
@@ -17,81 +21,67 @@ module Highcharts
 			end
 		end
 
-		def self.get_x_axis_choices
-			return [ "month", "week", "day" ]
+		def self.x_choices
+			return [ "year", "month", "week", "day", "hour", "minute", "second" ]
 		end
 
-		def self.get_style_choices
+		def self.style_choices
 			return [ "line", "spline", "area", "areaspline", "column", "bar", "pie", "scatter" ]
 		end
 
 		def to_hc
 			hc_hash = {}
 
-			hc_hash.store(:categories,@categories)
-			hc_hash.store(:drilldown,@drilldown)
-			hc_hash.store(:start,@start)
-			hc_hash.store(:end,@end)
-			hc_hash.store(:maximum,@maximum)
-			hc_hash.store(:minimum,@minimum)
-			hc_hash.store(:series,@series)
-			hc_hash.store(:sla,@sla)
-			hc_hash.store(:style,@style)
-			hc_hash.store(:subtitle,@subtitle)
-			hc_hash.store(:title,@title)
-			hc_hash.store(:x,@x)
-			hc_hash.store(:y,@y)
-
-			return hc_hash
-		end
-
-		#Need to fix this to include hours also
-		def self.transform_x_axis(x_axis)
-			case x_axis
-			when 'month'
-				return 31
-			when 'week'
-				return 7
-			when 'day'
-				return 1
-			else
-				return x_axis
+			self.instance_variables.each do |variable|
+				v = variable.to_s[1,variable.length]
+				hc_hash.store(v,self.send(v))
 			end
-		end
-
-		def self.difference_between_two_dates(start_time,end_time,x_axis)
-			x_axis = Highcharts::Charting.transform_x_axis(x_axis)
 
-			return ((Date.strptime(end_time) - Date.strptime(start_time)) / x_axis).to_i
+			return hc_hash
 		end
 
-		#Need to fix this to include hours also
-		def self.create_array_of_dates(start_time,end_time,x_axis)
-			old_x_axis = x_axis
-			x_axis = Highcharts::Charting.transform_x_axis(x_axis)
-
-			x_amount = Highcharts::Charting.difference_between_two_dates(start_time,end_time,x_axis)
-
-			categories = Array.new
-			categories << Time.parse(start_time+" 00:00:00")
-			for range in 1..x_amount
-				if old_x_axis == "month"
-					categories << Time.parse(start_time+" 00:00:00") + range.month
-				else
-					categories << Time.parse(start_time+" 00:00:00") + (x_axis * range).days
-				end
-			end
-
-			return categories
+		def create_array_of_dates
+			all_dates = IceCube::Schedule.new(Time.parse(@start), :end_time => Time.parse(@end))
+
+			rule = case @x
+							when "month"
+								IceCube::Rule.monthly
+							when "week"
+								IceCube::Rule.weekly
+							when "day"
+								IceCube::Rule.daily
+							when "hour"
+								IceCube::Rule.hourly
+							when "minute"
+								IceCube::Rule.minutely
+							when "second"
+								IceCube::Rule.secondly
+							end
+
+			all_dates.add_recurrence_rule rule
+			@categories = all_dates.all_occurrences
 		end
 
-		def fix_categories
-			x = []
-			@categories.each do |category|
-				x << category.strftime("%m-%d")
+		def humanize_categories
+			label = case @x
+							when "month"
+								"%m-%Y"
+							when "week", "day"
+								"%m-%d"
+							when "hour"
+								"%I%p"
+							when "minute"
+								"%I:%M%p"
+							when "second"
+								"%I:%M:%S%p"
+							end
+
+			temp_categories = []
+			@categories.each do |date|
+				temp_categories << date.strftime(label)
 			end
 
-			@categories = x
+			@categories = temp_categories
 		end
 	end
 end

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,35 +1,38 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: highcharts
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Nick Willever
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &82638030 !ruby/object:Gem::Requirement
+
+date: 2012-02-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ice_cube
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.7
   type: :runtime
-  prerelease: false
-  version_requirements: *82638030
-description: This allows you to extend the charting module into your classes and then
-  use it to create json for highcharts
-email:
+  version_requirements: *id001
+description: This allows you to extend the charting module into your classes and then use it to create json for highcharts
+email: 
 - nickwillever@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.markdown
@@ -37,28 +40,32 @@ files:
 - highcharts.gemspec
 - lib/highcharts.rb
 - lib/highcharts/version.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides an extendable class for charting with high charts
 test_files: []
+