rumx 0.0.4 → 0.0.5

data/History.md

@@ -1,6 +1,11 @@
 Rumx Changelog
 =====================
 
+0.0.5
+
+ - Allow default values for operation arguments.
+ - Add json mime type.
+
 0.0.4
 
  - Fix bug where embedded beans and bean-lists of base classes weren't included.

data/examples/simple/my_bean.rb

@@ -10,9 +10,9 @@ class MyBean
   bean_reader        :readable_my_writer, :float,   'My secret access to the write-only attribute my_writer'
 
   bean_operation     :my_operation,       :string,  'My operation', [
-      [ :arg_int,    :integer, 'An int argument'   ],
-      [ :arg_float,  :float,   'A float argument'  ],
-      [ :arg_string, :string,  'A string argument' ]
+      [ :arg_int,    :integer, 'An int argument',   42                 ],
+      [ :arg_float,  :float,   'A float argument'                      ],    # No default value
+      [ :arg_string, :string,  'A string argument', 'My default value' ]
   ]
 
   def initialize

data/lib/rumx/argument.rb

@@ -1,11 +1,12 @@
 module Rumx
   class Argument
-    attr_reader :name, :type, :description
+    attr_reader :name, :type, :description, :default_value
 
-    def initialize(name, type_name, description)
-      @name        = name.to_sym
-      @type        = Type.find(type_name)
-      @description = description
+    def initialize(name, type_name, description, default_value=nil)
+      @name          = name.to_sym
+      @type          = Type.find(type_name)
+      @description   = description
+      @default_value = default_value
     end
   end
 end

data/lib/rumx/bean.rb

@@ -89,7 +89,7 @@ module Rumx
       #]
       def bean_operation(name, type, description, args)
         arguments = args.map do |arg|
-          raise 'Invalid bean_operation format' unless arg.kind_of?(Array) && arg.size == 3
+          raise 'Invalid bean_operation format' unless arg.kind_of?(Array) && (arg.size == 3 || arg.size == 4)
           Argument.new(*arg)
         end
         bean_operations_local << Operation.new(name, type, description, arguments)

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 => value }
+  %input{ :type => 'text', :name => param_name, :size => 30, :value => escape_html(value) }
 - else
-  %span= value
+  %span= escape_html(value)

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

@@ -24,7 +24,7 @@
       %tr
         %td Value:
         %td
-          %input{ :type => 'text', :name => arg.name, :size => 30 }
+          %input{ :type => 'text', :name => arg.name, :size => 30, :value => arg.default_value.to_s }
   %input{ :type => 'submit', :value => 'Execute' }
 
 %p#results

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

@@ -6,7 +6,7 @@
       %td Name
       %td Description
       %td Returns
-      %td{:colspan => 4} Arguments
+      %td{:colspan => 5} Arguments
     %tr
       %td  
       %td  
@@ -15,6 +15,7 @@
       %td Name
       %td Description
       %td Type
+      %td Default Value
   %tbody
     - bean.bean_each_operation do |operation, rel_path|
       %tr
@@ -34,3 +35,4 @@
           %td= arg.name
           %td= arg.description
           %td= arg.type
+          %td= arg.default_value

data/lib/rumx/server.rb

@@ -7,6 +7,7 @@ module Rumx
   class Server < Sinatra::Base
     configure do
       enable :logging
+      mime_type :json, 'application/json'
     end
 
     set :root, File.join(File.dirname(__FILE__), 'server')

metadata

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