citygrid_api 0.0.5.1 → 0.0.6

data/test/auth_token.rb

@@ -0,0 +1,39 @@
+class AuthToken
+  class << self
+    def kunimom
+      @@kunimom ||= CityGrid.login(
+        :username => 'kunimom',
+        :password => 'pppppp'
+      ).authToken
+    end
+    
+    def dou
+      @@dou ||= CityGrid.login(
+        :username => 'doushen2',
+        :password => 'abcd1234'
+      ).authToken
+    end
+    
+    def sales_coord
+      @@sales_cord ||= CityGrid.login(
+        :username => 'QASalesCoord',
+        :password => 'pppppp'
+      ).authToken
+    end
+    
+    def gary_test
+      @@gary_test ||= CityGrid.login(
+        :username => 'GARYTEST',
+        :password => 'pppppp'
+      ).authToken
+    end
+    
+    def rand_number
+      @@rand_number ||= rand(10000000)
+    end
+    
+    def generate
+      kunimom
+    end
+  end
+end

data/test/helper.rb

@@ -1,32 +1,8 @@
-# Hack to allow storing tokens between tests
-class AuthToken
-  class << self
-    def kunimom
-      @@kunimom ||= CityGrid.login(
-        :username => 'kunimom',
-        :password => 'pppppp'
-      ).authToken
-    end
-    
-    def sales_coord
-      @@sales_cord ||= CityGrid.login(
-        :username => 'QASalesCoord',
-        :password => 'pppppp'
-      ).authToken
-    end
-   
-    def rand_number
-      @@rand_number ||= rand(10000000)
-    end
-    
-    def generate
-      kunimom
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), "auth_token")
+require File.join(File.dirname(__FILE__), "session_helper")
 
 # don't do gem setup if we're in the dashboad environment
-unless defined? IN_DASHBOARD 
+unless defined? IN_DASHBOARD
   require 'rubygems'
   require 'bundler'
   begin
@@ -45,10 +21,7 @@ unless defined? IN_DASHBOARD
   require "publisher_helper"
 
   # load default config
-  CityGrid.load_config File.expand_path(File.join(File.dirname(__FILE__), '..', 'citygrid_api.yml')), "qa"
-  # load endpoints from configs
-  # CityGrid.set_endpoints File.join(File.dirname(__FILE__), '..', "qa-endpoints.properties") 
-  # CityGrid.set_env File.join(File.dirname(__FILE__), '..', "qa-env.properties")
+  CityGrid.load_config File.expand_path(File.join(File.dirname(__FILE__), '..', 'citygrid_api.yml.sample')), "qa"
 
   # Run code with rescue so that exceptions
   # will be printed, but won't stop test suite
@@ -66,4 +39,31 @@ unless defined? IN_DASHBOARD
       false # return false
     end
   end
+  
+  # patch in VCR
+  require 'vcr'
+  
+  VCR.config do |c|
+    c.cassette_library_dir = 'fixtures/vcr_cassettes'
+    c.stub_with :webmock
+    c.allow_http_connections_when_no_cassette = true
+  end
+
+  # contexts now use VCR, with a cassette named by the description
+  module Riot
+    class Context
+      alias_method :old_run, :run
+      def run reporter
+        if option(:vcr) != nil && option(:vcr) == false
+          old_run reporter
+        else
+          VCR.use_cassette self.detailed_description[0..70] do
+            old_run reporter 
+          end
+        end
+      end
+      
+    end
+  end
+  
 end

data/test/session_helper.rb

@@ -0,0 +1,20 @@
+# cache sessions
+class SessionHelper
+  class << self
+    def kunimom
+      @@kunimom ||= CityGrid.session 'kunimom', 'pppppp'
+    end
+    
+    def dou
+      @@dou ||= CityGrid.session 'doushen2', 'abcd1234'
+    end
+    
+    def sales_coord
+      @@sales_cord ||= CityGrid.session 'QASalesCoord', 'pppppp'
+    end
+    
+    def gary_test
+      @@gary_test ||= CityGrid.session 'GARYTEST', 'pppppp'
+    end
+  end
+end

data/test/test_session.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+context "log in a session" do
+  setup do
+    CityGrid::Session.login "GARYTEST", "pppppp"
+  end
+
+  should "flag as logged in" do
+    topic.logged_in?
+  end
+  
+  should "have a valid AuthToken" do
+    topic.auth_token
+  end
+  
+  # context "run validate" do
+  #   setup do
+  #     topic.call_api CityGrid::API::Advertising::Authentication, 
+  #       :validate
+  #   end
+  #   
+  #   should "return correct username" do
+  #     puts topic
+  #   end
+  # end
+  
+  context "mutate places" do
+    setup do
+      topic.call_api CityGrid::API::Advertising::Places, 
+        :mutate,
+        "mutateOperationListResource" => [{
+          "operator" => "ADD",
+          "operand" => {
+            "name" => "Pi on sunset in LAAAAAAAAAAAAAA",
+            "address_1" => "Jackson 2102",
+            "address_2" => "",
+            "city" => "Los Angeles",
+            "state" => "California",
+            "postal_code" => 90025,
+            "phone_number" => 3103333333,
+            "website_url" => "pi.com",
+            "primary_tag_id" => "3623",
+            "bullet1" => "Knoll bullet 1",
+            "tagline" => "my tagline",
+            "primary_tag_id" => 3623,
+            "secondary_tags" => '1776'}
+        }]
+    end
+  
+    should("return code 200") { topic.resources.first.response.code }.equals(200)
+    should("return message OK") { topic.resources.first.response.message }.equals("OK")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citygrid_api
 version: !ruby/object:Gem::Version
-  version: 0.0.5.1
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000Z
+date: 2011-12-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2153153500 !ruby/object:Gem::Requirement
+  requirement: &2156985800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153153500
+  version_requirements: *2156985800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153152460 !ruby/object:Gem::Requirement
+  requirement: &2156985320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153152460
+  version_requirements: *2156985320
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &2153151200 !ruby/object:Gem::Requirement
+  requirement: &2156984840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153151200
+  version_requirements: *2156984840
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2153149840 !ruby/object:Gem::Requirement
+  requirement: &2156984360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153149840
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &2153148940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2153148940
+  version_requirements: *2156984360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153147700 !ruby/object:Gem::Requirement
+  requirement: &2156983880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153147700
+  version_requirements: *2156983880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153146680 !ruby/object:Gem::Requirement
+  requirement: &2156983400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,32 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153146680
+  version_requirements: *2156983400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153139180 !ruby/object:Gem::Requirement
+  requirement: &2156982920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156982920
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &2156982440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156982440
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2156981960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153139180
+  version_requirements: *2156981960
 description: Ruby wrapper for CityGrid APIs
 email: fu7iin@gmail.com
 executables: []
@@ -110,6 +121,7 @@ extra_rdoc_files:
 files:
 - .document
 - .sass-cache/7a5a675d951455410512a59af5ab2d160bd1735c/test.scssc
+- .sass-cache/c6f2c767b164f077e5b9fb1f18a7886d7c755211/test.scssc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -118,9 +130,40 @@ files:
 - Rakefile
 - VERSION
 - citygrid_api.gemspec
+- citygrid_api.yml.backup
 - citygrid_api.yml.sample
 - config.ru
 - dashboard.rb
+- fixtures/vcr_cassettes/AdGroupCriterion_mutate.yml
+- fixtures/vcr_cassettes/AdGroupCriterion_search.yml
+- fixtures/vcr_cassettes/Adding_a_place.yml
+- fixtures/vcr_cassettes/Call_Detail_by_campaign.yml
+- fixtures/vcr_cassettes/Geo.yml
+- fixtures/vcr_cassettes/Getting_an_offer_by_listing_ID.yml
+- fixtures/vcr_cassettes/Import_a_cg_account.yml
+- fixtures/vcr_cassettes/Initiating_a_Details.yml
+- fixtures/vcr_cassettes/Initiating_new_MultiDetails.yml
+- fixtures/vcr_cassettes/Method_of_Payment_mutate.yml
+- fixtures/vcr_cassettes/Method_of_Payment_search.yml
+- fixtures/vcr_cassettes/Mutating_AdGroup_Ads.yml
+- fixtures/vcr_cassettes/Report_summary_daily.yml
+- fixtures/vcr_cassettes/Report_summary_user_actions.yml
+- fixtures/vcr_cassettes/Search_Ad_Group_by_Campaign_Id.yml
+- fixtures/vcr_cassettes/Search_Billing_by_Campaign_Id.yml
+- fixtures/vcr_cassettes/Search_account_manager_by_Campaign_Id.yml
+- fixtures/vcr_cassettes/Searching_AdGroup_Geo.yml
+- fixtures/vcr_cassettes/Searching_budgets.yml
+- fixtures/vcr_cassettes/Searching_categories_by_listing_id.yml
+- fixtures/vcr_cassettes/Searching_categories_by_query.yml
+- fixtures/vcr_cassettes/Upload_an_image_Add_a_preview.yml
+- fixtures/vcr_cassettes/create_campaign.yml
+- fixtures/vcr_cassettes/log_in_a_session.yml
+- fixtures/vcr_cassettes/log_in_a_session_mutate_places.yml
+- fixtures/vcr_cassettes/query_account_type_by_id.yml
+- fixtures/vcr_cassettes/search_for_an_account_by_id.yml
+- fixtures/vcr_cassettes/search_for_an_account_by_name.yml
+- fixtures/vcr_cassettes/searching_for_a_CityGrid_listing.yml
+- fixtures/vcr_cassettes/searching_for_a_special_CityGrid_listing.yml
 - lib/citygrid.rb
 - lib/citygrid/abstraction.rb
 - lib/citygrid/abstraction/collection.rb
@@ -129,69 +172,74 @@ files:
 - lib/citygrid/abstraction/super_array.rb
 - lib/citygrid/abstraction/super_hash.rb
 - lib/citygrid/api.rb
-- lib/citygrid/api/ad_center.rb
-- lib/citygrid/api/ad_center/account.rb
-- lib/citygrid/api/ad_center/account_manager.rb
-- lib/citygrid/api/ad_center/ad_group.rb
-- lib/citygrid/api/ad_center/ad_group_ad.rb
-- lib/citygrid/api/ad_center/ad_group_criterion.rb
-- lib/citygrid/api/ad_center/ad_group_geo.rb
-- lib/citygrid/api/ad_center/authentication.rb
-- lib/citygrid/api/ad_center/billing.rb
-- lib/citygrid/api/ad_center/budget.rb
-- lib/citygrid/api/ad_center/call_detail.rb
-- lib/citygrid/api/ad_center/campaign.rb
-- lib/citygrid/api/ad_center/category.rb
-- lib/citygrid/api/ad_center/geolocation.rb
-- lib/citygrid/api/ad_center/image.rb
-- lib/citygrid/api/ad_center/method_of_payment.rb
-- lib/citygrid/api/ad_center/performance.rb
-- lib/citygrid/api/ad_center/places.rb
-- lib/citygrid/api/ad_center/user.rb
+- lib/citygrid/api/accounts.rb
+- lib/citygrid/api/accounts/account.rb
+- lib/citygrid/api/accounts/authentication.rb
+- lib/citygrid/api/accounts/method_of_payment.rb
+- lib/citygrid/api/accounts/user.rb
+- lib/citygrid/api/advertising.rb
+- lib/citygrid/api/advertising/account_manager.rb
+- lib/citygrid/api/advertising/ad_group.rb
+- lib/citygrid/api/advertising/ad_group_ad.rb
+- lib/citygrid/api/advertising/ad_group_criterion.rb
+- lib/citygrid/api/advertising/ad_group_geo.rb
+- lib/citygrid/api/advertising/billing.rb
+- lib/citygrid/api/advertising/budget.rb
+- lib/citygrid/api/advertising/call_detail.rb
+- lib/citygrid/api/advertising/campaign.rb
+- lib/citygrid/api/advertising/category.rb
+- lib/citygrid/api/advertising/geolocation.rb
+- lib/citygrid/api/advertising/image.rb
+- lib/citygrid/api/advertising/performance.rb
+- lib/citygrid/api/advertising/places.rb
 - lib/citygrid/api/content.rb
 - lib/citygrid/api/content/offers.rb
 - lib/citygrid/api/content/places.rb
-- lib/citygrid/api/content/places/detail.rb
-- lib/citygrid/api/content/places/search.rb
 - lib/citygrid/api/content/reviews.rb
+- lib/citygrid/api/mutatable.rb
 - lib/citygrid/api/response.rb
+- lib/citygrid/api/searchable.rb
 - lib/citygrid/details.rb
 - lib/citygrid/listing.rb
 - lib/citygrid/offers.rb
 - lib/citygrid/reviews.rb
 - lib/citygrid/search.rb
+- lib/citygrid/session.rb
 - lib/citygrid_api.rb
 - lib/dashboard/sinatra_partial.rb
 - lib/dashboard/stored_reporter.rb
 - lib/dashboard/test_result.rb
 - lib/request_ext.rb
+- lib/string_ext.rb
 - public/javascript/dashboard.js
-- test/api/ad_center/test_account.rb
-- test/api/ad_center/test_ad_group.rb
-- test/api/ad_center/test_ad_group_ad.rb
-- test/api/ad_center/test_ad_group_criterion.rb
-- test/api/ad_center/test_ad_group_geo.rb
-- test/api/ad_center/test_authentication.rb
-- test/api/ad_center/test_billing.rb
-- test/api/ad_center/test_budget.rb
-- test/api/ad_center/test_call_detail.rb
-- test/api/ad_center/test_campaign.rb
-- test/api/ad_center/test_category.rb
-- test/api/ad_center/test_geolocation.rb
-- test/api/ad_center/test_image.rb
-- test/api/ad_center/test_method_of_payment.rb
-- test/api/ad_center/test_places.rb
-- test/api/ad_center/test_reports.rb
+- test/api/accounts/test_account.rb
+- test/api/accounts/test_method_of_payment.rb
+- test/api/advertising/test_account_manager.rb
+- test/api/advertising/test_ad_group.rb
+- test/api/advertising/test_ad_group_ad.rb
+- test/api/advertising/test_ad_group_criterion.rb
+- test/api/advertising/test_ad_group_geo.rb
+- test/api/advertising/test_billing.rb
+- test/api/advertising/test_budget.rb
+- test/api/advertising/test_call_detail.rb
+- test/api/advertising/test_category.rb
+- test/api/advertising/test_create_campaign_and_ad_group.rb
+- test/api/advertising/test_geolocation.rb
+- test/api/advertising/test_image.rb
+- test/api/advertising/test_performance.rb
+- test/api/advertising/test_places.rb
+- test/api/content/test_details.rb
 - test/api/content/test_offers.rb
-- test/api/content/test_places.rb
+- test/api/content/test_search.rb
+- test/auth_token.rb
 - test/helper.rb
 - test/publisher_helper.rb.sample
+- test/session_helper.rb
 - test/test_config.rb
-- test/test_details.rb
 - test/test_img.jpg
 - test/test_img_big.png
 - test/test_listing.rb
-- test/test_search.rb
+- test/test_session.rb
 - test/test_super_array.rb
 - test/test_super_hash.rb
 - views/_context_result.haml

data/lib/citygrid/api/ad_center/account.rb

@@ -1,26 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class Account < AdCenter
-        # Adds new customer account to existing user
-        # http://docs.prod.cs/display/citygridv2/Internal+-+Account#Internal-Account-AddNewCustomerAccounttoExistingUser
-        def self.import_to_cg options = {}
-          token = extract_auth_token options
-          request_and_handle :post,
-            "#{base_uri}/accounts/account/v2/customer/mutate",
-            :body    => options.to_json,
-            :headers => merge_headers("authToken" => token)
-        end
-        
-        #http://docs-dev.prod.cs/display/citygridv2/Internal+-+Account+Type
-        def self.account_type options = {}
-          token = extract_auth_token options
-          request_and_handle :get,
-            "#{endpoint}/get/type",
-            :query => options,
-            :headers => merge_headers("authToken" => token)
-        end
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/account_manager.rb

@@ -1,8 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class AccountManager <  AdCenter
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/ad_group.rb

@@ -1,8 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class AdGroup < AdCenter
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/ad_group_ad.rb

@@ -1,8 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class AdGroupAd < AdCenter
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/ad_group_criterion.rb

@@ -1,8 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class AdGroupCriterion < AdCenter
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/ad_group_geo.rb

@@ -1,8 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class AdGroupGeo < AdCenter
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/authentication.rb

@@ -1,20 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class Authentication < AdCenter
-        def self.login options = {}
-          request_and_handle :post,
-            "#{endpoint}/login",
-            :query => options
-        end
-        
-        def self.validate options = {}
-          request_and_handle :get,
-            "#{endpoint}/validate",
-            :query => options,
-            :headers => merge_headers
-        end
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/billing.rb

@@ -1,8 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class Billing <  AdCenter
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/budget.rb

@@ -1,9 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class Budget < AdCenter
-        endpoint "/adcenter/budget/v2/recommendation"
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/call_detail.rb

@@ -1,25 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class CallDetail < AdCenter
-        class << self
-          def get by, options = {}
-            token = extract_auth_token options
-            request_and_handle :post,
-              "#{endpoint}/#{by}",
-              :body    => options.to_json,
-              :headers => merge_headers("authToken" => token)
-          end
-          
-          def note options = {}
-            token = extract_auth_token options
-            request_and_handle :post,
-              "#{endpoint}/note",
-              :body    => options.to_json,
-              :headers => merge_headers("authToken" => token)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/campaign.rb

@@ -1,8 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class Campaign < AdCenter
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/category.rb

@@ -1,9 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class Category < AdCenter
-        endpoint "/adcenter/categories/v2"
-      end
-    end
-  end
-end

data/lib/citygrid/api/ad_center/geolocation.rb

@@ -1,9 +0,0 @@
-class CityGrid
-  class API
-    class AdCenter
-      class GeoLocation < AdCenter
-        endpoint "/adcenter/categories/v2"
-      end
-    end
-  end
-end