rumx 0.0.5 → 0.0.6

data/History.md

@@ -1,6 +1,13 @@
 Rumx Changelog
 =====================
 
+0.0.6
+
+ - Separate out error tracking from Timer bean.  TimerAndError bean now includes what Timer bean used to bean.
+   Timer and Error beans can be used to track time and errors individually.
+   Apologies for the somewhat incompatible change if anyone is already using Rumx::Beans::Timer.  Just rename
+   to Rumx::Beans::TimerAndError if you want both.
+
 0.0.5
 
  - Allow default values for operation arguments.

data/examples/timer/my_bean.rb

@@ -8,7 +8,7 @@ class MyBean
   def initialize
     @sleep_time      = 0.5
     @percent_failure = 10
-    @timer           = Rumx::Beans::Timer.new(:max_errors => 5)
+    @timer           = Rumx::Beans::TimerAndError.new(:max_errors => 5)
 
     Thread.new do
       while true

data/lib/rumx/beans.rb

@@ -1,3 +1,5 @@
 require 'rumx/beans/folder'
 require 'rumx/beans/message'
 require 'rumx/beans/timer'
+require 'rumx/beans/error'
+require 'rumx/beans/timer_and_error'

data/lib/rumx/beans/error.rb

@@ -0,0 +1,36 @@
+module Rumx
+  module Beans
+    class Error
+      include Bean
+
+      bean_attr_reader     :error_count, :integer, 'Number of times the measured block has raised an exception'
+      bean_attr_embed_list :errors,                'List of the last occurring errors'
+
+      def initialize(opts={})
+        @errors = []
+        @max_errors = (opts[:max_errors] || 1).to_i
+      end
+
+      def reset=(val)
+        if val
+          @error_count = 0
+        end
+      end
+
+      def perform(prefix='')
+        yield
+      rescue Exception => e
+        bean_synchronize do
+          @error_count += 1
+          @errors << Message.new(e.message)
+          @errors.shift while @errors.size > @max_errors
+        end
+        raise
+      end
+
+      def to_s
+        "error_count=#{@error_count} last_error=#{@errors.last}"
+      end
+    end
+  end
+end

data/lib/rumx/beans/timer.rb

@@ -4,35 +4,30 @@ module Rumx
       include Bean
 
       bean_attr_reader     :total_count, :integer, 'Number of times the measured block has run'
-      bean_attr_reader     :error_count, :integer, 'Number of times the measured block has raised an exception'
       bean_attr_reader     :total_time,  :float,   'Total time (msec) for all the runs of the timed instruction'
       bean_attr_reader     :max_time,    :float,   'The maximum time (msec) for all the runs of the timed instruction'
       bean_attr_reader     :min_time,    :float,   'The minimum time (msec) for all the runs of the timed instruction'
       bean_attr_reader     :last_time,   :float,   'The time (msec) for the last run of the timed instruction'
       bean_reader          :avg_time,    :float,   'The average time (msec) for all runs of the timed instruction'
-      bean_writer          :reset,       :boolean, 'Reset the times and counts to zero (Note that last_time and errors are not reset)'
-      bean_attr_embed_list :errors,                'List of the last occurring errors'
+      bean_writer          :reset,       :boolean, 'Reset the times and counts to zero (Note that last_time is not reset)'
 
       def initialize(opts={})
         # Force initialization of Bean#bean_mutex to avoid race condition (See bean.rb)
         bean_mutex
         @last_time = 0.0
         self.reset = true
-        @errors = []
-        @max_errors = (opts[:max_errors] || 1).to_i
       end
 
       def reset=(val)
         if val
           @total_count = 0
-          @error_count = 0
           @min_time    = nil
           @max_time    = 0.0
           @total_time  = 0.0
         end
       end
 
-      def measure(prefix='')
+      def measure
         start_time = Time.now
         begin
           yield
@@ -47,13 +42,6 @@ module Rumx
           end
         end
         return current_time
-      rescue Exception => e
-        bean_synchronize do
-          @error_count += 1
-          @errors << Message.new(e.message)
-          @errors.shift while @errors.size > @max_errors
-        end
-        raise
       end
 
       def min_time

data/lib/rumx/beans/timer_and_error.rb

@@ -0,0 +1,37 @@
+module Rumx
+  module Beans
+    class TimerAndError < Timer
+
+      bean_attr_reader     :error_count, :integer, 'Number of times the measured block has raised an exception'
+      bean_attr_embed_list :errors,                'List of the last occurring errors'
+
+      def initialize(opts={})
+        super
+        @errors = []
+        @max_errors = (opts[:max_errors] || 1).to_i
+      end
+
+      def reset=(val)
+        super
+        if val
+          @error_count = 0
+        end
+      end
+
+      def measure
+        super
+      rescue Exception => e
+        bean_synchronize do
+          @error_count += 1
+          @errors << Message.new(e.message)
+          @errors.shift while @errors.size > @max_errors
+        end
+        raise
+      end
+
+      def to_s
+        "error_count=#{@error_count}" + super
+      end
+    end
+  end
+end

data/lib/rumx/server.rb

@@ -34,19 +34,19 @@ module Rumx
       end
 
       def attributes_path(path)
-        URI.escape(path + '/attributes')
+        url URI.escape(path + '/attributes')
       end
 
       def attribute_path(path)
-        URI.escape(path + '/attribute')
+        url URI.escape(path + '/attribute')
       end
 
       def operations_path(path)
-        URI.escape(path + '/operations')
+        url URI.escape(path + '/operations')
       end
 
       def operation_path(path)
-        URI.escape(path + '/operation')
+        url URI.escape(path + '/operation')
       end
 
       # http://sinatra-book.gittr.com/#implementation_of_rails_style_partials but extract_options! part of ActiveSupport

data/lib/rumx/server/views/content_attributes.haml.error_attempt

@@ -0,0 +1,51 @@
+%h3= path
+%h4 Attributes
+%form#form{ :method =>'POST' }
+  %table{:width => '100%'}
+    %thead
+      %tr
+        %td Name
+        %td Description
+        %td Allow Read
+        %td Allow Write
+        %td Type
+        %td Value
+    %tbody
+      - bean.send(get_set_method, params) do |attribute, value, rel_path, param_name|
+        %tr
+          - #puts "path=#{path} type=#{path.class.name} rel_path=#{rel_path} class=#{rel_path.class.name}"
+          %td= link_to_attribute(path, rel_path)
+          %td= attribute.description
+          %td= attribute.allow_read
+          %td= attribute.allow_write
+          %td= attribute.type.to_s
+          %td= attribute_value_tag(attribute, param_name, value)
+  %input{ :type => 'submit', :value => 'Update' }
+
+:javascript
+  $("#form").submit(function() {
+    $.post("#{attributes_path(path)}", $("#form").serialize(), function(result) {
+      $("#content").html(result);
+    })
+    .error(function(xhr, ajaxOptions, thrownError) { alert("error"); });
+    return false;
+  });
+  -#$().ready(function(){
+    -#$.ajaxSetup({
+    -#	error:function(x,e){
+    -#		if(x.status==0){
+    -#		alert('You are offline!!\n Please Check Your Network.');
+    -#		}else if(x.status==404){
+    -#		alert('Requested URL not found.');
+    -#		}else if(x.status==500){
+    -#		alert('Internel Server Error.');
+    -#		}else if(e=='parsererror'){
+    -#		alert('Error.\nParsing JSON Request failed.');
+    -#		}else if(e=='timeout'){
+    -#		alert('Request Time out.');
+    -#		}else {
+    -#		alert('Unknow Error.\n'+x.responseText);
+    -#		}
+    -#	}
+    -#});
+  -#});

metadata

@@ -2,7 +2,7 @@
 name: rumx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
   - Brad Pardee
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2011-12-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: sinatra
@@ -79,9 +79,11 @@ files:
   - lib/rumx/operation.rb
   - lib/rumx/server.rb
   - lib/rumx/type.rb
+  - lib/rumx/beans/error.rb
   - lib/rumx/beans/folder.rb
   - lib/rumx/beans/message.rb
   - lib/rumx/beans/timer.rb
+  - lib/rumx/beans/timer_and_error.rb
   - lib/rumx/server/public/attribute_test.html
   - lib/rumx/server/public/jquery-ui-1.8.16.custom.min.js
   - lib/rumx/server/public/jquery.jstree.js
@@ -111,6 +113,7 @@ files:
   - lib/rumx/server/views/attribute_value_tag.haml
   - lib/rumx/server/views/content_attribute.haml
   - lib/rumx/server/views/content_attributes.haml
+  - lib/rumx/server/views/content_attributes.haml.error_attempt
   - lib/rumx/server/views/content_operation.haml
   - lib/rumx/server/views/content_operations.haml
   - lib/rumx/server/views/index.haml