xmlmapper 0.5.9 → 0.6.0

data/lib/{happymapper → xmlmapper}/anonymous_mapper.rb

@@ -1,4 +1,4 @@
-module HappyMapper
+module XmlMapper
   module AnonymousMapper
 
     def parse(xml_content)
@@ -7,13 +7,13 @@ module HappyMapper
       #   to handle which includes the text, xml document, node, fragment, etc.
       xml = Nokogiri::XML(xml_content)
 
-      happymapper_class = create_happymapper_class_with_element(xml.root)
+      xmlmapper_class = create_xmlmapper_class_with_element(xml.root)
 
       # With all the elements and attributes defined on the class it is time
-      # for the class to actually use the normal HappyMapper powers to parse
+      # for the class to actually use the normal XmlMapper powers to parse
       # the content. At this point this code is utilizing all of the existing
       # code implemented for parsing.
-      happymapper_class.parse(xml_content, :single => true)
+      xmlmapper_class.parse(xml_content, :single => true)
 
     end
 
@@ -38,48 +38,48 @@ module HappyMapper
     # going to match the content it will be able to parse so the tag
     # value is set to the one provided.
     #
-    def create_happymapper_class_with_tag(tag_name)
-      happymapper_class = Class.new
-      happymapper_class.class_eval do
-        include HappyMapper
+    def create_xmlmapper_class_with_tag(tag_name)
+      xmlmapper_class = Class.new
+      xmlmapper_class.class_eval do
+        include XmlMapper
         tag tag_name
       end
-      happymapper_class
+      xmlmapper_class
     end
 
     #
-    # Used internally to create and define the necessary happymapper
+    # Used internally to create and define the necessary xmlmapper
     # elements.
     #
-    def create_happymapper_class_with_element(element)
-      happymapper_class = create_happymapper_class_with_tag(element.name)
+    def create_xmlmapper_class_with_element(element)
+      xmlmapper_class = create_xmlmapper_class_with_tag(element.name)
 
-      happymapper_class.namespace element.namespace.prefix if element.namespace
+      xmlmapper_class.namespace element.namespace.prefix if element.namespace
 
       element.namespaces.each do |prefix,namespace|
-        happymapper_class.register_namespace prefix, namespace
+        xmlmapper_class.register_namespace prefix, namespace
       end
 
       element.attributes.each do |name,attribute|
-        define_attribute_on_class(happymapper_class,attribute)
+        define_attribute_on_class(xmlmapper_class,attribute)
       end
 
       element.children.each do |element|
-        define_element_on_class(happymapper_class,element)
+        define_element_on_class(xmlmapper_class,element)
       end
 
-      happymapper_class
+      xmlmapper_class
     end
 
 
     #
-    # Define a HappyMapper element on the provided class based on
+    # Define a XmlMapper element on the provided class based on
     # the element provided.
     #
     def define_element_on_class(class_instance,element)
 
       # When a text element has been provided create the necessary
-      # HappyMapper content attribute if the text happens to content
+      # XmlMapper content attribute if the text happens to content
       # some content.
 
       if element.text? and element.content.strip != ""
@@ -87,11 +87,11 @@ module HappyMapper
       end
 
       # When the element has children elements, that are not text
-      # elements, then we want to recursively define a new HappyMapper
+      # elements, then we want to recursively define a new XmlMapper
       # class that will have elements and attributes.
 
       element_type = if !element.elements.reject {|e| e.text? }.empty? or !element.attributes.empty?
-        create_happymapper_class_with_element(element)
+        create_xmlmapper_class_with_element(element)
       else
         String
       end
@@ -102,7 +102,7 @@ module HappyMapper
     end
 
     #
-    # Define a HappyMapper attribute on the provided class based on
+    # Define a XmlMapper attribute on the provided class based on
     # the attribute provided.
     #
     def define_attribute_on_class(class_instance,attribute)
@@ -111,4 +111,4 @@ module HappyMapper
 
   end
 
-end
+end

data/lib/{happymapper → xmlmapper}/attribute.rb

@@ -1,4 +1,4 @@
-module HappyMapper
+module XmlMapper
   class Attribute < Item
     attr_accessor :default
 

data/lib/{happymapper → xmlmapper}/element.rb

@@ -1,4 +1,4 @@
-module HappyMapper
+module XmlMapper
   class Element < Item
 
     def find(node, namespace, xpath_options)

data/lib/{happymapper → xmlmapper}/item.rb

@@ -1,4 +1,4 @@
-module HappyMapper
+module XmlMapper
   class Item
     attr_accessor :name, :type, :tag, :options, :namespace
 

data/lib/{happymapper → xmlmapper}/supported_types.rb

@@ -1,4 +1,4 @@
-module HappyMapper
+module XmlMapper
   module SupportedTypes
     extend self
 
@@ -41,7 +41,7 @@ module HappyMapper
     #
     # @example Registering a DateTime parser
     #
-    #     HappyMapper::SupportedTypes.register_type DateTime do |value|
+    #     XmlMapper::SupportedTypes.register_type DateTime do |value|
     #       DateTime.parse(value,to_s)
     #     end
     #

data/lib/{happymapper → xmlmapper}/text_node.rb

@@ -1,4 +1,4 @@
-module HappyMapper
+module XmlMapper
   class TextNode < Item
 
     def find(node, namespace, xpath_options)

data/lib/xmlmapper/version.rb

@@ -0,0 +1,3 @@
+module XmlMapper
+  VERSION = "0.6.0"
+end

data/spec/attribute_default_value_spec.rb

@@ -5,7 +5,7 @@ describe "Attribute Default Value" do
   context "when given a default value" do
 
     class Meal
-      include HappyMapper
+      include XmlMapper
       tag 'meal'
       attribute :type, String, :default => 'omnivore'
     end

data/spec/attributes_spec.rb

@@ -10,7 +10,7 @@ describe "Attribute Method Conversion" do
 
   module AttributeMethodConversion
     class Document
-      include HappyMapper
+      include XmlMapper
 
       has_many :link, String, :attributes => { :'data-src' => String, :type => String, :href => String }
 
@@ -33,4 +33,4 @@ describe "Attribute Method Conversion" do
     expect(document.link.first.type).to eq "recipe"
   end
 
-end
+end

data/spec/fixtures/unformatted_address.xml

@@ -0,0 +1 @@
+<address><street>Milchstrasse</street><housenumber>23</housenumber></address>

data/spec/has_many_empty_array_spec.rb

@@ -2,11 +2,11 @@ require "spec_helper"
 
 module Sheep
   class Item
-    include HappyMapper
+    include XmlMapper
   end
 
   class Navigator
-    include HappyMapper
+    include XmlMapper
     tag 'navigator'
 
     # This is purposefully set to have the name 'items' with the tag 'item'.

data/spec/ignay_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class CatalogTree
-  include HappyMapper
+  include XmlMapper
 
   tag 'CatalogTree'
   register_namespace 'xmlns', 'urn:eventis:prodis:onlineapi:1.0'
@@ -16,7 +16,7 @@ end
 
 
 class CatalogNode
-  include HappyMapper
+  include XmlMapper
 
   tag 'Node'
 
@@ -28,7 +28,7 @@ class CatalogNode
   has_many :translations, 'CatalogNode::Translations', :tag => 'Translation', :xpath => 'child::*'
 
   class Translations
-    include HappyMapper
+    include XmlMapper
     tag 'Translation'
 
     attribute :language, String, :tag => 'Language'
@@ -40,7 +40,7 @@ class CatalogNode
 
 end
 
-describe HappyMapper do
+describe XmlMapper do
 
   it "should not be nil" do
     catalog_tree.should_not be_nil
@@ -92,4 +92,4 @@ describe HappyMapper do
     xml_reference = "#{File.dirname(__FILE__)}/fixtures/inagy.xml"
     @catalog_tree = CatalogTree.parse(File.read(xml_reference), :single => true)
   end
-end
+end

data/spec/inheritance_spec.rb

@@ -3,24 +3,24 @@ require 'spec_helper'
 describe "Using inheritance to share elements and attributes" do
 
   class Genetics
-    include HappyMapper
+    include XmlMapper
     content :dna, String
   end
 
   class Parent
-    include HappyMapper
+    include XmlMapper
     attribute :love, Integer
     element :genetics, Genetics
   end
 
   class Child < Parent
-    include HappyMapper
+    include XmlMapper
     attribute :naivety, String
     has_many :immunities, String
   end
 
   class Overwrite < Parent
-    include HappyMapper
+    include XmlMapper
 
     attribute :love, String
     element :genetics, Integer
@@ -76,7 +76,7 @@ describe "Using inheritance to share elements and attributes" do
         expect(subject.love).to eq 99
         expect(subject.genetics.dna).to eq "ABBA"
         expect(subject.naivety).to eq "trusting"
-        expect(subject.immunities).to have(1).item
+        expect(subject.immunities.size).to eq(1)
       end
     end
 
@@ -99,7 +99,7 @@ describe "Using inheritance to share elements and attributes" do
 
       it "saves both the Child and Parent elements" do
         expect(subject.xpath("genetics").text).to eq "GATTACA"
-        expect(subject.xpath("immunities")).to have(3).items
+        expect(subject.xpath("immunities").size).to eq 3
       end
     end
 

data/spec/mixed_namespaces_spec.rb

@@ -21,7 +21,7 @@ describe "A document with mixed namespaces" do
 
   module MixedNamespaces
     class Address
-      include HappyMapper
+      include XmlMapper
 
       namespace :prefix
       tag :address
@@ -58,4 +58,4 @@ describe "A document with mixed namespaces" do
     expect(address.city).to eq "Oldenburg"
   end
 
-end
+end

data/spec/parse_with_object_to_update_spec.rb

@@ -52,20 +52,20 @@ describe "Updating existing objects with .parse and #parse" do
 
   module ParseInstanceSpec
     class SubItem
-      include HappyMapper
+      include XmlMapper
       tag 'subitem'
       attribute :attr1, String
       element :name, String
     end
     class Item
-      include HappyMapper
+      include XmlMapper
       tag 'item'
       attribute :attr1, String
       element :description, String
       has_many :sub_items, SubItem
     end
     class Root
-      include HappyMapper
+      include XmlMapper
       tag 'root'
       attribute :attr1, String
       has_many :items, Item
@@ -108,4 +108,4 @@ describe "Updating existing objects with .parse and #parse" do
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rspec'
 
-require 'happymapper'
+require 'xmlmapper'
 
 def fixture_file(filename)
   File.read(File.dirname(__FILE__) + "/fixtures/#{filename}")

data/spec/to_xml_spec.rb

@@ -4,7 +4,7 @@ describe "Saving #to_xml" do
 
   module ToXML
     class Address
-      include HappyMapper
+      include XmlMapper
 
       tag 'address'
 
@@ -72,7 +72,7 @@ describe "Saving #to_xml" do
     # value.
     #
     class Country
-      include HappyMapper
+      include XmlMapper
 
       attribute :code, String, :tag => 'countryCode'
       has_one :name, String, :tag => 'countryName'
@@ -83,7 +83,7 @@ describe "Saving #to_xml" do
       # and optional attributes
       #
       class Description
-        include HappyMapper
+        include XmlMapper
         content :description, String
         attribute :category, String, :tag => 'category'
         attribute :rating, String, :tag => 'rating', :state_when_nil => true
@@ -184,7 +184,7 @@ describe "Saving #to_xml" do
     end
   end
 
-  context "when an element type is a HappyMapper subclass" do
+  context "when an element type is a XmlMapper subclass" do
     it "saves attributes" do
       expect(subject.xpath('country/@countryCode').text).to eq "us"
     end
@@ -197,4 +197,4 @@ describe "Saving #to_xml" do
       expect(subject.xpath('country/description').text).to eq "A lovely country"
     end
   end
-end
+end

data/spec/to_xml_with_namespaces_spec.rb

@@ -6,7 +6,7 @@ module ToXMLWithNamespaces
   # Similar example as the to_xml but this time with namespacing
   #
   class Address
-    include HappyMapper
+    include XmlMapper
 
     register_namespace 'address', 'http://www.company.com/address'
     register_namespace 'country', 'http://www.company.com/country'
@@ -70,7 +70,7 @@ module ToXMLWithNamespaces
   # value.
   #
   class Country
-    include HappyMapper
+    include XmlMapper
 
     register_namespace 'countryName', 'http://www.company.com/countryName'
 
@@ -91,7 +91,7 @@ module ToXMLWithNamespaces
   #xmlns="urn:eventis:prodis:onlineapi:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   #
   class Recipe
-    include HappyMapper
+    include XmlMapper
 
     # this is the default namespace of the document
     register_namespace 'xmlns', 'urn:eventis:prodis:onlineapi:1.0'
@@ -176,7 +176,7 @@ describe "Saving #to_xml", "with xml namespaces" do
       end
     end
 
-    context "when an element type is a HappyMapper subclass" do
+    context "when an element type is a XmlMapper subclass" do
       it "saves attributes" do
         expect(subject.xpath('country:country/@countryCode').text).to eq "us"
       end
@@ -207,14 +207,14 @@ describe "Saving #to_xml", "with xml namespaces" do
     end
 
     class Beverage
-      include HappyMapper
+      include XmlMapper
       namespace 'coffee'
 
       attribute :name, String
     end
 
     class CoffeeMachine
-      include HappyMapper
+      include XmlMapper
       register_namespace 'coffee', "http://coffee.org/Coffee/0.1"
       register_namespace 'beverage', "http://beverages.org/Beverage/0.1"
 

data/spec/wilcard_tag_name_spec.rb

@@ -16,7 +16,7 @@ describe "Wildcard Root Tag" do
   module GenericBase
     class Base
       include Comparable
-      include HappyMapper
+      include XmlMapper
 
       def initialize(params = {})
         @name = params[:name]
@@ -34,12 +34,12 @@ describe "Wildcard Root Tag" do
       end
     end
     class Sub
-      include HappyMapper
+      include XmlMapper
       tag 'subelement'
       has_one :jello, Base, :tag => 'jello'
     end
     class Root
-      include HappyMapper
+      include XmlMapper
       tag 'root'
       element :description, String
       has_many :blargs, Base, :tag => 'blarg', :xpath => '.'
@@ -60,9 +60,9 @@ describe "Wildcard Root Tag" do
     end
 
     it 'should filter on xpath appropriately' do
-      subject.blargs.should have(2).items
-      subject.jellos.should have(1).items
-      subject.subjellos.should have(1).items
+      expect(subject.blargs.size).to eq 2
+      expect(subject.jellos.size).to eq 1
+      expect(subject.subjellos.size).to eq 1
     end
 
     def base_with(name,href,other)
@@ -89,8 +89,8 @@ describe "Wildcard Root Tag" do
       validate_xpath("/root/jello[1]","jelloname","http://jello.com","")
     end
 
-    it "should properly respect child HappyMapper tags if tag isn't provided on the element defintion" do
-      xml.xpath('root/subelement').should have(1).item
+    it "should properly respect child XmlMapper tags if tag isn't provided on the element defintion" do
+      expect(xml.xpath('root/subelement').size).to eq 1
     end
   end
 end