diggr 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.2 / 2008-09-09
+
+* 1 minor bug-fix
+
+  * Singular responses work with Enumerable methods
+
 === 0.1.1 / 2008-09-08
 
 * 1 major bug-fix

data/README.txt

@@ -2,6 +2,7 @@
 
 * Documentation - http://diggr.rubyforge.org
 * Source - http://github.com/dfg59/diggr/tree/master
+* Issue Tracking - http://drewolson.lighthouseapp.com/projects/16743/home
 
 == DESCRIPTION:
 
@@ -35,8 +36,8 @@ Options such as count or offset can be set using the options method and providin
 arguments. See synopsis for more information.
 
 Note: In an effort to remain consistent with the Digg API, some method names do not follow
-the ruby idiom of underscores. Although somewhat ugly, this allows a user read the Digg API
-and understand the exact methods to call in Diggr to achieve their desired results.
+the ruby idiom of underscores. Although somewhat ugly, this allows a user to read the Digg
+API and understand the exact methods to call in Diggr to achieve their desired results.
 
 == FEATURES/PROBLEMS:
 
@@ -78,7 +79,7 @@ and understand the exact methods to call in Diggr to achieve their desired resul
 
 * need 1.0.2 or greater
 * json 1.1.3 or greater
-* activesupport 2.1.0 or greater
+* activesupport 2.1.1 or greater
 
 == INSTALL:
 

data/lib/diggr.rb

@@ -2,5 +2,5 @@ require 'need'
 need { File.join('diggr','api') }
 
 module Diggr
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/diggr/request.rb

@@ -12,7 +12,7 @@ module Diggr
 
     def initialize
       @end_point = ''
-      @options = nil
+      @options = ''
     end
 
     def options(params)
@@ -31,7 +31,13 @@ module Diggr
     end
 
     def each(&block)
-      fetch.each(&block)
+      result = fetch
+
+      if result.kind_of? Array
+        fetch.each(&block)
+      else
+        yield result
+      end
     end
 
     def fetch
@@ -59,9 +65,7 @@ module Diggr
     end
 
     def path
-      path = @end_point + "?appkey=#{cleanse(Diggr::Constants::APP_KEY)}"
-      path += @options if @options
-      path
+      @end_point + "?appkey=#{cleanse(Diggr::Constants::APP_KEY)}" + @options
     end
   end
 end

data/lib/diggr/response_classes/story.rb

@@ -12,21 +12,15 @@ module Diggr
 
     def self.new_from_parsed_json(data)
       story = Story.new
+  
+      %w(id link submit_date diggs comments title description status media href).each do |attribute|
+        story.send("#{attribute}=",data[attribute]) if data[attribute]
+      end
 
-      story.id = data['id'] if data['id']
-      story.link = data['link'] if data['link']
-      story.submit_date = data['submit_date'] if data['submit_date']
-      story.diggs = data['diggs'] if data['diggs']
-      story.comments = data['comments'] if data['comments']
-      story.title = data['title'] if data['title']
-      story.description = data['description'] if data['description']
-      story.status = data['status'] if data['status']
-      story.media = data['media'] if data['media']
       story.user = Diggr::User.new_from_parsed_json(data['user']) if data['user']
       story.topic = Diggr::Topic.new_from_parsed_json(data['topic']) if data['topic']
       story.container = Diggr::Container.new_from_parsed_json(data['container']) if data['container']
       story.thumbnail = Diggr::Photo.new_from_parsed_json(data['thumbnail']) if data['thumbnail']
-      story.href = data['href'] if data['href']
 
       story
     end

data/test/test_request.rb

@@ -108,4 +108,15 @@ class TestRequest < Test::Unit::TestCase
       assert_instance_of Diggr::Story, item
     end
   end
+
+  def test_each_with_singular_response
+    story = Diggr::Story.new
+    Diggr::JSONParser.any_instance.stubs(:parse).with(story).returns(story) 
+    request = Diggr::Request.new
+    request.stubs(:make_request).returns(story)
+
+    request.each do |item|
+      assert_instance_of Diggr::Story, item
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: diggr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Drew Olson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-08 00:00:00 -05:00
+date: 2008-09-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
     version: 
-description: "Diggr is a ruby wrapper for the Digg API.  Diggr strives to remain consistent with the Digg API endpoints listed here:  http://apidoc.digg.com/CompleteList. Endpoints are created in Diggr with method calls.  Each node in an endpoint becomes a method call and each node which is an argument becomes  an argument to the previous method. As an example, the following endpoint  /user/{user name}  in which the user name is \"johndoe\" would be created with this Diggr call:  diggr.user(\"johndoe\")  To send the request to the Digg API and retrieve the results of the call, Diggr requests are terminated in one of two ways.  1. Using the fetch method. By ending your request with the fetch method, your result will be returned to you. If the request is singular, you will receive a single object as a response. If the request is plural, you will receive a collection of objects stored in an array.  2. Using any Enumerable method. This works only on plural requests. In this case, it is unnecessary to use the fetch method.  See the synopsis for examples of each of these types of calls.  Options such as count or offset can be set using the options method and providing a hash of  arguments. See synopsis for more information.  Note: In an effort to remain consistent with the Digg API, some method names do not follow the ruby idiom of underscores. Although somewhat ugly, this allows a user read the Digg API and understand the exact methods to call in Diggr to achieve their desired results."
+description: "Diggr is a ruby wrapper for the Digg API.  Diggr strives to remain consistent with the Digg API endpoints listed here:  http://apidoc.digg.com/CompleteList. Endpoints are created in Diggr with method calls.  Each node in an endpoint becomes a method call and each node which is an argument becomes  an argument to the previous method. As an example, the following endpoint  /user/{user name}  in which the user name is \"johndoe\" would be created with this Diggr call:  diggr.user(\"johndoe\")  To send the request to the Digg API and retrieve the results of the call, Diggr requests are terminated in one of two ways.  1. Using the fetch method. By ending your request with the fetch method, your result will be returned to you. If the request is singular, you will receive a single object as a response. If the request is plural, you will receive a collection of objects stored in an array.  2. Using any Enumerable method. This works only on plural requests. In this case, it is unnecessary to use the fetch method.  See the synopsis for examples of each of these types of calls.  Options such as count or offset can be set using the options method and providing a hash of  arguments. See synopsis for more information.  Note: In an effort to remain consistent with the Digg API, some method names do not follow the ruby idiom of underscores. Although somewhat ugly, this allows a user to read the Digg API and understand the exact methods to call in Diggr to achieve their desired results."
 email: 
 - drew@drewolson.org
 executables: []