rumx 0.0.8 → 0.1.0

data/lib/rumx/server/views/attribute_value_tag.haml

@@ -1,4 +1,4 @@
-- if attribute.allow_write
-  %input{ :type => 'text', :name => param_name, :size => 30, :value => escape_html(value) }
+- if attribute_info.attribute.allow_write
+  %input{ :type => 'text', :name => param_name(attribute_info.ancestry), :size => 30, :value => attribute_info.value }
 - else
-  %span= escape_html(value)
+  %span= escape_html(attribute_info.value)

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

@@ -11,15 +11,15 @@
         %td Type
         %td Value
     %tbody
-      - bean.send(get_set_method, params) do |attribute, value, rel_path, param_name|
+      - bean.send(get_set_method, params) do |attribute_info|
+        - attribute = attribute_info.attribute
         %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= rel_path(attribute_info.ancestry)
           %td= attribute.description
           %td= attribute.allow_read
           %td= attribute.allow_write
           %td= attribute.type.to_s
-          %td= attribute_value_tag(attribute, param_name, value)
+          %td= attribute_value_tag(attribute_info)
   %input{ :type => 'submit', :value => 'Update' }
 
 :javascript

data/lib/rumx/server/views/content_operations.haml

@@ -17,9 +17,9 @@
       %td Type
       %td Default Value
   %tbody
-    - bean.bean_each_operation do |operation, rel_path|
+    - bean.bean_each_operation do |operation|
       %tr
-        %td= link_to_operation(path, rel_path)
+        %td= link_to_operation(path, operation)
         %td= operation.description
         %td= operation.type.to_s
         %td  

data/lib/rumx/server/views/tree_bean_attributes.haml

@@ -1,6 +1,2 @@
 %li.tree-bean-attributes
   = link_to_attributes(path)
-  %ul
-    - bean.bean_get_attributes do |attribute, value, rel_path, param_name|
-      %li
-        = link_to_attribute(path, rel_path)

data/lib/rumx/server/views/tree_bean_operations.haml

@@ -1,6 +1,6 @@
 %li.tree-bean-operations
   = link_to_operations(path)
   %ul
-    - bean.bean_each_operation do |operation, rel_path|
+    - bean.bean_each_operation do |operation|
       %li
-        = link_to_operation(path, rel_path)
+        = link_to_operation(path, operation)

data/lib/rumx/type.rb

@@ -8,12 +8,17 @@ module Rumx
       type
     end
 
-    def initialize(name, string_to_value_proc, value_to_string_proc=lambda{|v| v.to_s})
-      @name = name
+    def initialize(name, attribute_class, string_to_value_proc, value_to_string_proc=lambda{|v| v.to_s})
+      @name                 = name
+      @attribute_class      = attribute_class
       @string_to_value_proc = string_to_value_proc
       @value_to_string_proc = value_to_string_proc
     end
 
+    def create_attribute(name, description, allow_read, allow_write, options)
+      @attribute_class.new(name, self, description, allow_read, allow_write, options)
+    end
+
     def string_to_value(string)
       @string_to_value_proc.call(string)
     end
@@ -23,11 +28,14 @@ module Rumx
     end
 
     @@allowed_types = {
-        :integer => new(:integer, lambda {|s| s.to_i}),
-        :float   => new(:float,   lambda {|s| s.to_f}),
-        :string  => new(:string,  lambda {|s| s.to_s}),
-        :boolean => new(:boolean, lambda {|s| s.to_s == 'true'}),
-        :void    => new(:void,    lambda {|s| nil}, lambda {|v| ''})
+        :integer => new(:integer, Attribute,     lambda {|s| s.to_i}),
+        :float   => new(:float,   Attribute,     lambda {|s| s.to_f}),
+        :string  => new(:string,  Attribute,     lambda {|s| s.to_s}),
+        :symbol  => new(:symbol,  Attribute,     lambda {|s| s.to_sym}),
+        :boolean => new(:boolean, Attribute,     lambda {|s| s.to_s == 'true'}),
+        :list    => new(:list,    ListAttribute, nil),
+        :hash    => new(:hash,    HashAttribute, nil),
+        :void    => new(:void,    nil,           lambda {|s| nil}, lambda {|v| ''})
     }
 
     # We've created all the instances we need

metadata

@@ -2,7 +2,7 @@
 name: rumx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
   - Brad Pardee
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 Z
+date: 2011-12-21 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: sinatra
@@ -55,6 +55,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+  - examples/bean_hash/config.ru
+  - examples/bean_hash/my_bean.rb
+  - examples/bean_hash/README
   - examples/bean_list/config.ru
   - examples/bean_list/my_bean.rb
   - examples/bean_list/README
@@ -62,28 +65,44 @@ files:
   - examples/embedded/my_bean.rb
   - examples/embedded/my_embedded_bean.rb
   - examples/embedded/README
+  - examples/hash/config.ru
+  - examples/hash/my_bean.rb
+  - examples/hash/README
   - examples/list/config.ru
   - examples/list/my_bean.rb
   - examples/list/README
+  - examples/monitor_script/README
+  - examples/monitor_script/rumx_attributes
   - examples/simple/config.ru
   - examples/simple/my_bean.rb
+  - examples/simple/my_other_bean.rb
   - examples/simple/README
   - examples/timer/config.ru
   - examples/timer/my_bean.rb
   - examples/timer/README
+  - examples/timer_hash/config.ru
+  - examples/timer_hash/my_bean.rb
+  - examples/timer_hash/README
   - lib/rumx.rb
   - lib/rumx/argument.rb
   - lib/rumx/attribute.rb
+  - lib/rumx/attribute_info.rb
   - lib/rumx/bean.rb
   - lib/rumx/beans.rb
+  - lib/rumx/hash_attribute.rb
+  - lib/rumx/hash_bean.rb
+  - lib/rumx/list_attribute.rb
+  - lib/rumx/list_bean.rb
   - 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/hash.rb
   - lib/rumx/beans/message.rb
   - lib/rumx/beans/timer.rb
   - lib/rumx/beans/timer_and_error.rb
+  - lib/rumx/beans/timer_hash.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,7 +130,6 @@ files:
   - lib/rumx/server/public/themes/default-rtl/style.css
   - lib/rumx/server/public/themes/default-rtl/throbber.gif
   - 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

data/lib/rumx/server/views/content_attribute.haml

@@ -1,35 +0,0 @@
-%h3= path[1..-1]
-%h4 Attribute
-%table{}
-  %tr
-    %td  Name:
-    %td= attribute.name
-  %tr
-    %td  Description:
-    %td= attribute.description
-  %tr
-    %td  Allow Read:
-    %td= attribute.allow_read
-  %tr
-    %td  Allow Write:
-    %td= attribute.allow_write
-  %tr
-    %td  Type:
-    %td= attribute.type.to_s
-  %tr
-    %td  Value:
-    %td
-      - if attribute.allow_write
-        %form#form{ :method =>'POST'}
-          = attribute_value_tag(attribute, param_name, value)
-          %input{ :type => 'submit', :value => attribute.allow_read ? 'Update' : 'Set' }
-      - else
-        = value
-
-:javascript
-  $("#form").submit(function() {
-    $.post("#{attribute_path(path)}", $("#form").serialize(), function(result) {
-      $("#content").html(result);
-    });
-    return false;
-  });