kentaa-api 0.2.1 → 0.3.0

data/lib/kentaa/api/resources/registration_fee.rb

@@ -3,7 +3,7 @@
 module Kentaa
   module Api
     module Resources
-      class RegistrationFee < Base
+      class RegistrationFee < Resource
         def amount
           data[:amount]
         end

data/lib/kentaa/api/resources/resource.rb

@@ -5,9 +5,18 @@ require 'time'
 module Kentaa
   module Api
     module Resources
-      module Resource
-        def id
-          data[:id]
+      class Resource < Base
+        attr_accessor :id
+
+        def initialize(config, options = {})
+          super(config, options)
+
+          if options.key?(:data)
+            @data = options.delete(:data) || {}
+            @id = @data.fetch(:id) if @data.key?(:id)
+          elsif options.key?(:id)
+            @id = options.delete(:id)
+          end
         end
 
         def created_at

data/lib/kentaa/api/resources/reward.rb

@@ -3,9 +3,7 @@
 module Kentaa
   module Api
     module Resources
-      class Reward < Base
-        include Kentaa::Api::Resources::Resource
-
+      class Reward < Resource
         def type
           data[:type]
         end

data/lib/kentaa/api/resources/segment.rb

@@ -6,9 +6,7 @@ require 'time'
 module Kentaa
   module Api
     module Resources
-      class Segment < Base
-        include Kentaa::Api::Resources::Resource
-
+      class Segment < Resource
         def object_key
           "Segment_#{id}"
         end
@@ -63,7 +61,7 @@ module Kentaa
 
             if data[:banners]
               data[:banners].each do |banner|
-                banners << Kentaa::Api::Resources::Banner.new(config, banner)
+                banners << Kentaa::Api::Resources::Banner.new(config, data: banner)
               end
             end
 
@@ -74,6 +72,12 @@ module Kentaa
         def external_reference
           data[:external_reference]
         end
+
+        protected
+
+        def load_resource(options)
+          request.get("/segments/#{id}", options)
+        end
       end
     end
   end

data/lib/kentaa/api/resources/segments.rb

@@ -3,14 +3,19 @@
 module Kentaa
   module Api
     module Resources
-      class Segments < Base
+      class Segments < List
         include Enumerable
-        include Kentaa::Api::Resources::Pagination
 
         def each(&block)
           segments.each(&block)
         end
 
+        protected
+
+        def load_resource(options)
+          request.get("/segments", options)
+        end
+
         private
 
         def segments
@@ -19,7 +24,7 @@ module Kentaa
 
             if data
               data.each do |segment|
-                segments << Kentaa::Api::Resources::Segment.new(config, segment)
+                segments << Kentaa::Api::Resources::Segment.new(config, data: segment)
               end
             end
 

data/lib/kentaa/api/resources/site.rb

@@ -6,9 +6,7 @@ require 'time'
 module Kentaa
   module Api
     module Resources
-      class Site < Base
-        include Kentaa::Api::Resources::Resource
-
+      class Site < Resource
         def object_key
           "Site_#{id}"
         end
@@ -75,7 +73,7 @@ module Kentaa
 
             if data[:banners]
               data[:banners].each do |banner|
-                banners << Kentaa::Api::Resources::Banner.new(config, banner)
+                banners << Kentaa::Api::Resources::Banner.new(config, data: banner)
               end
             end
 
@@ -86,6 +84,12 @@ module Kentaa
         def external_reference
           data[:external_reference]
         end
+
+        protected
+
+        def load_resource(options)
+          request.get("/sites/current", options)
+        end
       end
     end
   end

data/lib/kentaa/api/resources/team.rb

@@ -6,23 +6,18 @@ require 'time'
 module Kentaa
   module Api
     module Resources
-      class Team < Base
-        include Kentaa::Api::Resources::Resource
-
+      class Team < Resource
         def object_key
           "Team_#{id}"
         end
 
         def parent
           if project_id
-            client = Kentaa::Api::Clients::Projects.new(config)
-            client.get(project_id)
+            Kentaa::Api::Resources::Project.new(config, id: project_id)
           elsif segment_id
-            client = Kentaa::Api::Clients::Segments.new(config)
-            client.get(segment_id)
+            Kentaa::Api::Resources::Segment.new(config, id: segment_id)
           else
-            client = Kentaa::Api::Clients::Sites.new(config)
-            client.current
+            Kentaa::Api::Resources::Site.new(config, id: site_id)
           end
         end
 
@@ -43,7 +38,7 @@ module Kentaa
         end
 
         def owner
-          @owner ||= Kentaa::Api::Resources::User.new(config, data[:owner])
+          @owner ||= Kentaa::Api::Resources::User.new(config, data: data[:owner])
         end
 
         def members
@@ -52,7 +47,7 @@ module Kentaa
 
             if data[:members]
               data[:members].each do |member|
-                members << Kentaa::Api::Resources::Action.new(config, member)
+                members << Kentaa::Api::Resources::Action.new(config, data: member)
               end
             end
 
@@ -122,7 +117,7 @@ module Kentaa
 
             if data[:photos]
               data[:photos].each do |photo|
-                photos << Kentaa::Api::Resources::Photo.new(config, photo)
+                photos << Kentaa::Api::Resources::Photo.new(config, data: photo)
               end
             end
 
@@ -136,7 +131,7 @@ module Kentaa
 
             if data[:videos]
               data[:videos].each do |video|
-                videos << Kentaa::Api::Resources::Video.new(config, video)
+                videos << Kentaa::Api::Resources::Video.new(config, data: video)
               end
             end
 
@@ -150,7 +145,7 @@ module Kentaa
 
             if data[:questions]
               data[:questions].each do |question|
-                questions << Kentaa::Api::Resources::Question.new(config, question)
+                questions << Kentaa::Api::Resources::Question.new(config, data: question)
               end
             end
 
@@ -161,6 +156,12 @@ module Kentaa
         def external_reference
           data[:external_reference]
         end
+
+        protected
+
+        def load_resource(options)
+          request.get("/teams/#{id}", options)
+        end
       end
     end
   end

data/lib/kentaa/api/resources/teams.rb

@@ -3,14 +3,19 @@
 module Kentaa
   module Api
     module Resources
-      class Teams < Base
+      class Teams < List
         include Enumerable
-        include Kentaa::Api::Resources::Pagination
 
         def each(&block)
           teams.each(&block)
         end
 
+        protected
+
+        def load_resource(options)
+          request.get("/teams", options)
+        end
+
         private
 
         def teams
@@ -19,7 +24,7 @@ module Kentaa
 
             if data
               data.each do |team|
-                teams << Kentaa::Api::Resources::Team.new(config, team)
+                teams << Kentaa::Api::Resources::Team.new(config, data: team)
               end
             end
 

data/lib/kentaa/api/resources/user.rb

@@ -5,9 +5,7 @@ require 'time'
 module Kentaa
   module Api
     module Resources
-      class User < Base
-        include Kentaa::Api::Resources::Resource
-
+      class User < Resource
         def object_key
           "User_#{id}"
         end
@@ -89,7 +87,13 @@ module Kentaa
         end
 
         def consent
-          @consent ||= Kentaa::Api::Resources::Consent.new(config, data[:consent]) if data[:consent]
+          @consent ||= Kentaa::Api::Resources::Consent.new(config, data: data[:consent]) if data[:consent]
+        end
+
+        protected
+
+        def load_resource(options)
+          request.get("/users/#{id}", options)
         end
       end
     end

data/lib/kentaa/api/resources/users.rb

@@ -3,14 +3,19 @@
 module Kentaa
   module Api
     module Resources
-      class Users < Base
+      class Users < List
         include Enumerable
-        include Kentaa::Api::Resources::Pagination
 
         def each(&block)
           users.each(&block)
         end
 
+        protected
+
+        def load_resource(options)
+          request.get("/users", options)
+        end
+
         private
 
         def users
@@ -19,7 +24,7 @@ module Kentaa
 
             if data
               data.each do |user|
-                users << Kentaa::Api::Resources::User.new(config, user)
+                users << Kentaa::Api::Resources::User.new(config, data: user)
               end
             end
 

data/lib/kentaa/api/resources/video.rb

@@ -3,9 +3,7 @@
 module Kentaa
   module Api
     module Resources
-      class Video < Base
-        include Kentaa::Api::Resources::Resource
-
+      class Video < Resource
         def url
           data[:url]
         end

data/lib/kentaa/api/response.rb

@@ -13,14 +13,14 @@ module Kentaa
       end
 
       def success?
-        (code == 200 || code == 201) && !message
+        (http_code == 200 || http_code == 201) && !message
       end
 
       def error?
         !success?
       end
 
-      def code
+      def http_code
         response.code.to_i
       end
 

data/lib/kentaa/api/version.rb

@@ -2,6 +2,6 @@
 
 module Kentaa
   module Api
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kentaa-api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kentaa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,10 +116,10 @@ files:
 - lib/kentaa/api/resources/consent.rb
 - lib/kentaa/api/resources/donation.rb
 - lib/kentaa/api/resources/donations.rb
+- lib/kentaa/api/resources/list.rb
 - lib/kentaa/api/resources/location.rb
 - lib/kentaa/api/resources/newsletter_subscription.rb
 - lib/kentaa/api/resources/newsletter_subscriptions.rb
-- lib/kentaa/api/resources/pagination.rb
 - lib/kentaa/api/resources/photo.rb
 - lib/kentaa/api/resources/project.rb
 - lib/kentaa/api/resources/projects.rb
@@ -130,7 +130,6 @@ files:
 - lib/kentaa/api/resources/segment.rb
 - lib/kentaa/api/resources/segments.rb
 - lib/kentaa/api/resources/site.rb
-- lib/kentaa/api/resources/status.rb
 - lib/kentaa/api/resources/team.rb
 - lib/kentaa/api/resources/teams.rb
 - lib/kentaa/api/resources/user.rb
@@ -157,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby library for communicating with the Kentaa API

data/lib/kentaa/api/resources/status.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Kentaa
-  module Api
-    module Resources
-      module Status
-        attr_accessor :response
-
-        def success?
-          response.success?
-        end
-
-        def error?
-          response.error?
-        end
-
-        def body
-          response.body
-        end
-
-        def message
-          response.message
-        end
-      end
-    end
-  end
-end