edh 0.1 → 0.2

data/changelog.md

@@ -1,3 +1,8 @@
+v0.2
+====
+
+* Allow app_token to be set on initial api init.
+
 v0.1
 ====
 

data/lib/edh/api.rb

@@ -8,9 +8,10 @@ module EDH
       # @param [String] access_token access token
       # @note If no access token is provided, you can only access some public information.
       # @return [EDH::Passport::API] the API client
-      def initialize(access_token = nil, server = nil)
-        @access_token = access_token
-        @server = server
+      def initialize options = {}
+        @access_token = options[:access_token]
+        @app_access_token = options[:app_token]
+        @server = options[:server]
       end
 
       attr_accessor :access_token

data/lib/edh/test_users.rb

@@ -139,8 +139,8 @@ module EDH
           raise ArgumentError, "TestUsers#befriend requires hash arguments for both users with id and access_token"
         end
 
-        u1_graph_api = API.new(user1_token)
-        u2_graph_api = API.new(user2_token)
+        u1_graph_api = API.new(:access_token => user1_token)
+        u2_graph_api = API.new(:access_token => user2_token)
 
         u1_graph_api.graph_call("#{user1_id}/friends/#{user2_id}", {}, "post", options) &&
           u2_graph_api.graph_call("#{user2_id}/friends/#{user1_id}", {}, "post", options)

data/lib/edh/version.rb

@@ -1,3 +1,3 @@
 module EDH
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/readme.md

@@ -4,9 +4,11 @@
 $passport_client = EDH::Passport::API.new
 ```
 
-####optional access_token
+####optional 
 ```ruby
-$passport_client = EDH::Passport::API.new(nil, "http://dummy-passport.dev")
+#options: app_token, server, access_token (user)
+#access_token is used for sending requests first, then falls back to app_token if that exists.
+$passport_client = EDH::Passport::API.new(:server => "http://dummy-passport.dev")
 ```
 ####set the user token
 ```ruby

data/spec/cases/api_spec.rb

@@ -18,7 +18,7 @@ describe "EDH::Passport::API" do
 
   it "includes an access token if given" do
     token = 'adfadf'
-    service = EDH::Passport::API.new token
+    service = EDH::Passport::API.new(:access_token => token)
 
     EDH.should_receive(:make_request).with(
       anything,
@@ -32,7 +32,7 @@ describe "EDH::Passport::API" do
 
   it "has an attr_reader for access token" do
     token = 'adfadf'
-    service = EDH::Passport::API.new token
+    service = EDH::Passport::API.new(:access_token => token)
     service.access_token.should == token
   end
 
@@ -127,7 +127,7 @@ describe "EDH::Passport::API" do
 
   describe "with an access token" do
     before(:each) do
-      @api = EDH::Passport::API.new(@token)
+      @api = EDH::Passport::API.new(:access_token => @token)
     end
 
     it_should_behave_like "EDH RestAPI"

data/spec/support/edh_test.rb

@@ -121,7 +121,7 @@ module EDHTest
   def self.validate_user_info(token)
     print "Validating permissions for live testing..."
     # make sure we have the necessary permissions
-    api = EDH::Passport::API.new(token)
+    api = EDH::Passport::API.new(:access_token => token)
     perms = api.fql_query("select #{testing_permissions} from permissions where uid = me()")[0]
     perms.each_pair do |perm, value|
       if value == (perm == "read_insights" ? 1 : 0) # live testing depends on insights calls failing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edh
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json