jekyll-attendease 0.6.11.pre → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c29fa1f96f397b4c423f4bbb7eea5b1aab3fadf
-  data.tar.gz: c501afde0e0347dedbf076f84ccc297c391d4d66
+  metadata.gz: ee99d06f8c1a20786499ad241dd543f9f7721b8d
+  data.tar.gz: fd1258e81bd31ebbecd27c11e1ec3d78ba3aebd4
 SHA512:
-  metadata.gz: 45832ac3c8ad82a7dd59ef71c788c7ce334e0b92edc98015081535eca026be31a4b2ad43430066d88a177fb5806dde6758b3eea8673d469fd3538620c16f08ee
-  data.tar.gz: 36d04b855eb0cb3b00e1bda2dd8f67de89a194c97cf3098cddd1bf9736441b099fe923214f158774861d031c6e47e6b50c43c30d85f1c8d038f7e5325f8f07cb
+  metadata.gz: 63711df01ce343ab2a2caecf19a6ba81ce837a500c51d5dfc4dcea7c7f1750afbd7d1b754a80e50b9acb8007baee8b909df86919c97f1e10571b2212ec114486
+  data.tar.gz: dc94248e7026860ac525a099591fe25f56240a0a6fb99de6eec498f071d37c51ba1558fddd5b4aa236eb44c4561a439da0c4b1500518b8dcb4e98f59a7bae131

data/lib/jekyll/attendease_plugin/helpers.rb

@@ -37,6 +37,18 @@ module Jekyll
         s.encode('ASCII',
         fallback: lambda { |c| fallback.key?(c) ? fallback[c] : undefined })
       end
+
+      def self.get_template(site, template_string)
+        template = nil
+
+        if site.config['attendease'] && templates = site.config['attendease']['templates']
+          if t = templates.detect{|t| t['page'] == template_string}
+            template = t['data']
+          end
+        end
+
+        template
+      end
     end
   end
 end

data/lib/jekyll/attendease_plugin/home_page.rb

@@ -15,18 +15,13 @@ module Jekyll
 
         self.data['title'] = site.config['homepage_title'] || 'Welcome'
 
-        if site.config['attendease'] && templates = site.config['attendease']['templates']
-          if t = templates.detect{|t| t['page'] == 'index'}
-            template = t['data']
-          end
-        end
-
-        if template.nil?
-          # use the included template in the gem
-          self.content = File.read(File.join(base, '_attendease', 'templates', 'index.html'))
-        else
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'index')
           # use the template file from the attendease api
           self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'index.html'))
         end
       end
     end

data/lib/jekyll/attendease_plugin/presenter_page.rb

@@ -24,7 +24,14 @@ module Jekyll
 
         self.data['presenter'] = presenter
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'presenters', 'presenter.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'presenters/presenter')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'presenters', 'presenter.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/presenters_index_page.rb

@@ -15,7 +15,14 @@ module Jekyll
 
         self.data['presenters'] = presenters
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'presenters', 'index.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'presenters/index')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'presenters', 'index.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/schedule_day_page.rb

@@ -30,7 +30,14 @@ module Jekyll
 
         self.data['instances'] = instances.sort{|x,y| [x['time'], x['session']['name']] <=> [y['time'], y['session']['name']]}
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'day.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'schedule/day')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'day.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/schedule_index_page.rb

@@ -15,7 +15,14 @@ module Jekyll
 
         self.data['dates'] = dates
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'index.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'schedule/index')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'index.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/schedule_session_page.rb

@@ -16,7 +16,14 @@ module Jekyll
 
         self.data['session'] = session
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'session.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'schedule/session')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'session.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/schedule_sessions_page.rb

@@ -18,7 +18,14 @@ module Jekyll
         self.data['sessions'] = sessions
         self.data['dates'] = dates
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'sessions.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'schedule/sessions')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'schedule', 'sessions.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/sponsors_index_page.rb

@@ -15,7 +15,14 @@ module Jekyll
 
         self.data['sponsor_levels'] = sponsor_levels
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'sponsors', 'index.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'sponsors/index')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'sponsors', 'index.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/venue_page.rb

@@ -16,7 +16,14 @@ module Jekyll
 
         self.data['venue'] = venue
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'venues', 'venue.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'venues/venue')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'venues', 'venue.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/venues_index_page.rb

@@ -15,7 +15,14 @@ module Jekyll
 
         self.data['venues'] = venues
 
-        self.content = File.read(File.join(base, '_attendease', 'templates', 'venues', 'index.html'))
+        # Check if Attendease API has a template for this page
+        if template = Helpers.get_template(site, 'venues/index')
+          # use the template file from the attendease api
+          self.content = template
+        else
+          # use the included template in the gem
+          self.content = File.read(File.join(base, '_attendease', 'templates', 'venues', 'index.html'))
+        end
       end
     end
   end

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = "0.6.11.pre"
+    VERSION = "0.6.11"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.11.pre
+  version: 0.6.11
 platform: ruby
 authors:
 - Michael Wood
@@ -194,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2