oos4ruby 0.1.6 → 0.1.7

data/History.txt

@@ -35,3 +35,7 @@
 == 0.1.6 2008-04-03
 
 * 1 connection bug fixed
+
+== 0.1.7 2009-03-16
+
+* User pagination

data/lib/oos4ruby/bean.rb

@@ -103,9 +103,7 @@ module Bean #:nodoc:
     
     def contains?(elem, value)
       xpath = @xml.first(elem)
-      return true if xpath && xpath.text == value
-      
-      return false
+      return xpath && xpath.text == value
     end
     
     def update!
@@ -139,7 +137,7 @@ module Bean #:nodoc:
     
     protected
     def add_category(term, scheme)
-      Bean.add_category(@xml, term, scheme)
+      self.add_category(@xml, term, scheme)
     end
     
     def update_category(new_term, new_scheme, old_term = nil, old_scheme = nil)
@@ -148,7 +146,7 @@ module Bean #:nodoc:
     end
     
     def remove_category(term = nil, scheme = nil)
-      Bean.remove_category(@xml, term, scheme)
+      self.remove_category(@xml, term, scheme)
     end
     
     def self.make_id

data/lib/oos4ruby/collection.rb

@@ -85,10 +85,6 @@ class Collection < Array
     return get_page!(@feed.self_link)
   end
   
-  def to_s
-    @entries.join("\n")
-  end
-  
 =begin rdoc
   method to create a resource into a collection.
   opts available keys:

data/lib/oos4ruby/contact.rb

@@ -33,8 +33,7 @@ class Contact < Bean::BeanClass
   returns the user associated with this contact
 =end
   def data         
-    @data = User.find @auth, @xml.link('userInfo') unless @data
-    @data
+    @data ||= User.find @auth, @xml.link('userInfo')
   end
   
   def trusted?

data/lib/oos4ruby/site.rb

@@ -42,7 +42,8 @@ class Site < Bean::BeanClass
     raise Oos4ruby::UnknownUser if slug.nil?
     
     uri = SITES_URL + "/#{slug}"
-    
+    uri << "?page=#{opts[:page].to_i}" if opts[:page]
+
     getter = HTTPInvoker.new uri, auth
     
     worked = getter.get
@@ -205,8 +206,8 @@ class Site < Bean::BeanClass
     if @categories_added
       @categories_added.each { |cat|
         add_category cat.term, cat.scheme
-        @tags << cat if cat.scheme == @tags_scheme
-        @lists << cat if cat.scheme == @lists_scheme
+        (@tags ||= []) << cat if cat.scheme == @tags_scheme
+        (@lists ||=[]) << cat if cat.scheme == @lists_scheme
       }
       @categories_added.clear
     end

data/lib/oos4ruby/user.rb

@@ -41,7 +41,7 @@ class User < Bean::BeanClass
     if worked
       if slug #response is an Entry
         entry = Entry.new getter.body
-        return User.new(entry, auth, slug)
+        return User.new(entry, auth)
       else
         #response is a feed
         feed = Feed.read getter.body        
@@ -64,13 +64,11 @@ class User < Bean::BeanClass
   end
   
   def sites( opts = {} )
-    @sites_collection = Site.find_by_user(@auth, @slug, opts) unless @sites_collection
-    @sites_collection
+    @sites_collection ||= Site.find_by_user(@auth, @slug, opts)
   end
   
   def contacts( opts = {} )
-    @contacts_collection = Contact.find_by_user(@auth, @slug, opts) unless @contacts_collection
-    @contacts_collection
+    @contacts_collection ||= Contact.find_by_user(@auth, @slug, opts)
   end
   
   def avatar

data/lib/oos4ruby/version.rb

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

data/test/test_oos4ruby.rb

@@ -86,7 +86,7 @@ class TestOos4ruby < Test::Unit::TestCase
 
   def setup
     @oos = Oos4ruby::Oos.new
-    @oos.auth_user('david.calavera@11870.com', '3beedf801db0d373919f6462345d6f76')
+    @oos.auth_user('david.calavera@11870.com', '85a9526f48b90283713f70d483afbfd5')
   end
   
   def assert_user_not_nil(user)
@@ -147,6 +147,22 @@ class TestOos4ruby < Test::Unit::TestCase
   def test_contains?
     assert_equal(true, @oos.user.sites.contains?('oos:locality', 'Madrid'))
   end
+  
+  def test_contact_sites
+    assert_not_nil(@oos.user.contacts.last.data.sites)
+  end
+
+  def test_create_media
+    file_path = '/home/david/Pantallazo-1.png'
+    medias = @oos.user.sites.first.multimedia
+    
+    media = nil
+    assert_nothing_raised {
+      media = medias.create!(:file => file_path,
+        :content_length => File.size(file_path), :content_type => 'image/png' )
+    }
+    assert_not_nil media
+  end
 
 end
 

data/website/index.html

@@ -33,54 +33,24 @@
     <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.5</a>
+      <a href="http://rubyforge.org/projects/oos4ruby" class="numbers">0.1.7</a>
     </div>
-    <h1>&#x2192; &#8216;oos4ruby&#8217;</h1>
-
-
-	<h2>What</h2>
-
-
-	<p>oos4ruby is a ruby library to interact with the 11870 <span class="caps">API</span>.</p>
-
-
-	<h2>Installing</h2>
-
-
-	<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">oos4ruby</span></pre></p>
-
-
-	<h2>The basics</h2>
-
-
-	<p>The class &#8220;Oos4ruby::Oos&#8221; is the endpoint to interact with the api. This class provides the authentication methods in addition to the search and user management methods.</p>
-
-
-	<p><pre class='syntax'><span class="ident">oos</span> <span class="punct">=</span> <span class="constant">Oos4ruby</span><span class="punct">::</span><span class="constant">Oos</span><span class="punct">.</span><span class="ident">new</span></pre></p>
-
-
-	<p>Authenticate as an application in order to perform searches or explore the user contents:</p>
-
-
-	<p><pre class='syntax'><span class="ident">oos</span><span class="punct">.</span><span class="ident">auth_app</span> <span class="punct">'</span><span class="string">your appToken</span><span class="punct">',</span> <span class="punct">'</span><span class="string">your secret key</span><span class="punct">'</span></pre></p>
-
-
-	<p>Authenticate as a user in order to manage his contents:</p>
-
-
-	<p><pre class='syntax'><span class="ident">oos</span><span class="punct">.</span><span class="ident">auth_user</span> <span class="punct">'</span><span class="string">user email in 11870.com</span><span class="punct">',</span> <span class="punct">'</span><span class="string">user authorization token</span><span class="punct">'</span></pre></p>
-
-
-	<p>Method to perform a search inside 11870:</p>
-
-
-	<p><pre class='syntax'><span class="ident">oos</span><span class="punct">.</span><span class="ident">search</span> <span class="symbol">:q</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">cheap restaurants in new york</span><span class="punct">'</span></pre></p>
-
-
-	<p>How to obtain the services or places saved by a user:</p>
-
-
-	<p><pre class='syntax'>
+    <h1>&amp;#x2192; &#8216;oos4ruby&#8217;</h1>
+<h2>What</h2>
+<p>oos4ruby is a ruby library to interact with the 11870 <span class="caps">API</span>.</p>
+<h2>Installing</h2>
+<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">oos4ruby</span></pre></p>
+<h2>The basics</h2>
+<p>The class &#8220;Oos4ruby::Oos&#8221; is the endpoint to interact with the api. This class provides the authentication methods in addition to the search and user management methods.</p>
+<p><pre class='syntax'><span class="ident">oos</span> <span class="punct">=</span> <span class="constant">Oos4ruby</span><span class="punct">::</span><span class="constant">Oos</span><span class="punct">.</span><span class="ident">new</span></pre></p>
+<p>Authenticate as an application in order to perform searches or explore the user contents:</p>
+<p><pre class='syntax'><span class="ident">oos</span><span class="punct">.</span><span class="ident">auth_app</span> <span class="punct">'</span><span class="string">your appToken</span><span class="punct">',</span> <span class="punct">'</span><span class="string">your secret key</span><span class="punct">'</span></pre></p>
+<p>Authenticate as a user in order to manage his contents:</p>
+<p><pre class='syntax'><span class="ident">oos</span><span class="punct">.</span><span class="ident">auth_user</span> <span class="punct">'</span><span class="string">user email in 11870.com</span><span class="punct">',</span> <span class="punct">'</span><span class="string">user authorization token</span><span class="punct">'</span></pre></p>
+<p>Method to perform a search inside 11870:</p>
+<p><pre class='syntax'><span class="ident">oos</span><span class="punct">.</span><span class="ident">search</span> <span class="symbol">:q</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">cheap restaurants in new york</span><span class="punct">'</span></pre></p>
+<p>How to obtain the services or places saved by a user:</p>
+<p><pre class='syntax'>
 <span class="comment">#if your app is authenticated with this user authorization token</span>
 <span class="ident">user</span> <span class="punct">=</span> <span class="ident">oos</span><span class="punct">.</span><span class="ident">user</span>
 <span class="comment">#if your app is authenticated to expore contents</span>
@@ -88,12 +58,8 @@
 
 <span class="ident">sites</span> <span class="punct">=</span> <span class="ident">user</span><span class="punct">.</span><span class="ident">sites</span>
 </pre></p>
-
-
-	<p>How to add a review from a site that doesn&#8217;t exist in 11870:</p>
-
-
-	<p><pre class='syntax'>
+<p>How to add a review from a site that doesn&#8217;t exist in 11870:</p>
+<p><pre class='syntax'>
 <span class="ident">oos</span><span class="punct">.</span><span class="ident">user</span><span class="punct">.</span><span class="ident">sites</span><span class="punct">.</span><span class="ident">create!</span> <span class="punct">{</span><span class="symbol">:title</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">this site doesn</span><span class="punct">'</span><span class="ident">t</span> <span class="ident">exist</span><span class="punct">'</span><span class="string">, 
     :user_address =&gt; </span><span class="punct">'</span><span class="ident">the</span> <span class="ident">address</span><span class="punct">'</span><span class="string">, 
     :locality =&gt; {:name =&gt; </span><span class="punct">'</span><span class="constant">Madrid</span><span class="punct">'</span><span class="string">, :slug =&gt; </span><span class="punct">'/</span><span class="ident">es</span><span class="punct">/</span><span class="ident">madrid</span><span class="punct">'</span><span class="string">},
@@ -101,56 +67,26 @@
     :summary =&gt; </span><span class="punct">'</span><span class="ident">review</span> <span class="ident">title</span><span class="punct">'</span><span class="string">, :content =&gt; </span><span class="punct">'</span><span class="ident">review</span> <span class="ident">content</span><span class="punct">'</span><span class="string">
     :tags =&gt; [</span><span class="punct">'</span><span class="ident">tapas</span><span class="punct">'</span><span class="string">, </span><span class="punct">'</span><span class="ident">tipical</span> <span class="ident">spanish</span><span class="punct">'</span><span class="string">], :lists =&gt; [</span><span class="punct">'</span><span class="ident">food</span><span class="punct">'</span><span class="string">]}<span class="normal">
 </span></span></pre></p>
-
-
-	<p>How to add a review from a site that exists in 11870:</p>
-
-
-	<p><pre class='syntax'>
+<p>How to add a review from a site that exists in 11870:</p>
+<p><pre class='syntax'>
 <span class="ident">oos</span><span class="punct">.</span><span class="ident">user</span><span class="punct">.</span><span class="ident">sites</span><span class="punct">.</span><span class="ident">create!</span> <span class="punct">{</span><span class="symbol">:id</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">11870 site id</span><span class="punct">',</span>
     <span class="symbol">:summary</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">review title</span><span class="punct">',</span> <span class="symbol">:content</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">review content</span><span class="punct">'}</span>
 </pre></p>
-
-
-	<p>How to obtain all user contacts in 11870:</p>
-
-
-	<p><pre class='syntax'><span class="ident">contacts</span> <span class="punct">=</span> <span class="ident">user</span><span class="punct">.</span><span class="ident">contacts</span></pre></p>
-
-
-	<p>How to obtain the multimedia feed associated with a review:</p>
-
-
-	<p><pre class='syntax'><span class="ident">media_collection</span> <span class="punct">=</span> <span class="ident">user</span><span class="punct">.</span><span class="ident">sites</span><span class="punct">[</span><span class="number">0</span><span class="punct">].</span><span class="ident">multimedia</span></pre></p>
-
-
-	<h2>Forum</h2>
-
-
-	<p><a href="http://groups.google.com/group/api-11870">http://groups.google.com/group/api-11870</a></p>
-
-
-	<h2>How to submit patches</h2>
-
-
-	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-
-
-	<p>The trunk repository is <code>http://api-11870.googlecode.com/svn/trunk/oos4ruby</code> for anonymous access.</p>
-
-
-	<h2>License</h2>
-
-
-	<p>This code is free to use under the terms of the <span class="caps">BSD</span> license.</p>
-
-
-	<h2>Contact</h2>
-
-
-	<p>Comments are welcome. Send an email to <a href="mailto:david.calavera@gmail.com">David Calavera</a> email via the <a href="http://groups.google.com/group/api-11870">forum</a></p>
+<p>How to obtain all user contacts in 11870:</p>
+<p><pre class='syntax'><span class="ident">contacts</span> <span class="punct">=</span> <span class="ident">user</span><span class="punct">.</span><span class="ident">contacts</span></pre></p>
+<p>How to obtain the multimedia feed associated with a review:</p>
+<p><pre class='syntax'><span class="ident">media_collection</span> <span class="punct">=</span> <span class="ident">user</span><span class="punct">.</span><span class="ident">sites</span><span class="punct">[</span><span class="number">0</span><span class="punct">].</span><span class="ident">multimedia</span></pre></p>
+<h2>Forum</h2>
+<p><a href="http://groups.google.com/group/api-11870">http://groups.google.com/group/api-11870</a></p>
+<h2>How to submit patches</h2>
+<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
+<p>The trunk repository is <code>http://api-11870.googlecode.com/svn/trunk/oos4ruby</code> for anonymous access.</p>
+<h2>License</h2>
+<p>This code is free to use under the terms of the <span class="caps">BSD</span> license.</p>
+<h2>Contact</h2>
+<p>Comments are welcome. Send an email to <a href="mailto:david.calavera@gmail.com">David Calavera</a> email via the <a href="http://groups.google.com/group/api-11870">forum</a></p>
     <p class="coda">
-      <a href="FIXME email">David Calavera</a>, 13th November 2007<br>
+      <a href="FIXME email">David Calavera</a>, 16th March 2009<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oos4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - David Calavera
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-03 00:00:00 +02:00
+date: 2009-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.5"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.0
+    version: 
 description: oos4ruby is a ruby binding for the 11870 API
 email: david.calavera@gmail.com
 executables: []
@@ -98,10 +109,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: oos4r
-rubygems_version: 1.1.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: oos4ruby is a ruby binding for the 11870 API
 test_files: 
-- test/test_oos4ruby.rb
 - test/test_helper.rb
+- test/test_oos4ruby.rb