citygrid_api 0.0.10 → 0.0.11

data/Gemfile

@@ -3,17 +3,16 @@ source "http://rubygems.org"
 gem "httparty", "~> 0.8.1"
 gem "json", "1.5.3"
 gem "riot", "~> 0.12.4"
-gem "awesome_print", "~> 0.4.0", :require => "ap"
 
 group :development do
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.2"
   gem "rcov", ">= 0"
   gem "vcr"
   gem "webmock"
+  gem 'rdoc'
 end
 
 group :dashboard do
   gem "sinatra"
   gem "haml"
-end
+end

data/Gemfile.lock

@@ -2,7 +2,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
-    awesome_print (0.4.0)
     crack (0.3.1)
     git (1.2.5)
     haml (3.1.4)
@@ -21,6 +20,8 @@ GEM
       rack
     rake (0.9.2)
     rcov (0.9.11)
+    rdoc (3.12)
+      json (~> 1.4)
     riot (0.12.5)
       rr
     rr (1.0.4)
@@ -38,13 +39,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print (~> 0.4.0)
-  bundler (~> 1.0.0)
   haml
   httparty (~> 0.8.1)
   jeweler (~> 1.6.2)
   json (= 1.5.3)
   rcov
+  rdoc
   riot (~> 0.12.4)
   sinatra
   vcr

data/Rakefile

@@ -19,8 +19,8 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Ruby wrapper for CityGrid APIs}
   gem.description = %Q{Ruby wrapper for CityGrid APIs}
-  gem.email = "Joseph.Chen@citygridmedia.com"
-  gem.authors = ["Elpizo Choi", "Joseph Chen"]
+  gem.email = "fu7iin@gmail.com"
+  gem.authors = ["Elpizo Choi"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -42,7 +42,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/citygrid_api.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "citygrid_api"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Elpizo Choi", "Joseph Chen"]
-  s.date = "2012-03-08"
+  s.authors = ["Elpizo Choi"]
+  s.date = "2012-05-02"
   s.description = "Ruby wrapper for CityGrid APIs"
-  s.email = "Joseph.Chen@citygridmedia.com"
+  s.email = "fu7iin@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -82,6 +82,8 @@ Gem::Specification.new do |s|
     "lib/citygrid/api/accounts/method_of_payment.rb",
     "lib/citygrid/api/accounts/temp_impersonation.rb",
     "lib/citygrid/api/accounts/user.rb",
+    "lib/citygrid/api/ads.rb",
+    "lib/citygrid/api/ads/custom.rb",
     "lib/citygrid/api/advertising.rb",
     "lib/citygrid/api/advertising/account_manager.rb",
     "lib/citygrid/api/advertising/ad_group.rb",
@@ -149,6 +151,7 @@ Gem::Specification.new do |s|
     "test/publisher_helper.rb.sample",
     "test/session_helper.rb",
     "test/test_config.rb",
+    "test/test_exceptions.rb",
     "test/test_img.jpg",
     "test/test_img_big.png",
     "test/test_listing.rb",
@@ -163,7 +166,7 @@ Gem::Specification.new do |s|
   ]
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Ruby wrapper for CityGrid APIs"
 
   if s.respond_to? :specification_version then
@@ -173,33 +176,30 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, ["~> 0.8.1"])
       s.add_runtime_dependency(%q<json>, ["= 1.5.3"])
       s.add_runtime_dependency(%q<riot>, ["~> 0.12.4"])
-      s.add_runtime_dependency(%q<awesome_print>, ["~> 0.4.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<vcr>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
       s.add_dependency(%q<httparty>, ["~> 0.8.1"])
       s.add_dependency(%q<json>, ["= 1.5.3"])
       s.add_dependency(%q<riot>, ["~> 0.12.4"])
-      s.add_dependency(%q<awesome_print>, ["~> 0.4.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<vcr>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
     s.add_dependency(%q<httparty>, ["~> 0.8.1"])
     s.add_dependency(%q<json>, ["= 1.5.3"])
     s.add_dependency(%q<riot>, ["~> 0.12.4"])
-    s.add_dependency(%q<awesome_print>, ["~> 0.4.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<vcr>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end
 

data/citygrid_api.yml.sample

@@ -9,6 +9,8 @@ defaults:
 #   endpoint: endpoint
 
 api:
+  ads:
+    custom: ads/custom/v2
   accounts:
     account:
       ssl: true

data/dashboard.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'sinatra'
-require "awesome_print"
 require "riot"
 require "haml"
 require 'stringio'

data/lib/citygrid/api/ads/custom.rb

@@ -0,0 +1,13 @@
+class CityGrid
+  class API
+    class Ads
+      class Custom < Ads
+        define_action :where, :get, "where",
+          :auth_token => false, 
+          :publisher => true, 
+          :client_ip => true, 
+          :format => true
+      end
+    end
+  end
+end

data/lib/citygrid/api/ads.rb

@@ -0,0 +1,8 @@
+class CityGrid
+  class API
+    class Ads < API
+    end
+  end
+end
+
+Dir[File.dirname(__FILE__) + '/ads/*.rb'].each {|file| require file }

data/lib/citygrid/api/advertising/image.rb

@@ -4,7 +4,7 @@ class CityGrid
   class API
     class Advertising
       class Image < Advertising
-        def self.upload user_id, name, type, image_path, options = {}
+        def self.upload name, type, image_path, options = {}
           token = extract_auth_token options
           image_data = Base64.encode64(File.open(image_path).read.to_s).gsub(/\n/, "")
           format = options[:format] || image_path.split(".").last
@@ -13,13 +13,12 @@ class CityGrid
             :body => {"mutateOperationListResource" => [
               {
                 "operand" => {
-                  "imageType" => type,
-                  "imageName" => name,
-                  "imageFormat" => format,
-                  "image" => image_data
-                },
-                "operator" => "ADD",
-                "userId" => user_id
+                	"imageType" => type,
+                	"imageName" => name,
+                	"imageFormat" => format,
+                	"image" => image_data
+                  },
+                "operator" => "ADD"
               }
             ]}.to_json,
             :headers => merge_headers("authToken" => token)

data/lib/citygrid/api/content/places.rb

@@ -6,9 +6,10 @@ class CityGrid
         
         define_action :detail, :get, "detail", :auth_token => false, :publisher => true, :client_ip => true
         define_action :search, :get, "search/where", :auth_token => false, :publisher => true, :client_ip => true
+        define_action :searchlatlon, :get, "search/latlon", :auth_token => false, :publisher => true, :client_ip => true
       end
     end
   end
 end
 
-Dir[File.dirname(__FILE__) + '/places/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/places/*.rb'].each {|file| require file }

data/lib/citygrid/api.rb

@@ -1,6 +1,7 @@
 require "httparty"
 require "json"
 require "citygrid/citygrid_exceptions"
+require "pp"
 
 class CityGrid
   class API 
@@ -36,7 +37,7 @@ class CityGrid
           token = options.delete :token
           
           headers = API::DEFAULT_HEADERS.clone
-          
+
           headers.merge! "authToken" => token if define_options[:auth_token] && token
 
           options.merge! "format"     => "json" if define_options[:format]
@@ -128,7 +129,7 @@ class CityGrid
       def parse_multiple_responses response
         parsing = response.values.select{ |x| x.is_a? Array }.first
         if parsing.nil? || parsing == []
-          #ap "Response was too hard to parse... letting it through..."
+          #pp "Response was too hard to parse... letting it through..."
           return parsing
         elsif parsing != nil && parsing != []
           if parsing[0]["response"]
@@ -136,7 +137,7 @@ class CityGrid
             return parsing
           else
             # this accomodates geocode response which does not contain a response node
-            #ap "Response was too hard to parse... letting it through..."
+            #pp "Response was too hard to parse... letting it through..."
             return nil
           end
         else
@@ -181,11 +182,11 @@ class CityGrid
         begin 
           # catch unparsable responses (html etc)
           if !response.parsed_response.is_a?(Hash)
-            #ap "[gem] the response was unparsable (response was not a hash)"
+            #pp "[gem] the response was unparsable (response was not a hash)"
             raise CityGridExceptions::ResponseParseError.new req, response
           # catch responses not in new response format
           elsif response["errors"]
-            #ap "[gem] An error in the old response format was caught.  Raising a general response error..."
+            #pp "[gem] An error in the old response format was caught.  Raising a general response error..."
             raise CityGridExceptions::ResponseError.new req, response["errors"], response
 
           # Parse and handle new response codes 
@@ -193,30 +194,30 @@ class CityGrid
                 (response["response"] && response["response"]["code"] != 200) && 
                 (response["response"] && response["response"]["code"] != 400) 
             error_code = response["response"]["code"]
-            #ap "[gem] The response was contained in the first level of the response hash.  Below:"
-            #ap response
-            #ap "found error code: #{error_code}"
-            #ap "****************************************************************************"
+            #pp "[gem] The response was contained in the first level of the response hash.  Below:"
+            #pp response
+            #pp "found error code: #{error_code}"
+            #pp "****************************************************************************"
             raise CityGridExceptions.appropriate_error(error_code).new req, response, response["response"]["message"].to_s #+ " " + CityGridExceptions.print_superclasses(error_code)
           # if the response is a nested hash/nested hash containing arrays
           elsif response["totalNumEntries"] && response["response"].nil?
-            #ap "[gem] now parsing a response with multiple entries: #{response}"
+            #pp "[gem] now parsing a response with multiple entries: #{response}"
             error_code = parse_multiple_responses(response)
-            #ap "the error code that came back is #{error_code}"
+            #pp "the error code that came back is #{error_code}"
             if error_code.nil? || error_code == []
-              #ap "[gem] passing over this for now"
+              #pp "[gem] passing over this for now"
               return CityGrid::API::Response.new response # pass over for now
             elsif error_code[0] == "SUCCESS" || error_code[0] == 200 || error_code[0] == 400
               return CityGrid::API::Response.new response
             else 
-              #ap "[gem] we found an error and it was #{error_code[1]}"
+              #pp "[gem] we found an error and it was #{error_code[1]}"
                 raise CityGridExceptions.appropriate_error(error_code[0]).new req, response, error_code[1].to_s  + " "# + CityGridExceptions.print_superclasses(error_code[0])
             end
           else
             return CityGrid::API::Response.new response
           end
         rescue => ex
-          ap "The gem threw an error: #{ex}"
+          pp "The gem threw an error: #{ex}"
           raise ex if CityGrid.raise_errors?
         end
       end
@@ -248,4 +249,4 @@ class CityGrid
       end
     end
   end
-end
+end

data/lib/citygrid.rb

@@ -143,6 +143,7 @@ require "citygrid/api/response"
 
 require "citygrid/api/accounts"
 require "citygrid/api/advertising"
+require "citygrid/api/ads"
 require "citygrid/api/content"
 
 require "request_ext"

data/test/helper.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), "auth_token")
 require File.join(File.dirname(__FILE__), "session_helper")
+require "pp"
 
 # don't do gem setup if we're in the dashboad environment
 unless defined? IN_DASHBOARD
@@ -12,7 +13,6 @@ unless defined? IN_DASHBOARD
     $stderr.puts "Run `bundle install` to install missing gems"
     exit e.status_code
   end
-  require "ap"
   require "riot"
 
   $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -36,11 +36,11 @@ unless defined? IN_DASHBOARD
       x = {"description" => ex.message, "server_msg" => "blank"}
       #x = {"description" => ex.description, "server_msg" => ex.server_msg}
       puts "======= ERROR ======="
-      ap x
-      ap ex.backtrace
+      pp x
+      pp ex.backtrace
       false
     rescue => ex
-      ap ex
+      pp ex
       puts ex.backtrace.join("\n")
       false # return false
     end
@@ -73,4 +73,4 @@ unless defined? IN_DASHBOARD
     end
   end
 
-end
+end

data/test/test_exceptions.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+context "Login with bad password" do
+	setup do
+		begin
+			CityGrid.login :username => "iamafakeuserandineverexisted", :password => 'sofakethatsmyname'
+		rescue => ex
+			return ex
+		end
+	end
+
+	should("return an AccountNotFoundError"){ topic.instance_of? CityGridExceptions::AccountNotFoundError }
+end
+
+context "Login with no username" do
+	setup do
+		begin
+			CityGrid.login :username => "", :password => 'sofakethatsmyname'
+		rescue => ex
+			return ex
+		end
+	end
+
+	should("return an UsernameRequiredError"){ topic.instance_of? CityGridExceptions::UsernameRequiredError }	
+end

metadata

@@ -1,124 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: citygrid_api
-version: !ruby/object:Gem::Version
-  version: 0.0.10
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.11
 platform: ruby
-authors:
+authors: 
 - Elpizo Choi
-- Joseph Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: &70187366267200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.8.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70187366267200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70187366266180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 1.5.3
   type: :runtime
-  prerelease: false
-  version_requirements: *70187366266180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: riot
-  requirement: &70187366264980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.12.4
-  type: :runtime
   prerelease: false
-  version_requirements: *70187366264980
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: &70187366263960 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+      - !ruby/object:Gem::Version 
+        version: 0.12.4
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
-  version_requirements: *70187366263960
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70187366262020 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+      - !ruby/object:Gem::Version 
+        version: 1.6.2
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
-  version_requirements: *70187366262020
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70187366260260 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: vcr
   prerelease: false
-  version_requirements: *70187366260260
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70187366259520 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: *70187366259520
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: &70187366248660 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  version_requirements: *70187366248660
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70187366247360 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70187366247360
+  version_requirements: *id008
 description: Ruby wrapper for CityGrid APIs
-email: Joseph.Chen@citygridmedia.com
+email: fu7iin@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .sass-cache/7a5a675d951455410512a59af5ab2d160bd1735c/test.scssc
 - .sass-cache/c6f2c767b164f077e5b9fb1f18a7886d7c755211/test.scssc
@@ -184,6 +175,8 @@ files:
 - lib/citygrid/api/accounts/method_of_payment.rb
 - lib/citygrid/api/accounts/temp_impersonation.rb
 - lib/citygrid/api/accounts/user.rb
+- lib/citygrid/api/ads.rb
+- lib/citygrid/api/ads/custom.rb
 - lib/citygrid/api/advertising.rb
 - lib/citygrid/api/advertising/account_manager.rb
 - lib/citygrid/api/advertising/ad_group.rb
@@ -251,6 +244,7 @@ files:
 - test/publisher_helper.rb.sample
 - test/session_helper.rb
 - test/test_config.rb
+- test/test_exceptions.rb
 - test/test_img.jpg
 - test/test_img_big.png
 - test/test_listing.rb
@@ -263,28 +257,31 @@ files:
 - views/stylesheets/test.scss
 - views/test.haml
 homepage: 
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for CityGrid APIs
 test_files: []
+