destiny_rb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac2b48b3b626aea46a905659c5bf37e3dd8dcf2
-  data.tar.gz: 811ed1e19cb6d98143da578f7bee0ee4b24f0526
+  metadata.gz: 4373dd724f34c41342d1eacc976fd21471d30dcd
+  data.tar.gz: 006349a2e9dca25e6540b89209bfa79ede3b2ded
 SHA512:
-  metadata.gz: 2e3e94d98e7fcf8d05333788d9f173deee99dbbcc7baad1e04b98ebbf3bb206f19e077924def38a5e58efc74399d9a28865005eb1086c5e446a769689a79e981
-  data.tar.gz: 1d5e272003e345263138b27f32c219b655a5377bce22933086963a66775e5623146a793d0c422643bbaf9bc168da43afab7dae4873f1fb0e63cb04095e806ce6
+  metadata.gz: c1e098690e716b3a409166c15fdefc8369d4dd8967b822f126cfaa9b4c0c9d2f7d03b5e60ceac8ae39d70a4e54d23d369544e5979ba5138463130aa374bfe99a
+  data.tar.gz: 946b076a2bf1c143fc39584e51a547ae9dcaec3152d21cdc0b88d04c780b65cbf33cca1e6f0002b8a45a6b9b392dd07091106e82f96d6340c67b0cd3ec422675

data/.env.sample

@@ -0,0 +1 @@
+TEST_DESTINY_API_KEY=abc123

data/destiny_rb.gemspec

@@ -37,4 +37,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.10", ">= 0.10.0"
   spec.add_development_dependency "coveralls", "~> 0.8", ">= 0.8.1"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4", ">= 0.4.7"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "multi_json"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "dotenv"
 end

data/lib/destiny_rb/advisors.rb

@@ -57,8 +57,23 @@ module Destiny
     #  raw: (boolean)
     #
     def nightfall(raw=false)
-      nightfall_activity_hash = self.daily_report['nightfallActivityHash']
-      activity_search(nightfall_activity_hash, raw)
+      nightfall_info = self.daily_report["nightfall"]
+
+      nightfall_activity_hash = nightfall_info["activityBundleHash"]
+      activity_info = activity_search(nightfall_activity_hash, raw)
+
+      if raw
+        activity_info
+      else
+        active_skulls = nightfall_info["tiers"][0]["skullIndexes"]
+        all_skulls = activity_info[:skulls]
+
+        activity_info[:activeSkulls] = active_skulls.map { |index| all_skulls[index] }
+
+        specific_activity = activity_search(nightfall_info["tiers"][0]["specificActivityHash"])
+        activity_info[:specificActivity] = specific_activity
+        activity_info
+      end
     end
 
     # GET the weekly strike info from '/manifest/activity/#{activity_hash}'

data/lib/destiny_rb/vendors.rb

@@ -8,7 +8,7 @@ module Destiny
 
       if raw
         raw_data
-      elsif raw_data.empty?
+      elsif raw_data.empty? || raw_data.nil?
         return nil
       else
         vendor_hash = raw_data['data']['vendorHash']

data/lib/destiny_rb/version.rb

@@ -1,3 +1,3 @@
 module Destiny
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destiny_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - pDaily
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -184,6 +184,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.7
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bungies Destiny API in an easily consumable ruby gem!
 email:
 - pat@pdaily.me
@@ -191,6 +247,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.sample"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"