jekyll_jam_comments 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d448f4cd6edf18704e6380893b7a0da258e55816af17df9a778768fee0deeb
-  data.tar.gz: 4af7c2326c1c6124cc51d04aa90347cce7297b492b4abdc8ca1e4b405f83a974
+  metadata.gz: cab1988147e713f97a3a754b85c2be3b10356c84165966bbe0b4c13401899801
+  data.tar.gz: 316bce7d76454cbebcd0310fe4be6dfa00b502c10ba714406a8a0484af298096
 SHA512:
-  metadata.gz: a9d23672db0a49e40665d9ff80dfb9548524324dde9ad0d889217110b2f7c0e1243aa9d4f35c15e894da6b18cab83d2c89c8659b427af42ee1547dc6f510f25a
-  data.tar.gz: a015ef0acf8d94c76234f8caf095b5e3d3d60ce199eada41c977757f611a7c26ec91656ba5b257d84c8ac2f5d1fc7f60c7cf035f5423a16c15d22a916d0052bc
+  metadata.gz: c793a13bb427f570db98204d3f067cbf80f606a792719f37c5c9e1e91d803ccf724c07891dcd2a84872c8d5f021fa2fc5c8adc474ad706b3fd69fae4f7919b6c
+  data.tar.gz: 1c2ae50320c3a60affec563ce048d6168320a74f891c7ff668e67f8bc6343a5705d9b2552ba3b0d7db60efcaf2ddef069106f5d6d9021f16bab9ca68e3ea338b

data/lib/jekyll_jam_comments/configuration.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module JamComments
+    class Configuration
+      class << self
+        def domain
+          configuration["domain"] || ENV["JAM_COMMENTS_DOMAIN"]
+        end
+
+        def base_url
+          configuration["base_url"] || ENV["JAM_COMMENTS_BASE_URL"]
+        end
+
+        def api_key
+          configuration["api_key"] || ENV["JAM_COMMENTS_API_KEY"]
+        end
+
+        def environment
+          configuration["environment"] || ENV["JAM_COMMENTS_ENVIRONMENT"] || ENV["JEKYLL_ENV"]
+        end
+
+        def configuration
+          Jekyll.configuration({})["jam_comments"] || {}
+        end
+      end
+    end
+  end
+end

data/lib/jekyll_jam_comments/service.rb

@@ -35,11 +35,25 @@ module Jekyll
           },
         }
 
-        client.get(endpoint, options)
+        send_request(options)
       end
 
       private
 
+      def send_request(options)
+        response = client.get(endpoint, options)
+
+        if response.code == 401
+          raise "Oh no! It looks like your credentials for JamComments are incorrect."
+        end
+
+        if response.code != 200
+          raise "Oh no! JamComments request failed. Please try again. Status: #{response.code}"
+        end
+
+        response.body
+      end
+
       def stub_value
         return "true" if environment != "production"
 

data/lib/jekyll_jam_comments/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module JamComments
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/jekyll_jam_comments.rb

@@ -2,6 +2,7 @@
 
 require "jekyll"
 require_relative "./jekyll_jam_comments/service"
+require_relative "./jekyll_jam_comments/configuration"
 
 module Jekyll
   module JamComments
@@ -14,10 +15,12 @@ module Jekyll
         super
 
         @path = path
-        @markup = service.fetch(:path => path)
       end
 
-      def render(_context)
+      def render(context)
+        path = context["page"] && context["page"]["url"]
+        markup = service.fetch(:path => path)
+
         "
           #{markup}
           <script src=\"#{CLIENT_SCRIPT_URL}\"></script>
@@ -30,10 +33,10 @@ module Jekyll
 
       def service
         @service ||= Service.new(
-          :domain      => configuration["domain"],
-          :api_key     => configuration["api_key"],
-          :base_url    => configuration["base_url"],
-          :environment => configuration["environment"]
+          :domain      => Jekyll::JamComments::Configuration.domain,
+          :api_key     => Jekyll::JamComments::Configuration.api_key,
+          :base_url    => Jekyll::JamComments::Configuration.base_url,
+          :environment => Jekyll::JamComments::Configuration.environment
         )
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_jam_comments
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex MacArthur
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,6 +124,7 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/jekyll_jam_comments.rb
+- lib/jekyll_jam_comments/configuration.rb
 - lib/jekyll_jam_comments/service.rb
 - lib/jekyll_jam_comments/version.rb
 homepage: https://github.com/alexmacarthur/jekyll-jam-comments