oxmlk 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/examples/example.rb

@@ -25,6 +25,7 @@ class Person
   ox_attr :alternate, :from => 'alt'
   
   ox_elem :name
+  ox_elem :lame?
   ox_elem :contacts, :as => [Number,Email]
   ox_elem :friends, :as => [Person], :in => :friends
   

data/examples/xml/example.xml

@@ -1,6 +1,6 @@
 <person category="meat_popsicle" alt="human">
   <name>Joe</name>
-	<lame>false</lame>
+  <lame>false</lame>
   <number group="main">3035551212</number>
   <number group="cell">3035551234</number>
   <email group="home">test@example.com</email>

data/examples/xml/phrk.xml

@@ -0,0 +1,32 @@
+<Response>
+  <Play loop="2">http://foo.com/cowbell.mp3</Play>
+  <Say voice="man" loop="4" language="en">Josh</Say>
+  <Gather action="/digit.php" method="GET" timeout="10" finishOnKey="4" numDigits="3">
+    <Say>Robinson</Say>
+    <Play>http://foo.com/cowbell.mp3</Play>
+  </Gather>
+  <Record action="http://foo.edu/handleRecording.php" method="GET" maxLength="20" finishOnKey="123*"/>
+  <Say voice="man" loop="4" language="en">Josh</Say>
+  <Redirect>http://www.foo.com/nextInstructions</Redirect>
+  <Pause length="10"/>
+  <Hangup/>
+  <Dial callerid="1234567">
+    <Number sendDigits="ww3">344444</Number>
+  </Dial>
+ 
+  
+  <Rule name="open" mode="all">
+    <Conditions>  
+      <Schedule mode="all" tz_offset="-7" time="08:00-17:00" year="2009-2020" month="jan-dec" day_of_week="mon-fri" day_of_month="10-20"/>
+      <Tags mode="all" include="monkey" exclude="tacobell"/>
+    </Conditions>
+    
+    <Match>
+      <Tag>open</Tag>
+    </Match>
+    
+    <NoMatch>
+      <Tag>closed</Tag>
+    </NoMatch>
+  </Rule>
+</Response>

data/lib/oxmlk/attr.rb

@@ -7,15 +7,16 @@ module OxMlk
       Symbol => :to_sym.to_proc,
       :bool => proc {|a| fetch_bool(a)})
     
-    attr_reader :accessor, :setter,:from, :as, :procs, :tag
+    attr_reader :accessor, :setter,:from, :as, :procs, :tag_proc, :tag
     
     def initialize(name,o={},&block)
       name = name.to_s
       @accessor = name.chomp('?').intern
       @setter = "#{@accessor}=".intern
-      @from = o.delete(:from)
-      @tag = (from || accessor).to_s
-      @as = o.delete(:as) || (:bool if name.ends_with?('?'))
+      @from = o[:from]
+      @tag_proc = o[:tag_proc].to_proc rescue proc {|x| x}
+      @tag = (from || (@tag_proc.call(accessor.to_s) rescue accessor)).to_s
+      @as = o[:as] || (:bool if name.ends_with?('?'))
       @procs = ([*as].map {|k| PROCS[k]} + [block]).compact
     end
     

data/lib/oxmlk/elem.rb

@@ -11,11 +11,13 @@ module OxMlk
       :value => proc {|e| e.value},
       :bool => proc {|e| fetch_bool(e)})
     
-    attr_reader :accessor, :setter, :collection, :from, :as, :in, :procs, :block, :tag
+    attr_reader :accessor, :setter, :collection, :from, :as, :in, :procs, :block, :tag_proc, :tag
     
     def initialize(name,o={},&blk)
-      @tag = name.to_s.chomp('?')
-      @accessor = @tag.intern
+      @tag_proc = o[:tag_proc].to_proc rescue proc {|x| x}
+      @base_tag = name.to_s.chomp('?')
+      @tag = @tag_proc.call(@base_tag) rescue @base_tag
+      @accessor = @base_tag.intern
       @setter = "#{@accessor}=".intern
       @collection = o[:as].is_a?(Array)
       

data/lib/oxmlk.rb

@@ -27,22 +27,33 @@ module OxMlk
   end
   
   module ClassMethods
-    attr_accessor :ox_attrs, :ox_elems
+    attr_accessor :ox_attrs, :ox_elems, :tag_proc
     
     def ox_attr(name,o={})
-      new_attr =  Attr.new(name, o)
+      new_attr =  Attr.new(name, o.reverse_merge(:tag_proc => @tag_proc))
       @ox_attrs << new_attr
       attr_accessor new_attr.accessor
     end
     
     def ox_elem(name,o={})
-      new_elem =  Elem.new(name, o)
+      new_elem =  Elem.new(name, o.reverse_merge(:tag_proc => @tag_proc))
       @ox_elems << new_elem
       attr_accessor new_elem.accessor
     end
     
-    def ox_tag(tag=false)
-      @ox_tag ||= (tag || self).to_s.split('::').last
+    def ox_tag(tag=nil,&block)
+      raise 'you can only set tag or a block, not both.' if tag && block
+
+      @base_tag ||= self.to_s.split('::').last
+      @ox_tag ||= case tag
+      when String
+        tag
+      when Proc, Symbol, nil
+        @tag_proc = (block || tag || :to_s).to_proc
+        @tag_proc.call(@base_tag) rescue tag.to_s
+      else
+        raise 'you passed something weird'
+      end
     end
     
     def ox?
@@ -70,6 +81,9 @@ module OxMlk
       ox
     end
     
+    def xml_convention(converter=nil)
+      @xml_convention = converter
+    end
   end
   
 end

data/oxmlk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oxmlk}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Robinson"]
-  s.date = %q{2009-09-02}
+  s.date = %q{2009-09-03}
   s.description = %q{OxMlk gives you a simple way to map you ruby objects to XML and then convert one to the other.}
   s.email = %q{hexorx@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "examples/twitter.rb",
      "examples/xml/amazon.xml",
      "examples/xml/example.xml",
+     "examples/xml/phrk.xml",
      "examples/xml/posts.xml",
      "examples/xml/twitter.xml",
      "lib/oxmlk.rb",

data/spec/oxmlk/attr_spec.rb

@@ -48,6 +48,10 @@ describe OxMlk::Attr do
     it 'should default to name cleaned up' do
       ox_attr(:name).tag.should == 'name'
     end
+    
+    it 'should apply :tag_proc if set' do
+      ox_attr(:name, :tag_proc => :upcase.to_proc).tag.should == 'NAME'
+    end
   end
 end
 

data/spec/oxmlk/elem_spec.rb

@@ -124,6 +124,10 @@ describe OxMlk::Elem do
     it 'should add :in + / to all items in array of ox objects' do
       ox_elem(:name, :as => [OxKlass,OxKlass], :in => :friends).xpath.should == 'friends/name|friends/name'
     end
+    
+    it 'should be :tag_proc.call(name) if :tag_proc is set' do
+      ox_elem(:name, :tag_proc => :upcase).xpath.should == 'NAME'
+    end
   end
 end
 

data/spec/oxmlk_spec.rb

@@ -24,7 +24,7 @@ describe OxMlk::InstanceMethods do
     end
     
     it 'should set elements' do
-      @oxml.children.map(&:name).should == ['name','number','number','email','friends']
+      @oxml.children.map(&:name).should == ['name','lame','number','number','email','friends']
     end
     
     it 'should set content to text node' do
@@ -84,7 +84,6 @@ describe OxMlk::ClassMethods do
   end
     
   describe '#from_xml' do
-    
     it 'should return an instance of class' do
       @klass.from_xml('<person/>').should be_a(@klass)
     end
@@ -125,7 +124,7 @@ describe OxMlk::ClassMethods do
   
   describe '#ox_elems' do
     it 'should return a list of elements' do
-      @klass.ox_elems.size.should == 3
+      @klass.ox_elems.size.should == 4
     end
   end
   
@@ -137,6 +136,33 @@ describe OxMlk::ClassMethods do
     it 'should default to class name with module removed' do
       Test::Example.ox_tag.should == 'Example'
     end
+    
+    describe 'procs and blocs' do
+      before(:each) do
+        @klass = Class.new do
+          include OxMlk
+
+          def self.to_s
+            'ExampleTest'
+          end
+        end
+      end
+      
+      it 'should apply proc if set' do
+        @klass.ox_tag(proc {|x| x.upcase}).should == 'EXAMPLETEST'
+      end
+      
+      it 'should apply :sym.to_proc if set' do
+        @klass.ox_tag(:downcase).should == 'exampletest'
+      end
+      
+      it 'should apply block if passed' do
+        @klass.ox_tag do |x|
+          x.underscore
+        end
+        @klass.ox_tag.should == 'example_test'
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oxmlk
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Josh Robinson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -06:00
+date: 2009-09-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - examples/twitter.rb
 - examples/xml/amazon.xml
 - examples/xml/example.xml
+- examples/xml/phrk.xml
 - examples/xml/posts.xml
 - examples/xml/twitter.xml
 - lib/oxmlk.rb