playlyfe 0.5.5 → 0.6.0

data/lib/playlyfe.rb

@@ -20,8 +20,7 @@ end
 class Playlyfe
   @@api = 'https://api.playlyfe.com/v1'
 
-  def self.init(options = {})
-    puts 'Playlyfe Initializing...............................................'
+  def initialize(options = {})
     if options[:type].nil?
       err = PlaylyfeError.new("")
       err.name = 'init_failed'
@@ -32,13 +31,13 @@ class Playlyfe
     @@id = options[:client_id]
     @@secret = options[:client_secret]
     @@store = options[:store]
-    @@retrieve = options[:retrieve]
+    @@load = options[:load]
     @@redirect_uri = options[:redirect_uri]
     if @@store.nil?
       @@store = lambda { |token| puts 'Storing Token' }
     end
     if @@type == 'client'
-      self.get_access_token()
+      get_access_token()
     else
       if options[:redirect_uri].nil?
         err = PlaylyfeError.new("")
@@ -49,8 +48,7 @@ class Playlyfe
     end
   end
 
-  def self.get_access_token
-    puts 'Getting Access Token'
+  def get_access_token
     begin
       if @@type == 'client'
         access_token = RestClient.post('https://playlyfe.com/auth/token',
@@ -80,12 +78,12 @@ class Playlyfe
       access_token.delete('expires_in')
       access_token['expires_at'] = expires_at
       @@store.call access_token
-      if @@retrieve.nil?
-        @@retrieve = lambda { return access_token }
+      if @@load.nil?
+        @@load = lambda { return access_token }
       else
-        old_token = @@retrieve.call
+        old_token = @@load.call
         if access_token != old_token
-          @@retrieve = lambda { return access_token }
+          @@load = lambda { return access_token }
         end
       end
     rescue => e
@@ -93,43 +91,51 @@ class Playlyfe
     end
   end
 
-  def self.get_login_url
-    query = { response_type: 'code', redirect_uri: @@redirect_uri, client_id: @@id }
-    "https://playlyfe.com/auth?#{self.hash_to_query(query)}"
-  end
-
-  def self.exchange_code(code)
-    if code.nil?
-      err = PlaylyfeError.new("")
-      err.name = 'init_failed'
-      err.message = 'You must pass in a code in exchange_code for the auth code flow'
-      raise err
-    else
-      @@code = code
-      self.get_access_token()
-    end
-  end
-
-  def self.check_token(options)
-    access_token = @@retrieve.call
+  def check_token(options)
+    access_token = @@load.call
     if access_token['expires_at'] < Time.now.to_i
       puts 'Access Token Expired'
-      self.get_access_token()
-      access_token = @@retrieve.call
+      get_access_token()
+      access_token = @@load.call
     end
     options[:query][:access_token] = access_token['access_token']
   end
 
-  def self.get(options = {})
+  def api(options = {})
     options[:route] ||= ''
     options[:query] ||= {}
+    options[:body] ||= {}
     options[:raw] ||= false
-    self.check_token(options)
-
+    check_token(options)
     begin
-      res = RestClient.get("#{@@api}#{options[:route]}",
-        {:params => options[:query] }
-      )
+      case options[:method]
+        when 'GET'
+          res = RestClient.get("#{@@api}#{options[:route]}",
+            {:params => options[:query] }
+          )
+        when 'POST'
+          res = RestClient.post("#{@@api}#{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])}",
+            options[:body].to_json,
+            :content_type => :json,
+            :accept => :json
+          )
+        when 'PATCH'
+          res = RestClient.patch("#{@@api}#{options[:route]}?#{hash_to_query(options[:query])}",
+            options[:body].to_json,
+            :content_type => :json,
+            :accept => :json
+          )
+        when 'DELETE'
+          res = RestClient.delete("#{@@api}#{options[:route]}",
+            {:params => options[:query] }
+          )
+      end
       if options[:raw] == true
         return res.body
       else
@@ -140,76 +146,53 @@ class Playlyfe
     end
   end
 
-  def self.post(options = {})
-    options[:route] ||= ''
-    options[:query] ||= {}
-    options[:body] ||= {}
-    self.check_token(options)
+  def get(options = {})
+    options[:method] = "GET"
+    api(options)
+  end
 
-    begin
-      res = RestClient.post("#{@@api}#{options[:route]}?#{self.hash_to_query(options[:query])}",
-        options[:body].to_json,
-        :content_type => :json,
-        :accept => :json
-      )
-      return JSON.parse(res.body)
-    rescue => e
-      raise PlaylyfeError.new(e.response)
-    end
+  def post(options = {})
+    options[:method] = "POST"
+    api(options)
   end
 
-  def self.put(options = {})
-    options[:route] ||= ''
-    options[:query] ||= {}
-    options[:body] ||= {}
-    self.check_token(options)
+  def put(options = {})
+    options[:method] = "PUT"
+    api(options)
+  end
 
-    begin
-      res = RestClient.put("#{@@api}#{options[:route]}?#{self.hash_to_query(options[:query])}",
-        options[:body].to_json,
-        :content_type => :json,
-        :accept => :json
-      )
-      return JSON.parse(res.body)
-    rescue => e
-      raise PlaylyfeError.new(e.response)
-    end
+  def patch(options = {})
+    options[:method] = "PATCH"
+    api(options)
   end
 
-  def self.patch(options = {})
-    options[:route] ||= ''
-    options[:query] ||= {}
-    options[:body] ||= {}
-    self.check_token(options)
+  def delete(options = {})
+    options[:method] = "DELETE"
+    api(options)
+  end
 
-    begin
-      res = RestClient.patch("#{@@api}#{options[:route]}?#{self.hash_to_query(options[:query])}",
-        options[:body].to_json,
-        :content_type => :json,
-        :accept => :json
-      )
-      return JSON.parse(res.body)
-    rescue => e
-      raise PlaylyfeError.new(e.response)
-    end
+  def hash_to_query(hash)
+    return URI.encode(hash.map{|k,v| "#{k}=#{v}"}.join("&"))
   end
 
-  def self.delete(options = {})
-    options[:route] ||= ''
-    options[:query] ||= {}
-    self.check_token(options)
+  def get_login_url
+    query = { response_type: 'code', redirect_uri: @@redirect_uri, client_id: @@id }
+    "https://playlyfe.com/auth?#{hash_to_query(query)}"
+  end
 
-    begin
-      res = RestClient.delete("#{@@api}#{options[:route]}",
-        {:params => options[:query] }
-      )
-      JSON.parse(res.body)
-    rescue => e
-      raise PlaylyfeError.new(e.response)
-    end
+  def get_logout_url
+    ""
   end
 
-  def self.hash_to_query(hash)
-    return URI.encode(hash.map{|k,v| "#{k}=#{v}"}.join("&"))
+  def exchange_code(code)
+    if code.nil?
+      err = PlaylyfeError.new("")
+      err.name = 'init_failed'
+      err.message = 'You must pass in a code in exchange_code for the auth code flow'
+      raise err
+    else
+      @@code = code
+      get_access_token()
+    end
   end
 end

data/test/test.rb

@@ -6,7 +6,7 @@ class PlaylyfeTest < Test::Unit::TestCase
 
   def test_invalid_client
     begin
-      Playlyfe.init(
+      Playlyfe.new(
         client_id: "wrong_id",
         client_secret: "wrong_secret",
         type: 'client'
@@ -19,7 +19,7 @@ class PlaylyfeTest < Test::Unit::TestCase
 
   def test_wrong_init
     begin
-      Playlyfe.init(
+      Playlyfe.new(
         client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
         client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3"
       )
@@ -28,56 +28,54 @@ class PlaylyfeTest < Test::Unit::TestCase
     end
   end
 
-  def test_wrong_api
+  def test_init_staging
+    pl = Playlyfe.new(
+      client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
+      client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3",
+      type: 'client'
+    )
+
     begin
-      Playlyfe.init(
-        client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
-        client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3",
-        type: 'client'
-      )
-      Playlyfe.get(route: '/gege', query: { player_id: 'student1' })
+      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
-  end
 
-  def test_init_staging
-    Playlyfe.init(
-      client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
-      client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3",
-      type: 'client'
-    )
-    players = Playlyfe.get(route: '/players', query: { player_id: 'student1', limit: 1 })
+    players = pl.api(method: 'GET', route: '/players', query: { player_id: 'student1', limit: 1 })
+    assert_not_nil players["data"]
+    assert_not_nil players["data"][0]
+
+    players = pl.get(route: '/players', query: { player_id: 'student1', limit: 1 })
     assert_not_nil players["data"]
     assert_not_nil players["data"][0]
 
     begin
-      assert_nil Playlyfe.get(route: '/player')
+      pl.get(route: '/player')
     rescue PlaylyfeError => e
       assert_equal e.message, "The 'player_id' parameter should be specified in the query"
     end
 
     player_id = 'student1'
-    player = Playlyfe.get(route: '/player', query: { player_id: player_id } )
+    player = pl.get(route: '/player', query: { player_id: player_id } )
     assert_equal player["id"], "student1"
     assert_equal player["alias"], "Student1"
     assert_equal player["enabled"], true
 
-    Playlyfe.get(route: '/definitions/processes', query: { player_id: player_id } )
-    Playlyfe.get(route:'/definitions/teams', query: { player_id: player_id } )
-    Playlyfe.get(route: '/processes', query: { player_id: player_id } )
-    Playlyfe.get(route: '/teams', query: { player_id: player_id } )
+    pl.get(route: '/definitions/processes', query: { player_id: player_id } )
+    pl.get(route:'/definitions/teams', query: { player_id: player_id } )
+    pl.get(route: '/processes', query: { player_id: player_id } )
+    pl.get(route: '/teams', query: { player_id: player_id } )
 
-    processes = Playlyfe.get(route: '/processes', query: { player_id: 'student1', limit: 1, skip: 4 })
+    processes = pl.get(route: '/processes', query: { player_id: 'student1', limit: 1, skip: 4 })
     assert_equal processes["data"][0]["definition"], "module1"
     assert_equal processes["data"].size, 1
 
-    new_process = Playlyfe.post(route: '/definitions/processes/module1', query: { player_id: player_id })
+    new_process = pl.post(route: '/definitions/processes/module1', query: { player_id: player_id })
     assert_equal new_process["definition"], "module1"
     assert_equal new_process["state"], "ACTIVE"
 
-    patched_process = Playlyfe.patch(
+    patched_process = pl.patch(
       route: "/processes/#{new_process['id']}",
       query: { player_id: player_id },
       body: { name: 'patched_process', access: 'PUBLIC' }
@@ -86,43 +84,42 @@ class PlaylyfeTest < Test::Unit::TestCase
     assert_equal patched_process['name'], 'patched_process'
     assert_equal patched_process['access'], 'PUBLIC'
 
-    deleted_process = Playlyfe.delete(route: "/processes/#{new_process['id']}", query: { player_id: player_id })
+    deleted_process = pl.delete(route: "/processes/#{new_process['id']}", query: { player_id: player_id })
     assert_not_nil deleted_process['message']
 
-    #data = Playlyfe.put(route: "/players/#{player_id}/reset", query: { player_id: player_id })
+    #data = pl.put(route: "/players/#{player_id}/reset", query: { player_id: player_id })
     #puts data
 
-    raw_data = Playlyfe.get(route: '/player', query: { player_id: player_id }, raw: true)
+    raw_data = pl.get(route: '/player', query: { player_id: player_id }, raw: true)
     assert_equal raw_data.class, String
   end
 
   def test_init_production
-    Playlyfe.init(
+    pl = Playlyfe.new(
       client_id: "N2Y4NjNlYTItODQzZi00YTQ0LTkzZWEtYTBiNTA2ODg3MDU4",
       client_secret: "NDc3NTA0NmItMjBkZi00MjI2LWFhMjUtOTI0N2I1YTkxYjc2M2U3ZGI0MDAtNGQ1Mi0xMWU0LWJmZmUtMzkyZTdiOTYxYmMx",
       type: 'client'
     )
-    #player = Playlyfe.get(route: '/players', query: { player_id: 'l54328754bddc332e0021a847', limit: 1 })
-    #assert_equal player["data"][0]["email"], "peter@playlyfe.com"
+    players = pl.get(route: '/game/players', query: { limit: 1 })
   end
 
   def test_store
     redis = Redis.new
-    Playlyfe.init(
+    pl = Playlyfe.new(
       client_id: "Zjc0MWU0N2MtODkzNS00ZWNmLWEwNmYtY2M1MGMxNGQ1YmQ4",
       client_secret: "YzllYTE5NDQtNDMwMC00YTdkLWFiM2MtNTg0Y2ZkOThjYTZkMGIyNWVlNDAtNGJiMC0xMWU0LWI2NGEtYjlmMmFkYTdjOTI3",
       type: 'client',
       store: lambda { |token| redis.set('token', JSON.generate(token)) },
-      retrieve: lambda { return JSON.parse(redis.get('token')) }
+      load: lambda { return JSON.parse(redis.get('token')) }
     )
-    players = Playlyfe.get(route: '/players', query: { player_id: 'student1', limit: 1 })
+    players = pl.get(route: '/players', query: { player_id: 'student1', limit: 1 })
     assert_not_nil players["data"]
     assert_not_nil players["data"][0]
   end
 
   def test_auth_code_error
     begin
-      Playlyfe.init(
+      Playlyfe.new(
         client_id: "NGM2ZmYyNGQtNjViMy00YjQ0LWI0YTgtZTdmYWFlNDRkMmUx",
         client_secret: "ZTQ0OWI4YTItYzE4ZC00MWQ5LTg3YjktMDI5ZjAxYTBkZmRiZGQ0NzI4OTAtNGQ1My0xMWU0LWJmZmUtMzkyZTdiOTYxYmMx",
         type: 'code'
@@ -133,7 +130,7 @@ class PlaylyfeTest < Test::Unit::TestCase
   end
 
   def test_auth_code
-    Playlyfe.init(
+    Playlyfe.new(
       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.5.5
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_client