lita-destiny 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f8fff55885215ad537fdf8426014f984537740
-  data.tar.gz: d46388aec3dcf560cb2d25f827bf440208e774fd
+  metadata.gz: 273db0f6ec1165b2bfb680c9adb3dbb17784d983
+  data.tar.gz: 8a77938f5edd415ec959fe837f8f1d853c2b83e3
 SHA512:
-  metadata.gz: 216d833748bd8518b54447d08a1617f27414d9b8a7267cf0bf7889f107308dd7eb49740233c36a67f9e355dac9349417ffd5b208bd81bef766b28f086083d24d
-  data.tar.gz: 7fdcf111a0a6b24ba9d8702cc5ac24d053309f2a20f4e2d9ae92c763305c4513a54154c7cd954c3994531aa55709d8863a801da89b366d963374f793feb2579e
+  metadata.gz: 93111e093fb4d5001ad794df9017067859138d5611984921fcf2fbc8fa0be319d80eb2334b639afc6cf1d9692f7d815df084c461f4ccb0d8ec42b3c70b835ff8
+  data.tar.gz: 88f9029bc6439c23e1fe82f871acd8e9597c5d66eac40d3d8034293263a99642fc5762703bd9cabd2601d8e85636e57c2a9e42a9d26b95f16cdbebf36f871458

data/lib/destiny/destiny_api.rb

@@ -1,83 +1,85 @@
 require 'httparty'
 
-module DestinyApi
-  include HTTParty
-  format :json
-  base_uri 'www.bungie.net/platform/destiny/'
+module DestinyAPI
+  class Base
+    include HTTParty
+    format :json
+    base_uri 'www.bungie.net/platform/destiny/'
 
 
-  # Init the Destiny API with Bungie API stored in ENV variable
-  # destiny = Destiny.new(api_token)
-  def initialize(api_token)
-    @headers = { 'X-API-Key' => api_token, 'Content-Type' => 'application/json' }
-  end
-
-  # Pull the days advisor report from http://www.bungie.net/platform/destiny/advisors/
-  # destiny.advisors
-  def advisors
-    raw_data = self.class.get('/advisors', headers: @headers)
-    parsed = raw_data.parsed_response['Response']['data']
-  end
+    # Init the Destiny API with Bungie API stored in ENV variable
+    # destiny = Destiny.new(api_token)
+    def initialize(api_token)
+      @headers = { 'X-API-Key' => api_token, 'Content-Type' => 'application/json' }
+    end
 
-  def activity(activity_hash, raw=false)
-    raw_data = self.class.get("/manifest/activity/#{activity_hash}").parsed_response['Response']['data']['activity']
-    skulls = []
-    raw_data['skulls'].each do |skull|
-      skulls << skull['displayName']
+    # Pull the days advisor report from http://www.bungie.net/platform/destiny/advisors/
+    # destiny.advisors
+    def advisors
+      raw_data = self.class.get('/advisors', headers: @headers)
+      parsed = raw_data.parsed_response['Response']['data']
     end
-    unless raw == true
-      parsed_data = { activityName: raw_data['activityName'], activityDescription: raw_data['activityDescription'], skulls: skulls }
-    else
-      raw_data
+
+    def activity(activity_hash, raw=false)
+      raw_data = self.class.get("/manifest/activity/#{activity_hash}").parsed_response['Response']['data']['activity']
+      skulls = []
+      raw_data['skulls'].each do |skull|
+        skulls << skull['displayName']
+      end
+      unless raw == true
+        parsed_data = { activityName: raw_data['activityName'], activityDescription: raw_data['activityDescription'], skulls: skulls }
+      else
+        raw_data
+      end
     end
-  end
 
-  # Pull the weekly nightfall info from http://www.bungie.net/platform/destiny/manifest/activity/#{activity_hash}
-  # Optional boolean argument, defaults to false from activity method to only return basic information for Lita bot.
-  # 
-  # destiny.nightfall
-  # 
-  def nightfall(options={})
-    nightfall_activity_hash = self.advisors['nightfallActivityHash']
-    activity(nightfall_activity_hash, boolean)
-  end
+    # Pull the weekly nightfall info from http://www.bungie.net/platform/destiny/manifest/activity/#{activity_hash}
+    # Optional boolean argument, defaults to false from activity method to only return basic information for Lita bot.
+    # 
+    # destiny.nightfall
+    # 
+    def nightfall(options={})
+      nightfall_activity_hash = self.advisors['nightfallActivityHash']
+      activity(nightfall_activity_hash, boolean)
+    end
 
-  # Pull the weekly nightfall info from http://www.bungie.net/platform/destiny/manifest/activity/#{activity_hash}
-  # Returns an array of three items, only need one for the skulls and location.
-  # 
-  # Optional boolean argument, defaults to false from activity method to return basic information for Lita bot.
-  # 
-  # destiny.weekly_strike(false)
-  # 
-  def weekly_strike(options={})
-    heroic_strike_hashes = self.advisors['heroicStrikeHashes']
-    activity(heroic_strike_hashes[0], boolean)
-  end
+    # Pull the weekly nightfall info from http://www.bungie.net/platform/destiny/manifest/activity/#{activity_hash}
+    # Returns an array of three items, only need one for the skulls and location.
+    # 
+    # Optional boolean argument, defaults to false from activity method to return basic information for Lita bot.
+    # 
+    # destiny.weekly_strike(false)
+    # 
+    def weekly_strike(options={})
+      heroic_strike_hashes = self.advisors['heroicStrikeHashes']
+      activity(heroic_strike_hashes[0], boolean)
+    end
 
-  # Pull the weekly nightfall info from http://www.bungie.net/platform/destiny/manifest/activity/#{activity_hash}
-  #
-  # 
-  # No known endpoints.
-  def arena(options={})
-  end
+    # Pull the weekly nightfall info from http://www.bungie.net/platform/destiny/manifest/activity/#{activity_hash}
+    #
+    # 
+    # No known endpoints.
+    def arena(options={})
+    end
 
-  # WIP: Pull xur inventory
-  # http://www.bungie.net/platform/destiny/advisors/xur/?definitions=true
-  def xur
-    raw_data = self.class.get('/advisors/xur/?definitions=true').parsed_response['Response']['definitions']
-  end
+    # WIP: Pull xur inventory
+    # http://www.bungie.net/platform/destiny/advisors/xur/?definitions=true
+    def xur
+      raw_data = self.class.get('/advisors/xur/?definitions=true').parsed_response['Response']['definitions']
+    end
 
-  # Pull the days bounties
-  def bounties
-  end
+    # Pull the days bounties
+    def bounties
+    end
 
-  def place(place_hash)
-    raw data = self.class.get('/manifest/place/#{place_hash}').parsed_response['Response']['data']['place']
-    response = { place_name: raw_data['placeName'], place_desc: raw_data['placeDescription'] }
-  end
+    def place(place_hash)
+      raw data = self.class.get('/manifest/place/#{place_hash}').parsed_response['Response']['data']['place']
+      response = { place_name: raw_data['placeName'], place_desc: raw_data['placeDescription'] }
+    end
 
-  def destination(destination_hash)
-    raw_data = self.class.get('/manifest/destination/#{destination_hash}').parsed_response['Response']['data']
-    response = { dest_name: raw_data['destinationName'], dest_desc: raw_data['destinationDescription'] }
+    def destination(destination_hash)
+      raw_data = self.class.get('/manifest/destination/#{destination_hash}').parsed_response['Response']['data']
+      response = { dest_name: raw_data['destinationName'], dest_desc: raw_data['destinationDescription'] }
+    end
   end
 end

data/lib/lita/handlers/destiny.rb

@@ -1,20 +1,33 @@
 module Lita
   module Handlers
     class Destiny < Handler
-      include DestinyApi
-      config :api_key
+      namespace "destiny"
+      # Bring in DestinyAPI module
+      include DestinyAPI
       
-      DESTINY = DestinyApi.new(config.api_key)
+      # Required configuration attribute
+      config :api_key, type: String, required: true do 
+        validate do |value|
+           "must be 32 characters" unless value.respond_to?(:size) && value.size == 32
+        end
+      end
       
-      route(/!+?\b(nightfall)/i, :build_activity_message(DESTINY.nightfall), help: { "!nightfall" => "Get this weeks nightfall description and skulls" })
+            
+      # Set up our client
+      destiny_client = DestinyAPI::Base.new(config.api_key).call
+
+      
+      route(/^!\w(.*)/i, :nightfall , help: { "!nightfall" => "Get this weeks nightfall description and skulls" })
       
             
+      def nightfall(response)
+        build_activity_message(destiny_client.nightfall, response)
+      end
       
       # activity = { activityName: raw_data['activityName'], activityDescription: raw_data['activityDescription'], skulls: skulls }
-      def build_activity_message(activity)
+      def build_activity_message(activity, response)
         activity = activity
-        #response.reply("#{activity["activityName"]}\n #{activityDescription["activityDescription"]}\n #{skulls["skulls"]}")
-        response.reply("Hi!")
+        response.reply("#{activity["activityName"]}\n #{activityDescription["activityDescription"]}\n #{skulls["skulls"]}")
       end
      
     end

data/lita-destiny.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-destiny"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["PDaily"]
   spec.email         = ["pat.irwin4@gmail.com"]
   spec.description   = "Small lita.io handler for interacting with the Destiny API"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-destiny
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - PDaily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita