kentaa-api 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e317284946afab2fe387f02c389431d8da90563fce27a24f08ced1b7d917ef58
-  data.tar.gz: aafac4c4a7092d5110574524feda8b3f574da2783f0da53348da74fd1fadcafc
+  metadata.gz: 58138e9b4ca52fbd0e9af4db524365bfed6f349ba30fb498c2078aaeeb280dd8
+  data.tar.gz: 01b8334eb0e53bee3cc4d5bc6f48047a1ec8189348c142deeefeee9c54ac32ab
 SHA512:
-  metadata.gz: 38577f345e7899350c7cbc707a7b80d4d091d202f20c42e1852fa4c9c4f9f094fe5a43d2191c6090bdb18dfc44d107404a0ebc8700f9631c84e066b66cd3c381
-  data.tar.gz: 56c05b187e22f81f163a5e124404e926260335fc3888c727af336f35f3fa3f115af3b4dd24e406d2b38b69f7953da2fe63cb3dc19e96b6b9b520541316649fc3
+  metadata.gz: 67f498117301de1f06b0e233fa7771cc41a8afbc41f27f3dc1a5124a1145463efeb9dae068d758fc8f867484f83973dce97972998307eea663e77a78367ed843
+  data.tar.gz: e5b371bac8cdaaccc5c133581176a1c28c364c997fecb6d7611ad60d0fb60faba2452ac7bb39e0b450db084761c8644a8c7f0768d863f5efb118e43cff945d96

data/.rubocop.yml

@@ -19,6 +19,9 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Enabled: false
 
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kentaa-api (0.2.1)
+    kentaa-api (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -54,7 +54,7 @@ The results might be part of a paginated set. You can query the next page by doi
 actions = client.actions.list(page: actions.next_page) if actions.next_page?
 ```
 
-See also `Kentaa::Api::Resources::Pagination` for the available methods for pagination.
+See also `Kentaa::Api::Resources::List` for the available methods for pagination.
 
 The `all` method on the endpoint returns an [Enumerator](https://ruby-doc.org/core/Enumerator.html) and will iterate automatically through all pages to retrieve the requested data.
 

data/lib/kentaa/api.rb

@@ -13,9 +13,8 @@ require_relative "api/clients/teams"
 require_relative "api/clients/users"
 
 require_relative "api/resources/base"
-require_relative "api/resources/pagination"
+require_relative "api/resources/list"
 require_relative "api/resources/resource"
-require_relative "api/resources/status"
 
 require_relative "api/resources/action"
 require_relative "api/resources/actions"

data/lib/kentaa/api/clients/actions.rb

@@ -7,13 +7,13 @@ module Kentaa
         include Kentaa::Api::Clients::All
 
         def list(options = {})
-          response = request.get("/actions", options)
-          Kentaa::Api::Resources::Actions.new(config, response)
+          actions = Kentaa::Api::Resources::Actions.new(config, options)
+          actions.load
         end
 
-        def get(id)
-          response = request.get("/actions/#{id}")
-          Kentaa::Api::Resources::Action.new(config, response)
+        def get(id, options = {})
+          action = Kentaa::Api::Resources::Action.new(config, options.merge(id: id))
+          action.load
         end
       end
     end

data/lib/kentaa/api/clients/all.rb

@@ -10,7 +10,7 @@ module Kentaa
 
             loop do
               response = list(options.merge(page: page))
-              response.each { |item| yielder.yield item } if response.success?
+              response.each { |item| yielder.yield item }
 
               raise StopIteration unless response.next_page?
 

data/lib/kentaa/api/clients/base.rb

@@ -9,10 +9,6 @@ module Kentaa
         def initialize(config)
           @config = config
         end
-
-        def request
-          @request ||= Kentaa::Api::Request.new(config)
-        end
       end
     end
   end

data/lib/kentaa/api/clients/donations.rb

@@ -7,13 +7,13 @@ module Kentaa
         include Kentaa::Api::Clients::All
 
         def list(options = {})
-          response = request.get("/donations", options)
-          Kentaa::Api::Resources::Donations.new(config, response)
+          donations = Kentaa::Api::Resources::Donations.new(config, options)
+          donations.load
         end
 
-        def get(id)
-          response = request.get("/donations/#{id}")
-          Kentaa::Api::Resources::Donation.new(config, response)
+        def get(id, options = {})
+          donation = Kentaa::Api::Resources::Donation.new(config, options.merge(id: id))
+          donation.load
         end
       end
     end

data/lib/kentaa/api/clients/newsletter_subscriptions.rb

@@ -7,13 +7,13 @@ module Kentaa
         include Kentaa::Api::Clients::All
 
         def list(options = {})
-          response = request.get("/newsletter-subscriptions", options)
-          Kentaa::Api::Resources::NewsletterSubscriptions.new(config, response)
+          newsletter_subscriptions = Kentaa::Api::Resources::NewsletterSubscriptions.new(config, options)
+          newsletter_subscriptions.load
         end
 
-        def get(id)
-          response = request.get("/newsletter-subscriptions/#{id}")
-          Kentaa::Api::Resources::NewsletterSubscription.new(config, response)
+        def get(id, options = {})
+          newsletter_subscription = Kentaa::Api::Resources::NewsletterSubscription.new(config, options.merge(id: id))
+          newsletter_subscription.load
         end
       end
     end

data/lib/kentaa/api/clients/projects.rb

@@ -7,13 +7,13 @@ module Kentaa
         include Kentaa::Api::Clients::All
 
         def list(options = {})
-          response = request.get("/projects", options)
-          Kentaa::Api::Resources::Projects.new(config, response)
+          projects = Kentaa::Api::Resources::Projects.new(config, options)
+          projects.load
         end
 
-        def get(id)
-          response = request.get("/projects/#{id}")
-          Kentaa::Api::Resources::Project.new(config, response)
+        def get(id, options = {})
+          project = Kentaa::Api::Resources::Project.new(config, options.merge(id: id))
+          project.load
         end
       end
     end

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

@@ -7,13 +7,13 @@ module Kentaa
         include Kentaa::Api::Clients::All
 
         def list(options = {})
-          response = request.get("/segments", options)
-          Kentaa::Api::Resources::Segments.new(config, response)
+          segments = Kentaa::Api::Resources::Segments.new(config, options)
+          segments.load
         end
 
-        def get(id)
-          response = request.get("/segments/#{id}")
-          Kentaa::Api::Resources::Segment.new(config, response)
+        def get(id, options = {})
+          segment = Kentaa::Api::Resources::Segment.new(config, options.merge(id: id))
+          segment.load
         end
       end
     end

data/lib/kentaa/api/clients/sites.rb

@@ -4,9 +4,9 @@ module Kentaa
   module Api
     module Clients
       class Sites < Base
-        def current
-          response = request.get("/sites/current")
-          Kentaa::Api::Resources::Site.new(config, response)
+        def current(options = {})
+          site = Kentaa::Api::Resources::Site.new(config, options)
+          site.load
         end
       end
     end

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

@@ -7,13 +7,13 @@ module Kentaa
         include Kentaa::Api::Clients::All
 
         def list(options = {})
-          response = request.get("/teams", options)
-          Kentaa::Api::Resources::Teams.new(config, response)
+          teams = Kentaa::Api::Resources::Teams.new(config, options)
+          teams.load
         end
 
-        def get(id)
-          response = request.get("/teams/#{id}")
-          Kentaa::Api::Resources::Team.new(config, response)
+        def get(id, options = {})
+          team = Kentaa::Api::Resources::Team.new(config, options.merge(id: id))
+          team.load
         end
       end
     end

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

@@ -7,13 +7,13 @@ module Kentaa
         include Kentaa::Api::Clients::All
 
         def list(options = {})
-          response = request.get("/users", options)
-          Kentaa::Api::Resources::Users.new(config, response)
+          users = Kentaa::Api::Resources::Users.new(config, options)
+          users.load
         end
 
-        def get(id)
-          response = request.get("/users/#{id}")
-          Kentaa::Api::Resources::User.new(config, response)
+        def get(id, options = {})
+          user = Kentaa::Api::Resources::User.new(config, options.merge(id: id))
+          user.load
         end
       end
     end

data/lib/kentaa/api/exception.rb

@@ -4,5 +4,19 @@ module Kentaa
   module Api
     class Exception < StandardError
     end
+
+    class RequestError < Kentaa::Api::Exception
+      attr_accessor :response
+
+      def initialize(response)
+        @response = response
+
+        super(response.message)
+      end
+
+      def http_code
+        response.code
+      end
+    end
   end
 end

data/lib/kentaa/api/finder.rb

@@ -16,6 +16,12 @@ module Kentaa
         when "Action"
           client = Kentaa::Api::Clients::Actions.new(config)
           client.get(id)
+        when "Donation"
+          client = Kentaa::Api::Clients::Donations.new(config)
+          client.get(id)
+        when "NewsletterSubscription"
+          client = Kentaa::Api::Clients::NewsletterSubscriptions.new(config)
+          client.get(id)
         when "Project"
           client = Kentaa::Api::Clients::Projects.new(config)
           client.get(id)
@@ -28,6 +34,9 @@ module Kentaa
         when "Team"
           client = Kentaa::Api::Clients::Teams.new(config)
           client.get(id)
+        when "User"
+          client = Kentaa::Api::Clients::Users.new(config)
+          client.get(id)
         end
       end
     end

data/lib/kentaa/api/request.rb

@@ -20,7 +20,7 @@ module Kentaa
         request["X-Api-Key"] = config.api_key
 
         begin
-          response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+          result = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
             http.request(request)
           end
         # Try to catch some common exceptions Net::HTTP might raise.
@@ -30,7 +30,13 @@ module Kentaa
           raise Kentaa::Api::Exception, e.message
         end
 
-        Kentaa::Api::Response.new(response)
+        response = Kentaa::Api::Response.new(result)
+
+        if response.error?
+          raise Kentaa::Api::RequestError, response
+        end
+
+        response
       end
     end
   end

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

@@ -6,26 +6,20 @@ require 'time'
 module Kentaa
   module Api
     module Resources
-      class Action < Base
-        include Kentaa::Api::Resources::Resource
-
+      class Action < Resource
         def object_key
           "Action_#{id}"
         end
 
         def parent
           if team_id
-            client = Kentaa::Api::Clients::Teams.new(config)
-            client.get(team_id)
+            Kentaa::Api::Resources::Team.new(config, id: team_id)
           elsif 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
 
@@ -50,7 +44,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 team_captain?
@@ -126,7 +120,7 @@ module Kentaa
         end
 
         def activity
-          @activity ||= Kentaa::Api::Resources::Activity.new(config, data[:activity])
+          @activity ||= Kentaa::Api::Resources::Activity.new(config, data: data[:activity])
         end
 
         def previous_participations
@@ -142,11 +136,11 @@ module Kentaa
         end
 
         def registration_fee
-          @registration_fee ||= Kentaa::Api::Resources::RegistrationFee.new(config, data[:registration_fee])
+          @registration_fee ||= Kentaa::Api::Resources::RegistrationFee.new(config, data: data[:registration_fee])
         end
 
         def location
-          @location ||= Kentaa::Api::Resources::Location.new(config, data[:location])
+          @location ||= Kentaa::Api::Resources::Location.new(config, data: data[:location])
         end
 
         def photos
@@ -155,7 +149,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
 
@@ -169,7 +163,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
 
@@ -183,7 +177,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
 
@@ -192,12 +186,18 @@ 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
 
         def external_reference
           data[:external_reference]
         end
+
+        protected
+
+        def load_resource(options)
+          request.get("/actions/#{id}", options)
+        end
       end
     end
   end

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

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

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

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