one40_proof 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,20 +1,103 @@
 = 140Proof API Wrapper
 
-A Ruby wrapper around  the 140Proof API. Documentation can be found here - http://developers.140proof.com/docs
+This is a wrapper around the 140 Proof API.
 
-It currently only supports JSON.
+It is split into two parts. The first is a simple interface (One40Proof::Base) and the second is a multi interface (One40Proof::Multi::Base).
+
+<b>The simple interface requires:</b>
+
+- http://github.com/jnunemaker/httparty
+
+<b>The multi interface requires:</b>
+
+- http://github.com/pauldix/typhoeus
+
+<b>They both require:</b>
+
+- http://flori.github.com/json
+
+The multi interface allows you to make parallel requests (benchmarks are below). 
+
+Documentation for the 140Proof API can be found here - http://developers.140proof.com/docs
 
 == Install
 
   gem sources -a http://gemcutter.org
   sudo gem install one40_proof
   
+== Benchmarks
+
+This can be found on the benchmark dir
+
+  n = 10
+  Benchmark.bm do |x|
+    x.report("Simple") do 
+      n.times { One40Proof::Test.new }
+    end
+    x.report("Multi") do
+      query = []
+      n.times { query << {:method => :test} }
+      One40Proof::Multi::Base.new(query)
+    end
+  end
+  
+                ## Ruby 1.9.1 ##
+            user      system      total      real
+  Simple  0.030000   0.020000   0.050000 (  2.507165)
+  Multi   0.010000   0.010000   0.020000 (  0.426687)
+  
 == How To Use
 
+<b>Making Parallel Requests</b>
+
+Queries are created using a hash and then placed in an array
+
+  require 'rubygems'
+  require 'one40_proof/multi'
+
+  queries = []
+  
+  # One40Proof's "Test" method
+  queries << {:method => :test}
+  
+  # One40Proof's "User" method
+  queries << {:method => :user, :user_id => 'sferik', :app_id => 'test'}
+  
+  # One40Proof's "Search" method
+  queries << {:method => :search, :user_id => 'sferik', :app_id => 'test', :q => 'New York Mets'}
+  
+  # We then initialize the calls to the service
+  a = One40Proof::Multi::Base.new(queries)
+  
+  # Then we have access to all our ads
+  a.ads.each do |ad|
+    # The Ad
+    ad.image_url
+    ad.byline
+    ad.text
+
+    # User
+    ad.user.screen_name
+    ad.user.user_id
+    ad.user.profile_image_url
+    ad.user.name
+
+    # Action URLS
+    ad.action_urls.click_url
+    ad.action_urls.favorite_url   # Or ad.action_urls.favourite_url for the English
+    ad.action_urls.impression_url
+    ad.action_urls.friendship_url
+    ad.action_urls.reply_url
+    ad.action_urls.retweet_url
+  end
+
+
+<b>Making Single Requests</b>
+
 Testing ad placement while in development
 
   require 'rubygems'
-  require 'one40_proof'
+  require 'one40_proof/simple'
   
   ad = One40Proof::Test.new
   

data/Rakefile

@@ -23,7 +23,7 @@ end
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_files = FileList['spec/**/*_spec.rb'].uniq
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/benchmark/benchmark.rb

@@ -0,0 +1,21 @@
+# Benchmark between
+# One40Proof::Test
+# One40Proof::Multi::Base
+
+require 'rubygems'
+require 'benchmark'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/one40_proof/simple')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/one40_proof/multi')
+
+n = 10
+query = []
+n.times { query << {:method => :test} }
+
+Benchmark.bm do |x|
+  x.report("Simple") do 
+    n.times { One40Proof::Test.new }
+  end
+  x.report("Multi") do    
+    One40Proof::Multi::Base.new(query)
+  end
+end

data/lib/one40_proof/attributes/action_urls.rb

@@ -2,7 +2,7 @@ module One40Proof
   class ActionUrls
     
     def initialize(data)
-      @data = data['ads'][0]['action_urls']
+      @data = data
     end
     
     def click_url

data/lib/one40_proof/attributes/ad.rb

@@ -0,0 +1,40 @@
+require 'json'
+require 'attributes/user'
+require 'attributes/action_urls'
+require 'attributes/status'
+
+module One40Proof
+  class Ad
+    
+    def initialize(data)
+      @data = JSON.parse(data)['ads'][0]
+    end
+    
+    def image_url
+      @data['image_url']
+    end
+    
+    # e.g "ads by Pizza Hut"
+    def byline
+      @data['byline']
+    end
+    
+    # Ad text
+    def text
+      @data['text']
+    end
+    
+    def user
+      @user ||= User.new(@data['user'])
+    end
+    
+    def action_urls
+      @action_urls ||= ActionUrls.new(@data['action_urls'])
+    end
+    
+    def status
+      @status ||= Status.new(@data['status'])
+    end
+    
+  end
+end

data/lib/one40_proof/attributes/status.rb

@@ -0,0 +1,13 @@
+module One40Proof
+  class Status
+    
+    def initialize(data)
+      @data = data
+    end
+    
+    def id
+      @data['id']
+    end
+    
+  end
+end

data/lib/one40_proof/attributes/user.rb

@@ -2,7 +2,7 @@ module One40Proof
   class User
     
     def initialize(data)
-      @data = data['ads'][0]['user']
+      @data = data
     end
     
     def profile_image_url

data/lib/one40_proof/multi/base.rb

@@ -0,0 +1,59 @@
+require 'typhoeus'
+require 'attributes/ad'
+
+module One40Proof
+  module Multi
+    class Base
+    
+      def initialize(ad_requests)
+        hydra = Typhoeus::Hydra.new
+            
+        ad_requests.each do |ad_request|
+          url = build_url(ad_request.delete(:method))
+        
+          params = {:params => turn_keys_to_strings(ad_request)}
+          request = Typhoeus::Request.new(url, params)
+        
+          request.on_complete do |response|
+            ads << Ad.new(response.body)
+          end
+        
+          hydra.queue(request)
+        end
+      
+        hydra.run
+      end
+    
+      def ads
+        @ads ||= []
+      end
+        
+      private
+    
+      # I get undefined method `<=>' for :user_id:Symbol in Ruby 1.8.6
+      def turn_keys_to_strings(hash)
+        new_hash = {}
+        hash.each {|k,v| new_hash[k.to_s] = v}
+        new_hash
+      end
+    
+      def build_url(method)
+        case method
+        when :test
+          path = '/test/ads.json'
+        when :user
+          path = '/ads/user.json'
+        when :search
+          path = '/ads/search.json'
+        end
+      
+        base_uri + path
+      end
+    
+      def base_uri
+        "http://api.140proof.com"
+      end
+  
+    end
+  end
+end

data/lib/one40_proof/multi.rb

@@ -0,0 +1,3 @@
+$:.unshift(File.dirname(__FILE__))
+
+require 'multi/base'

data/lib/one40_proof/{base.rb → simple/base.rb}

@@ -1,8 +1,6 @@
 require 'httparty'
-require 'json'
-require 'one40_proof/attributes/action_urls'
-require 'one40_proof/attributes/user'
-require 'one40_proof/exceptions'
+require 'attributes/ad'
+require 'simple/exceptions'
 
 module One40Proof
   class Base
@@ -15,31 +13,33 @@ module One40Proof
     end
     
     def action_urls
-      @action_urls ||= ActionUrls.new(json)
+      ad.action_urls
     end
         
     def user
-      @user ||= User.new(json)
+      ad.user
+    end
+    
+    def status
+      ad.status
     end
     
     def image_url
-      json['ads'][0]['image_url']
+      ad.image_url
     end
     
-    # e.g "ads by Pizza Hut"
     def byline
-      json['ads'][0]['byline']
+      ad.byline
     end
     
-    # Ad text
     def text
-      json['ads'][0]['text']
+      ad.text
     end
     
     private
             
-    def json
-      @json ||= JSON.parse(@response.body)
+    def ad
+      @ad ||= Ad.new(@response.body)
     end
     
     def validate_response(response)

data/lib/one40_proof/{search.rb → simple/search.rb}

@@ -1,4 +1,4 @@
-require 'one40_proof/base'
+require 'simple/base'
 
 # Returns an ad for a specified user. 
 # Returns an HTTP 404 error if the user does not exist, if the publisher does not exist, or if a targetted ad could not be found for the user.

data/lib/one40_proof/{test.rb → simple/test.rb}

@@ -1,4 +1,4 @@
-require 'one40_proof/base'
+require 'simple/base'
 
 # Returns an ad. Use for testing and verifying your ad-serving code while in development.
 

data/lib/one40_proof/{user_ad.rb → simple/user_ad.rb}

@@ -1,4 +1,4 @@
-require 'one40_proof/base'
+require 'simple/base'
 
 # Returns an ad for a specified user. 
 # Returns an HTTP 404 error if the user does not exist, if the publisher does not exist, or if a targetted ad could not be found for the user.

data/lib/one40_proof/simple.rb

@@ -0,0 +1,5 @@
+$:.unshift(File.dirname(__FILE__))
+
+require 'simple/test'
+require 'simple/user_ad'
+require 'simple/search'

data/one40_proof.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{one40_proof}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["reddavis"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-03-07}
   s.description = %q{A Ruby wrapper around  the 140Proof API. Documentation can be found here - http://developers.140proof.com/docs/}
   s.email = %q{reddavis@gmail.com}
   s.extra_rdoc_files = [
@@ -23,36 +23,47 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "lib/one40_proof.rb",
+     "benchmark/benchmark.rb",
      "lib/one40_proof/attributes/action_urls.rb",
+     "lib/one40_proof/attributes/ad.rb",
+     "lib/one40_proof/attributes/status.rb",
      "lib/one40_proof/attributes/user.rb",
-     "lib/one40_proof/base.rb",
-     "lib/one40_proof/exceptions.rb",
-     "lib/one40_proof/search.rb",
-     "lib/one40_proof/test.rb",
-     "lib/one40_proof/user_ad.rb",
+     "lib/one40_proof/multi.rb",
+     "lib/one40_proof/multi/base.rb",
+     "lib/one40_proof/simple.rb",
+     "lib/one40_proof/simple/base.rb",
+     "lib/one40_proof/simple/exceptions.rb",
+     "lib/one40_proof/simple/search.rb",
+     "lib/one40_proof/simple/test.rb",
+     "lib/one40_proof/simple/user_ad.rb",
      "one40_proof.gemspec",
      "spec/one40_proof/attributes/action_urls_spec.rb",
+     "spec/one40_proof/attributes/ad_spec.rb",
+     "spec/one40_proof/attributes/status_spec.rb",
      "spec/one40_proof/attributes/user_spec.rb",
-     "spec/one40_proof/base_spec.rb",
-     "spec/one40_proof/search_spec.rb",
-     "spec/one40_proof/test_spec.rb",
-     "spec/one40_proof/user_ad_spec.rb",
+     "spec/one40_proof/multi/base_spec.rb",
+     "spec/one40_proof/simple/base_spec.rb",
+     "spec/one40_proof/simple/search_spec.rb",
+     "spec/one40_proof/simple/test_spec.rb",
+     "spec/one40_proof/simple/user_ad_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/reddavis/One40Proof}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Ruby wrapper around  the 140Proof API}
   s.test_files = [
     "spec/one40_proof/attributes/action_urls_spec.rb",
+     "spec/one40_proof/attributes/ad_spec.rb",
+     "spec/one40_proof/attributes/status_spec.rb",
      "spec/one40_proof/attributes/user_spec.rb",
-     "spec/one40_proof/base_spec.rb",
-     "spec/one40_proof/search_spec.rb",
-     "spec/one40_proof/test_spec.rb",
-     "spec/one40_proof/user_ad_spec.rb",
+     "spec/one40_proof/multi/base_spec.rb",
+     "spec/one40_proof/simple/base_spec.rb",
+     "spec/one40_proof/simple/search_spec.rb",
+     "spec/one40_proof/simple/test_spec.rb",
+     "spec/one40_proof/simple/user_ad_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/one40_proof/attributes/action_urls_spec.rb

@@ -1,8 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'one40_proof/multi'
 
 describe "ActionUrls" do
   before(:all) do
-    parsed_json = JSON.parse(test_ad_data)
+    parsed_json = JSON.parse(test_ad_data)['ads'][0]['action_urls']
     @action_urls = One40Proof::ActionUrls.new(parsed_json)
   end
   

data/spec/one40_proof/attributes/ad_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'one40_proof/multi'
+
+describe "Ad" do
+  before(:all) do
+    @ad = One40Proof::Ad.new(test_ad_data)
+  end
+  
+  it "should have an image_url" do
+    @ad.image_url.should_not be_nil
+  end
+  
+  it "should have byline" do
+    @ad.byline.should_not be_nil
+  end
+  
+  it "should have text" do
+    @ad.text.should_not be_nil
+  end
+  
+  it "should return a User object" do
+    @ad.user.should be_a(One40Proof::User)
+  end
+  
+  it "should return an ActionUrls object" do
+    @ad.action_urls.should be_a(One40Proof::ActionUrls)
+  end
+  
+  it "should return a Status object" do
+    @ad.status.should be_a(One40Proof::Status)
+  end
+end

data/spec/one40_proof/attributes/status_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'one40_proof/multi'
+
+describe "Status" do
+  before(:all) do
+    parsed_json = JSON.parse(test_ad_data)['ads'][0]['status']
+    @status = One40Proof::Status.new(parsed_json)
+  end
+  
+  it "should return status id" do
+    @status.id.should == 6017128450
+  end
+end

data/spec/one40_proof/attributes/user_spec.rb

@@ -1,8 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'one40_proof/multi'
 
 describe "User" do
   before(:all) do
-    parsed_json = JSON.parse(test_ad_data)
+    parsed_json = JSON.parse(test_ad_data)['ads'][0]['user']
     @user = One40Proof::User.new(parsed_json)
   end
   

data/spec/one40_proof/multi/base_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'one40_proof/multi'
+
+describe "MultiBase" do
+  before(:all) do
+    hydra = Typhoeus::Hydra.new
+    test_response = Response.new(:code => 200, :body => test_ad_data)
+    user_response = Response.new(:code => 200, :body => user_ad_data)
+    
+    # I receive undefined method `request=' for #<WebMock::Response:0x7fc658> without these:
+    test_response.stub!(:request=)
+    user_response.stub!(:request=)
+    
+    hydra.stub(:get, "http://api.140proof.com/test/ads.json").and_return(test_response)
+    hydra.stub(:get, "http://api.140proof.com/ads/user.json?app_id=test&user_id=sferik").and_return(user_response)
+    hydra.stub(:get, "http://api.140proof.com/ads/search.json?app_id=test&q=New+York+Mets&user_id=sferik").and_return(user_response)
+    
+    Typhoeus::Hydra.stub!(:new).and_return(hydra)
+    
+    @a = One40Proof::Multi::Base.new(queries)
+    @a.ads.should be_an(Array)
+  end
+    
+  it "should return an Array of Ads" do
+    @a.ads.should be_an(Array)
+  end
+  
+  it "should create 3 ads" do
+    @a.ads.size.should == 3
+  end
+  
+  def queries
+    [
+      {:method => :test},
+      {:method => :user, :user_id => 'sferik', :app_id => 'test'},
+      {:method => :search, :user_id => 'sferik', :app_id => 'test', :q => 'New York Mets'}
+    ]
+  end
+end

data/spec/one40_proof/{base_spec.rb → simple/base_spec.rb}

@@ -1,7 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'one40_proof/simple'
 
 describe "Base" do
-  
+
   describe "200 OK" do
     before(:all) do
       stub_request(:get, base_url).to_return(:body => user_ad_data)
@@ -15,6 +16,10 @@ describe "Base" do
     it "should return a User object" do
       @base.user.should be_a(One40Proof::User)
     end
+    
+    it "should return a Status object" do
+      @base.status.should be_a(One40Proof::Status)
+    end
 
     it "should return image_url" do
       @base.image_url.should == "http://img.tweetimag.es/i/LittleSkillet_n"

data/spec/one40_proof/simple/search_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "Search" do
+  it "should request GET /ads/search.json..." do
+   url = base_url + '/ads/search.json?user_id=sferik&app_id=test&q=New%20York%20Mets'
+   stub_request(:get, url)
+   One40Proof::Search.new(:user_id => 'sferik', :app_id => 'test', :q => 'New York Mets')
+
+   WebMock.should have_requested(:get, url)
+  end
+end

data/spec/one40_proof/simple/test_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "Test" do
+  describe "Connection to the service" do
+   it "should request GET /test/ads.json" do
+     url = base_url + '/test/ads.json'
+     stub_request(:get, url)
+     One40Proof::Test.new
+ 
+     WebMock.should have_requested(:get, url)
+   end
+  end
+end

data/spec/one40_proof/simple/user_ad_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "UserAd" do
+  it "should request GET /ads/user.json..." do
+   url = base_url + '/ads/user.json?user_id=sferik&app_id=test'
+   stub_request(:get, url)
+   One40Proof::UserAd.new(:user_id => 'sferik', :app_id => 'test')
+
+   WebMock.should have_requested(:get, url)
+  end
+end
+
+  

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
-require 'one40_proof'
 require 'spec'
 require 'spec/autorun'
 require 'webmock/rspec'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: one40_proof
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - reddavis
@@ -9,39 +14,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +00:00
+date: 2010-03-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: A Ruby wrapper around  the 140Proof API. Documentation can be found here - http://developers.140proof.com/docs/
 email: reddavis@gmail.com
 executables: []
@@ -58,21 +71,29 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/one40_proof.rb
+- benchmark/benchmark.rb
 - lib/one40_proof/attributes/action_urls.rb
+- lib/one40_proof/attributes/ad.rb
+- lib/one40_proof/attributes/status.rb
 - lib/one40_proof/attributes/user.rb
-- lib/one40_proof/base.rb
-- lib/one40_proof/exceptions.rb
-- lib/one40_proof/search.rb
-- lib/one40_proof/test.rb
-- lib/one40_proof/user_ad.rb
+- lib/one40_proof/multi.rb
+- lib/one40_proof/multi/base.rb
+- lib/one40_proof/simple.rb
+- lib/one40_proof/simple/base.rb
+- lib/one40_proof/simple/exceptions.rb
+- lib/one40_proof/simple/search.rb
+- lib/one40_proof/simple/test.rb
+- lib/one40_proof/simple/user_ad.rb
 - one40_proof.gemspec
 - spec/one40_proof/attributes/action_urls_spec.rb
+- spec/one40_proof/attributes/ad_spec.rb
+- spec/one40_proof/attributes/status_spec.rb
 - spec/one40_proof/attributes/user_spec.rb
-- spec/one40_proof/base_spec.rb
-- spec/one40_proof/search_spec.rb
-- spec/one40_proof/test_spec.rb
-- spec/one40_proof/user_ad_spec.rb
+- spec/one40_proof/multi/base_spec.rb
+- spec/one40_proof/simple/base_spec.rb
+- spec/one40_proof/simple/search_spec.rb
+- spec/one40_proof/simple/test_spec.rb
+- spec/one40_proof/simple/user_ad_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -88,26 +109,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper around  the 140Proof API
 test_files: 
 - spec/one40_proof/attributes/action_urls_spec.rb
+- spec/one40_proof/attributes/ad_spec.rb
+- spec/one40_proof/attributes/status_spec.rb
 - spec/one40_proof/attributes/user_spec.rb
-- spec/one40_proof/base_spec.rb
-- spec/one40_proof/search_spec.rb
-- spec/one40_proof/test_spec.rb
-- spec/one40_proof/user_ad_spec.rb
+- spec/one40_proof/multi/base_spec.rb
+- spec/one40_proof/simple/base_spec.rb
+- spec/one40_proof/simple/search_spec.rb
+- spec/one40_proof/simple/test_spec.rb
+- spec/one40_proof/simple/user_ad_spec.rb
 - spec/spec_helper.rb

data/lib/one40_proof.rb

@@ -1,5 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'one40_proof/test'
-require 'one40_proof/user_ad'
-require 'one40_proof/search'

data/spec/one40_proof/search_spec.rb

@@ -1,11 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "Search" do
-  it "should request GET /ads/search.json..." do
-    url = base_url + '/ads/search.json?user_id=sferik&app_id=test&q=New%20York%20Mets'
-    stub_request(:get, url)
-    One40Proof::Search.new(:user_id => 'sferik', :app_id => 'test', :q => 'New York Mets')
-  
-    WebMock.should have_requested(:get, url)
-  end
-end

data/spec/one40_proof/test_spec.rb

@@ -1,13 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "Test" do
-  describe "Connection to the service" do
-    it "should request GET /test/ads.json" do
-      url = base_url + '/test/ads.json'
-      stub_request(:get, url)
-      One40Proof::Test.new
-    
-      WebMock.should have_requested(:get, url)
-    end
-  end
-end

data/spec/one40_proof/user_ad_spec.rb

@@ -1,11 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "UserAd" do
-  it "should request GET /ads/user.json..." do
-    url = base_url + '/ads/user.json?user_id=sferik&app_id=test'
-    stub_request(:get, url)
-    One40Proof::UserAd.new(:user_id => 'sferik', :app_id => 'test')
-  
-    WebMock.should have_requested(:get, url)
-  end
-end