ratom 0.6.6 → 0.6.7

data/History.txt

@@ -1,3 +1,11 @@
+== 0.6.7
+
+* Handle dashes in extension names.
+
+== 0.6.6
+
+* Added support for absoluting relative uris using xml:base. [Greg Campbell]
+
 == 0.6.5
 
 * Fixed missing version.rb, now loads version.yml. [Greg Campbell]

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 6
+:patch: 7
 :major: 0
 :build: 
 :minor: 6

data/lib/atom/xml/parser.rb

@@ -29,6 +29,10 @@ unless defined?(ActiveSupport)
 end
 
 module Atom
+  def self.to_attrname(element_name)
+    element_name.to_s.sub(/:/, '_').gsub('-', '_').to_sym
+  end
+  
   class LoadError < StandardError
     attr_reader :response
     def initialize(response)
@@ -117,7 +121,7 @@ module Atom
       end
 
       def accessor_name(name)
-        name.to_s.sub(/:/, '_').to_sym
+        Atom.to_attrname(name)
       end
   
       def Parseable.included(o)
@@ -233,7 +237,7 @@ module Atom
           options.merge!(names.pop) if names.last.is_a?(Hash) 
         
           names.each do |name|
-            attr_accessor name.to_s.sub(/:/, '_').to_sym
+            attr_accessor Atom.to_attrname(name)
             ns, local_name = name.to_s[/(.*):(.*)/,1], $2 || name
             self.known_namespaces << self.extensions_namespaces[ns] if ns
             self.ordered_element_specs << self.element_specs[local_name.to_s] = ParseSpec.new(name, options)
@@ -245,7 +249,7 @@ module Atom
           options.merge!(names.pop) if names.last.is_a?(Hash)
         
           names.each do |name|
-            name_sym = name.to_s.sub(/:/, '_').to_sym
+            name_sym = Atom.to_attrname(name)
             attr_writer name_sym
             define_method name_sym do 
               ivar = :"@#{name_sym}"
@@ -349,7 +353,7 @@ module Atom
       
         def initialize(name, options = {})
           @name = name.to_s
-          @attribute = name.to_s.sub(/:/, '_')
+          @attribute = Atom.to_attrname(name)
           @options = options
         end
       

data/spec/atom_spec.rb

@@ -1066,6 +1066,10 @@ describe Atom do
         @feed['http://example.org/example', 'title'].should == ['Extension Title']
       end
       
+      it "should find simple extension with dashes in the name" do
+        @entry["http://example.org/example", 'simple-with-dash'].should == ['Simple with dash Value']
+      end
+      
       it_should_behave_like 'simple_single_entry.atom attributes'
       
       it "should load simple extension 3 xml for entry" do
@@ -1082,7 +1086,8 @@ describe Atom do
         it "should return namespace elements as a hash" do
           @example_elements.should == {
             'simple1' => ['Simple1 Entry Value'],
-            'simple2' => ['Simple2', 'Simple2a']
+            'simple2' => ['Simple2', 'Simple2a'],
+            'simple-with-dash' => ["Simple with dash Value"]
           }
 
           @example2_elements.should == {
@@ -1115,6 +1120,7 @@ describe Atom do
     before(:all) do
       Atom::Entry.add_extension_namespace :ns_alias, "http://custom.namespace"
       Atom::Entry.elements "ns_alias:property", :class => Atom::Extensions::Property
+      Atom::Entry.elements "ns_alias:property-with-dash", :class => Atom::Extensions::Property
       @entry = Atom::Entry.load_entry(File.open('spec/fixtures/entry_with_custom_extensions.atom'))
     end
     

data/spec/fixtures/entry_with_custom_extensions.atom

@@ -4,4 +4,5 @@
   <link rel='self' type='application/atom+xml' href='https://custom.namespace/id/1'/>
   <custom:property name='foo' value='bar'/>
   <custom:property name='baz' value='bat'/>
+	<custom:property-with-dash name="blag" value="blurgh" />
 </entry>

data/spec/fixtures/entry_with_simple_extensions.atom

@@ -22,6 +22,7 @@
     <ex:simple1>Simple1 Entry Value</ex:simple1>
     <ex:simple2>Simple2</ex:simple2>
     <ex:simple2>Simple2a</ex:simple2>
+		<ex:simple-with-dash>Simple with dash Value</ex:simple-with-dash>
     <ex2:simple1>Simple Entry Value (NS2)</ex2:simple1>
     <ex3:simple3><ContinuityOfCareRecord xmlns="urn:astm-org:CCR">Simple Entry Value (NS2)</ContinuityOfCareRecord></ex3:simple3>
     <category term="atom" scheme="http://example.org" label="Atom" ex:attribute="extension" />

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Peerworks