share_counts 0.1.1 → 0.1.2

data/README.rdoc

@@ -169,11 +169,6 @@ And, if needed, your can clear the cached values:
 
 However the gem will namespace all the keys as you can see, in case you also use Redis for something else in the same app.
 
-== TODO
-
-* specs
-
-
 == Authors
 
 * Vito Botta ( http://vitobotta.com )

data/lib/share_counts.rb

@@ -1,5 +1,5 @@
 %w( rubygems rest_client json nokogiri redis ).each{ |lib| require lib }
-%w( array caching common reddit ).each{ |file| load File.expand_path( File.join( File.dirname( __FILE__ ), "share_counts", "#{file}.rb" ) ) } # TODO: replace load with require
+%w( caching common reddit ).each{ |file| load File.expand_path( File.join( File.dirname( __FILE__ ), "share_counts", "#{file}.rb" ) ) } # TODO: replace load with require
 
 module ShareCounts
 

data/lib/share_counts/common.rb

@@ -1,6 +1,10 @@
 module ShareCounts
   module Common
 
+    def to_merged_hash array
+      array.inject({}){|r, c| r.merge!(c); r }
+    end
+
     private
 
     # 

data/lib/share_counts/reddit.rb

@@ -6,7 +6,7 @@ module ShareCounts
     def self.info_for url, raise_exceptions = false
       try("reddit-details", url, raise_exceptions) {
         data = extract_info from_json( "http://www.reddit.com/api/info.json", :url => url ), :selector => "data/children/data" 
-        data.select{|k, v| ["permalink", "score"].include? k }.map{|x| { x[0] => x[1] } }.to_hash
+        ShareCounts.to_merged_hash(data.select{|k, v| ["permalink", "score"].include? k }.map{|x| { x[0] => x[1] } })
       }
     end
     

data/share_counts.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib/share_counts", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "share_counts"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Vito Botta"]
   s.email       = ["vito@botta.name"]

data/test/test_helper.rb

@@ -19,6 +19,10 @@ class ActiveSupport::TestCase
     $stdin  = @stdin  =  STDIN
     $stdout = @stdout =  STDOUT
   end
+  
+  def to_merged_hash array
+    ShareCounts.to_merged_hash array
+  end
 end
 
 class Reddit

data/test/test_reddit_module.rb

@@ -2,12 +2,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class RedditModuleTest < ActiveSupport::TestCase
   test ".info_for should return a hash with score and permalink for the given url" do
-    stub_request(:get, Reddit.api).with(:query => Reddit.params.to_hash).to_return(:body => Reddit.url_info_json)
+    stub_request(:get, Reddit.api).with(:query => to_merged_hash(Reddit.params)).to_return(:body => Reddit.url_info_json)
     assert_equal({ "permalink" => "/r/ruby/comments/ffik5/geeky_cv_d/", "score" => 30}, ShareCounts::Reddit.info_for(SOME_URL))
   end
 
   test ".info_for with raise_exceptions=true should raise exception" do
-    stub_request(:get, Reddit.api).with(:query => Reddit.params.to_hash).to_raise(Exception)
+    stub_request(:get, Reddit.api).with(:query => to_merged_hash(Reddit.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts::Reddit.info_for(SOME_URL, true) }
   end
   

data/test/test_share_counts.rb

@@ -1,15 +1,14 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class ShareCountsTest < ActiveSupport::TestCase
-  
   def stub_all
-    stub_request(:get, Reddit.api).with(:query => Reddit.params.to_hash).to_return(:body => Reddit.json)
-    stub_request(:get, Digg.api).with(:query => Digg.params.to_hash).to_return(:body => Digg.json)
-    stub_request(:get, Facebook.api).with(:query => Facebook.params.to_hash).to_return(:body => Facebook.json)
-    stub_request(:get, Twitter.api).with(:query => Twitter.params.to_hash).to_return(:body => Twitter.json)
-    stub_request(:get, Linkedin.api).with(:query => Linkedin.params.to_hash).to_return(:body => Linkedin.json)
-    stub_request(:get, GoogleBuzz.api).with(:query => GoogleBuzz.params.to_hash).to_return(:body => GoogleBuzz.json)
-    stub_request(:get, StumbleUpon.api).with(:query => StumbleUpon.params.to_hash).to_return(:body => StumbleUpon.html)
+    stub_request(:get, Reddit.api).with(:query => to_merged_hash(Reddit.params)).to_return(:body => Reddit.json)
+    stub_request(:get, Digg.api).with(:query => to_merged_hash(Digg.params)).to_return(:body => Digg.json)
+    stub_request(:get, Facebook.api).with(:query => to_merged_hash(Facebook.params)).to_return(:body => Facebook.json)
+    stub_request(:get, Twitter.api).with(:query => to_merged_hash(Twitter.params)).to_return(:body => Twitter.json)
+    stub_request(:get, Linkedin.api).with(:query => to_merged_hash(Linkedin.params)).to_return(:body => Linkedin.json)
+    stub_request(:get, GoogleBuzz.api).with(:query => to_merged_hash(GoogleBuzz.params)).to_return(:body => GoogleBuzz.json)
+    stub_request(:get, StumbleUpon.api).with(:query => to_merged_hash(StumbleUpon.params)).to_return(:body => StumbleUpon.html)
   end
   
   test ".supported_networks returns the supported networks" do
@@ -17,7 +16,7 @@ class ShareCountsTest < ActiveSupport::TestCase
   end
 
   test ".make_request makes a request to a remove service and returns the response" do
-    stub_request(:get, SOME_URL).with(:query => SOME_PARAMS.to_hash).to_return(:body => "---RESPONSE---")
+    stub_request(:get, SOME_URL).with(:query => to_merged_hash(SOME_PARAMS)).to_return(:body => "---RESPONSE---")
 
     assert_equal("---RESPONSE---", ShareCounts.send(:make_request, SOME_URL, *SOME_PARAMS ))
     assert_equal(0, @stdout.string.split("\n").size)
@@ -56,7 +55,7 @@ class ShareCountsTest < ActiveSupport::TestCase
   end
 
   test ".make_request should strip the callback call from the JSON response if a callback has been specified" do
-    stub_request(:get, SOME_URL).with(:query => SOME_PARAMS.to_hash).
+    stub_request(:get, SOME_URL).with(:query => to_merged_hash(SOME_PARAMS)).
     to_return(:body => "myCallback(JSON_DATA);").then.
     to_return(:body => "myCallback(JSON_DATA)")
 
@@ -68,7 +67,7 @@ class ShareCountsTest < ActiveSupport::TestCase
 
   test ".from_json parses the JSON response returned by a remote service" do
     stub_request(:get, SOME_URL).to_return(:body => "{\"a\":1,\"b\":2}").then.to_return(:body => "[\"a\", \"b\", 1, 2]")
-    stub_request(:get, SOME_URL).with(:query => SOME_PARAMS.to_hash).to_return(:body => "myCallback({\"a\":1,\"b\":2})")
+    stub_request(:get, SOME_URL).with(:query => to_merged_hash(SOME_PARAMS)).to_return(:body => "myCallback({\"a\":1,\"b\":2})")
 
     assert_equal({ "a" => 1, "b" => 2 }, ShareCounts.send(:from_json, SOME_URL))
     assert_equal(["a", "b", 1, 2], ShareCounts.send(:from_json, SOME_URL))
@@ -89,82 +88,82 @@ class ShareCountsTest < ActiveSupport::TestCase
   end
 
   test ".reddit should return the reddit score" do
-    stub_request(:get, Reddit.api).with(:query => Reddit.params.to_hash).to_return(:body => Reddit.json)
+    stub_request(:get, Reddit.api).with(:query => to_merged_hash(Reddit.params)).to_return(:body => Reddit.json)
     assert_equal(31, ShareCounts.reddit(SOME_URL))
   end
 
   test ".reddit with raise_exceptions=true should raise exception" do
-    stub_request(:get, Reddit.api).with(:query => Reddit.params.to_hash).to_raise(Exception)
+    stub_request(:get, Reddit.api).with(:query => to_merged_hash(Reddit.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.reddit(SOME_URL, true) }
   end
 
   test ".digg should return the digg score" do
-    stub_request(:get, Digg.api).with(:query => Digg.params.to_hash).to_return(:body => Digg.json)
+    stub_request(:get, Digg.api).with(:query => to_merged_hash(Digg.params)).to_return(:body => Digg.json)
     assert_equal(1, ShareCounts.digg(SOME_URL))
   end
 
   test ".digg with raise_exceptions=true should raise exception" do
-    stub_request(:get, Digg.api).with(:query => Digg.params.to_hash).to_raise(Exception)
+    stub_request(:get, Digg.api).with(:query => to_merged_hash(Digg.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.digg(SOME_URL, true) }
   end
 
   test ".twitter should return the twitter score" do
-    stub_request(:get, Twitter.api).with(:query => Twitter.params.to_hash).to_return(:body => Twitter.json)
+    stub_request(:get, Twitter.api).with(:query => to_merged_hash(Twitter.params)).to_return(:body => Twitter.json)
     assert_equal(35, ShareCounts.twitter(SOME_URL))
   end
 
   test ".twitter with raise_exceptions=true should raise exception" do
-    stub_request(:get, Twitter.api).with(:query => Twitter.params.to_hash).to_raise(Exception)
+    stub_request(:get, Twitter.api).with(:query => to_merged_hash(Twitter.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.twitter(SOME_URL, true) }
   end
 
   test ".facebook should return the facebook score" do
-    stub_request(:get, Facebook.api).with(:query => Facebook.params.to_hash).to_return(:body => Facebook.json)  
+    stub_request(:get, Facebook.api).with(:query => to_merged_hash(Facebook.params)).to_return(:body => Facebook.json)  
     assert_equal(23, ShareCounts.facebook(SOME_URL))
   end
 
   test ".facebook with raise_exceptions=true should raise exception" do
-    stub_request(:get, Facebook.api).with(:query => Facebook.params.to_hash).to_raise(Exception)
+    stub_request(:get, Facebook.api).with(:query => to_merged_hash(Facebook.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.facebook(SOME_URL, true) }
   end
 
   test ".linkedin should return the linkedin score" do
-    stub_request(:get, Linkedin.api).with(:query => Linkedin.params.to_hash).to_return(:body => Linkedin.json)
+    stub_request(:get, Linkedin.api).with(:query => to_merged_hash(Linkedin.params)).to_return(:body => Linkedin.json)
     assert_equal(23, ShareCounts.linkedin(SOME_URL))
   end
 
   test ".linkedin with raise_exceptions=true should raise exception" do
-    stub_request(:get, Linkedin.api).with(:query => Linkedin.params.to_hash).to_raise(Exception)
+    stub_request(:get, Linkedin.api).with(:query => to_merged_hash(Linkedin.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.linkedin(SOME_URL, true) }
   end
 
   test ".googlebuzz should return the googlebuzz score" do
-    stub_request(:get, GoogleBuzz.api).with(:query => GoogleBuzz.params.to_hash).to_return(:body => GoogleBuzz.json)
+    stub_request(:get, GoogleBuzz.api).with(:query => to_merged_hash(GoogleBuzz.params)).to_return(:body => GoogleBuzz.json)
     assert_equal(1, ShareCounts.googlebuzz(SOME_URL))
   end
 
   test ".googlebuzz with raise_exceptions=true should raise exception" do
-    stub_request(:get, GoogleBuzz.api).with(:query => GoogleBuzz.params.to_hash).to_raise(Exception)
+    stub_request(:get, GoogleBuzz.api).with(:query => to_merged_hash(GoogleBuzz.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.googlebuzz(SOME_URL, true) }
   end
 
   test ".stumbleupon should return the stumbleupon score" do
-    stub_request(:get, StumbleUpon.api).with(:query => StumbleUpon.params.to_hash).to_return(:body => StumbleUpon.html)
+    stub_request(:get, StumbleUpon.api).with(:query => to_merged_hash(StumbleUpon.params)).to_return(:body => StumbleUpon.html)
     assert_equal(6, ShareCounts.stumbleupon(SOME_URL))
   end
 
   test ".stumbleupon with raise_exceptions=true should raise exception" do
-    stub_request(:get, StumbleUpon.api).with(:query => StumbleUpon.params.to_hash).to_raise(Exception)
+    stub_request(:get, StumbleUpon.api).with(:query => to_merged_hash(StumbleUpon.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.stumbleupon(SOME_URL, true) }
   end
 
   test ".reddit_with_permalink should return a hash with Reddit score and permalink" do
-    stub_request(:get, Reddit.api).with(:query => Reddit.params.to_hash).to_return(:body => Reddit.json)
+    stub_request(:get, Reddit.api).with(:query => to_merged_hash(Reddit.params)).to_return(:body => Reddit.json)
     assert_equal({ "permalink" => "/r/ruby/comments/ffik5/geeky_cv_d/", "score" => 31 }, ShareCounts.reddit_with_permalink(SOME_URL)) 
   end
   
   test ".reddit_with_permalink with raise_exceptions=true should raise exception" do
-    stub_request(:get, Reddit.api).with(:query => Reddit.params.to_hash).to_raise(Exception)
+    stub_request(:get, Reddit.api).with(:query => to_merged_hash(Reddit.params)).to_raise(Exception)
     assert_raise(Exception) { ShareCounts.reddit_with_permalink(SOME_URL, true) }
   end
   
@@ -174,8 +173,8 @@ class ShareCountsTest < ActiveSupport::TestCase
   end
   
   test ".selected should only return scores for the networks specified" do
-    stub_request(:get, Twitter.api).with(:query => Twitter.params.to_hash).to_return(:body => Twitter.json)
-    stub_request(:get, Linkedin.api).with(:query => Linkedin.params.to_hash).to_return(:body => Linkedin.json)
+    stub_request(:get, Twitter.api).with(:query => to_merged_hash(Twitter.params)).to_return(:body => Twitter.json)
+    stub_request(:get, Linkedin.api).with(:query => to_merged_hash(Linkedin.params)).to_return(:body => Linkedin.json)
 
     assert_equal({ :twitter => 35, :linkedin => 23 }, ShareCounts.selected(SOME_URL, ["twitter", "linkedin"])) 
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: share_counts
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
-  version: 0.1.1
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Vito Botta
@@ -21,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -32,6 +40,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -43,6 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -54,6 +68,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -65,6 +82,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -76,6 +96,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -87,6 +110,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -98,6 +124,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -109,6 +138,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -131,7 +163,6 @@ files:
 - autotest/discover.rb
 - autotest/rules.rb
 - lib/share_counts.rb
-- lib/share_counts/array.rb
 - lib/share_counts/caching.rb
 - lib/share_counts/common.rb
 - lib/share_counts/reddit.rb
@@ -162,12 +193,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 

data/lib/share_counts/array.rb

@@ -1,5 +0,0 @@
-class Array
-  def to_hash
-    @hash ||= self.inject({}){|r, c| r.merge!(c); r }
-  end
-end