pulse-meter 0.2.1 → 0.2.2

data/lib/pulse-meter/visualize/dsl/page.rb

@@ -1,57 +1,31 @@
 module PulseMeter
   module Visualize
     module DSL
-      WIDGETS = %w(pie line area table)
-      DEFAULT_GCHART_OPTIONS = {}
+      class Page < Base
+        self.data_class = PulseMeter::Visualize::Page 
 
-      class Page
-        def initialize(title = nil)
-          @title = title || ""
-          @widgets = []
-          @gchart_options = DEFAULT_GCHART_OPTIONS.dup
+        def initialize(title = '')
+          super()
+          self.title(title)
         end
 
-        def widget(type, title = '', widget_args = nil, &block) 
-          w = PulseMeter::Visualize::DSL::Widget.new(type, title)
-          w.process_args(widget_args) if widget_args
-          yield(w) if block_given?
-          @widgets << w
-        end
+        string_setter :title
 
-        WIDGETS.each do |wtype|
-          class_eval <<-EVAL
-            def #{wtype}(title = '', args = nil, &block)
-              widget(:#{wtype}, title, args, &block)
-            end
-          EVAL
-        end
+        dsl_array_extender :widgets, :area,  PulseMeter::Visualize::DSL::Widgets::Area
+        dsl_array_extender :widgets, :line,  PulseMeter::Visualize::DSL::Widgets::Line
+        dsl_array_extender :widgets, :pie,   PulseMeter::Visualize::DSL::Widgets::Pie
+        dsl_array_extender :widgets, :table, PulseMeter::Visualize::DSL::Widgets::Table
+        dsl_array_extender :widgets, :gauge, PulseMeter::Visualize::DSL::Widgets::Gauge
 
-        def spline(*args, &block)
-          STDERR.puts "DEPRECATION: spline widget is no longer available. Using `line' as a fallback."
-          line(*args, &block)
-        end
+        hash_extender :gchart_options
 
-        def title(new_title)
-          @title = new_title || ''
+        def spline(*args)
+          STDERR.puts "DEPRECATION: spline widget is no longer available."
         end
 
-        def highchart_options(_)
+        def highchart_options(*args)
           STDERR.puts "DEPRECATION: highchart_options DSL helper does not take effect anymore, use gchart_options instead"
         end
-
-        def gchart_options(options = {})
-          @gchart_options.merge!(options)
-        end
-
-        def to_page
-          args = {
-            title: @title,
-            widgets: @widgets.map(&:to_widget),
-            gchart_options: @gchart_options
-          }
-          PulseMeter::Visualize::Page.new(args)
-        end
-
       end
     end
   end

data/lib/pulse-meter/visualize/dsl/sensor.rb

@@ -1,18 +1,17 @@
 module PulseMeter
   module Visualize
-    module DSL
-      class Sensor
-        def initialize(name)
-          @args = {:sensor => name}
-        end
+    module DSL 
+      class Sensor < Base
 
-        def process_args(args) 
-          @args.merge!(args)
-        end
+        self.data_class = PulseMeter::Visualize::Sensor
 
-        def to_sensor
-          PulseMeter::Visualize::Sensor.new(@args)
+        def initialize(name)
+          super()
+          self.name(name)
         end
+
+        string_setter :color
+        string_setter :name
       end
     end
   end

data/lib/pulse-meter/visualize/dsl/widget.rb

@@ -1,82 +1,35 @@
 module PulseMeter
   module Visualize
     module DSL
-      class Widget
-        include PulseMeter::Mixins::Utils
+      class Widget < Base
+        MAX_WIDTH = 10
 
-        DEFAULT_WIDTH = 10
-        DEFAULT_TIMESPAN = 60 * 60 * 24 # One day
+        self.data_class = PulseMeter::Visualize::Widget
 
-        def initialize(type, title = '')
-          raise BadWidgetType, type if type.to_s.empty?
-          @type = type
-          @title = title.to_s || ''
-          @values_label = ''
-          @width = DEFAULT_WIDTH
-          @sensors = []
-          @show_last_point = false
-          @redraw_interval = nil
-          @timespan = DEFAULT_TIMESPAN
+        def initialize(title)
+          super()
+          self.title(title)
+          self.width(MAX_WIDTH)
         end
 
-        def process_args(args)
-          [:sensor, :title, :width, :values_label, :show_last_point, :redraw_interval, :timespan].each do |arg|
-            if args.has_key?(arg)
-              send(arg, args[arg])
-            end
-          end
-        end
-
-        def redraw_interval(new_redraw_interval)
-          new_redraw_interval = new_redraw_interval.to_i
-          raise BadWidgetRedrawInterval, new_redraw_interval unless new_redraw_interval > 0
-          @redraw_interval = new_redraw_interval
-        end
-
-        def show_last_point(new_show_last_point)
-          @show_last_point = !!new_show_last_point
-        end
+        hash_extender :gchart_options
+       
+        string_setter :title
 
-        def timespan(new_timespan)
-          new_timespan = new_timespan.to_i
-          raise BadWidgetTimeSpan, new_timespan unless new_timespan > 0
-          @timespan = new_timespan
+        int_setter :redraw_interval do |int|
+          raise BadWidgetRedrawInterval, int unless int > 0
         end
-
-        def values_label(new_label)
-          @values_label = new_label.to_s
+        
+        int_setter :width do |w|
+          raise BadWidgetWidth, w unless w > 0 && w <= MAX_WIDTH
         end
 
-        def title(new_title)
-          @title = new_title.to_s || ''
-        end
+        dsl_array_extender :sensors, :sensor, PulseMeter::Visualize::DSL::Sensor
 
-        def width(new_width)
-          raise BadWidgetWidth, new_width unless new_width.respond_to?(:to_i)
-          w = new_width.to_i
-          raise BadWidgetWidth, new_width unless w > 0 && w <= 10
-          @width = new_width.to_i
+        def method_missing(name, value)
+          gchart_options(name => value)
         end
 
-        def sensor(name, sensor_args = nil) 
-          s = PulseMeter::Visualize::DSL::Sensor.new(name)
-          s.process_args(sensor_args) if sensor_args
-          @sensors << s
-        end
-
-        def to_widget
-          args = {
-            title: @title,
-            type: @type,
-            values_label: @values_label,
-            width: @width,
-            sensors: @sensors.map(&:to_sensor),
-            redraw_interval: @redraw_interval,
-            show_last_point: @show_last_point,
-            timespan: @timespan
-          }
-          PulseMeter::Visualize::Widget.new(args)
-        end
       end
     end
   end

data/lib/pulse-meter/visualize/dsl/widget_old.rb

@@ -0,0 +1,95 @@
+module PulseMeter
+  module Visualize
+    module DSL
+      class Widget
+        include PulseMeter::Mixins::Utils
+
+        DEFAULT_WIDTH = 10
+        DEFAULT_TIMESPAN = 60 * 60 * 24 # One day
+        DEFAULT_GCHART_OPTIONS = {}
+
+        def initialize(type, title = '')
+          raise BadWidgetType, type if type.to_s.empty?
+          @type = type
+          @title = title.to_s || ''
+          @values_label = ''
+          @width = DEFAULT_WIDTH
+          @sensors = []
+          @show_last_point = false
+          @redraw_interval = nil
+          @timespan = DEFAULT_TIMESPAN
+          @gchart_options = DEFAULT_GCHART_OPTIONS.dup
+        end
+
+        def process_args(args)
+          [:sensor, :title, :width, :values_label, :show_last_point, :redraw_interval, :timespan].each do |arg|
+            if args.has_key?(arg)
+              send(arg, args[arg])
+            end
+          end
+        end
+
+        def redraw_interval(new_redraw_interval)
+          new_redraw_interval = new_redraw_interval.to_i
+          raise BadWidgetRedrawInterval, new_redraw_interval unless new_redraw_interval > 0
+          @redraw_interval = new_redraw_interval
+        end
+
+        def show_last_point(new_show_last_point)
+          @show_last_point = !!new_show_last_point
+        end
+
+        def timespan(new_timespan)
+          new_timespan = new_timespan.to_i
+          raise BadWidgetTimeSpan, new_timespan unless new_timespan > 0
+          @timespan = new_timespan
+        end
+
+        def values_label(new_label)
+          @values_label = new_label.to_s
+        end
+
+        def title(new_title)
+          @title = new_title.to_s || ''
+        end
+
+        def width(new_width)
+          raise BadWidgetWidth, new_width unless new_width.respond_to?(:to_i)
+          w = new_width.to_i
+          raise BadWidgetWidth, new_width unless w > 0 && w <= 10
+          @width = new_width.to_i
+        end
+
+        def gchart_options(options = {})
+          @gchart_options.merge!(options)
+        end
+
+        def sensor(name, sensor_args = nil) 
+          s = PulseMeter::Visualize::DSL::Sensor.new(name)
+          s.process_args(sensor_args) if sensor_args
+          @sensors << s
+        end
+
+        def method_missing(name, value)
+          @gchart_options[name] = value
+        end
+
+        def to_widget
+          args = {
+            title: @title,
+            type: @type,
+            values_label: @values_label,
+            width: @width,
+            sensors: @sensors.map(&:to_sensor),
+            redraw_interval: @redraw_interval,
+            show_last_point: @show_last_point,
+            timespan: @timespan,
+            gchart_options: @gchart_options
+          }
+          PulseMeter::Visualize::Widget.new(args)
+        end
+      end
+    end
+  end
+end
+

data/lib/pulse-meter/visualize/dsl/widgets/area.rb

@@ -0,0 +1,20 @@
+module PulseMeter
+  module Visualize
+    module DSL
+      module Widgets
+        class Area < PulseMeter::Visualize::DSL::Widget
+          self.data_class = PulseMeter::Visualize::Widgets::Area
+
+          string_setter :values_label
+          bool_setter :show_last_point
+
+          int_setter :timespan do |ts|
+            raise BadWidgetTimeSpan, ts unless ts > 0
+          end
+
+        end
+      end
+    end
+  end
+end
+

data/lib/pulse-meter/visualize/dsl/widgets/gauge.rb

@@ -0,0 +1,12 @@
+module PulseMeter
+  module Visualize
+    module DSL
+      module Widgets
+        class Gauge < PulseMeter::Visualize::DSL::Widget
+          self.data_class = PulseMeter::Visualize::Widgets::Gauge
+        end
+      end
+    end
+  end
+end
+

data/lib/pulse-meter/visualize/dsl/widgets/line.rb

@@ -0,0 +1,21 @@
+module PulseMeter
+  module Visualize
+    module DSL
+      module Widgets
+        class Line < PulseMeter::Visualize::DSL::Widget
+          self.data_class = PulseMeter::Visualize::Widgets::Line
+
+          string_setter :values_label
+          bool_setter :show_last_point
+
+          int_setter :timespan do |ts|
+            raise BadWidgetTimeSpan, ts unless ts > 0
+          end
+
+        end
+      end
+    end
+  end
+end
+
+

data/lib/pulse-meter/visualize/dsl/widgets/pie.rb

@@ -0,0 +1,16 @@
+module PulseMeter
+  module Visualize
+    module DSL
+      module Widgets
+        class Pie < PulseMeter::Visualize::DSL::Widget
+          self.data_class = PulseMeter::Visualize::Widgets::Pie
+
+          string_setter :values_label
+          bool_setter :show_last_point
+
+        end
+      end
+    end
+  end
+end
+

data/lib/pulse-meter/visualize/dsl/widgets/table.rb

@@ -0,0 +1,19 @@
+module PulseMeter
+  module Visualize
+    module DSL
+      module Widgets
+        class Table < PulseMeter::Visualize::DSL::Widget
+          self.data_class = PulseMeter::Visualize::Widgets::Table
+
+          bool_setter :show_last_point
+
+          int_setter :timespan do |ts|
+            raise BadWidgetTimeSpan, ts unless ts > 0
+          end
+
+        end
+      end
+    end
+  end
+end
+

data/lib/pulse-meter/visualize/layout.rb

@@ -1,18 +1,10 @@
 module PulseMeter
   module Visualize
-    class Layout
-      attr_reader :pages
-
-      attr_reader :title
-      attr_reader :use_utc
-      attr_reader :gchart_options
-
-      def initialize(args) 
-        raise ArgumentError unless args.respond_to?('[]')
-        @title = args[:title] or raise ArgumentError, ":title not specified"
-        @pages = args[:pages] or raise ArgumentError, ":pages not specified"
-        @use_utc = args[:use_utc]
-        @gchart_options = args[:gchart_options]
+    class Layout < Base
+      def initialize(opts)
+        super
+        @opts[:pages] ||= []
+        @opts[:gchart_options] ||= {}
       end
 
       def to_app
@@ -33,8 +25,8 @@ module PulseMeter
 
 			def options
 				{
-					use_utc: @use_utc,
-          gchart_options: @gchart_options
+					use_utc: use_utc,
+          gchart_options: gchart_options
         }
       end
 
@@ -45,7 +37,6 @@ module PulseMeter
       def widgets(page_id)
         pages[page_id].widget_datas
       end
-
     end
   end
 end

data/lib/pulse-meter/visualize/page.rb

@@ -1,15 +1,10 @@
 module PulseMeter
   module Visualize
-    class Page
-      attr_reader :widgets
-      attr_reader :title
-      attr_reader :gchart_options
-
-      def initialize(args) 
-        raise ArgumentError unless args.respond_to?('[]')
-        @title = args[:title] or raise ArgumentError, ":title not specified"
-        @widgets = args[:widgets] or raise ArgumentError, ":widgets not specified"
-        @gchart_options = args[:gchart_options] or raise ArgumentError, ":gchart_options not specified"
+    class Page < Base
+      def initialize(opts)
+        super
+        @opts[:widgets] ||= []
+        @opts[:gchart_options] ||= {}
       end
 
       def widget_data(widget_id, opts = {})