popularity 0.1.1 → 0.2.1

data/lib/popularity/networks/reddit_share.rb

@@ -1,7 +1,7 @@
-
 module Popularity
   class RedditShare < Crawler
     include Popularity::ContainerMethods
+    stats :comments, :score, :posts
 
     def initialize(*args)
       super(*args)
@@ -19,20 +19,6 @@ module Popularity
       self
     end
 
-    def to_json(options ={})
-      total = {"comments" => 0, "posts" => 0, "score" => 0}
-      return total unless @results
-
-      @results.collect(&:to_json).each do |json|
-        json.each do |key, value|
-            total[key] ||= 0
-            total[key] += value
-        end
-      end
-      total["posts"] = posts
-      total
-    end
-
     def posts
       @results.size rescue 0
     end
@@ -45,4 +31,4 @@ module Popularity
       "http://www.reddit.com/r/search/search.json?q=url:#{@url}"
     end
   end
-end
+end

data/lib/popularity/networks/rubygems.rb

@@ -1,17 +1,11 @@
 module Popularity
   class Rubygems < Crawler
+    stats :downloads
+
     def downloads
       response_json["downloads"]
     end
 
-    def as_json(options = {})      
-      {"downloads" => downloads}
-    end
-
-    def total
-      downloads
-    end
-    
     def valid?
       host == 'rubygems.org' && @url =~ /\/gems\//
     end
@@ -26,4 +20,4 @@ module Popularity
       "https://rubygems.org/api/v1/gems/#{gem_name}.json"
     end
   end
-end
+end

data/lib/popularity/networks/soundcloud.rb

@@ -1,5 +1,7 @@
 module Popularity
   class Soundcloud < Crawler
+    stats :plays, :likes, :comments, :downloads
+
     def plays
       response.scan(/\"soundcloud:play_count\" content=\"([0-9]*)\"/).flatten.first.to_f.to_i
     end
@@ -16,17 +18,6 @@ module Popularity
       response.scan(/\"soundcloud:download_count\" content=\"([0-9]*)\"/).flatten.first.to_f.to_i
     end
 
-    def as_json(options = {})      
-      {"plays" => plays,
-       "likes" => likes,
-       "comments" => comments,
-       "downloads" => downloads }
-    end
-
-    def total
-      plays + likes + downloads + comments
-    end
-
     def valid?
       host == 'soundcloud.com'
     end
@@ -41,4 +32,4 @@ module Popularity
       @url
     end
   end
-end
+end

data/lib/popularity/networks/twitter.rb

@@ -1,21 +1,15 @@
 module Popularity
   class Twitter < Crawler
+    stats :tweets
+
     def tweets
       response_json['count'].to_i if has_response?
     end
 
-    def total
-      tweets
-    end
-
-    def as_json(options = {})
-      {"tweets" => tweets}
-    end
-
     protected
 
     def request_url
       "https://cdn.api.twitter.com/1/urls/count.json?url=#{@url}"
     end
   end
-end
+end

data/lib/popularity/results_container.rb

@@ -1,10 +1,9 @@
-
 module Popularity
   module ContainerMethods
     def self.included(base)
       base.class_eval do
         def results
-          @results
+          @results || []
         end
 
         def add_result(result)
@@ -22,32 +21,42 @@ module Popularity
           end
         end
 
-        def to_json(options ={})
-          individual = {}
-          total = {}
-          @results.collect do |result|
-            json = result.to_json
-            individual[result.url] = json
-
-            json.each do |key, value|
-              next if key == "total"
-
-              if value.is_a?(Hash) 
-                # RedditShare breaks out into separate results for each reddit link 
-                # I'm not a big fan of this hacky stuff here
-                value.each do |k,v|
-                  total[k] ||= 0
-                  total[k] += v
-                end
-              else
-                total[key] ||= 0
-                total[key] += value
-              end    
+        def as_json(options = {})
+          result_property_names = []
+          results_json = self.results.collect do |r|
+            json = {}
+
+            r.class.property_names.each do |name|
+              json[name.to_s] = r.send(name.to_sym)
             end
+
+            json["total"] = r.total
+
+            {r.url => json}
           end
 
-          individual["total"] = total
-          individual
+          json = aggregate_json
+          json["_results"] = results_json
+
+          json
+        end
+
+        def aggregate_json
+          json = {}
+
+          names = if self.class.respond_to?(:property_names)
+            self.class.property_names
+          else
+            self.results.first.class.property_names
+          end
+
+          names.each do |name|
+            json[name.to_s] = self.send(name.to_sym)
+          end
+
+          json["total"] = self.total
+
+          json
         end
 
         def method_missing(method_sym, *arguments, &block)
@@ -57,7 +66,9 @@ module Popularity
           end
 
           if collection.all? { |t| t.is_a?(Fixnum) }
-            collection.reduce(:+) 
+            collection.reduce(:+)
+          else
+            collection.flatten
           end
         end
       end

data/lib/popularity/search.rb

@@ -3,7 +3,6 @@ module Popularity
     attr_accessor :info
     attr_accessor :results
     attr_accessor :sources
-    attr_reader :total
     attr_reader :url
 
     def initialize(url)
@@ -14,10 +13,8 @@ module Popularity
       selected_types.each do |network|
         network.fetch_async do |code, body|
           add_result(network)
-          begin 
-            if network.has_response?
-              total_score << network.total
-            end
+          begin
+
           rescue Exception => e
             puts "#{network.name} had an accident"
             puts e.message
@@ -26,24 +23,22 @@ module Popularity
         end
       end
 
-      loop do 
-        # we want the requests to be asyncronous, but we don't 
+      loop do
+        # we want the requests to be asyncronous, but we don't
         # want gem users to have to deal with async code
-        # 
+        #
         break if selected_types.all? { |network| network.async_done? }
       end
-
-      @total = total_score.reduce(:+)
     end
 
-    def to_json(options ={})
+    def as_json(options ={})
       json = {}
       self.results.collect do |result|
-        json[result.name.to_s] = result.to_json
+        json[result.name.to_s] = result.as_json
       end
 
       self.sources.collect do |source|
-        json[source.to_s] = self.send(source.to_sym).to_json
+        json[source.to_s] = self.send(source.to_sym).as_json
       end
 
       json["total"] = total
@@ -51,6 +46,10 @@ module Popularity
       json
     end
 
+    def total
+      self.results.collect(&:total).compact.reduce(:+)
+    end
+
     protected
 
     def selected_types
@@ -69,6 +68,8 @@ module Popularity
 
       self.instance_variable_set "@#{result.name}", result
 
+      # if there's a facebook result, this class will
+      # have a facebook method returning it
       self.define_singleton_method(result.name.to_sym) { result }
     end
 

data/popularity.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: popularity 0.1.1 ruby lib
+# stub: popularity 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "popularity"
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jeff Keen"]
-  s.date = "2015-04-11"
+  s.date = "2015-05-22"
   s.description = "Supports Facebook, Twitter, Pinterest, Reddit (Links, Posts, and Comments), Github, Soundcloud, Medium, and Rubygems"
   s.email = "jeff@keen.me"
   s.extra_rdoc_files = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -73,13 +74,7 @@ Gem::Specification.new do |s|
     "spec/search_spec.rb",
     "spec/soundcloud_spec.rb",
     "spec/spec_helper.rb",
-    "spec/twitter_spec.rb",
-    "test/facebook_test.rb",
-    "test/fixtures/vcr_cassettes/facebook.yml",
-    "test/fixtures/vcr_cassettes/google.yml",
-    "test/helper.rb",
-    "test/test_non_specific.rb",
-    "test/test_twitter.rb"
+    "spec/twitter_spec.rb"
   ]
   s.homepage = "http://github.com/jkeen/popularity"
   s.licenses = ["MIT"]
@@ -93,7 +88,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<open_uri_redirections>, ["~> 0"])
       s.add_runtime_dependency(%q<json>, ["~> 1.8"])
       s.add_runtime_dependency(%q<unirest>, ["~> 1"])
-      s.add_development_dependency(%q<pry>, ["~> 0.10"])
+      s.add_runtime_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -104,7 +99,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<open_uri_redirections>, ["~> 0"])
       s.add_dependency(%q<json>, ["~> 1.8"])
       s.add_dependency(%q<unirest>, ["~> 1"])
-      s.add_dependency(%q<pry>, ["~> 0.10"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -116,7 +111,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<open_uri_redirections>, ["~> 0"])
     s.add_dependency(%q<json>, ["~> 1.8"])
     s.add_dependency(%q<unirest>, ["~> 1"])
-    s.add_dependency(%q<pry>, ["~> 0.10"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/spec/google_plus_spec.rb

@@ -17,11 +17,11 @@ describe Popularity::GooglePlus do
     end
 
     context "json" do
-      let(:json) { subject.to_json }
+      let(:json) { subject.as_json }
 
-      it "should have required attributes in json" do 
+      it "should have required attributes in json" do
         expect(subject.plus_ones).to eq(json["plus_ones"])
       end
     end
   end
-end
+end

data/spec/medium_spec.rb

@@ -37,11 +37,11 @@ describe Popularity::Medium do
     end
 
     context "json" do
-      let(:json) { subject.to_json }
+      let(:json) { subject.as_json }
 
-      it "should have required attributes in json" do 
+      it "should have required attributes in json" do
         expect(subject.recommends).to eq(json["recommends"])
       end
     end
   end
-end
+end

data/spec/pinterest_spec.rb

@@ -17,11 +17,11 @@ describe Popularity::Pinterest do
     end
 
     context "json" do
-      let(:json) { subject.to_json }
+      let(:json) { subject.as_json }
 
-      it "should have required attributes in json" do 
+      it "should have required attributes in json" do
         expect(subject.pins).to eq(json["pins"])
       end
     end
   end
-end
+end

data/spec/reddit_post_spec.rb

@@ -61,4 +61,4 @@ describe Popularity::RedditPost do
       expect(subject.total).to eq(subject.score + subject.comments)
     end
   end
-end
+end

data/spec/reddit_spec.rb

@@ -27,19 +27,48 @@ describe Popularity::RedditShare do
     end
 
     context "json" do
-      let(:json) { subject.to_json }
+      let(:json) { subject.as_json }
 
-      it "should include post count in json" do 
-        expect(25).to eq(json["posts"])
+      it "should include post count in json" do
+        expect(json["posts"]).to eq(25)
       end
 
-      it "should comments in json" do 
+      it "should have comments in json" do
         expect(json["comments"]).to_not be_nil
       end
 
-      it "should score in json" do 
+      it "should have score in json" do
         expect(json["score"]).to_not be_nil
       end
+
+      it "should have _results in json" do
+        expect(json["_results"]).to_not be_nil
+      end
+
+      context "results" do
+        let(:json_results) { subject.as_json["_results"] }
+
+        it "should equal number of results" do
+          expect(subject.results.size).to eq(json_results.size)
+        end
+
+        it "should contain the result urls" do
+          subject.results.each_with_index do |result, index|
+            json_result = json_results[index]
+
+            expect(json_result.keys.first).to eq(result.url)
+          end
+        end
+
+        it "should contain the correct values" do
+          subject.results.each_with_index do |result, index|
+            json_result = json_results[index]
+            expect(json_result.values.first["score"]).to eq(result.score)
+            expect(json_result.values.first["comments"]).to eq(result.comments)
+            expect(json_result.values.first["total"]).to eq(result.total)
+          end
+        end
+      end
     end
 
     context "unknown url" do
@@ -65,25 +94,25 @@ describe Popularity::RedditShare do
       end
 
       it "should have correct total" do
-        expect(subject.total).to eq(subject.score + subject.comments)
+        expect(subject.total).to eq(subject.score + subject.comments + subject.posts)
       end
 
       context "json" do
-        let(:json) { subject.to_json }
+        let(:json) { subject.as_json }
 
-        it "should include post count in json" do 
+        it "should include post count in json" do
           expect(0).to eq(json["posts"])
         end
 
-        it "should comments in json" do 
+        it "should comments in json" do
           expect(0).to eq(json["comments"])
         end
 
-        it "should score in json" do 
+        it "should score in json" do
           expect(0).to eq(json["score"])
         end
 
       end
     end
   end
-end
+end