jekyll-attendease 0.6.26e → 0.6.26f

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8514ba50f31f521220c6ce095b97e241d56d2b9d
-  data.tar.gz: cc969ad1eba291537c5082de46a606c17677f546
+  metadata.gz: 0844353a2904ae30967b8d89082b67dd85689c6c
+  data.tar.gz: 5d4b9461c72c403e80991a52bb50114572dee213
 SHA512:
-  metadata.gz: f897a374ef09075350456a1954de9d3f3689a0a1c71fbc4d94392313b30610bb6c6b20379e7f1746a655b04c5c5eff2238c91d74f5b9e1aec912517495a365b6
-  data.tar.gz: 5e1d1d48dc32e200a276be4d3ccbb935c85f943c30bb30adcffd0db7ce6bcb9ab26d937761aea1d903615c35f68e90de5ec7750d749685236d13292fc0de7612
+  metadata.gz: 4307c512679b1a03ccfca0a938aceab2d12b3fcfbf0acb1400f322b0f5897a37a6e4914d03c5fdfc6f9ec68db68c71dcfbaf4df4bdf8ab5b613cea13397e174c
+  data.tar.gz: 8bf169e03af6b771ce9e9fcf5a3f3ae53a7b0bd90859a99e8fb86024f246a19972210dee47992fb56727da265406b9bd40b51209e175f9b6c7ccb13bcec060d7

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -5,11 +5,9 @@ module Jekyll
 
       priority :highest
 
-      include HTTParty
-
       def get(url, options = {})
         begin
-          self.class.get(url, options)
+          HTTParty.get(url, options)
         rescue => e
           Jekyll.logger.error "Could not connect to #{url}."
           puts e.inspect

data/lib/jekyll/attendease_plugin/site_pages_generator.rb

@@ -5,7 +5,7 @@ module Jekyll
 
       def generate(site)
         site.data['pages'].each do |page|
-          if !page['permanent']
+          if !page['permanent'] && !page['external']
             site.pages << SitePage.new(site, site.source, page)
 
             zones = {}
@@ -30,21 +30,7 @@ module Jekyll
                 zones[i['zone']] << i
               end
 
-              # sort each bucket by widget weightILTO="pgib@me.com"
-              # ACCESS_KEY_ID="AKIAJYFM5LRNS3YG3MMA"
-              # SECRET_ACCESS_KEY="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"
-              # SLACK_WEBHOOK_URL="https://hooks.slack.com/services/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"
-              # QUIET="yes"
-              #
-              # #0 0 * * * /usr/local/bin/imapsync --syncinternaldates --host1 mail.me.com --user1 pgib --password1 m0bile42 --ssl1 --authmech1 LOGIN --host2 localhost --user2 pgib@me.com --password2 backup42
-              #
-              # #0 0 * * * /home/camera/garage/clean_yesterday.sh
-              #
-              # 0 1 * * * /usr/local/etc/asterisk/backup_asterisk_db.sh >/dev/null 2>/dev/null
-              #
-              # #* * * * * /home/patrick/bin/keep-my-ip.sh >/dev/null
-              # * * * * * /home/patrick/bin/keep-my-ip ZW8Q92H776T13 home
-              #
+              # sort each bucket by widget weight
               zones.each do |k, zone|
                 zone.sort! { |x, y| x['weight'] <=> y['weight'] }
               end

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.26e'
+    VERSION = '0.6.26f'
   end
 end

data/spec/lib/jekyll/attendease_plugin/event_data_generator_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
 
     it 'populates a site wide pages array' do
       expect(site.data['pages'].class).to eq(Array)
-      expect(site.data['pages'].length).to eq(5)
+      expect(site.data['pages'].length).to eq(6)
     end
 
     it 'populates a site wide event object' do
@@ -59,7 +59,7 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
 
     it 'populates a site wide pages array' do
       expect(site.data['pages'].class).to eq(Array)
-      expect(site.data['pages'].length).to eq(5)
+      expect(site.data['pages'].length).to eq(6)
     end
 
     it 'populates a site wide event object' do

data/spec/lib/jekyll/attendease_plugin/organization_data_generator_spec.rb

@@ -6,13 +6,17 @@ RSpec.describe Jekyll::AttendeasePlugin::OrganizationDataGenerator do
 
     it 'populates a site wide pages array' do
       expect(site.data['pages'].class).to eq(Array)
-      expect(site.data['pages'].length).to eq(5)
+      expect(site.data['pages'].length).to eq(6)
     end
 
     it 'populates a site wide settings object' do
       expect(site.data['site_settings'].class).to eq(Hash)
       expect(site.data['site_settings']['look_and_feel']['body_font_family']).to eq('serif')
     end
+
+    it 'responds to GET from HTTParty' do
+      expect(subject).to respond_to(:get)
+    end
   end
 end
 

data/spec/lib/jekyll/attendease_plugin/site_pages_generator_spec.rb

@@ -1,22 +1,32 @@
 require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::SitePagesGenerator do
-  let (:site) { build_site }
-  let (:site_pages_generator) { find_generator(site, described_class) }
-  let(:index_file) {  'index.html' }
+  let(:site) { build_site }
+  let(:site_pages_generator) { find_generator(site, described_class) }
+  let(:index_file) { 'index.html' }
+  let(:page) { site.data['pages'].detect { |p| p['slug'] == 'test' } }
+  let(:external_page) { site.data['pages'].detect { |p| p['external'] == true } }
 
-  it 'creates a page using the provided slug' do
-    slug = site.data['pages'].last['slug']
-    file = File.join(site.config['destination'], slug, 'index.html')
-    expect(File.exists?(file)).to eq(true)
-    expect(File.file?(file)).to eq(true)
-    expect(File.read(file)).to include '<title>Test Page</title>'
+  context 'regular page' do
+    it 'creates a page using the provided slug' do
+      slug = page['slug']
+      file = File.join(site.config['destination'], slug, 'index.html')
+      expect(File.exists?(file)).to eq(true)
+      expect(File.file?(file)).to eq(true)
+      expect(File.read(file)).to include '<title>Test Page</title>'
+    end
+
+    it 'creates a block instance json file using the provided slug' do
+      slug = page['slug']
+      file = File.join(site.config['destination'], slug, 'index.json')
+      expect(File.exists?(file)).to eq(true)
+      expect(File.file?(file)).to eq(true)
+    end
   end
 
-  it 'creates a block instance json file using the provided slug' do
-    slug = site.data['pages'].last['slug']
-    file = File.join(site.config['destination'], slug, 'index.json')
-    expect(File.exists?(file)).to eq(true)
-    expect(File.file?(file)).to eq(true)
+  context 'external page' do
+    it 'does not create a page using the provided slug' do
+
+    end
   end
 end

data/spec/lib/jekyll/attendease_plugin/tags_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe "Jekyll Attendease tags" do
 
   context "{% attendease_nav %}" do
     subject { render("{% attendease_nav %}{% raw %}<li><a href=\"{{ page.href }}\">{{ page.name }}</a></li>{% endraw %}{% endattendease_nav %}") }
-    it { is_expected.to match(/<li><a href="\/schedule\/"/) }
+    it { is_expected.to match(/<li><a href="\/agenda\/"/) }
 
     # hidden page
     it { is_expected.to_not match(/<li><a href="\/test\/"/) }

data/spec/spec_helper.rb

@@ -98,15 +98,18 @@ RSpec.configure do |config|
     build_site({ 'attendease' => { 'mode' => 'organization', 'jekyll33' => true } })
   end
 
-  config.after(:each) do
+  config.after(:each) do |foo|
+    puts "Removing #{dest}"
     dest.rmtree if dest.exist?
     fixtures_path.join('_attendease', 'templates').rmtree if File.exists?(fixtures_path.join('_attendease', 'templates'))
     fixtures_path.join('attendease_layouts').rmtree if File.exists?(fixtures_path.join('attendease_layouts'))
     unless @site.nil?
       Dir.glob(File.join(@site.source, '**', 'index.json')).map do |i|
-        puts "Removing #{Pathname.new(i).parent}"
-
-        FileUtils.rm_r Pathname.new(i).parent
+        if (Pathname.new(i).parent == fixtures_path)
+          FileUtils.rm i
+        else
+          FileUtils.rm_r Pathname.new(i).parent
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.26e
+  version: 0.6.26f
 platform: ruby
 authors:
 - Michael Wood
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll