dfg59-diggr 0.0.1 → 0.1.2

data/History.txt

@@ -1,3 +1,21 @@
+=== 0.1.3 / 2008-09-09
+
+* 1 minor bug-fix
+
+  * Added more attributes to user class
+
+=== 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
+
+  * Updated to work with activesupport 2.1.1
+
 === 0.1.0 / 2008-08-26
 
 * 1 major enhancement

data/Rakefile

@@ -9,7 +9,7 @@ Hoe.new('diggr', Diggr::VERSION) do |p|
   p.developer('Drew Olson', 'drew@drewolson.org')
   p.extra_deps << ['need', '>= 1.0.2']
   p.extra_deps << ['json', '>= 1.1.3']
-  p.extra_deps << ['activesupport', '>= 2.1.0']
+  p.extra_deps << ['activesupport', '>= 2.1.1']
   p.remote_rdoc_dir = ''
 end
 

data/lib/diggr.rb

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

data/lib/diggr/json_parser.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'active_support/inflector'
+require 'active_support'
 require 'json'
 require 'need'
 need { 'api_error' }
@@ -42,9 +42,9 @@ module Diggr
     end
 
     def find_class(collection_type)
-      file_name = Inflector.singularize(collection_type)
+      file_name = collection_type.singularize
       need { File.join('response_classes',file_name) }
-      Inflector.constantize('Diggr::'+ Inflector.camelize(file_name))
+      ('Diggr::' + file_name.camelize).constantize
     end 
   end
 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/lib/diggr/response_classes/user.rb

@@ -1,6 +1,6 @@
 module Diggr
   class User
-    attr_accessor :name, :fullname, :icon, :registered, :profileviews, :links
+    attr_accessor :name, :fullname, :icon, :registered, :profileviews, :links, :mutual, :date
 
     def self.new_from_parsed_json(data)
       user = User.new

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: dfg59-diggr
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Drew Olson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-05 00:00:00 -07:00
+date: 2008-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -46,9 +46,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     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.  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: 
 email: 
 - drew@drewolson.org
 executables: []
@@ -60,7 +60,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
-- .DS_Store
 - History.txt
 - Manifest.txt
 - README.txt
@@ -93,7 +92,7 @@ files:
 - test/test_topic.rb
 - test/test_user.rb
 has_rdoc: true
-homepage: http://diggr.rubyforge.org
+homepage: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -118,7 +117,7 @@ rubyforge_project: diggr
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Diggr is a ruby wrapper for the Digg API
+summary: ruby wrapper for digg api
 test_files: 
 - test/test_api.rb
 - test/test_comment.rb

data/README.txt

@@ -1,113 +0,0 @@
-= diggr
-
-* http://diggr.rubyforge.org
-
-== 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.
-
-== FEATURES/PROBLEMS:
-
-* Diggr wraps the Digg API and returns both single elements and collections based on the request
-
-== SYNOPSIS:
-
-  require 'rubygems'
-  require 'diggr'
-  
-  diggr = Diggr::API.new
-  
-  # retrieve a single user by user name and print the number of profile views
-  user = diggr.user("johndoe").fetch
-  puts user.profileviews
-
-  # iterator over the most recent 10 stories (default return size) and print their titles
-  diggr.stories.each do |story|
-    puts story.title
-  end
-
-  # print the title of the 3 most recent hot stories
-  diggr.stories.hot.options(:count => 3).each do |story|
-    puts story.title
-  end
-
-  # build an array of stories whos title contains "foo"
-  diggr.stories.inject([]) do |array,story|
-    array << story if story.title =~ /foo/
-    array
-  end
-
-  # print the title of the 2nd and 3rd most recent stories
-  diggr.stories.options(:count => 2, :offset => 2).each do |story|
-    puts story.title
-  end
-
-== REQUIREMENTS:
-
-* need 1.0.2 or greater
-* json 1.1.3 or greater
-* activesupport 2.1.0 or greater
-
-== INSTALL:
-
-* install from rubyforge (major releases)
-* sudo gem install diggr
-
-* install from github (major and minor releases)
-* sudo gem install dfg59-diggr --source=http://gems.github.com
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008 FIX
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.