playapi 0.1.6 → 0.1.7

data/lib/playapi/campaign.rb

@@ -13,8 +13,8 @@ module Playapi
 			# Get the primary campaign for which you are currently authorized, one will be able to
 			# pass the name of the campaign, if your credentials are good for multiple campaigns...
 			# but not yet.
-			def get(campaign_name = "index")
-				url = "api/v2/campaigns/"
+			def get
+				url = "api/v2/campaigns"
 				#url += "/#{campaign_name}" unless campaign_name == nil
 				get_object(:get, "campaign", url)
 			end
@@ -27,10 +27,10 @@ module Playapi
 			# :limit=INTEGER 	(Limit to a number of entries, defaults to 10)
 			# :page=INTEGER		(Determines the offset for limit, defaults to 1)
 			# :type=STRING 		(Valid options are Instapic, Tweet, Checkin)
-			def get_interactions(campaign_name, opts = {})
+			def get_interactions(opts = {})
 				#* This could just called Playapi::Interaction.list....
-				url = "api/v2/campaigns/#{campaign_name}/interactions"
-				get_object(:get, "interactions", url, opts).interactions
+				url = "api/v2/interactions"
+				get_objects(:get, "interactions", url, opts).interactions
 			end
 
 			# Get interactions with the most points (highest score) for a campaign
@@ -38,10 +38,10 @@ module Playapi
 			# :limit=INTEGER 	(Limit to a number of entries, defaults to 10)
 			# :page=INTEGER		(Determines the offset for limit, defaults to 1)
 			# :type=STRING 		(Valid options are Instapic, Tweet, Checkin)
-			def leaders(campaign_name, opts = {})
+			def leaders(opts = {})
 				#* This could just call Playapi::Interactions.list with most points params...
-				url = "api/v2/campaigns/#{campaign_name}/leaders"
-				get_object(:get, "results", url, opts)
+				url = "api/v2/interactions/leaders"
+				get_objects(:get, "interactions", url, opts)
 			end
 
 			def features

data/lib/playapi/client.rb

@@ -32,7 +32,7 @@ module Playapi
 				end
 			end
 
-			def request(method, path, params={}, signature_params=params)
+			def request(method, path, params={}, signature_params={})
 				connection.send(method.to_sym, path, params) do |request|
         	request.headers["x-authorization"] = auth_header(method.to_sym, path, signature_params).to_s
         	request.headers.merge!(default_headers)

data/lib/playapi/configurable.rb

@@ -24,6 +24,7 @@ module Playapi
           :connection_options,
           :identity_map,
           :connection_middleware,
+          :campaign_name
         ]
       end
 
@@ -45,7 +46,7 @@ module Playapi
     end
 
     def reset!
-      defaultz = {client_id: "F1Ox4PEhf1eiNGRge7kscIRgay1mh8cbi2zruIC1OI", client_secret: "xLeR0lXVdEtfjwP04w4FJKZm8KxS97Qg5o8Xbyw3JeE", oauth_token: "KqoCXCoyhrJTyGFtCYmiUcWModkTYBILiMHyKGQCBYg", token_secret: "b63V8SyY9ip8yigE5o6bsf3HFyza1wRfLnl3HyhhPz4", endpoint: "http://api.papi.io/"}
+      defaultz = {campaign_name: "fishing", client_id: "F1Ox4PEhf1eiNGRge7kscIRgay1mh8cbi2zruIC1OI", client_secret: "xLeR0lXVdEtfjwP04w4FJKZm8KxS97Qg5o8Xbyw3JeE", oauth_token: "KqoCXCoyhrJTyGFtCYmiUcWModkTYBILiMHyKGQCBYg", token_secret: "b63V8SyY9ip8yigE5o6bsf3HFyza1wRfLnl3HyhhPz4", endpoint: "http://localhost:5000/"}
       # we can probably chuck conn_ops
       conn_ops = {
         :connection_options => {:headers => {:accept => "application/json", :user_agent => "PlayAPI Gem 0.1.1"}, 

data/lib/playapi/interaction.rb

@@ -107,8 +107,8 @@ module Playapi
 
 			def classed_interaction(type="Custom", opts = {})
 				url = "api/v2/interactions"
-				validator = "Playapi::Validation::#{type.split('_').map {|w| w.capitalize}.join}".split("::").inject(Module) {|acc, val| acc.const_get(val)}
-				validator.validate(opts)
+				#validator = "Playapi::Validation::#{type.split('_').map {|w| w.capitalize}.join}".split("::").inject(Module) {|acc, val| acc.const_get(val)}
+				#validator.validate(opts)
 				get_object(:post, "interaction", url, {:interaction => opts, :type => type})
 			end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playapi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors: