oxmlk 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/examples/fs_cdr.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+require File.expand_path(File.dirname(__FILE__) + '/../spec/spec_helper')
+require 'sqlite3'
+require 'activerecord'
+
+DB_PATH = File.join(File.dirname(__FILE__), 'active_record.sqlite3')
+ActiveRecord::Base.establish_connection(
+  :adapter  => 'sqlite3',
+  :database => DB_PATH
+)
+
+class Cdr < ActiveRecord::Base
+  include OxMlk
+  
+  ox_tag :cdr
+  
+  ox_elem :hangup_cause, :in => 'variables'
+  ox_elem :start_stamp, :in => 'variables'
+  ox_elem :answer_stamp, :in => 'variables'
+  ox_elem :end_stamp, :in => 'variables'
+  ox_elem :caller_id, :in => 'variables'
+  ox_elem :duration, :in => 'variables'
+  ox_elem :billsec, :in => 'variables'
+end
+
+# do a quick pseudo migration.  This should only get executed on the first run
+unless Cdr.table_exists?
+  ActiveRecord::Base.connection.create_table(:cdrs) do |t|
+    t.string :hangup_cause
+    t.string :start_stamp
+    t.string :answer_stamp
+    t.string :end_stamp
+    t.string :caller_id
+    t.string :duration
+    t.string :billsec
+    t.timestamps
+  end
+end
+
+new_cdr = Cdr.from_xml(xml_for(:fs_cdr))
+
+new_cdr.save
+cdr = Cdr.find new_cdr.id
+
+puts cdr.hangup_cause, 
+  cdr.start_stamp, 
+  cdr.answer_stamp, 
+  cdr.end_stamp, 
+  cdr.caller_id, 
+  cdr.duration, 
+  cdr.billsec, 
+  '', 
+  cdr.to_xml

data/examples/xml/fs_cdr.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<cdr>
+  <variables>
+    
+    <!-- extra xml tags 'n such i don't need -->
+    
+    <hangup_cause>NORMAL_CLEARING</hangup_cause>
+    <start_stamp>2008-07-31 2011</start_stamp>
+    <answer_stamp>2008-07-31 2011</answer_stamp>
+    <end_stamp>2008-07-31 2011</end_stamp>
+    
+    <caller_id>Mikey</caller_id>
+    <duration>39</duration>
+    <billsec>36</billsec>
+    
+    <!-- extra xml tags 'n such i don't need -->
+    
+  </variables>
+</cdr>
+
+<!-- 
+     these are the exact tag names and such i will recieve from Mod_xml_cdr,
+     there's ALOT more, but these are the only ones i need. 
+     From the xml_cdr wiki: 'Date/time stamp variables are URI encoded
+     so be sure to "URI decode" them prior to inserting them into a database.' 
+-->

data/lib/oxmlk.rb

@@ -25,7 +25,6 @@ private
   end
   
   module InstanceMethods
-    
     # Returns a LibXML::XML::Node representing this object
     def to_xml
       self.class.to_xml(self)
@@ -124,7 +123,7 @@ private
     def ox_attr(name,o={},&block)
       new_attr =  Attr.new(name, o.reverse_merge(:tag_proc => @tag_proc),&block)
       @ox_attrs << new_attr
-      attr_accessor new_attr.accessor
+      ox_accessor new_attr.accessor
     end
     
     # Declares a reference to a certain xml element or a typed collection of elements.
@@ -197,7 +196,7 @@ private
     # The array will include all elements already manipulated by anything passed to
     # the :as option. If the :as option is an Array and no block is passed then the 
     # Array is returned unmodified. If the :as option is nil or is not an Array then 
-    # only the first element is returned.
+    # only the first element is 
     #
     # == Options
     # === :as
@@ -336,7 +335,7 @@ private
     def ox_elem(name,o={},&block)
       new_elem =  Elem.new(name, o.reverse_merge(:tag_proc => @tag_proc),&block)
       @ox_elems << new_elem
-      attr_accessor new_elem.accessor
+      ox_accessor new_elem.accessor
     end
     
     # Sets the name of the XML element that represents this class. Use this
@@ -407,9 +406,21 @@ private
       xml = XML::Node.from(data)
       raise 'invalid XML' unless xml.name == ox_tag
       
-      ox = new
-      (ox_attrs + ox_elems).each {|e| ox.send(e.setter,e.from_xml(xml))}
-      ox
+      returning new do |ox|
+        (ox_attrs + ox_elems).each {|e| ox.send(e.setter,e.from_xml(xml))}
+        ox.send(:after_parse) if ox.respond_to?(:after_parse)
+      end
+    end
+    
+    def ox_accessor(sym)
+      define_method(sym) do
+        @attributes ||= {}
+        @attributes[sym.to_s]
+      end
+      define_method("#{sym}=") do |val|
+        @attributes ||= {}
+        @attributes[sym.to_s] = val
+      end
     end
     
     # Returns XML generated from an instance based on Attr & Elem definitions.
@@ -417,13 +428,24 @@ private
     # @return [XML::Node] Generated XML::Node  
     def to_xml(data)
       ox = XML::Node.new(ox_tag)
+      wrappers = {}
+      
       ox_elems.each do |elem|
-        elem.to_xml(data).each{|e| ox << e}
+        if elem.in
+          wrappers[elem.in] ||= XML::Node.new elem.in
+          elem.to_xml(data).each {|e| wrappers[elem.in] << e}
+        else
+          elem.to_xml(data).each {|e| ox << e}
+        end
       end
+      
+      wrappers.each {|k,v| ox << v}
+      
       ox_attrs.each do |a| 
         val = data.send(a.accessor).to_s
         ox[a.tag]= val if val.present?
       end
+      
       ox
     end
   end

data/lib/oxmlk/attr.rb

@@ -1,7 +1,7 @@
 module OxMlk
   class Attr
     
-    attr_reader :accessor, :setter,:from, :as, :procs, :tag_proc, :tag
+    attr_reader :accessor, :setter, :from, :as, :procs, :tag_proc, :tag
     
     # Named Procs for use in :as option.
     PROCS = (Hash.new {|h,k| k.to_proc rescue nil}).merge(
@@ -44,13 +44,13 @@ module OxMlk
       @procs = ([*as].map {|k| PROCS[k]} + [block]).compact
     end
     
-  private
-    
     # Finds @tag in data and applies procs.
     def from_xml(data)
       procs.inject(XML::Node.from(data)[tag]) {|d,p| p.call(d) rescue d}
     end
     
+  private
+    
     # Converts a value to a Boolean.
     # @param [Symbol,String,Integer] value Value to convert
     # @return [Boolean] Returns true if value is 'true', 'yes', 't' or 1.

data/lib/oxmlk/elem.rb

@@ -24,7 +24,7 @@ module OxMlk
       @from = o[:from]
       @as = [*o[:as]].compact
       @as = [:bool] if as.empty? && name.to_s.end_with?('?')
-      @in = o[:in]
+      @in = o[:in].to_s
       
       @procs = as.map {|k| PROCS[k]}
       @procs = [PROCS[:value]] + procs unless [:raw,:name,:value].include?(as.first) || ox?
@@ -63,8 +63,7 @@ module OxMlk
           XML::Node.new(tag, node.to_s)
         end
       end
-      return [] if nodes.empty?
-      @in ? [nodes.inject(XML::Node.new(@in)) {|o,n| o << n}] : nodes
+      nodes.empty? ? [] : nodes
     end
     
     def xpath

data/oxmlk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oxmlk}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Robinson"]
-  s.date = %q{2009-09-08}
+  s.date = %q{2009-09-10}
   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 = [
@@ -24,11 +24,13 @@ Gem::Specification.new do |s|
      "VERSION",
      "examples/amazon.rb",
      "examples/example.rb",
+     "examples/fs_cdr.rb",
      "examples/phrk.rb",
      "examples/posts.rb",
      "examples/twitter.rb",
      "examples/xml/amazon.xml",
      "examples/xml/example.xml",
+     "examples/xml/fs_cdr.xml",
      "examples/xml/phrk.xml",
      "examples/xml/posts.xml",
      "examples/xml/twitter.xml",
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
      "spec/xml_spec.rb",
      "examples/amazon.rb",
      "examples/example.rb",
+     "examples/fs_cdr.rb",
      "examples/phrk.rb",
      "examples/posts.rb",
      "examples/twitter.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oxmlk
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - Josh Robinson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -06:00
+date: 2009-09-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,11 +59,13 @@ files:
 - VERSION
 - examples/amazon.rb
 - examples/example.rb
+- examples/fs_cdr.rb
 - examples/phrk.rb
 - examples/posts.rb
 - examples/twitter.rb
 - examples/xml/amazon.xml
 - examples/xml/example.xml
+- examples/xml/fs_cdr.xml
 - examples/xml/phrk.xml
 - examples/xml/posts.xml
 - examples/xml/twitter.xml
@@ -115,6 +117,7 @@ test_files:
 - spec/xml_spec.rb
 - examples/amazon.rb
 - examples/example.rb
+- examples/fs_cdr.rb
 - examples/phrk.rb
 - examples/posts.rb
 - examples/twitter.rb