oos4ruby 0.1.4 → 0.1.5

data/History.txt

@@ -27,3 +27,7 @@
 
 *1 bugs fixed:
   * see this thread: http://tinyurl.com/253a2d (thanks to Luismi Cavallé)
+
+== 0.1.5 2008-01-14
+
+*1 save bugs fixed

data/lib/oos4ruby.rb

@@ -20,7 +20,7 @@ module Oos4ruby
   
   AtomEntryContentType = 'application/atom+xml;type=entry'
   
-  OOS_URL = 'http://11870.com'
+  OOS_URL = 'http://localhost'
   API_URL = OOS_URL + '/api/v1'
   
   SITES_URL = Oos4ruby::API_URL + '/sites'

data/lib/oos4ruby/bean.rb

@@ -88,45 +88,6 @@ module Bean #:nodoc:
     end
   end
   
-  def make_id
-    id = ''
-    5.times { id += rand(1000000).to_s }
-    "Oos4ruby:11870.com,2007:#{id}"
-  end
-    
-  def add_element(base, new_el, text, attrs = {})
-    el = base.add_element new_el.to_s, attrs
-    el.text = text
-    base
-  end
-  
-  def add_category(xml, term, scheme)
-    xml.add_category(term.to_s, scheme)
-  end
-  
-  def remove_category(xml, term = nil, scheme = nil)
-    if xml.is_a?Entry
-    hash = {}
-    hash[:term] = term if term
-    hash[:scheme] = scheme if scheme      
-    cat = xml.category( hash )
-    xml.delete_category( cat ) if cat
-    elsif xml.is_a?REXML::Element
-      xml.delete_element c
-    end
-  end
-  
-  def create_entry
-    entry = REXML::Element.new('entry')
-    entry.add_namespace AtomNamespace
-    XmlNamespaces.each_pair { |prefix, namespace|
-      unless prefix == 'atom' || prefix == 'gml'
-        entry.add_namespace prefix, namespace
-      end
-    }
-    entry
-  end
- 
   class BeanClass
     def author
       @entry.child('author/name').text
@@ -140,6 +101,13 @@ module Bean #:nodoc:
       @xml.to_s
     end
     
+    def contains?(elem, value)
+      xpath = @xml.first(elem)
+      return true if xpath && xpath.text == value
+      
+      return false
+    end
+    
     def update!
       edit_link = @xml.link('edit')
 
@@ -183,6 +151,51 @@ module Bean #:nodoc:
       Bean.remove_category(@xml, term, scheme)
     end
     
+    def self.make_id
+      id = ''
+      5.times { id += rand(1000000).to_s }
+      "Oos4ruby:11870.com,2007:#{id}"
+    end
+
+    def self.add_element(base, new_el, text, attrs = {})
+      elements = new_el.to_s.split("/")
+      last = elements[elements.size - 1]
+      elements.pop
+      root_el = base
+      elements.each do |path|
+        root_el = base.add_element(path)      
+      end
+      el = root_el.add_element last.to_s, attrs
+      el.text = text
+    end
+
+    def self.add_category(xml, term, scheme)
+      xml.add_category(term.to_s, scheme)
+    end
+
+    def self.remove_category(xml, term = nil, scheme = nil)
+      if xml.is_a?Entry
+      hash = {}
+      hash[:term] = term if term
+      hash[:scheme] = scheme if scheme      
+      cat = xml.category( hash )
+      xml.delete_category( cat ) if cat
+      elsif xml.is_a?REXML::Element
+        xml.delete_element c
+      end
+    end
+
+    def self.create_entry
+      entry = REXML::Element.new('entry')
+      entry.add_namespace AtomNamespace
+      XmlNamespaces.each_pair { |prefix, namespace|
+        unless prefix == 'atom' || prefix == 'gml'
+          entry.add_namespace prefix, namespace
+        end
+      }
+      entry
+    end
+    
   end
 end
 end

data/lib/oos4ruby/collection.rb

@@ -12,7 +12,7 @@ class Collection < Array
     @auth = auth
     @slug = slug
     evalued_class = eval(self.class.name.gsub(/s$/, ''))
-    feed.entries.each {|entry| self << evalued_class.new(entry, @auth, @slug) }    
+    @feed.entries.each {|entry| self << evalued_class.new(entry, @auth, @slug) }    
   end
  
 =begin rdoc
@@ -114,9 +114,7 @@ class Collection < Array
         :content_length => file size
         :content_type => file content type
 =end
-  def create!(opts = {})
-    opts[:author] = REXML::XPath.first(@feed.xml, 'author', XmlNamespaces)
-    
+  def create!(opts = {})    
     evalued_class = eval(self.class.name.gsub(/s$/, ''))
     body = evalued_class.dump! opts, @slug
     unless self.instance_of?Medias      
@@ -134,6 +132,21 @@ class Collection < Array
     raise RuntimeError.new unless worked
     return evalued_class.new(poster.entry, @auth, @slug)
   end
+=begin rdoc
+  return true if the text of the element is equals to the given value
+
+  i.e: 
+    user.contacts.contains? 'oos:slug', 'calavera'
+    user.sites.contains? 'oos:locality', 'Madrid'
+=end
+  def contains?(elem, value)
+    self.each do |obj|
+       if obj.contains?(elem, value)
+         return true
+       end
+    end
+    return false
+  end
   
   private
   def get_page(link)

data/lib/oos4ruby/contact.rb

@@ -44,9 +44,11 @@ class Contact < Bean::BeanClass
   end
   
   def Contact.dump!(opts, slug)
+    include Bean
+    
     entry = create_entry
     
-    entry.add_element opts[:author]
+    add_element entry, 'author/name', slug
 
     updated = DateTime::now.strftime("%Y-%m-%dT%H:%M:%S%z").sub(/(..)$/, ':\1')
     

data/lib/oos4ruby/site.rb

@@ -53,9 +53,8 @@ class Site < Bean::BeanClass
   def Site.dump!(opts, slug)
     require 'date'
     
-    entry = create_entry
-    
-    entry.add_element opts[:author]
+    entry = create_entry    
+    add_element(entry, 'author/name', slug)
     
     updated = DateTime::now.strftime("%Y-%m-%dT%H:%M:%S%z").sub(/(..)$/, ':\1')
     

data/lib/oos4ruby/version.rb

@@ -2,7 +2,7 @@ module Oos4ruby #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_oos4ruby.rb

@@ -42,7 +42,7 @@ puts sites.entries.to_s
 sites = user.sites.entries
 
 
-new_site = user.sites.create! :title => 'asdfasdf', :user_address => 'asdfasdf', 
+new_site = user.sites.create! :title => 'asdfw4rwqwasf', :user_address => 'asdfw4rwqwasf', 
   :country => {:name => 'España', :slug => '/es'}, :locality => {:name => 'Madrid', :slug => '/es/madrid'},
   :summary => 'nueva opinion desde la API', :review_content => 'asdfasdf',
   :tags => ['tapas', 'tipical spanish'], :lists => ['food']
@@ -86,7 +86,7 @@ class TestOos4ruby < Test::Unit::TestCase
 
   def setup
     @oos = Oos4ruby::Oos.new
-    @oos.auth_user('david.calavera@11870.com', 'deadbeeff00')
+    @oos.auth_user('david.calavera@11870.com', '3beedf801db0d373919f6462345d6f76')
   end
   
   def assert_user_not_nil(user)
@@ -104,7 +104,7 @@ class TestOos4ruby < Test::Unit::TestCase
   end
   
   def test_user_with_uri
-    user = @oos.user('http://11870.com/api/v1/users/peralta')
+    user = @oos.user("#{Oos4ruby::API_URL}/users/peralta")
     assert_user_not_nil(user)
   end
   
@@ -131,7 +131,21 @@ class TestOos4ruby < Test::Unit::TestCase
   def test_all_sites
     user = @oos.user
     assert_not_nil user.sites.all, ''
-    assert (user.sites.total_size == user.sites.all.size)
+    assert_equal user.sites.total_size, user.sites.all.size
+  end
+  
+  def test_create_site
+    site = @oos.user.sites.create! :title => 'asdfwdss4rwqwasf', :user_address => 'asdfw4rwqwasf', 
+      :country => {:name => 'España', :slug => '/es'}, 
+      :locality => {:name => 'Madrid', :slug => '/es/madrid'},
+      :summary => 'nueva opinion desde la API', :review_content => 'asdfasdf',
+      :tags => ['tapas', 'tipical spanish'], :lists => ['food'], :telephone => '913545471'
+    
+    assert_not_nil site
+  end
+  
+  def test_contains?
+    assert_equal(true, @oos.user.sites.contains?('oos:locality', 'Madrid'))
   end
 
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>oos4ruby</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/oos4ruby"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/oos4ruby" class="numbers">0.1.4</a>
+      <a href="http://rubyforge.org/projects/oos4ruby" class="numbers">0.1.5</a>
     </div>
     <h1>&#x2192; &#8216;oos4ruby&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oos4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ""
 authors: 
 - David Calavera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-10 00:00:00 +01:00
+date: 2008-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency