lita-destiny 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ea47e27f80fe3f59b2066e75e90241ca8732de
-  data.tar.gz: c444142a09b63132d63148454f7287fdae3ade2f
+  metadata.gz: c0c9ea265299377f1f240610fad0221fbe49751e
+  data.tar.gz: 517d8c99a7357800806fb72339d38f04b4826b85
 SHA512:
-  metadata.gz: 6548499bef7ecc6ecdcd4ccecc5acfbd9e135bc04a2a3f18b930f760e5493b6c973ac933bff13e6baf937656cbf4d2cb41c9f3dc74d295c2c41666daa404f8d0
-  data.tar.gz: 318e1177eecb42d1d07b5aae43eb517b819790dc4a0b5c04bcc04622d6c9ebc8dfa811d7e087d47ca3278e0490c26ae0830508b57888e1680b19ac0fc44744be
+  metadata.gz: 70d9beb976b5084e80e66b9ea0e5151b26f72dcffacc1e31d8f94e99e470ea33ea95acbd1bd4b108dc9428e98a6b79291c09765ea14faad2dcf4000b432c1b0d
+  data.tar.gz: 69e64caaf95ceeb4e131739ec4d3a8044688771e99b32a892829accd5c2b93b46214ca5237e577bd834b619a814f54f34be007c085707baa94c7dee7d6157b61

data/README.md

@@ -19,9 +19,5 @@ gem "lita-destiny"
 
 Add the config to your lita config file with your Bungie API key:
 ``` ruby
-config.handlers.destiny.api_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+config.handlers.destiny_handler.api_key = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
 ```
-
-## Usage
-
-This gem adds several methods for chat routes.

data/lib/lita-destiny.rb

@@ -10,7 +10,7 @@ Lita.load_locales Dir[File.expand_path(
 require "lita/handlers/destiny"
 
 # Require response templates
-Lita::Handlers::Destiny.template_root File.expand_path(
+Lita::Handlers::DestinyHandler.template_root File.expand_path(
   File.join("..", "..", "templates"),
  __FILE__
 )

data/lib/lita/handlers/destiny.rb

@@ -1,6 +1,6 @@
 module Lita
   module Handlers
-    class Destiny < Handler 
+    class DestinyHandler < Handler
       # Required configuration attribute
       config :api_key, type: String, required: true do
         # Do validation against provided api_key, MUST be 32 chars.
@@ -9,114 +9,172 @@ module Lita
            "must be 32 characters" unless value.respond_to?(:size) && value.size == 32
         end
       end
-      
-      # Bring in DestinyAPI module
-      include DestinyAPI
+
+      # Bring in Destiny module
+      include Destiny
 
       # Nightfall Route
       route(/^!(nightfall)/i, :nightfall , help: { "!nightfall" => "Get this weeks nightfall description and skulls" })
-      
+
       # Weekly Strike Route
       route(/^!(weekly)/i, :weekly , help: { "!weekly" => "Get this weeks nightfall description and skulls" })
-      
+
       # Xur Route
       route(/^!(xur)/i, :xur , help: { "!xur" => "Get Xur's inventory when availible" })
-      
+
+      route(/^!(poe32)/i, :poe_32, help: { "!32" => "Get this weeks level 32 Prison of Elders information." })
+
+      route(/^!(poe34)/i, :poe_34, help: { "!34" => "Get this weeks level 34 Prison of Elders information." })
+
+      route(/^!(poe35)/i, :poe_35, help: { "!35" => "Get this weeks level 35 Prison of Elders information." })
+
       # Nightfall Activity Method
-      # 
+      #
       # Calls #build_activity_message(activity)
       # where activity would be nightfall.
-      #     
+      #
       def nightfall(response)
         # Set up our client
-        destiny_client = DestinyAPI::Base.new(api_key)
+        destiny_client = Destiny::Client.new(api_key)
         # Build the activity message with nightfall info
         build_activity_message(destiny_client.nightfall, response)
       end
-      
+
       # Weekly Strike Activity Method
-      # 
+      #
       # Calls #build_activity_message(activity)
       # where activity would be the weekly strike.
-      #      
+      #
       def weekly(response)
         # Set up our client
-        destiny_client = DestinyAPI::Base.new(api_key)
+        destiny_client = Destiny::Client.new(api_key)
         # Build the activity message with weekly info
         build_activity_message(destiny_client.weekly_strike, response)
       end
-      
+
       # Xur Items Method
-      # 
+      #
       # Calls #build_xur_message()
-      # Returns Xur inventory when availible.  
-      # 
+      # Returns Xur inventory when availible.
+      #
       def xur(response)
         build_xur_message(response)
       end
-      
+
+      def poe_32(response)
+        build_poe_message(32, response)
+      end
+
+      def poe_34(response)
+        build_poe_message(34, response)
+      end
+
+      def poe_35(response)
+        build_poe_message(35, response)
+      end
+
       # Begin private methods
-      # 
+      #
       private
-      
+
       # Set our api_key for calling in route methods.
-      # 
+      #
       def api_key
         config.api_key
       end
-      
+
       # Generalized Response Method
-      # 
+      #
       # Used by activity methods to bring concise activity info
       # into the chat.
-      # 
+      #
       def build_activity_message(activity, response)
         # Set activity
         activity_hash = activity
-        # Send response based on adapter
-        case robot.config.robot.adapter
-        when :slack
-          # Send response
-          response.reply("*#{activity_hash[:activityName]}*\n#{activity_hash[:activityDescription]}\n*Skulls:* #{activity_hash[:skulls].join(', ')}")
-        else
-          # Send response
-          response.reply("#{activity_hash[:activityName]}\n#{activity_hash[:activityDescription]}\nSkulls: #{activity_hash[:skulls].join(', ')}")
-        end
+        response.reply("*#{activity_hash[:activityName]}*\n#{activity_hash[:activityDescription]}\n*Skulls:* #{activity_hash[:skulls].join(', ')}")
       end
 
       # Xur Response Method
-      # 
+      #
       # Builds response to bring Xur items into chat.
-      # 
+      #
+      # TODO: Is slow due to each item having to be polled from Bungies server.
       def build_xur_message(response)
         # Set up our client
-        destiny_client = DestinyAPI::Base.new(api_key)
+        destiny_client = Destiny::Client.new(api_key)
         # Set xur to our clients xur method
         xur = destiny_client.xur
 
-        items = []
-        xur.each do |key, value|
-          value.each do |key, value|
-            item_name = destiny_client.get_manifest_item(6, key[:item_hash])['itemName']
-            item_cost = key[:item_cost]
-            item_cost_name = destiny_client.get_manifest_item(6, key[:item_cost_hash])['itemName']
-            constructed_item = "#{item_name}, #{item_cost} #{item_cost_name}"
-            items << constructed_item
-          end
-        end
-        
         # Check vendorDetails to see if anything is availible.
         if xur.nil?
-          # If nothing, send to chat that he isn't there.
-          response.reply "Xur isn't in game right now."
+          # If nil, send to chat that he isn't there.
+          response.reply "Xur isn't in the game world right now."
         else
-           #If something, send to chat what he is selling.
+          # If not nil, cycle over items and build our items array.
+          items = []
+          xur.each do |key, value|
+            value.each do |key, value|
+              item_name = destiny_client.get_manifest_item(6, key[:item_hash])['itemName']
+              item_cost = key[:item_cost]
+              item_cost_name = destiny_client.get_manifest_item(6, key[:item_cost_hash])['itemName']
+              constructed_item = "#{item_name}, #{item_cost} #{item_cost_name}"
+              items << constructed_item
+            end
+          end
+           # Once parsed, send completed message to chat.
           response.reply "*Xur is selling:*\n#{items.join("\n")}"
         end
       end
+
+      def build_poe_message(level, response)
+        # Set up our client
+        destiny_client = Destiny::Client.new(api_key)
+        # Returns:
+        # {"activityHash"=>3508129769, "iconPath"=>"/img/destiny_content/arena/32_challenge.v2.png",
+        # "rounds"=>[{"enemyRaceHash"=>711470098, "skulls"=>[4]}, {"enemyRaceHash"=>3265589059, "skulls"=>[2]},
+        # {"enemyRaceHash"=>711470098, "skulls"=>[11]}, {"enemyRaceHash"=>3265589059, "skulls"=>[12]},
+        # {"enemyRaceHash"=>3265589059, "skulls"=>[3]}],
+        # "bossFight"=>false, "bossSkulls"=>[], "activeRewardIndexes"=>[0], "isCompleted"=>false}
+        arena = destiny_client.arena(level)
+        arena_hash = arena['activityHash']
+        arena_rounds = arena['rounds']
+        arena_name = destiny_client.activity_search(arena_hash)[:activityName]
+        arena_description = destiny_client.activity_search(arena_hash)[:activityDescription]
+
+        # For 32 & 34. Only goes to Round 5
+        parsed_rounds = []
+        arena_rounds.each_with_index do |round, index|
+          enemy = destiny_client.enemy_race(round['enemyRaceHash']).capitalize
+          raw_skulls = round['skulls']
+          skulls = []
+            raw_skulls.each do |skull|
+              parsed_skulls = destiny_client.skulls(skull).capitalize
+              skulls << parsed_skulls
+            end
+          parsed_round = "Round #{index+1}: #{enemy}-- #{skulls.join(", ")}"
+          parsed_rounds << parsed_round
+        end
+
+        # For 35, final skolas round.
+        if arena['bossFight'] == true
+          skulls = []
+          raw_skulls = arena['bossSkulls']
+          raw_skulls.each do |skull|
+            parsed_skulls = destiny_client.skulls(skull).capitalize
+            skulls << parsed_skulls
+          end
+          parsed_round  = "Round 6: Skolas-- #{skulls.join(", ")}"
+          parsed_rounds << parsed_round
+        end
+
+        response.reply "*Level #{level} Prison of Elders*\n#{arena_name}\n#{arena_description}\n#{parsed_rounds.join("\n")}"
+
+
+
+      end
     end
-    
+
     # Register the handler
-    Lita.register_handler(Destiny)
+    Lita.register_handler(DestinyHandler)
   end
-end
+end

data/lita-destiny.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-destiny"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["PDaily"]
   spec.email         = ["pat.irwin4@gmail.com"]
   spec.description   = "Small lita.io handler for interacting with the Destiny API"
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "lita", "~> 4.3"
-  spec.add_runtime_dependency "destiny_rb", "~> 0.1"
+  spec.add_runtime_dependency "destiny_rb", "~> 0.1" , ">= 0.1.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-byebug", "~> 3.1", ">= 3.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-destiny
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - PDaily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement