ratom 0.6.4 → 0.6.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.5
+
+* Fixed missing version.rb, now loads version.yml. [Greg Campbell]
+
 == 0.6.4
 
 * Remove Hoe dependency and converted to a Jeweler based project build.

data/Rakefile

@@ -18,6 +18,7 @@ begin
   Jeweler::GemcutterTasks.new
   Jeweler::RubyforgeTasks.new do |rf|
     rf.doc_task = 'rdoc'
+    rf.remote_doc_path = ''
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"

data/VERSION.yml

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

data/lib/atom.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2008 The Kaphan Foundation
 #
-# For licensing information see LICENSE.txt.
+# For licensing information see LICENSE.
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #
@@ -85,7 +85,7 @@ module Atom # :nodoc:
     #
     # +xml+:: An XML::Reader object.
     #
-    def initialize(o = nil)
+    def initialize(o = {})
       case o
       when XML::Reader
         @name = o.read_string.strip
@@ -94,6 +94,8 @@ module Atom # :nodoc:
         o.each do |k, v|
           self.send("#{k.to_s}=", v)
         end
+      else
+        raise ArgumentError, "Got #{o.class} but expected a Hash or XML::Reader"
       end
       
       yield(self) if block_given?
@@ -116,7 +118,7 @@ module Atom # :nodoc:
     include SimpleExtensions
     attribute :label, :scheme, :term
     
-    def initialize(o = nil)
+    def initialize(o = {})
       case o
       when XML::Reader
         parse(o, :once => true)
@@ -124,6 +126,8 @@ module Atom # :nodoc:
         o.each do |k, v|
           self.send("#{k.to_s}=", v)
         end
+      else
+        raise ArgumentError, "Got #{o.class} but expected a Hash or XML::Reader"
       end
       
       yield(self) if block_given?
@@ -152,7 +156,11 @@ module Atom # :nodoc:
         o.each do |k, v|
           self.send("#{k.to_s}=", v)
         end
+      else
+        raise ArgumentError, "Got #{o.class} but expected a Hash or XML::Reader"
       end
+      
+      yield(self) if block_given?
     end
     
     def inspect
@@ -214,7 +222,9 @@ module Atom # :nodoc:
           @type = "text"
         when XML::Reader
           super(o.read_string)
-          parse(o, :once => true)  
+          parse(o, :once => true)
+        else
+          raise ArgumentError, "Got #{o} which isn't a String or XML::Reader"
         end        
       end
       
@@ -240,6 +250,8 @@ module Atom # :nodoc:
         when String
           super(o)
           @type = 'html'
+        else
+          raise ArgumentError, "Got #{o} which isn't a String or XML::Reader"
         end        
       end
       
@@ -290,7 +302,9 @@ module Atom # :nodoc:
           end
 
           # get back to the end of the element we were created with
-          while xml.read == 1 && xml.depth > starting_depth; end          
+          while xml.read == 1 && xml.depth > starting_depth; end
+        else
+          raise ArgumentError, "Got #{o} which isn't a String or XML::Reader" 
         end
       end
       
@@ -326,7 +340,7 @@ module Atom # :nodoc:
     elements :authors, :contributors, :class => Person
     elements :links
     
-    def initialize(o = nil)
+    def initialize(o = {})
       @authors, @contributors, @links = [], [], Links.new
 
       case o
@@ -341,6 +355,8 @@ module Atom # :nodoc:
         o.each do |k, v|
           self.send("#{k.to_s}=", v)
         end
+      else
+        raise ArgumentError, "Got #{o.class} but expected a Hash or XML::Reader"
       end
       
       yield(self) if block_given?   
@@ -431,6 +447,8 @@ module Atom # :nodoc:
         o.each do |k, v|
           self.send("#{k.to_s}=", v)
         end
+      else
+        raise ArgumentError, "Got #{o.class} but expected a Hash or XML::Reader"
       end
       
       yield(self) if block_given?
@@ -574,6 +592,8 @@ module Atom # :nodoc:
         o.each do |k,v|
           send("#{k.to_s}=", v)
         end
+      else
+        raise ArgumentError, "Got #{o.class} but expected a Hash or XML::Reader"
       end
 
       yield(self) if block_given?

data/lib/atom/configuration.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2008 The Kaphan Foundation
 #
-# For licensing information see LICENSE.txt.
+# For licensing information see LICENSE.
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #

data/lib/atom/pub.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2008 The Kaphan Foundation
 #
-# For licensing information see LICENSE.txt.
+# For licensing information see LICENSE.
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #

data/lib/atom/version.rb

@@ -0,0 +1,7 @@
+require 'yaml'
+module Atom
+  module VERSION
+    INFO = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "VERSION.yml"))
+    STRING = [:major, :minor, :patch, :build].map {|l| INFO[l]}.compact.join('.')
+  end
+end

data/lib/atom/xml/parser.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2008 The Kaphan Foundation
 #
-# For licensing information see LICENSE.txt.
+# For licensing information see LICENSE.
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #

data/spec/atom/pub_spec.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2008 The Kaphan Foundation
 #
-# For licensing information see LICENSE.txt.
+# For licensing information see LICENSE.
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #

data/spec/atom_spec.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2008 The Kaphan Foundation
 #
-# For licensing information see LICENSE.txt.
+# For licensing information see LICENSE.
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2008 The Kaphan Foundation
 #
-# For licensing information see LICENSE.txt.
+# For licensing information see LICENSE.
 #
 # Please visit http://www.peerworks.org/contact for further information.
 #

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Peerworks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +10:30
+date: 2010-04-07 00:00:00 +09:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - lib/atom.rb
 - lib/atom/configuration.rb
 - lib/atom/pub.rb
+- lib/atom/version.rb
 - lib/atom/xml/parser.rb
 - spec/app/member_entry.atom
 - spec/app/service.xml