teamsnap_rb 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b829229cc634f6e48b4654c2181b7e8846e54574
-  data.tar.gz: 3dad7f1b9071dc69ed4f148873871aa5592c5a6f
+SHA256:
+  metadata.gz: aa6ef11bfccf2b3846e2cb4ab9a57f72d1cc2fb82adc6ea1433fd8264a2d5750
+  data.tar.gz: 122ae6174ae38b9bffefc02df3851ca44138de3b086f18cfbb444a0c4fe506c4
 SHA512:
-  metadata.gz: 3f3b9660eb5fbe86eb8ed10b0df3a3d1299e8a8c42ca994cd196b7db6b609833edd0ab3571aa8cddc7117d1bb6a1e7334541886bac4def2d158233f366f35989
-  data.tar.gz: cb51d627b28277fe25ac8317a67ceb9d7931f11068427fec03c90553e26a10316cc1a5a63fa44cf53c1fdae5d6a97f874a263c4fb45e769ce4a4cb61eec7efa6
+  metadata.gz: 13b9cc1026d33b11a770a4ea94ad9943681c7c13d745ec16715092dd0343afc52e7c5978d1475a0a3d5c0b433178cfd8dce42bf509971f3c201676b5a9c04a74
+  data.tar.gz: 2f4523e62d26aecbf65aa9ea8b18cc88f05ffc50b393290f7d85f44218eea3d3a3ee92ba8dba4152eab62b9b7ce9f563fdedbaaa0d2c45529d0a1532e0fd1ebd

data/CHANGELOG.md

@@ -99,3 +99,9 @@ v2.0.0
 - Update typhoeus from 1.1 to 1.3
 - Update rspec from 3.6 to 3.8
 - Update vcr from 2.9 to 5.0
+
+[v2.4.0](https://github.com/teamsnap/teamsnap_rb/pull/111)
+------
+
+- Remove Oj gem dependency
+- Update faraday dependency to allow version 0.17

data/lib/teamsnap.rb

@@ -1,10 +1,10 @@
 %w(
-    faraday typhoeus typhoeus/adapters/faraday oj inflecto virtus
+    faraday typhoeus typhoeus/adapters/faraday inflecto virtus
     date securerandom
   ).each { |x| require x }
 
 %w(
-    config/inflecto config/oj teamsnap/version teamsnap/api
+    config/inflecto teamsnap/version teamsnap/api
     teamsnap/auth_middleware teamsnap/client teamsnap/collection teamsnap/item
     teamsnap/response teamsnap/structure
   ).each { |x| require_relative x }
@@ -79,7 +79,7 @@ module TeamSnap
           if use_multipart?(args)
             req.body = args
           else
-            req.body = Oj.dump(args)
+            req.body = JSON.generate(args)
           end
         end
       else

data/lib/teamsnap/api.rb

@@ -76,7 +76,7 @@ module TeamSnap
       return "Forbidden (403)" if resp.status == 403 && resp.body == ""
 
       begin
-        Oj.load(resp.body)
+        JSON.parse(resp.body, :symbolize_names => true)
           .fetch(:collection)
           .fetch(:error)
           .fetch(:message)

data/lib/teamsnap/collection.rb

@@ -106,7 +106,7 @@ module TeamSnap
     def parse_collection
       if resp
         TeamSnap.response_check(resp, :get)
-        collection = Oj.load(resp.body).fetch(:collection) { [] }
+        collection = JSON.parse(resp.body, :symbolize_names => true).fetch(:collection) { [] }
       elsif parsed_collection
         collection = parsed_collection
       end

data/lib/teamsnap/response.rb

@@ -4,7 +4,7 @@ module TeamSnap
     class << self
       def load_collection(resp)
         if resp.success?
-          return Oj.load(resp.body).fetch(:collection)
+          return JSON.parse(resp.body, :symbolize_names => true).fetch(:collection)
         else
           content_type = resp.headers["content-type"]
           if content_type && content_type.match("json")
@@ -69,14 +69,14 @@ module TeamSnap
     end
 
     def process_info
-      body = Oj.load(@resp.body)
+      body = JSON.parse(@resp.body, :symbolize_names => true)
       @collection = body.fetch(:collection) { {} }
       @message = "Data retrieved successfully"
       @objects = TeamSnap::Item.load_items(@client, @collection)
     end
 
     def process_action
-      body = Oj.load(@resp.body) || {}
+      body = JSON.parse(@resp.body, :symbolize_names => true) || {}
       @collection = body.fetch(:collection) { {} }
       @message = "`#{@via}` call was successful"
       @objects = TeamSnap::Item.load_items(@client, @collection)
@@ -84,7 +84,7 @@ module TeamSnap
 
     def process_error
       if @resp.headers["content-type"].match("json")
-        body = Oj.load(@resp.body) || {}
+        body = JSON.parse(@resp.body, :symbolize_names => true) || {}
         @collection = body.fetch(:collection) { {} }
         @message = TeamSnap::Api.parse_error(@resp)
         @objects = TeamSnap::Item.load_items(@client, @collection)

data/lib/teamsnap/structure.rb

@@ -34,7 +34,7 @@ module TeamSnap
 
         href_to_rel = Hash[*href_to_rel.flatten]
 
-        Oj.load(response.body)
+        JSON.parse(response.body, :symbolize_names => true)
           .map { |collection|
             col = collection.fetch(:collection) { {} }
             if rel = href_to_rel[col[:href]]

data/lib/teamsnap/version.rb

@@ -1,3 +1,3 @@
 module TeamSnap
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

data/spec/teamsnap/apiv_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe "teamsnap__api", :vcr => true do
     it "returns a proper error message" do
       response = Faraday::Response.new(
         :status => 403,
-        :body => Oj.dump("collection" => { :error => { :message => "Error Message"}})
+        :body => JSON.generate("collection" => { :error => { :message => "Error Message"}})
       )
       expect(TeamSnap::Api.parse_error(response)).to eq("Error Message")
     end

data/teamsnap_rb.gemspec

@@ -24,9 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec",   "~> 3.8.0"
   spec.add_development_dependency "vcr",     "~> 5.0.0"
 
-  spec.add_dependency "faraday",  "~> 0.15.0"
+  spec.add_dependency "faraday",  "~> 0.17", "< 1.0"
   spec.add_dependency "typhoeus", "~> 1.3.0"
-  spec.add_dependency "oj",       "~> 3.9.0"
   spec.add_dependency "inflecto", "~> 0.0.2"
   spec.add_dependency "virtus",   "~> 1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamsnap_rb
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Shane Emmons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,14 +73,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +101,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +144,6 @@ files:
 - README.md
 - Rakefile
 - lib/config/inflecto.rb
-- lib/config/oj.rb
 - lib/teamsnap.rb
 - lib/teamsnap/api.rb
 - lib/teamsnap/auth_middleware.rb
@@ -226,8 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem to interact with TeamSnap's API

data/lib/config/oj.rb

@@ -1,6 +0,0 @@
-Oj.default_options = {
-  :mode => :compat,
-  :symbol_keys => true,
-  :class_cache => true,
-  :use_as_json => true
-}