restbooks 0.1.4 → 0.2.0

data/lib/restbooks.rb

@@ -23,11 +23,11 @@
 
 # Gems
 require 'rubygems'
-require 'rest_client'
-#require 'json'
+require 'restclient'
+require 'nokogiri'
+require 'json'
 
 # StdLib
-require 'rexml/document'
 require 'cgi'
 require 'digest/md5'
 require 'date'

data/lib/restbooks/authors.rb

@@ -34,9 +34,9 @@ module RestBooks
     #     * death: author who dies in ...
     #     * lang: language of the author
     #     * order: normally from A to Z, use desc to reverse order
-    def all( options={} )
-      create_url( "/authors", options, ORDERED_AUTHOR_PARAMETERS )
-      return do_request( :author )
+    def all(options={})
+      create_url("/authors", options, ORDERED_AUTHOR_PARAMETERS)
+      return do_request(:author)
     end
 
     # Endpoint: /authors/top
@@ -48,9 +48,9 @@ module RestBooks
     #     * death: author who dies in ...
     #     * lang: language of the author
     #     * range: normally overall, week will display the most popular for the previous week and month for the last 4 weeks
-    def top( options={} )
-      create_url( "/authors/top", options, RANGED_AUTHOR_PARAMETERS )
-      return do_request( :author )
+    def top(options={})
+      create_url("/authors/top", options, RANGED_AUTHOR_PARAMETERS)
+      return do_request(:author)
     end
 
     # Endpoint: /authors/recent
@@ -61,9 +61,9 @@ module RestBooks
     #     * born: authors born in ...
     #     * death: author who dies in ...
     #     * lang: language of the author
-    def recent( options={} )
-      create_url( "/authors/recent", options, AUTHOR_PARAMETERS )
-      return do_request( :author )
+    def recent(options={})
+      create_url("/authors/recent", options, AUTHOR_PARAMETERS)
+      return do_request(:author)
     end
 
     # Endpoint: /author/:id/books

data/lib/restbooks/mixins/api.rb

@@ -47,7 +47,7 @@ module RestBooks
         if key == :format
           format = options.delete(:format)
         elsif !valid_keys.include?(key)
-          options.delete( key )
+          options.delete(key)
         else
           options_str << "#{key.to_s}=#{value}"
         end
@@ -63,7 +63,7 @@ module RestBooks
         begin
           data = RestClient.get(@uri.to_s, {'If-None-Match' => etag, 'User-Agent' => @user_agent})
           etag = data.headers[:etag]
-          save_etag(@uri.to_s, etag, data.body)
+          update_etag(@uri.to_s, etag, data.body)
         rescue RestClient::NotModified
           data = saved_data
         end
@@ -83,45 +83,40 @@ module RestBooks
       end
     end
     
-    def process_atom_responce( type, response )
+    def process_atom_responce(type, response)
       result = []
-      doc = REXML::Document.new( response )
-      REXML::XPath.each( doc, '//entry' ) do |element|
-        result << eval( "Models::#{type.to_s.capitalize}.new( element )" )
+      Nokogiri::XML::Document.parse(response).css('entry').each do |element|
+        result << eval("Models::#{type.to_s.capitalize}.new(element)")
       end
       return result
     end
     
-    def get_etag( path )
-      arr = @etags.assoc( path )
+    def get_etag(path)
+      arr = @etags.assoc(path)
       etag = data = nil
       if arr
         etag = arr[1]
         data = arr[2]
         if arr != @etags.first
           @etags.delete(arr)
-          @etags.unshift( arr )
+          @etags.unshift(arr)
         end
       end
       return etag, data
     end
     
-    def save_etag( path, etag, data )
-      @etags.unshift( [path,etag,data] )
+    def save_etag(path, etag, data)
+      @etags.unshift([path,etag,data])
       @etags.pop if @etags.length > 99
     end
     
-    def update_etag( path, etag, data )
-      arr = @etags.assoc( path )
-      if arr
-        if arr == @etags.first
-          @etags[0] = [path,etag,data]
-        else
-          @etags.delete(arr)
-          @etags.unshift( [path,etag,data] )
-        end
+    def update_etag(path, etag, data)
+      arr = @etags.assoc(path)
+      if arr == @etags.first
+        @etags[0] = [path,etag,data]
       else
-        @etags.unshift( [path,etag,data] )
+        @etags.delete(arr)
+        @etags.unshift([path,etag,data])
       end
     end
 

data/lib/restbooks/mixins/model.rb

@@ -32,10 +32,10 @@ module RestBooks
       return @element
     end
 
-    # def to_json
-    #   model = self.class.to_s.split('::').last.downcase.to_sym
-    #   return JSON.generate( { model => self.to_hash } )
-    # end
+    def to_json
+      model = self.class.to_s.split('::').last.downcase.to_sym
+      return JSON.generate( { model => self.to_hash } )
+    end
 
   end
 end

data/lib/restbooks/models/author.rb

@@ -25,12 +25,12 @@ module RestBooks
   module Models
     class Author
       include RestBooks::Model
-      attr_reader :title, :id, :updated, :born, :death
+      attr_reader :name, :id, :updated, :born, :death
       
-      def initialize( element )
+      def initialize(element)
         if element
           @element = element
-          @element.elements.each do |tag|
+          @element.xpath('*').each do |tag|
             case tag.name
             when 'title'
               @title = tag.text
@@ -40,13 +40,13 @@ module RestBooks
             when 'updated'
               @updated = Date.parse( tag.text )
             when 'content'
-              dates = tag.text.strip.split(' - ')
+              dates = tag.text.strip.split(' ')
               @born = dates.first
               @death = dates.last
             end
           end
         else
-          @element = REXML::Element.new( 'entry' )
+          @element = Nokogiri::XML::Element.new('entry')
         end
       end
 
@@ -54,8 +54,8 @@ module RestBooks
         return { :title => @title,
           :id => @id,
           :updated => @updated,
-          :born => @date,
-          :death => @subject }
+          :born => @born,
+          :death => @death }
       end
 
     end

data/lib/restbooks/models/book.rb

@@ -27,12 +27,12 @@ module RestBooks
       include RestBooks::Model
       attr_reader :title, :id, :author, :updated, :language, :date, :subject, :description, :rights
       
-      def initialize( element=nil )
+      def initialize(element=nil)
         @updated = Time.now
         @subject = []
         if element
           @element = element
-          @element.elements.each do |tag|
+          @element.xpath('*').each do |tag|
             case tag.name
             when 'title'
               @title = tag.text
@@ -40,10 +40,10 @@ module RestBooks
               @id = tag.text.split('/').last
               @id = @id.split(':').last if @id.split(':').length > 1
             when 'updated'
-              @updated = Date.parse( tag.text )
+              @updated = Date.parse(tag.text)
             when 'author'
-              @author = tag.elements['name'].text
-              @author_id = tag.elements['uri'].text.split('/').last
+              @author = tag.xpath('name').text
+              @author_id = tag.xpath('uri').text.split('/').last
             when 'language' 
               @language = tag.text
             when 'date'
@@ -51,15 +51,15 @@ module RestBooks
             when 'subject'
               @subject << tag.text
             when 'description'
-              @description = tag.text.strip()
+              @description = tag.text.strip
             when 'rights'
               @rights = tag.text
             when 'content'
-              @html = tag.text if tag.attributes['type'] == "xhtml"  
+              @html = tag.text if tag['type'] == "xhtml"  
             end
           end
         else
-          @element = REXML::Element.new( 'entry' )
+          @element = Nokogiri::XML::Element.new('entry')
         end
       end
 

data/lib/restbooks/models/category.rb

@@ -30,17 +30,17 @@ module RestBooks
       def initialize( element )
         if element
           @element = element
-          @element.elements.each do |tag|
+          @element.xpath('*').each do |tag|
             case tag.name
             when 'title'
-              @title = tag.text.strip()
-              @id = CGI.escape( @title )
+              @title = tag.text.strip
+              @id = CGI.escape(@title)
             when 'updated'
-              @updated = Date.parse( tag.text )
+              @updated = Date.parse(tag.text)
             end
           end
         else
-          @element = REXML::Element.new( 'entry' )
+          @element = Nokogiri::XML::Element.new('entry')
         end
       end
 

data/lib/restbooks/models/comment.rb

@@ -27,27 +27,27 @@ module RestBooks
       include RestBooks::Model
       attr_reader :title, :id, :author, :published, :updated, :body
       
-      def initialize( element )
+      def initialize(element)
         if element
           @element = element
-          @element.elements.each do |tag|
+          @element.xpath('*').each do |tag|
             case tag.name
             when 'title'
               @title = tag.text
             when 'id'
               @id = tag.text.split('#').last
             when 'author'
-              @author = tag.elements['name'].text
+              @author = tag.xpath('name').text
             when 'published'
-              @published = Date.parse( tag.text )
+              @published = Date.parse(tag.text)
             when 'updated'
-              @updated = Date.parse( tag.text )
+              @updated = Date.parse(tag.text)
             when 'content'
-              @body = tag.text.strip()
+              @body = tag.text.strip
             end
           end
         else
-          @element = REXML::Element.new( 'entry' )
+          @element = Nokogiri::XML::Element.new('entry')
         end
       end
 

data/lib/restbooks/models/list.rb

@@ -27,24 +27,24 @@ module RestBooks
       include RestBooks::Model
       attr_reader :title, :id, :updated, :description
       
-      def initialize( element )
+      def initialize(element)
         if element
           @element = element
-          @element.elements.each do |tag|
+          @element.xpath('*').each do |tag|
             case tag.name
             when 'title'
-              @title = tag.text.strip()
+              @title = tag.text.strip
             when 'id'
               @id = tag.text.split('/').last
               @id = @id.split(':').last if @id.split(':').length > 1
             when 'updated'
-              @updated = Date.parse( tag.text )
+              @updated = Date.parse(tag.text)
             when 'content'
-              @description = tag.text.strip()
+              @description = tag.text.strip
             end
           end
         else
-          @element = REXML::Element.new( 'entry' )
+          @element = Nokogiri::XML::Element.new('entry')
         end
       end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Paul Chavard
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +01:00
+date: 2010-03-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest_client
+  name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -29,9 +29,33 @@ dependencies:
         - 4
         - 1
         version: 1.4.1
-  type: :development
+  type: :runtime
   version_requirements: *id001
-description: Restbooks is a client library for feedbooks.com api.
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+description: Restbooks is a client library for feedbooks.com api
 email: paul@chavard.net
 executables: []
 
@@ -42,12 +66,12 @@ extra_rdoc_files: []
 files: 
 - README
 - LICENSE
+- lib/uri/uri.rb
 - lib/restbooks.rb
 - lib/restbooks/books.rb
 - lib/restbooks/authors.rb
 - lib/restbooks/categories.rb
 - lib/restbooks/lists.rb
-- lib/uri/uri.rb
 - lib/restbooks/mixins/api.rb
 - lib/restbooks/mixins/model.rb
 - lib/restbooks/models/author.rb
@@ -84,6 +108,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Restbooks is a client library for feedbooks.com api.
+summary: Restbooks is a client library for feedbooks.com api
 test_files: []