playlyfe 0.6.0 → 0.7.0

data/lib/playlyfe.rb

@@ -18,7 +18,6 @@ class PlaylyfeError < StandardError
 end
 
 class Playlyfe
-  @@api = 'https://api.playlyfe.com/v1'
 
   def initialize(options = {})
     if options[:type].nil?
@@ -27,16 +26,17 @@ class Playlyfe
       err.message = "You must pass in a type whether 'client' for client credentials flow or 'code' for auth code flow"
       raise err
     end
-    @@type = options[:type]
-    @@id = options[:client_id]
-    @@secret = options[:client_secret]
-    @@store = options[:store]
-    @@load = options[:load]
-    @@redirect_uri = options[:redirect_uri]
-    if @@store.nil?
-      @@store = lambda { |token| puts 'Storing Token' }
+    @version = options[:version] ||= 'v1'
+    @type = options[:type]
+    @id = options[:client_id]
+    @secret = options[:client_secret]
+    @store = options[:store]
+    @load = options[:load]
+    @redirect_uri = options[:redirect_uri]
+    if @store.nil?
+      @store = lambda { |token| puts 'Storing Token' }
     end
-    if @@type == 'client'
+    if @type == 'client'
       get_access_token()
     else
       if options[:redirect_uri].nil?
@@ -50,11 +50,11 @@ class Playlyfe
 
   def get_access_token
     begin
-      if @@type == 'client'
+      if @type == 'client'
         access_token = RestClient.post('https://playlyfe.com/auth/token',
           {
-            :client_id => @@id,
-            :client_secret => @@secret,
+            :client_id => @id,
+            :client_secret => @secret,
             :grant_type => 'client_credentials'
           }.to_json,
           :content_type => :json,
@@ -63,11 +63,11 @@ class Playlyfe
       else
         access_token = RestClient.post("https://playlyfe.com/auth/token",
           {
-            :client_id => @@id,
-            :client_secret => @@secret,
+            :client_id => @id,
+            :client_secret => @secret,
             :grant_type => 'authorization_code',
-            :code => @@code,
-            :redirect_uri => @@redirect_uri
+            :code => @code,
+            :redirect_uri => @redirect_uri
           }.to_json,
           :content_type => :json,
           :accept => :json
@@ -77,13 +77,13 @@ class Playlyfe
       expires_at ||= Time.now.to_i + access_token['expires_in']
       access_token.delete('expires_in')
       access_token['expires_at'] = expires_at
-      @@store.call access_token
-      if @@load.nil?
-        @@load = lambda { return access_token }
+      @store.call access_token
+      if @load.nil?
+        @load = lambda { return access_token }
       else
-        old_token = @@load.call
+        old_token = @load.call
         if access_token != old_token
-          @@load = lambda { return access_token }
+          @load = lambda { return access_token }
         end
       end
     rescue => e
@@ -92,11 +92,11 @@ class Playlyfe
   end
 
   def check_token(options)
-    access_token = @@load.call
+    access_token = @load.call
     if access_token['expires_at'] < Time.now.to_i
       puts 'Access Token Expired'
       get_access_token()
-      access_token = @@load.call
+      access_token = @load.call
     end
     options[:query][:access_token] = access_token['access_token']
   end
@@ -110,29 +110,29 @@ class Playlyfe
     begin
       case options[:method]
         when 'GET'
-          res = RestClient.get("#{@@api}#{options[:route]}",
+          res = RestClient.get("https://api.playlyfe.com/#{@version}#{options[:route]}",
             {:params => options[:query] }
           )
         when 'POST'
-          res = RestClient.post("#{@@api}#{options[:route]}?#{hash_to_query(options[:query])}",
+          res = RestClient.post("https://api.playlyfe.com/#{@version}#{options[:route]}?#{hash_to_query(options[:query])}",
             options[:body].to_json,
             :content_type => :json,
             :accept => :json
           )
         when 'PUT'
-          res = RestClient.put("#{@@api}#{options[:route]}?#{hash_to_query(options[:query])}",
+          res = RestClient.put("https://api.playlyfe.com/#{@version}#{options[:route]}?#{hash_to_query(options[:query])}",
             options[:body].to_json,
             :content_type => :json,
             :accept => :json
           )
         when 'PATCH'
-          res = RestClient.patch("#{@@api}#{options[:route]}?#{hash_to_query(options[:query])}",
+          res = RestClient.patch("https://api.playlyfe.com/#{@version}#{options[:route]}?#{hash_to_query(options[:query])}",
             options[:body].to_json,
             :content_type => :json,
             :accept => :json
           )
         when 'DELETE'
-          res = RestClient.delete("#{@@api}#{options[:route]}",
+          res = RestClient.delete("https://api.playlyfe.com/#{@version}#{options[:route]}",
             {:params => options[:query] }
           )
       end
@@ -142,6 +142,8 @@ class Playlyfe
         return JSON.parse(res.body)
       end
     rescue => e
+      puts e
+      puts e.response
       raise PlaylyfeError.new(e.response)
     end
   end
@@ -176,7 +178,7 @@ class Playlyfe
   end
 
   def get_login_url
-    query = { response_type: 'code', redirect_uri: @@redirect_uri, client_id: @@id }
+    query = { response_type: 'code', redirect_uri: @redirect_uri, client_id: @id }
     "https://playlyfe.com/auth?#{hash_to_query(query)}"
   end
 
@@ -191,7 +193,7 @@ class Playlyfe
       err.message = 'You must pass in a code in exchange_code for the auth code flow'
       raise err
     else
-      @@code = code
+      @code = code
       get_access_token()
     end
   end

data/test/test.rb

@@ -7,6 +7,7 @@ class PlaylyfeTest < Test::Unit::TestCase
   def test_invalid_client
     begin
       Playlyfe.new(
+        version: 'v1',
         client_id: "wrong_id",
         client_secret: "wrong_secret",
         type: 'client'
@@ -20,6 +21,7 @@ class PlaylyfeTest < Test::Unit::TestCase
   def test_wrong_init
     begin
       Playlyfe.new(
+        version: 'v1',
         client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
         client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3"
       )
@@ -30,6 +32,7 @@ class PlaylyfeTest < Test::Unit::TestCase
 
   def test_init_staging
     pl = Playlyfe.new(
+      version: 'v1',
       client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
       client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3",
       type: 'client'
@@ -94,8 +97,76 @@ class PlaylyfeTest < Test::Unit::TestCase
     assert_equal raw_data.class, String
   end
 
+  def test_init_staging_v2
+    pl = Playlyfe.new(
+      version: 'v2',
+      client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
+      client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3",
+      type: 'client'
+    )
+
+    begin
+      pl.get(route: '/gege', query: { player_id: 'student1' })
+    rescue PlaylyfeError => e
+      assert_equal e.name,'route_not_found'
+      assert_equal e.message, 'This route does not exist'
+    end
+
+    players = pl.api(method: 'GET', route: '/runtime/players', query: { player_id: 'student1', limit: 1 })
+    assert_not_nil players["data"]
+    assert_not_nil players["data"][0]
+
+    players = pl.get(route: '/runtime/players', query: { player_id: 'student1', limit: 1 })
+    assert_not_nil players["data"]
+    assert_not_nil players["data"][0]
+
+    begin
+      pl.get(route: '/runtime/player')
+    rescue PlaylyfeError => e
+      assert_equal e.message, "The 'player_id' parameter should be specified in the query"
+    end
+
+    player_id = 'student1'
+    player = pl.get(route: '/runtime/player', query: { player_id: player_id } )
+    assert_equal player["id"], "student1"
+    assert_equal player["alias"], "Student1"
+    assert_equal player["enabled"], true
+
+    pl.get(route: '/runtime/definitions/processes', query: { player_id: player_id } )
+    pl.get(route:'/runtime/definitions/teams', query: { player_id: player_id } )
+    pl.get(route: '/runtime/processes', query: { player_id: player_id } )
+    pl.get(route: '/runtime/teams', query: { player_id: player_id } )
+
+    processes = pl.get(route: '/runtime/processes', query: { player_id: 'student1', limit: 1, skip: 4 })
+    assert_equal processes["data"][0]["definition"], "module1"
+    assert_equal processes["data"].size, 1
+
+    new_process = pl.post(route: '/runtime/processes', query: { player_id: player_id }, body: { definition: 'module1' })
+    assert_equal new_process["definition"]["id"], "module1"
+    assert_equal new_process["state"], "ACTIVE"
+
+    patched_process = pl.patch(
+      route: "/runtime/processes/#{new_process['id']}",
+      query: { player_id: player_id },
+      body: { name: 'patched_process', access: 'PUBLIC' }
+    )
+
+    assert_equal patched_process['name'], 'patched_process'
+    assert_equal patched_process['access'], 'PUBLIC'
+
+    deleted_process = pl.delete(route: "/runtime/processes/#{new_process['id']}", query: { player_id: player_id })
+    assert_not_nil deleted_process['message']
+
+    #data = pl.put(route: "/players/#{player_id}/reset", query: { player_id: player_id })
+    #puts data
+
+    raw_data = pl.get(route: '/runtime/player', query: { player_id: player_id }, raw: true)
+    assert_equal raw_data.class, String
+  end
+
   def test_init_production
     pl = Playlyfe.new(
+      version: 'v1',
       client_id: "N2Y4NjNlYTItODQzZi00YTQ0LTkzZWEtYTBiNTA2ODg3MDU4",
       client_secret: "NDc3NTA0NmItMjBkZi00MjI2LWFhMjUtOTI0N2I1YTkxYjc2M2U3ZGI0MDAtNGQ1Mi0xMWU0LWJmZmUtMzkyZTdiOTYxYmMx",
       type: 'client'
@@ -106,6 +177,7 @@ class PlaylyfeTest < Test::Unit::TestCase
   def test_store
     redis = Redis.new
     pl = Playlyfe.new(
+      version: 'v1',
       client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
       client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3",
       type: 'client',
@@ -120,6 +192,7 @@ class PlaylyfeTest < Test::Unit::TestCase
   def test_auth_code_error
     begin
       Playlyfe.new(
+        version: 'v1',
         client_id: "NGM2ZmYyNGQtNjViMy00YjQ0LWI0YTgtZTdmYWFlNDRkMmUx",
         client_secret: "ZTQ0OWI4YTItYzE4ZC00MWQ5LTg3YjktMDI5ZjAxYTBkZmRiZGQ0NzI4OTAtNGQ1My0xMWU0LWJmZmUtMzkyZTdiOTYxYmMx",
         type: 'code'
@@ -131,6 +204,7 @@ class PlaylyfeTest < Test::Unit::TestCase
 
   def test_auth_code
     Playlyfe.new(
+      version: 'v1',
       client_id: "NGM2ZmYyNGQtNjViMy00YjQ0LWI0YTgtZTdmYWFlNDRkMmUx",
       client_secret: "ZTQ0OWI4YTItYzE4ZC00MWQ5LTg3YjktMDI5ZjAxYTBkZmRiZGQ0NzI4OTAtNGQ1My0xMWU0LWJmZmUtMzkyZTdiOTYxYmMx",
       type: 'code',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playlyfe
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_client