jekyll-action-network 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a9afd8b2fcbcc33e2f1f45ea6d25a07acc6bcc28e5b7ac3900443a5c4078dc
-  data.tar.gz: ba9411be015b223ded854fec35a3fb2f39c9cdaa60ce9271b0cddb4c80511ed7
+  metadata.gz: 2947b846e07427841ccd8923055f0bcda8f01f80fc38291fd0b9bf077af007c6
+  data.tar.gz: 9ff2f727a3da1e2c31015b3d9fc90f4c94ab1666db54a939473c02f2a1a81aa3
 SHA512:
-  metadata.gz: e00cde2d4c9d533931f046f11b7272bfa33dfedebd94b26141d721d7990ffb6d8be48be770ccac1ff378504a8856b958987c25ddd0d7e26c2607c76fa6709399
-  data.tar.gz: 4b0c39e1b928efce610feb7ba9733853c022a33d4a20eba190d6518f465777324152c6eba58a4294da562f2931ce39298bf4a524d1a4f7c948822f526a44ba1b
+  metadata.gz: 685c03c3b844d8fdd9cbfe373db626a492175958e3624f2dd1ec685057f05bceb652ec6179d7d6f348f934eb1a88b963601a08a5c0097167635f0bf5bfaca914
+  data.tar.gz: d6cc9aaa7040eb21d42458b4f09c2fa27f3668aa959f0196be2eed55ae69d455c510722601df65a3fc0126886e93171f376706e3091eb79090edcf0b9661c126

data/lib/jekyll/action-network/collection.rb

@@ -8,8 +8,9 @@ module Jekyll
     class Collection
       UTILS = Jekyll::ActionNetwork::Utils.new
 
-      def initialize(site, client, config_init, settings)
+      def initialize(site, generator, client, config_init, settings)
         @site = site
+        @generator = generator
         @settings = settings
         @client = client
         @config_init = config_init
@@ -44,7 +45,7 @@ module Jekyll
       end
 
       def actions
-        @actions ||= UTILS.get_full_list(@client, @name)
+        @actions ||= @generator.get_full_list(@name)
       end
 
       def filters

data/lib/jekyll/action-network/generator.rb

@@ -29,19 +29,26 @@ module Jekyll
 
       def make_collections
         @config["import"].each do |config|
-          name = config["name"] if config.is_a? Hash
-          name ||= config if config.is_a? String
-          next unless name
+          col_config = make_collection_config(config)
+          name = col_config["name"]
+          next unless col_config["name"]
 
-          make_collection(name, config)
+          make_collection(name, col_config)
         end
         @site.collections["actions"] = actions if @config["actions"]
       end
 
+      def make_collection_config(col_config_init)
+        return col_config_init if col_config_init.is_a? Hash
+        return { "name" => col_config_init } if col_config_init.is_a? String
+
+        Jekyll.logger.warn LOG_NAME, "Config format #{col_config_init} not recognised"
+      end
+
       def make_collection(name, config)
         return unless defaults[name]
 
-        collection = Jekyll::ActionNetwork::Collection.new(@site, @client, config, settings)
+        collection = Jekyll::ActionNetwork::Collection.new(@site, self, @client, config, settings)
         @site.collections[collection.config["collection"]] = collection.populate
         actions.docs.concat(collection.collection.docs)
       end
@@ -50,7 +57,7 @@ module Jekyll
         return @actions if @actions
 
         actions_config = @config["actions"] if @config["actions"].is_a? Hash
-        actions_settings = @settings["actions"].merge(actions_config || {})
+        actions_settings = settings["actions"].merge(actions_config || {})
         @actions ||= Jekyll::Collection.new(@site, actions_settings["collection"])
       end
 
@@ -67,10 +74,8 @@ module Jekyll
         @defaults ||= settings["defaults"]
       end
 
-      private
-
       def api_key
-        key = @config["key"] || @settings["key"]
+        key = @config["key"] || settings["key"]
         return ENV.fetch(key[4..key.length - 1], nil) if key[0..3] == "ENV_"
 
         key
@@ -82,13 +87,37 @@ module Jekyll
           return
         end
 
-        @client = ActionNetworkRest.new(api_key: api_key)
-        unless @client.entry_point.authenticated_successfully?
+        unless entry_point.dig("_links", "osdi:tags").present?
           Jekyll.logger.warn "Action Network Authentication Unsucessful"
           return
         end
         true
       end
+
+      def client
+        @client ||= ActionNetworkRest.new(api_key: api_key)
+      end
+
+      def entry_point
+        @entry_point ||= client.entry_point.get
+      end
+
+      def page_size
+        @page_size ||= @entry_point["max_page_size"]
+      end
+
+      def get_full_list(name)
+        page = 1
+        actions = []
+        loop do
+          action_page = @client.send(name).list(page: page)
+          actions.concat(action_page)
+          break if action_page.size < page_size
+
+          page += 1
+        end
+        actions
+      end
     end
   end
 end

data/lib/jekyll/action-network/utils.rb

@@ -26,19 +26,6 @@ module Jekyll
         "#{css}<script src='https://actionnetwork.org/widgets/v5/#{resource}/#{slug}?format=js&source=widget'></script>
         <div id='can-#{resource}-area-#{slug}' style='width: 100%'></div>"
       end
-
-      def get_full_list(client, name)
-        page = 1
-        actions = []
-        loop do
-          action_page = client.send(name).list(page: page)
-          break if action_page.empty?
-
-          actions.concat(action_page)
-          page += 1
-        end
-        actions
-      end
     end
   end
 end

data/lib/jekyll/action-network/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module ActionNetwork
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-action-network
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Joe Irving