postrank-api 0.2.0 → 0.4.0

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Rakefile

@@ -1,24 +1,9 @@
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "postrank-api"
-    gemspec.summary = "PostRank API Wrapper"
-    gemspec.description = gemspec.summary
-    gemspec.email = "ilya@igvita.com"
-    gemspec.homepage = "http://github.com/postrank/postrank-api"
-    gemspec.authors = ["Ilya Grigorik"]
-    gemspec.required_ruby_version = ">= 1.9.1"
-    gemspec.add_dependency('eventmachine', '>= 0.12.9')
-    gemspec.add_dependency('em-http-request')
-    gemspec.add_dependency('em-synchrony')
-    gemspec.add_dependency('yajl-ruby')
-    gemspec.add_dependency('chronic')
-    gemspec.rubyforge_project = "postrank-api"
-  end
+require 'rspec'
+require 'rspec/core/rake_task'
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+Rspec::Core::RakeTask.new do |t|
+  t.rspec_opts = '--color'
+end

data/lib/postrank-api/api.rb

@@ -1,5 +1,6 @@
 require 'em-synchrony'
 require 'em-synchrony/em-http'
+require 'postrank-uri'
 
 require 'digest/md5'
 require 'chronic'
@@ -7,8 +8,10 @@ require 'yajl'
 
 module PostRank
   class API
-    V1_API_BASE = 'http://api.postrank.com/v1'
-    V2_API_BASE = 'http://api.postrank.com/v2'
+    API_BASE    = 'http://api.postrank.com'
+    V1_API_BASE = API_BASE + '/v1'
+    V2_API_BASE = API_BASE + '/v2'
+    V3_API_BASE = API_BASE + '/v3'
 
     def initialize(appkey)
       @appkey = appkey
@@ -41,20 +44,7 @@ module PostRank
         }
       }
 
-      http = get("#{V2_API_BASE}/feed/", req)
-      parse(http.response)
-    end
-
-    def recommendations(feeds, opts = {})
-      req = {
-        :query => {
-          :appkey => @appkey,
-          :num => opts[:num] || 10
-        },
-        :body => build_body(feeds, 'feed')
-      }
-
-      http = post("#{V2_API_BASE}/recommend", req)
+      http = get("#{V3_API_BASE}/feed/", req)
       parse(http.response)
     end
 
@@ -65,10 +55,10 @@ module PostRank
       req = {
         :query => {
           :appkey => @appkey,
-          :min_time => Chronic.parse(opts[:start_time]).to_i,
-          :max_time => Chronic.parse(opts[:start_time]).to_i
+          :start_time => Chronic.parse(opts[:start_time]).to_i,
+          :end_time => Chronic.parse(opts[:end_time]).to_i
         },
-        :body => build_body( posts, 'post_hash')
+        :body => build_body(posts, 'post_hash')
       }
 
       http = post("#{V2_API_BASE}/entry/metrics/historic", req)
@@ -87,7 +77,6 @@ module PostRank
       parse(http.response)
     end
 
-
     def top_posts(feed, opts = {})
       req = {
         :query => {
@@ -98,7 +87,7 @@ module PostRank
         }
       }
 
-      http = get("#{V2_API_BASE}/feed/topposts/", req)
+      http = get("#{V3_API_BASE}/feed/topposts/", req)
       parse(http.response)
     end
 
@@ -156,19 +145,39 @@ module PostRank
         :body => build_body(urls, 'url')
       }
 
-      http = post("#{V2_API_BASE}/entry/metrics", req)
+      http = post("#{V3_API_BASE}/entry/metrics", req)
       parse(http.response).inject({}) do |hash, v|
         hash[reverse[v[0]]] = v[1]
         hash
       end
     end
 
+    def top_posts(feed, opts = {})
+      req = {
+        :query => {
+          :appkey => @appkey,
+          :q      => opts[:q]     || '',
+          :num    => opts[:num]   || 10,
+          :id     => feed
+        }
+      }
+
+      http = get("#{V3_API_BASE}/feed/topposts/", req)
+      parse(http.response)
+    end
+
     private
 
       def parse(data)
         begin
-          Yajl::Parser.parse(data)
-        rescue Exception => e
+          data = Yajl::Parser.parse(data)
+
+          if msg = data['error']
+            raise Exception.new(msg)
+          end
+
+          data
+        rescue Yajl::ParseError => e
           puts "Failed to parse request:"
           puts e.message
           puts e.backtrace[0, 5].join("\n")
@@ -176,7 +185,13 @@ module PostRank
       end
 
       def build_body(urls, key)
-        [urls].flatten.map { |e| "#{key}[]=#{e}" }.join("&")
+        [urls].flatten.map do |e|
+          if key == "url" && e !~ /\w{32}/
+            e = PostRank::URI.clean(e)
+          end
+
+          "#{key}[]=#{e}"
+        end.join("&")
       end
 
       def post(url, req)
@@ -187,14 +202,6 @@ module PostRank
         dispatch(:get, url, req)
       end
 
-      def build_body(urls, key)
-        [urls].flatten.map { |e| "#{key}[]=#{e}" }.join("&")
-      end
-
-      def post(url, req)
-        dispatch(:post, url, req)
-      end
-
       def dispatch(method, url, req)
         if EM.reactor_running?
           http = EM::HttpRequest.new(url).send(method, req)

data/lib/postrank-api/version.rb

@@ -0,0 +1,5 @@
+module PostRank
+  class API
+    VERSION = "0.4.0"
+  end
+end

data/postrank-api.gemspec

@@ -1,63 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "postrank-api/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{postrank-api}
-  s.version = "0.2.0"
+  s.name        = "postrank-api"
+  s.version     = PostRank::API::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Ilya Grigorik"]
+  s.email       = ["ilya@igvita.com"]
+  s.homepage    = "http://github.com/postrank-labs/postrank-api"
+  s.summary     = "Ruby 1.9 PostRank API Wrapper"
+  s.description = s.summary
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ilya Grigorik"]
-  s.date = %q{2010-12-15}
-  s.description = %q{PostRank API Wrapper}
-  s.email = %q{ilya@igvita.com}
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/postrank-api.rb",
-     "lib/postrank-api/api.rb",
-     "postrank-api.gemspec",
-     "spec/api_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/postrank/postrank-api}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubyforge_project = %q{postrank-api}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{PostRank API Wrapper}
-  s.test_files = [
-    "spec/api_spec.rb"
-  ]
+  s.rubyforge_project = "postrank-api"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "postrank-uri"
+  s.add_dependency "eventmachine"
+  s.add_dependency "em-http-request"
+  s.add_dependency "em-synchrony"
+  s.add_dependency "yajl-ruby"
+  s.add_dependency "chronic"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.9"])
-      s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
-      s.add_runtime_dependency(%q<em-synchrony>, [">= 0"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<chronic>, [">= 0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
-      s.add_dependency(%q<em-http-request>, [">= 0"])
-      s.add_dependency(%q<em-synchrony>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<chronic>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
-    s.add_dependency(%q<em-http-request>, [">= 0"])
-    s.add_dependency(%q<em-synchrony>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<chronic>, [">= 0"])
-  end
-end
+  s.add_development_dependency "rspec"
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/spec/api_spec.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'rspec'
 require 'lib/postrank-api'
 require 'pp'
 
@@ -70,28 +70,6 @@ describe PostRank::API do
     end
   end
 
-  describe "Recommendations API" do
-
-    it "should fetch recommendations for a single feed" do
-       EM.synchrony do
-          resp = api.recommendations(IGVITA)
-            resp.class.should == Array
-          EM.stop
-        end
-      end
-
-    it "should fetch recommendation for a set of feeds" do
-     EM.synchrony do
-        resp = api.recommendations([IGVITA, EVERBURNING], :num => 1)
-
-          resp.class.should == Array
-          resp.size.should == 1
-
-        EM.stop
-      end
-    end
-  end
-
   describe "Top Posts API" do
     it "should fetch top posts for a feed" do
       EM.synchrony do
@@ -106,18 +84,19 @@ describe PostRank::API do
     end
   end
 
- describe "Metrics Versioned API" do
+  describe "Metrics Versioned API" do
     it "should fetch metrics for a single post" do
       EM.synchrony do
-        met = api.metrics_versioned('b0432f947bc0d44766d046bfc3c15043', {:start => '5 years ago', :end => 'today'})
+        met = api.metrics_versioned('cd116fcfb7df471e3a2ba2065b3499bb', {:start_time => '5 years ago'})
         met.class.should == Hash
         met.keys.size.should == 1
         EM.stop
       end
     end
+
     it "should fetch metrics for multiple posts" do
       EM.synchrony do
-        met = api.metrics_versioned(['b0432f947bc0d44766d046bfc3c15043', 'a020c1c3a5b2aef1ab4a7307cf3d2cb6'], {:start => '5 years ago', :end => 'today'})
+        met = api.metrics_versioned(['b0432f947bc0d44766d046bfc3c15043', 'a020c1c3a5b2aef1ab4a7307cf3d2cb6'], {:start_time => '5 years ago', :end_time => 'today'})
         met.class.should == Hash
         met.keys.size.should == 2
         EM.stop
@@ -128,18 +107,19 @@ describe PostRank::API do
   describe "Postrank API" do
     it "should fetch postrank with respect to provided urls" do
       EM.synchrony do
-          pr = api.postrank(['http://www.igvita.com/2008/06/19/splunk-your-distributed-logs-in-ec2/', 'http://www.igvita.com/2008/02/11/nginx-and-memcached-a-400-boost/'])
-          pr.class.should == Hash
-          pr.keys.size.should == 2
+        pr = api.postrank(['http://www.igvita.com/2008/06/19/splunk-your-distributed-logs-in-ec2/', 'http://www.igvita.com/2008/02/11/nginx-and-memcached-a-400-boost/'])
+        pr.class.should == Hash
+        pr.keys.size.should == 2
         EM.stop
-       end
+      end
     end
+
     it "should fetch postrank with respect specific feeds" do
       EM.synchrony do
         pr = api.postrank(['http://www.igvita.com/2008/06/19/splunk-your-distributed-logs-in-ec2/', 'http://www.igvita.com/2008/02/11/nginx-and-memcached-a-400-boost/'], ['421df2d86ab95100de7dcc2e247a08ab'])
         pr.class.should == Hash
         pr.keys.size.should == 2
-       EM.stop
+        EM.stop
       end
     end
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: postrank-api
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,99 +10,114 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2011-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: postrank-uri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 9
-        version: 0.12.9
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: eventmachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: em-synchrony
+  name: em-http-request
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: em-synchrony
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: chronic
+  name: yajl-ruby
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
-description: PostRank API Wrapper
-email: ilya@igvita.com
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
+description: Ruby 1.9 PostRank API Wrapper
+email: 
+- ilya@igvita.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .rspec
+- Gemfile
 - README.md
 - Rakefile
 - VERSION
 - lib/postrank-api.rb
 - lib/postrank-api/api.rb
+- lib/postrank-api/version.rb
 - postrank-api.gemspec
 - spec/api_spec.rb
 has_rdoc: true
-homepage: http://github.com/postrank/postrank-api
+homepage: http://github.com/postrank-labs/postrank-api
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -114,25 +125,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
-      version: 1.9.1
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: postrank-api
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: PostRank API Wrapper
+summary: Ruby 1.9 PostRank API Wrapper
 test_files: 
 - spec/api_spec.rb