rumx 0.0.6 → 0.0.7

data/History.md

@@ -1,12 +1,17 @@
 Rumx Changelog
 =====================
 
+0.0.7
+
+ - Add .properties format for brain-dead hyperic.  Might as well allow extending while we're at it.
+
 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.
+ - Fix bug where Rack mounted apps don't have the correct url.
 
 0.0.5
 

data/README.md

@@ -87,6 +87,9 @@ Refer to the timer example for more information.
 
 ## TODO
 
+Figure out the "NameError - uninitialized constant Rack::File:" error that occurs frequently on startup and seems related
+to the tree not displaying correctly.  Works okay with refresh.
+
 Api doc non-existent.
 
 Really needs some html/css love.  Right now the sinatra pages are so ugly they'll make your eyes hurt but I don't do this stuff
@@ -102,7 +105,7 @@ New types :date and :datetime?
 
 Build in optional authentication or just let user extend Rumx::Server?
 
-Railtie it.
+Railtie it?
 
 ## Author
 

data/examples/timer/my_bean.rb

@@ -14,10 +14,10 @@ class MyBean
       while true
         begin
           @timer.measure do
+            sleep @sleep_time
             if rand(100) < @percent_failure
               raise "Failure occurred with sleep_time=#{@sleep_time} and percent failure=#{@percent_failure}"
             end
-            sleep @sleep_time
           end
         rescue Exception => e
           # Error handling...

data/lib/rumx/server.rb

@@ -8,6 +8,7 @@ module Rumx
     configure do
       enable :logging
       mime_type :json, 'application/json'
+      mime_type :properties, 'text/plain'
     end
 
     set :root, File.join(File.dirname(__FILE__), 'server')
@@ -92,17 +93,36 @@ module Rumx
         partial :attribute_value_tag, :locals => {:attribute => attribute, :param_name => param_name, :value => value}
       end
 
-      def name_value_hash(attribute_value_hash)
-        hash = {}
-        attribute_value_hash.each do |attribute, value|
-          if attribute.kind_of?(Rumx::Attribute)
-            hash[attribute.name] = value
-          elsif attribute.kind_of?(String)
-            # It's an embedded bean, attribute is actually the bean name and value is the hash of Attribute/values
-            hash[attribute] = name_value_hash(value)
+      # Brain-dead hyperic doesn't know about json?
+      def to_properties(val, prefix=nil)
+        str = ''
+        new_prefix = (prefix + '.') if prefix
+        new_prefix = new_prefix || ''
+        if val.kind_of?(Hash)
+          val.each do |key, value|
+            str += to_properties(value, new_prefix + key.to_s)
           end
+        elsif val.kind_of?(Array)
+          val.each_with_index do |value, i|
+            str += to_properties(value, new_prefix + i.to_s)
+          end
+        else
+          str += "#{prefix}=#{val}\n"
         end
-        hash
+        return str
+      end
+    end
+
+    def handle_attributes(attribute_hash, format)
+      case format
+        when 'json'
+          content_type :json
+          attribute_hash.to_json
+        when 'properties'
+          content_type :properties
+          to_properties(attribute_hash)
+        else
+          404
       end
     end
 
@@ -115,8 +135,8 @@ module Rumx
       bean = Bean.find(path.split('/'))
       return 404 unless bean
       # For get we read, then write.  post is the other way around.
-      if params[:format] == 'json'
-        bean.bean_get_and_set_attributes(params).to_json
+      if params[:format]
+        handle_attributes(bean.bean_get_and_set_attributes(params), params[:format])
       else
         haml_for_ajax :content_attributes, :locals => {:get_set_method => :bean_get_and_set_attributes, :params => params, :path => path, :bean => bean}
       end
@@ -128,8 +148,8 @@ module Rumx
       return 404 unless bean
       #puts "params=#{params.inspect}"
       # For post we write, then read.  get is the other way around.
-      if params[:format] == 'json'
-        bean.bean_set_and_get_attributes(params).to_json
+      if params[:format]
+        handle_attributes(bean.bean_set_and_get_attributes(params), params[:format])
       else
         haml_for_ajax :content_attributes, :locals => {:get_set_method => :bean_set_and_get_attributes, :params => params, :path => path, :bean => bean}
       end

metadata

@@ -2,7 +2,7 @@
 name: rumx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
   - Brad Pardee
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 Z
+date: 2011-12-14 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: sinatra