xforms 0.0.2 → 0.0.3

data/lib/xforms/control.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module XForms
 
   class ::Object
@@ -20,6 +22,10 @@ module XForms
     def itext id
       form.itext[I18n.locale.to_s][id] || ''
     end
+
+    def now
+      Time.now.utc.iso8601
+    end
   end
 
   module Label
@@ -37,6 +43,7 @@ module XForms
     attr_accessor :constraint
     attr_accessor :constraint_message
     attr_accessor :relevant
+    attr_accessor :type
     include Label
 
     def initialize(form)
@@ -45,11 +52,18 @@ module XForms
     end
 
     def value=(value)
+      value = Integer(value).to_s if type == 'int'
       form.model_instance.xpath(binding).first.children = value
     end
 
     def value
-      form.model_instance.xpath(binding).first.inner_text
+      data = form.model_instance.xpath(binding).first.inner_text
+      return data unless type
+
+      case type
+      when 'int' then Integer(data)
+      else data
+      end
     end
 
     def readonly

data/lib/xforms/form.rb

@@ -4,10 +4,12 @@ module XForms
     attr_accessor :itext
     attr_accessor :controls
     attr_accessor :namespaces
+    attr_accessor :calculates
 
     def initialize
       @controls = []
       @namespaces = {}
+      @calculates = []
     end
 
     def self.parse_file(path)
@@ -19,5 +21,12 @@ module XForms
     def self.parse(input)
       FormParser.new(input).parse
     end
+
+    def recalculate
+      calculates.each do |calc|
+        value = calc[:value].dyn_value
+        model_instance.xpath(calc[:binding]).first.children = value.to_s
+      end
+    end
   end
 end

data/lib/xforms/form_parser.rb

@@ -16,6 +16,7 @@ module XForms
           parse_xforms_element
         end
       end
+      @form.recalculate
       @form
     end
 
@@ -47,8 +48,18 @@ module XForms
         :readonly => @reader.attribute('readonly'),
         :constraint => @reader.attribute('constraint'),
         :constraint_message => @reader.attribute("#{jr_prefix}:constraintMsg"),
-        :relevant => @reader.attribute('relevant')
+        :relevant => @reader.attribute('relevant'),
+        :type => parse_type(@reader.attribute('type'))
       }
+
+      if @reader.attribute('calculate')
+        @form.calculates << { :binding => @reader.attribute('nodeset'), :value => XPathRef.new(@form, @reader.attribute('calculate')) }
+      end
+    end
+
+    def parse_type type
+      return type if type.nil?
+      type.split(':').last
     end
 
     def jr_prefix
@@ -92,6 +103,7 @@ module XForms
         control.constraint = binding[:constraint]
         control.constraint_message = binding[:constraint_message]
         control.relevant = XPathRef.new(@form, binding[:relevant]) if binding[:relevant]
+        control.type = binding[:type]
       end
 
       read_descendants do

data/lib/xforms/version.rb

@@ -1,3 +1,3 @@
 module XForms
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/data/xform1.xml

@@ -1,17 +1,24 @@
 <?xml version='1.0' encoding='utf-8'?>
-<xform xmlns:xf="http://www.w3.org/2002/xforms" xmlns:x="http://tempuri.org/" xmlns:jr="http://openrosa.org/javarosa">
+<xform xmlns:xf="http://www.w3.org/2002/xforms" xmlns:x="http://tempuri.org/" xmlns:jr="http://openrosa.org/javarosa" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <xf:model>
     <xf:instance>
       <x:data>
         <x:foo>123</x:foo>
         <x:bar />
         <x:baz />
+        <x:calc1 />
+        <x:calc2 />
+        <x:calc3 />
       </x:data>
     </xf:instance>
 
     <xf:bind id="bind1" nodeset="x:data/x:baz" constraint=". &lt; 10" jr:constraintMsg="Error Message" />
     <xf:bind id="bind2" nodeset="x:data/x:foo" readonly="true()" />
     <xf:bind id="bind3" nodeset="x:data/x:bar" relevant="/x:data/x:foo = 321" />
+    <xf:bind id="bind4" nodeset="x:data/x:foo" type="xsd:int" />
+    <xf:bind id="calc1" nodeset="x:data/x:calc1" calculate="/x:data/x:foo * 2" />
+    <xf:bind id="calc2" nodeset="x:data/x:calc2" calculate="/x:data/x:foo" />
+    <xf:bind id="calc3" nodeset="x:data/x:calc3" calculate="now()" />
   </xf:model>
 
   <xf:input ref="x:data/x:foo">
@@ -49,4 +56,6 @@
 
   <xf:input bind="bind3" />
 
+  <xf:input bind="bind4" />
+
 </xform>

data/spec/form_spec.rb

@@ -100,4 +100,34 @@ describe "Form" do
     form.controls[0].should be_relevant
   end
 
+  it "input type int" do
+    form.controls[6].type.should == 'int'
+  end
+
+  it "get input value with int type" do
+    form.controls[6].value.should == 123
+  end
+
+  it "set input value with int type" do
+    form.controls[6].value = '01'
+    model.xpath('x:data/x:foo').inner_text.should == '1'
+  end
+
+  it "set int value to integer input" do
+    form.controls[6].value = 1
+    model.xpath('x:data/x:foo').inner_text.should == '1'
+  end
+
+  it "execute2 calc1 binding" do
+    model.xpath('x:data/x:calc1').inner_text.should == '246.0'
+  end
+
+  it "executes calc2 binding" do
+    model.xpath('x:data/x:calc2').inner_text.should == '123'
+  end
+
+  it "executes calc3 binding with now function" do
+    model.xpath('x:data/x:calc3').inner_text.should == Time.now.utc.iso8601
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xforms
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149596159160 !ruby/object:Gem::Requirement
+  requirement: &70324868262480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149596159160
+  version_requirements: *70324868262480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70149596158680 !ruby/object:Gem::Requirement
+  requirement: &70324868262040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149596158680
+  version_requirements: *70324868262040
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70149596158040 !ruby/object:Gem::Requirement
+  requirement: &70324868261600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149596158040
+  version_requirements: *70324868261600
 description: This gem can be used to parse and fill XForms 1.1
 email:
 - jwajnerman@manas.com.ar
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: xforms
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: XForms 1.1 implementation