patreonrb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ab3e0e7e8c9030e9309ea077b189e5d2afcf8d26848d3b1fcae2611138c4e0e
-  data.tar.gz: caf44ce1048305d57d3e379663a3b0ad85cf7f978de91d7a71d24b1e3d3762d3
+  metadata.gz: 0c7b782dd247bad388fd4f4eeeb185efbe3ae5ffdc810fb26e80d09fa0683e39
+  data.tar.gz: '0587ad1a40a7d5e53f7489d4e19ad505f89c34f3c92ae0c0f9809f1a88e91d36'
 SHA512:
-  metadata.gz: ee4009bffbe0e79f9280d80b251ae9081643a7760b468221c6309c1f8a4bcce52bd0a5cd1dab268222c8e759f3a1acb46e073271366273121543f216e2fe5dc0
-  data.tar.gz: 169e6902cb2fd4813cffd916f60414855ea2456a897a1fc903320db4dcc35b95fccc47a9d7369163673d263fc6adacdb65e84805583cfe50096169900829a44c
+  metadata.gz: be1f01f3f6665c3a58510957879b3b61349aaf9ef6d5a28f450c80005fc44cf3a51366195c26a2b35d656e8e7f0e11b6d3a7aa96ceb52e271946599ec5529d4f
+  data.tar.gz: 93438c39c2bb5205c921f663ddf5baa9ba53e160c8e3ab7c0c65343e77ddb7b3bc4acdc9bd88ce65f9903c439c531d75218786e579d9aa20bce8126cd070cbae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patreonrb (0.1.0)
+    patreonrb (0.1.1)
       faraday (~> 2.0)
 
 GEM

data/README.md

@@ -4,8 +4,9 @@
 
 PatreonRB is a Ruby library for interacting with the Patreon V2 API.
 
-This API isn't great so this library tries to add required fields, such as `user_id` on `Patreon::Member`'s, to 
-make implementing the Patreon API in your application much easier.
+This API isn't great so this library tries to add useful fields, such as `user_id` and
+`campaign_id` on `Patreon::Member`'s, to  make implementing the Patreon API in
+your application much easier.
 
 ## Installation
 

data/lib/patreon/object.rb

@@ -8,7 +8,12 @@ module Patreon
 
     def to_ostruct(obj)
       if obj.is_a?(Hash)
-        if obj["attributes"]
+        if obj["data"]
+          # For when data is sent to the object, for instance if included is also added
+          if obj["data"]["attributes"]
+            OpenStruct.new(obj["data"]["attributes"].map { |key, val| [key, to_ostruct(val)] }.to_h)
+          end
+        elsif obj["attributes"]
           # Merge the attributes 
           OpenStruct.new(obj["attributes"].map { |key, val| [key, to_ostruct(val)] }.to_h)
         else

data/lib/patreon/objects/member.rb

@@ -6,7 +6,13 @@ module Patreon
     def initialize(options = {})
       super options
 
-      self.id = options["id"] if options["id"]
+      if options["data"] && options["data"]["id"]
+        self.id = options["data"]["id"]
+      end
+
+      if options["id"]
+        self.id = options["id"]
+      end        
 
       if options["relationships"] && options["relationships"]["currently_entitled_tiers"]
         self.currently_entitled_tiers = options["relationships"]["currently_entitled_tiers"]["data"]
@@ -28,7 +34,14 @@ module Patreon
         end
       end
 
-      # self.included = options["included"]
+      if options["included"]
+        case options["included"][0]["type"]
+        when "tier"
+          self.tier_id = options["included"][0]["id"]
+          self.tier = options["included"][0]["attributes"]
+        end
+      end
+
     end
 
   end

data/lib/patreon/resources/members.rb

@@ -1,18 +1,9 @@
 module Patreon
   class MembersResource < Resource
     
-    def retrieve(member_id:, fields: Member::DEFAULT_FIELDS)
-
-      response = get_request("members/#{member_id}?include=currently_entitled_tiers&fields[member]=#{fields}&fields[tier]=#{Tier::DEFAULT_FIELDS}")#.body#.dig("data")[0]
-      response.body
-
-    end
-
-    def address(member_id:, fields: Address::DEFAULT_FIELDS)
-
-      response = get_request("members/#{member_id}?include=address&fields[address]=#{fields}")#.body#.dig("data")[0]
-      response.body
-
+    def retrieve(member_id:, member_fields: Member::DEFAULT_FIELDS, tier_fields: Tier::DEFAULT_FIELDS)
+      response = get_request("members/#{member_id}?include=currently_entitled_tiers&fields[member]=#{member_fields}&fields[tier]=#{tier_fields}")
+      Member.new response.body
     end
 
   end

data/lib/patreon/version.rb

@@ -1,3 +1,3 @@
 module Patreon
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patreonrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dean Perry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday