baron 1.0.14 → 1.0.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1b7cb1562629316f255989b7b77ba359065d0e6a
+  data.tar.gz: 7c3e65e6abe83d721d871acdcd94e912f04a88a9
+SHA512:
+  metadata.gz: 30665503b10b8974bca7d8457067722caa7cd7a09c2ce09ec3a474296bbb8a89a43dbc3c66153a101303ba253e3ed7f72d262295a5974b99ed486f2129021116
+  data.tar.gz: cec6fd94927beb807a0dd5ece4c16834a075fc540c95e048748c3f0074a104d4c4df9048b092eef83658c44da162b38e780cc4d5988c20334c6b644cc5f31650

data/LICENSE

@@ -1,6 +1,6 @@
 This software is licensed under the MIT Software License
 
-Copyright (c) 2013 Nathan Buggia
+Copyright (c) 2016 Nathan Buggia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 
@@ -18,25 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
-
----
-
-While writing this blog engine, I barrowed some code and design approches
-from many existing blog engines. I'm not sure how much one must borrow before
-they are obligated to include the original license, so I'm including all of
-them below just in case.
-
-Toto
- - URL: https://github.com/cloudhead/toto
- - Author: http://cloudhead.io/ (Alexis Sellier)
- - License: https://github.com/cloudhead/toto/blob/master/LICENSE
-
-Jekyll
- - URL: https://github.com/mojombo/jekyll
- - Author: http://tom.preston-werner.com/ (Tom Preston-Werner)
- - License: https://github.com/mojombo/jekyll/blob/master/LICENSE
-
-Scanty
- - URL: https://github.com/adamwiggins/scanty
- - Author: http://about.adamwiggins.com/ (Adam Wiggins)
+SOFTWARE.

data/Readme.md

@@ -1,95 +1,31 @@
 #Baron Blog Engine Gem
 
-A minimalist, yet fully-featured, blog engine for developers.
+This is my first project in Ruby. I wanted to create the simplest blog engine I
+could that included all the features I was looking for in my person blog. 
+There are two parts, the [Baron Blog Engine Gem](https://rubygems.org/gems/baron) 
+and the [Baron Blog](https://github.com/nbuggia/baron-blog) project. The gem 
+contains the code for routing, HTTP, and the MVC components of a simple blog. 
+The blog project instantiates the gem and includes the blog UI templates and 
+content.
 
-This project is only the blog engine gem, if you want to play with your own 
-blog, you should use this project, which includes the client:
+---
 
-**https://github.com/nbuggia/baron-blog**
-
-##How Does it Work?
-
-Here's a quick overview of how the whole thing comes together. 
-
-There are two parts to this blog, the **Baron Blog Engine Gem** and the 
-**Baron Blog** project. The blog engine gem contains all the code for the data 
-model and the view controllers, which is conveniently packaged up into a gem 
-for easy distribution (I might change that in the future to make it easier to 
-hack). The Baron Blog project contains all of the views, and the assets (CSS, 
-images, articles, etc). It references the blog engine gem.
-
-**Baron Blog Engine Gem**
-
-All of the source code for this is in a single code file (./lib/baron.rb).
-
-Project structure:
-
-	├── LICENSE								
-	├── Rakefile							rake test, rake install
-	├── Readme.md							you are reading this document now...
-	├── VERSION
-	├── lib/
-	│   └── baron.rb						all the source code for the gem
-	├── pkg/
-	│   └── baron-1.0.0.gem					byte-code compiled gem (I think)
-	└── spec/								unit tests using RSpec
-	    ├── baron_article_spec.rb			article data model tests
-	    ├── baron_blog_engine_spec.rb		BlogEngine class tests
-	    ├── baron_spec.rb					end-to-end tests
-	    ├── sample_data/					sample data for testing
-	    └── spec_helper.rb
-
-* Baron::BlogEngine - handles the main application loop. It handles building the
-right page for every given route. It also contains all the logic for where all
-the files are stored.
-
-* Baron::PageController - uses Ruby's ERB library to render the template pages 
-with the variable's from the Baron::BlogEngine. Most pages get rendered twice,
-the first time we render the partial page (e.g. an article data model into the 
-article rhtml template) and the second time we render the article.rhtml results
-into the site layout template (./themes/theme/templates/layout.rhtml)
-
-* Baron::Article - the data model for a single article.
-
-##Thanks
-
-While writing this blog engine, I barrowed a lot of code and design approaches
-from the Toto project by Cloudhead and the Scanty project by Adam Wiggins. The
-primary purpose of this project was a learning one for me, and both of these
-folks provided a lot of good code an examples. I'm not sure how much code or 
-design awesomeness one needs to use before they are obligated to include their 
-license, so I'm included a link to each of them just in case (and thank you 
-both for your awesomeness!)
+While writing this blog engine, I borrowed some code and design approaches
+from many existing blog engines. Following were the most useful. 
 
 Toto
- - URL: https://github.com/cloudhead/toto
- - Author: http://cloudhead.io/ (Alexis Sellier)
- - License: https://github.com/cloudhead/toto/blob/master/LICENSE
 
-Scanty
- - URL: https://github.com/adamwiggins/scanty
- - Author: http://about.adamwiggins.com/ (Adam Wiggins)
-
-##License
+* URL: https://github.com/cloudhead/toto
+* Author: http://cloudhead.io/ (Alexis Sellier)
+* License: https://github.com/cloudhead/toto/blob/master/LICENSE
 
-This software is licensed under the MIT Software License
+Jekyll
 
-Copyright (c) 2013 Nathan Buggia
+* URL: https://github.com/mojombo/jekyll
+* Author: http://tom.preston-werner.com/ (Tom Preston-Werner)
+* License: https://github.com/mojombo/jekyll/blob/master/LICENSE
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
+Scanty
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
+* URL: https://github.com/adamwiggins/scanty
+* Author: http://about.adamwiggins.com/ (Adam Wiggins)

data/VERSION

@@ -1 +1 @@
-1.0.14
+1.0.17

data/baron.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: baron 1.0.17 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baron"
-  s.version = "1.0.14"
+  s.version = "1.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Nathan Buggia"]
-  s.date = "2013-03-26"
+  s.date = "2016-07-07"
   s.description = "What's in the box: (1) Publish to Heroku using Git (2) Author articles in markdown (3) Article categories (4) Multiple permalink formats supported (5) Redirects (6) Advanced SEO optimizations and Google Analytics/ Webmaster Tools support. Uses Rack, RSpec, Bootstrap, JQuery, Disqus, Thin"
   s.email = "nbuggia@gmail.com"
   s.extra_rdoc_files = [
@@ -27,7 +29,6 @@ Gem::Specification.new do |s|
     "lib/baron/models/article.rb",
     "lib/baron/models/theme.rb",
     "lib/baron/page_controller.rb",
-    "lib/baron/utils.rb",
     "spec/baron_article_spec.rb",
     "spec/baron_blog_engine_spec.rb",
     "spec/baron_spec.rb",
@@ -74,12 +75,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = "https://github.com/nbuggia/baron-blog-engine-gem"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.5.1"
   s.summary = "Minimalist, yet full-featured, blog engine."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])

data/lib/baron/blog_engine.rb

@@ -26,25 +26,24 @@ module Baron
       theme.load_config
     
       begin
-
-        # Atom feed... /feed.atom
+        # Atom feed /feed.atom
         body = if route.first == 'feed.atom'
           PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
             render(get_system_resource('feed.atom'))
             
-        # Robots... /robots.txt
+        # Robots /robots.txt
         elsif route.first == 'robots.txt'
           PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
             render(get_system_resource('robots.txt'))
         
-        # Home page... /
+        # Home page /
         elsif route.first == @config[:root]
           all_articles = get_all_articles
           params[:page_forward] = '/page/2/' if @config[:article_max] < all_articles.count
           PageController.new(all_articles, categories, @config[:article_max], params, theme, @config) . 
             render_html(theme.get_template(route.first), theme.get_template('layout'))
             
-        # Pagination... /page/2, /page/2/
+        # Pagination /page/2, /page/2/
         elsif route.first == 'page' && route.count == 2
           page_num = route.last.to_i rescue page_num = -1
           all_articles = get_all_articles
@@ -62,43 +61,41 @@ module Baron
           PageController.new(articles_on_this_page, categories, @config[:article_max], params, theme, @config) . 
             render_html(theme.get_template('home'), theme.get_template('layout'))
         
-        # System routes... /robots.txt, /archives
+        # System routes /robots.txt, /archives
         elsif route.first == 'archives' or route.first == 'robots'
           max_articles = ('archives' == route.first) ? :all : @config[:article_max]
           PageController.new(get_all_articles, categories, max_articles, params, theme, @config) . 
             render_html(theme.get_template(route.first), theme.get_template('layout'))
         
-        # Custom pages... /about, /contact-us
+        # Custom pages /about, /contact-us
         elsif is_route_custom_page? route.first
           PageController.new(get_all_articles, categories, @config[:article_max], params, theme, @config) . 
             render_html(get_page_template(route.first), theme.get_template('layout'))
       
-        # Category home pages... /projects/, /photography/, /poems/, etc
+        # Category home pages /projects/, /photography/, /poems/, etc
         elsif is_route_category_home? route.last
           filtered_articles = get_all_articles.select { |h| h[:category] == route.last }
-          params[:page_name] = route.last.gsub('-', ' ').titleize
+          params[:page_name] = titlecase(route.last.gsub('-', ' '))
           PageController.new(filtered_articles, categories, :all, params, theme, @config) .
             render_html(theme.get_template('category'), theme.get_template('layout'))
       
-        # Articles... /posts/2013/01/18/my-article-title, /posts/category/2013/my-article-title, etc
+        # Articles /posts/2013/01/18/my-article-title, /posts/category/2013/my-article-title, etc
         else
           article = [ find_single_article(route.last) ]
-          params[:page_title] = "#{article.first[:filename].gsub('-',' ').titleize} #{@config[:title_delimiter]} #{@config[:title]}"
+          params[:page_title] = "#{titlecase(article.first[:filename].gsub('-',' '))} #{@config[:title_delimiter]} #{@config[:title]}"
           PageController.new(article, categories, 1, params, theme, @config) .
             render_html(theme.get_template('article'), theme.get_template('layout'))
         end
 
-        return :body => body, :status => 200
+        return { body: body, status: 200 }
       
-      rescue Errno::ENOENT => e
-        
+      rescue Errno::ENOENT => e     
         # 404 Page Not Found
         params[:error_message] = 'Page not found'
         params[:error_code] = '404'
         body = PageController.new([], categories, 0, params, theme, @config) .
                 render_html(theme.get_template('error'), theme.get_template('layout'))
-        
-        return :body => body, :status => 404
+        return { body: body, status: 404 }
       end 
     end
 
@@ -116,11 +113,11 @@ module Baron
           if e.end_with? @config[:ext]
             parts = e.split('/')
             {
-              :filename_and_path => e,
-              :date => parts.last[0..9],
+              filename_and_path: e,
+              date: parts.last[0..9],
               # trims date and extention 
-              :filename => parts.last[11..(-1 * (@config[:ext].length + 2))].downcase,
-              :category => parts[parts.count-2] == 'articles' ? '' : parts[parts.count-2]
+              filename: parts.last[11..(-1 * (@config[:ext].length + 2))].downcase,
+              category: parts[parts.count-2] == 'articles' ? '' : parts[parts.count-2]
             }
           end
         end
@@ -135,10 +132,10 @@ module Baron
       Dir["#{get_articles_path}/*/"].map do |a| 
         folder_name = File.basename(a)
         {
-          :name => folder_name.titleize,
-          :node_name => folder_name.gsub(' ', '-'),
-          :path => "/#{@config[:permalink_prefix]}/#{folder_name.gsub(' ', '-')}/".squeeze('/'),
-          :count => Dir["#{get_articles_path}/#{folder_name}/*"].count 
+          name: titlecase(folder_name),
+          node_name: folder_name.gsub(' ', '-'),
+          path: "/#{@config[:permalink_prefix]}/#{folder_name.gsub(' ', '-')}/".squeeze('/'),
+          count: Dir["#{get_articles_path}/#{folder_name}/*"].count 
         }
       end .
         sort_by { |hash| hash[:name] }
@@ -175,6 +172,13 @@ module Baron
     def get_system_resource name
       "#{@config[:sample_data_path]}resources/#{name}".squeeze('/')
     end
+
+    private
+
+    # Capitalize the first letter of each word in a string
+    def titlecase str
+      str.split(/(\W)/).map(&:capitalize).join       
+    end  
   end
-  
+
 end

data/lib/baron/config.rb

@@ -5,61 +5,65 @@ module Baron
     Defaults = {
 
       # cache duration (seconds)
-      :cache => 28800,
+      cache: 28800,
       
       # token to represent root in the app
-      :root => 'home',
+      root: 'home',
 
       # used by the RSpec tests to show where the sample data is stored
-      :sample_data_path => '',
+      sample_data_path: '',
       
       # default name to use for the blog's author
-      :author => ENV['USER'],
+      author: ENV['USER'],
 
       # default title for the site
-      :title => Dir.pwd.split('/').last,
+      title: Dir.pwd.split('/').last,
 
       # used to divide the different elements of the page title
-      :title_delimiter => "›",
+      title_delimiter: "›",
       
-      # symbol used to represent trucated text (article summary)
-      :truncation_marker => '…',
-
       # root URL of the site
-      :url => 'http://localhost:3000/',
+      url: 'http://localhost:3000/',
 
       # date function block
-      :date => lambda {|now| now.strftime("%d/%m/%Y") },
+      date: lambda {|now| now.strftime("%d/%m/%Y") },
 
       # use markdown
-      :markdown => :smart,
+      markdown: :smart,
+
+      # symbol used to represent trucated text (article summary)
+      truncation_marker: '…',
 
       # length of summary and delimiter
-      :summary => {:max => 150, :delim => /~\n/},
+      summary: 
+      {
+        max: 150, 
+        delim: /~\n/
+      },
 
       # extension for article files
-      :ext => 'txt',
+      ext: 'txt',
 
       # common path prefix for article permalinks
-      :permalink_prefix => '',
+      permalink_prefix: '',
 
       # :year_date, :year_month_date, :year_month_day_date, :no_date
-      :permalink_date_format => :year_month_day_date,
+      permalink_date_format: :year_month_day_date,
 
       # number of most recent articles to return to custom pages
-      :article_max => 5,
+      article_max: 5,
 
       # name of the theme to use         
-      :theme => 'default',
+      theme: 'default',
 
       # account id for google analytics account  
-      :google_analytics => '',
+      google_analytics: '',
 
       # HTML Meta Tag verification code for google webmaster account
-      :google_webmaster => '',
+      google_webmaster: '',
 
       # account name for your disqus account www.disqus.com
-      :disqus_shortname => false
+      disqus_shortname: false
     }
 
     def get_feed_permalink

data/lib/baron/models/article.rb

@@ -1,7 +1,13 @@
 module Baron
   
   class Article < Hash
-    
+
+    def self.create_slug title, date
+      slug = title.empty? ? "Untitled" : title.strip.downcase
+      slug_encoded = slug.gsub(/[^a-z0-9]/, '-')
+      "#{date.strftime("%Y-%m-%d-") + slug_encoded}"
+    end
+
     def initialize file_parts, config = {}
       @config = config
       self[:filename_and_path] = file_parts[:filename_and_path]
@@ -29,10 +35,10 @@ module Baron
       permalink_prefix = prefix.empty? ? @config[:permalink_prefix] : prefix
       permalink_date_format = date_format.empty? ? @config[:permalink_date_format] : date_format
       date_path = case permalink_date_format
-      when :year_date; self[:date].strftime("/%Y")
-      when :year_month_date; self[:date].strftime("/%Y/%m")
-      when :year_month_day_date; self[:date].strftime("/%Y/%m/%d")
-      else ''
+        when :year_date; self[:date].strftime("/%Y")
+        when :year_month_date; self[:date].strftime("/%Y/%m")
+        when :year_month_day_date; self[:date].strftime("/%Y/%m/%d")
+        else ''
       end
       
       "/#{permalink_prefix}/#{self[:category]}#{date_path}/#{slug}/".squeeze('/')      
@@ -66,7 +72,7 @@ module Baron
     def slug
       self[:slug]
     end
-    
+
     protected 
     
     def load_article filename_and_path

data/spec/baron_article_spec.rb

@@ -17,38 +17,43 @@ describe "Baron::Article" do
   
   describe "Provides access to properties" do
     it "should return input parameters" do
-      @article[:filename_and_path].should == @article_parts[:filename_and_path]
-      @article[:date].should be_instance_of(Date)
-      @article[:category].should == @article_parts[:category]
+      expect(@article[:filename_and_path]).to eq(@article_parts[:filename_and_path])
+      expect(@article[:date]).to be_instance_of(Date)
+      expect(@article[:category]).to eq(@article_parts[:category])
     end
     
     it "should return article data correctly" do
-      @article[:title].should == 'The Road Not Taken'
-      @article.title.should == 'The Road Not Taken'
-      @article.date.should == '01/01/1916'
-      @article.date_iso8601.should == '1916-01-01T00:00:00+00:00'
-      @article[:author].should == 'Robert Frost'
-      @article.author.should == 'Robert Frost'
-      @article[:body].length.should > 0
-      @article[:category].should == 'poems'
-      @article.category.should == 'poems'
-      @article[:slug].should == 'the-road-not-taken'
-      @article.slug.should == 'the-road-not-taken'   
+      expect(@article[:title]).to eq('The Road Not Taken')
+      expect(@article.title).to eq('The Road Not Taken')
+      expect(@article.date).to eq('01/01/1916')
+      expect(@article.date_iso8601).to eq('1916-01-01T00:00:00+00:00')
+      expect(@article[:author]).to eq('Robert Frost')
+      expect(@article.author).to eq('Robert Frost')
+      expect(@article[:body].length).to be > 0
+      expect(@article[:category]).to eq('poems')
+      expect(@article.category).to eq('poems')
+      expect(@article[:slug]).to eq('the-road-not-taken')
+      expect(@article.slug).to eq('the-road-not-taken')
     end
     
     it "should handle different path configuations" do
-      @article.path('', :no_date).should == '/poems/the-road-not-taken/'
-      @article.path('', :year_month_day_date).should == '/poems/1916/01/01/the-road-not-taken/'
-      @article.path('', :year_month_date).should == '/poems/1916/01/the-road-not-taken/'
-      @article.path('', :year_date).should == '/poems/1916/the-road-not-taken/'
-      @article.path('posts', :no_date).should == '/posts/poems/the-road-not-taken/'
-      @article.path('posts', :year_month_day_date).should == '/posts/poems/1916/01/01/the-road-not-taken/'
-      @article.path('posts', :year_month_date).should == '/posts/poems/1916/01/the-road-not-taken/'
-      @article.path('posts', :year_date).should == '/posts/poems/1916/the-road-not-taken/'
-      @article.path('/foo/bar/', :no_date).should == '/foo/bar/poems/the-road-not-taken/'
-      @article.path('/foo/bar/', :year_month_day_date).should == '/foo/bar/poems/1916/01/01/the-road-not-taken/'
-      @article.path('/foo/bar/', :year_month_date).should == '/foo/bar/poems/1916/01/the-road-not-taken/'
-      @article.path('/foo/bar/', :year_date).should == '/foo/bar/poems/1916/the-road-not-taken/'
+      expect(@article.path('', :no_date)).to eq('/poems/the-road-not-taken/')
+      expect(@article.path('', :year_month_day_date)).to eq('/poems/1916/01/01/the-road-not-taken/')
+      expect(@article.path('', :year_month_date)).to eq('/poems/1916/01/the-road-not-taken/')
+      expect(@article.path('', :year_date)).to eq('/poems/1916/the-road-not-taken/')
+      expect(@article.path('posts', :no_date)).to eq('/posts/poems/the-road-not-taken/')
+      expect(@article.path('posts', :year_month_day_date)).to eq('/posts/poems/1916/01/01/the-road-not-taken/')
+      expect(@article.path('posts', :year_month_date)).to eq('/posts/poems/1916/01/the-road-not-taken/')
+      expect(@article.path('posts', :year_date)).to eq('/posts/poems/1916/the-road-not-taken/')
+      expect(@article.path('/foo/bar/', :no_date)).to eq('/foo/bar/poems/the-road-not-taken/')
+      expect(@article.path('/foo/bar/', :year_month_day_date)).to eq('/foo/bar/poems/1916/01/01/the-road-not-taken/')
+      expect(@article.path('/foo/bar/', :year_month_date)).to eq('/foo/bar/poems/1916/01/the-road-not-taken/')
+      expect(@article.path('/foo/bar/', :year_date)).to eq('/foo/bar/poems/1916/the-road-not-taken/')
     end
+
+    it "should create values correctly" do
+      expect(Baron::Article.create_slug "B's Cookies & Cream 2,3,4", Date.new(2016,6,15)).to eq("2016-06-15-b-s-cookies---cream-2-3-4")
+    end
+
   end
-end
+end

data/spec/baron_blog_engine_spec.rb

@@ -14,53 +14,53 @@ describe "Baron::BlogEngine" do
     
   describe "Access all content" do
     it "finds application paths" do
-      @blog_engine.get_pages_path.should == SAMPLE_DATA_PATH + 'pages/'
-      @blog_engine.get_articles_path.should == SAMPLE_DATA_PATH + 'articles'
-      @blog_engine.get_page_template('about').should == SAMPLE_DATA_PATH + 'pages/about.rhtml'
-      @blog_engine.get_system_resource('redirects.txt').should == SAMPLE_DATA_PATH + 'resources/redirects.txt'
-      @blog_engine.get_system_resource('robots.txt').should == SAMPLE_DATA_PATH + 'resources/robots.txt'
-      @blog_engine.get_system_resource('feeds.atom').should == SAMPLE_DATA_PATH + 'resources/feeds.atom'
+      expect(@blog_engine.get_pages_path).to eq(SAMPLE_DATA_PATH + 'pages/')
+      expect(@blog_engine.get_articles_path).to eq(SAMPLE_DATA_PATH + 'articles')
+      expect(@blog_engine.get_page_template('about')).to eq(SAMPLE_DATA_PATH + 'pages/about.rhtml')
+      expect(@blog_engine.get_system_resource('redirects.txt')).to eq(SAMPLE_DATA_PATH + 'resources/redirects.txt')
+      expect(@blog_engine.get_system_resource('robots.txt')).to eq(SAMPLE_DATA_PATH + 'resources/robots.txt')
+      expect(@blog_engine.get_system_resource('feeds.atom')).to eq(SAMPLE_DATA_PATH + 'resources/feeds.atom')
     end 
     
     it "finds all categories" do
       categories = @blog_engine.get_all_categories
-      categories.count.should == 4
-      categories.first[:name].should == 'Favorites'
-      categories.first[:path].should == '/favorites/'
-      categories.first[:count].should == 1
-      categories.last[:name].should == 'Other Authors'
-      categories.last[:path].should == '/other-authors/'
-      categories.last[:count].should == 1
+      expect(categories.count).to eq(3)
+      expect(categories.first[:name]).to eq('Favorites')
+      expect(categories.first[:path]).to eq('/favorites/')
+      expect(categories.first[:count]).to eq(1)
+      expect(categories.last[:name]).to eq('Other Authors')
+      expect(categories.last[:path]).to eq('/other-authors/')
+      expect(categories.last[:count]).to eq(1)
     end
 
     # todo, refactor to break out testing that we're appropriately breaking the fileparts down
 
     it "finds all articles" do
       articles_fileparts = @blog_engine.get_all_articles()
-      articles_fileparts.count.should == 7
+      expect(articles_fileparts.count).to eq(7)
     end
     
     it "parses all article fileparts" do
       articles_fileparts = @blog_engine.get_all_articles()
-      articles_fileparts[0][:filename_and_path].should == SAMPLE_DATA_PATH + 'articles/favorites/1916-01-01-the-road-not-taken.txt' 
-      articles_fileparts[0][:date].should == '1916-01-01' 
-      articles_fileparts[0][:filename].should == 'the-road-not-taken' 
-      articles_fileparts[0][:category].should == 'favorites'
-      articles_fileparts[1][:filename_and_path].should == SAMPLE_DATA_PATH + 'articles/north of boston/1914-01-05-A-Hundred-callers.txt' 
-      articles_fileparts[1][:date].should == '1914-01-05' 
-      articles_fileparts[1][:filename].should == 'a-hundred-callers' 
-      articles_fileparts[1][:category].should == 'north of boston'
-      articles_fileparts.last[:filename_and_path].should == SAMPLE_DATA_PATH + 'articles/other authors/1909-01-02-If.txt' 
-      articles_fileparts.last[:date].should == '1909-01-02' 
-      articles_fileparts.last[:filename].should == 'if' 
-      articles_fileparts.last[:category].should == 'other authors' 
+      expect(articles_fileparts[0][:filename_and_path]).to eq(SAMPLE_DATA_PATH + 'articles/favorites/1916-01-01-the-road-not-taken.txt')
+      expect(articles_fileparts[0][:date]).to eq('1916-01-01')
+      expect(articles_fileparts[0][:filename]).to eq('the-road-not-taken')
+      expect(articles_fileparts[0][:category]).to eq('favorites')
+      expect(articles_fileparts[1][:filename_and_path]).to eq(SAMPLE_DATA_PATH + 'articles/north of boston/1914-01-05-A-Hundred-callers.txt')
+      expect(articles_fileparts[1][:date]).to eq('1914-01-05')
+      expect(articles_fileparts[1][:filename]).to eq('a-hundred-callers')
+      expect(articles_fileparts[1][:category]).to eq('north of boston')
+      expect(articles_fileparts.last[:filename_and_path]).to eq(SAMPLE_DATA_PATH + 'articles/other authors/1909-01-02-If.txt')
+      expect(articles_fileparts.last[:date]).to eq('1909-01-02') 
+      expect(articles_fileparts.last[:filename]).to eq('if')
+      expect(articles_fileparts.last[:category]).to eq('other authors')
     end
         
     it "returns all article parts" do
       @blog_engine.get_all_articles().each do |article_parts|
-        article_parts[:filename_and_path].should_not == nil
-        article_parts[:date].should_not == nil
-        article_parts[:filename].should_not == nil
+        expect(article_parts[:filename_and_path]).not_to eq(nil)
+        expect(article_parts[:date]).not_to eq(nil)
+        expect(article_parts[:filename]).not_to eq(nil)
       end
     end
   end # Access all content

data/spec/baron_spec.rb

@@ -6,27 +6,27 @@ require 'spec_helper'
 
 shared_examples_for "Server Response" do
   it "should be valid" do
-    @response.status.should == 200
-    @response.body.length.should > 0
+    expect(@response.status).to eq(200)
+    expect(@response.body.length).to be > 0
   end
 end
 
 shared_examples_for "Server HTML Response" do
   it "should be instrumented" do
-    @response.body.should include(GOOGLE_ANALYTICS) unless GOOGLE_ANALYTICS.empty?
+    expect(@response.body).to include(GOOGLE_ANALYTICS) unless GOOGLE_ANALYTICS.empty?
   end
 
   it "returns HTML content type" do
-      @response['Content-Type'].should == 'text/html'
+      expect(@response['Content-Type']).to eq('text/html')
   end
   
   it "should generate valid HTML" do
-    @response.body.scan(/<html/).count.should == 1
-    @response.body.scan(/<\/html>/).count.should == 1
-    @response.body.scan(/<head>/).count.should == 1
-    @response.body.scan(/<\/head>/).count.should == 1
-    @response.body.scan(/<body/).count.should == 1
-    @response.body.scan(/<\/body>/).count.should == 1
+    expect(@response.body.scan(/<html/).count).to eq(1)
+    expect(@response.body.scan(/<\/html>/).count).to eq(1)
+    expect(@response.body.scan(/<head>/).count).to eq(1)
+    expect(@response.body.scan(/<\/head>/).count).to eq(1)
+    expect(@response.body.scan(/<body/).count).to eq(1)
+    expect(@response.body.scan(/<\/body>/).count).to eq(1)
   end
 end
 
@@ -45,7 +45,7 @@ describe "Baron" do
     it_behaves_like "Server HTML Response"
     
     it "is instrumented for Google Webmaster Tools" do
-      @response.body.should include(GOOGLE_WEBMASTER) unless GOOGLE_WEBMASTER.empty?
+      expect(@response.body).to include(GOOGLE_WEBMASTER) unless GOOGLE_WEBMASTER.empty?
     end    
   end
   
@@ -93,30 +93,30 @@ describe "Baron" do
     end
     
     it "should not render a page out of bounds" do
-      @baron.get('/page/0/').status.should == 404
-      @baron.get('/page/100/').status.should == 404
+      expect(@baron.get('/page/0/').status).to eq(404)
+      expect(@baron.get('/page/100/').status).to eq(404)
     end
     
     it "should not render a mal-formed URL" do
-      @baron.get('/page/foobar/').status.should == 404
+      expect(@baron.get('/page/foobar/').status).to eq(404)
     end
 
     it "should render a valid request" do
       response = @baron.get('/page/2/')
-      response.status.should == 200
-      response.body.length.should > 0
-      response.body.should include(GOOGLE_WEBMASTER) unless GOOGLE_WEBMASTER.empty?
+      expect(response.status).to eq(200)
+      expect(response.body.length).to be > 0
+      expect(response.body).to include(GOOGLE_WEBMASTER) unless GOOGLE_WEBMASTER.empty?
     end
   end
   
   describe "GET error page" do
     it "returns proper error data" do
       response = @baron.get('/fake-url-of-impossible-page-give-me-your-404-error')
-      response.status.should == 404
-      response.body.should include('Page not found')
-      response.body.should include('404')
-      # should not render in the layout.rhtml if <html is in the first 100 chars
-      response.body.should_not include("<meta name=\"description\" content="">")
+      expect(response.status).to eq(404)
+      expect(response.body).to include('Page not found')
+      expect(response.body).to include('404')
+      # Should not render in the layout.rhtml if <html is in the first 100 chars
+      expect(response.body).to_not include("<meta name=\"description\" content="">")
     end
     
   end
@@ -129,16 +129,16 @@ describe "Baron" do
     it_behaves_like "Server Response"
     
     it "returns expected content" do
-      @response.body.should include(@config[:title])
-      @response.body.should include("http://localhost/feed.atom")
-      @response.body.scan(/<entry>/).count.should == 5
-      @response.body.scan(/<\/entry>/).count.should == 5
-      @response.body.should include('<feed')
-      @response.body.should include('</feed>')
+      expect(@response.body).to include(@config[:title])
+      expect(@response.body).to include("http://localhost/feed.atom")
+      expect(@response.body.scan(/<entry>/).count).to eq(5)
+      expect(@response.body.scan(/<\/entry>/).count).to eq(5)
+      expect(@response.body).to include('<feed')
+      expect(@response.body).to include('</feed>')
     end
     
     it "returns atom content type" do
-      @response['Content-Type'].should == 'application/atom+xml'
+      expect(@response['Content-Type']).to eq('application/atom+xml')
     end
   end
   
@@ -150,27 +150,20 @@ describe "Baron" do
     it_behaves_like "Server Response"
     
     it "returns text content type" do
-      @response['Content-Type'].should == 'text/plain'
+      expect(@response['Content-Type']).to eq('text/plain')
     end
   end
   
   describe "Redirect URLs" do
     it "should canonicalize pagination at page 1" do
       @response = @baron.get('/page/1/')
-      @response.status.should == 301
-      @response['Location'].should == '/'
+      expect(@response.status).to eq(301)
+      expect(@response['Location']).to eq('/')
+
       @response = @baron.get('/page/1')
-      @response.status.should == 301
-      @response['Location'].should == '/'
+      expect(@response.status).to eq(301)
+      expect(@response['Location']).to eq('/')
     end    
   end
-  
-  # add a method to test CSS, and a downloaded file, like a ppt
 
-  describe "Helper Functions" do
-    it "should return a titleized string" do
-      "the quick red fox".titleize.should == "The Quick Red Fox"
-    end
-  end
-  
-end
+end

data/spec/baron_theme_spec.rb

@@ -13,26 +13,26 @@ describe "Baron::Theme" do
   end
 
   it "finds all parameters in theme_config.yml" do
-    @theme.root.should == '/themes/typography'
-    @theme[:root].should == '/themes/typography'
-    @theme[:masthead_url].should == "http://www.my-corporation.com"
-    @theme[:param_test].should == "FOOBAR"
-    @theme[:company_description].should == "Insert content here"
+    expect(@theme.root).to eq('/themes/typography')
+    expect(@theme[:root]).to eq('/themes/typography')
+    expect(@theme[:masthead_url]).to eq("http://www.my-corporation.com")
+    expect(@theme[:param_test]).to eq("FOOBAR")
+    expect(@theme[:company_description]).to eq("Insert content here")
   end
   
   it "finds all the rendering templates" do
-    @theme.get_template('article').should == SAMPLE_DATA_PATH + 'themes/typography/templates/article.rhtml'
-    @theme.get_template('category').should == SAMPLE_DATA_PATH + 'themes/typography/templates/category.rhtml'
-    @theme.get_template('error').should == SAMPLE_DATA_PATH + 'themes/typography/templates/error.rhtml'
-    @theme.get_template('home').should == SAMPLE_DATA_PATH + 'themes/typography/templates/home.rhtml'
-    @theme.get_template('layout').should == SAMPLE_DATA_PATH + 'themes/typography/templates/layout.rhtml'
+    expect(@theme.get_template('article')).to eq(SAMPLE_DATA_PATH + 'themes/typography/templates/article.rhtml')
+    expect(@theme.get_template('category')).to eq(SAMPLE_DATA_PATH + 'themes/typography/templates/category.rhtml')
+    expect(@theme.get_template('error')).to eq(SAMPLE_DATA_PATH + 'themes/typography/templates/error.rhtml')
+    expect(@theme.get_template('home')).to eq(SAMPLE_DATA_PATH + 'themes/typography/templates/home.rhtml')
+    expect(@theme.get_template('layout')).to eq(SAMPLE_DATA_PATH + 'themes/typography/templates/layout.rhtml')
   end
   
   it "doesn't crash with a bad or empty config file" do
     theme = Baron::Theme.new({})
     theme.load_config("#{SAMPLE_DATA_PATH}supplemental-files/theme_config.yml")
-    theme.length.should == 4
+    expect(theme.length).to eq(4)
     theme.load_config("FOOBAR-FAKE-URL-FAKE-FAKE")
-    theme.length.should == 4
+    expect(theme.length).to eq(4)
   end
 end

metadata

@@ -1,49 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: baron
 version: !ruby/object:Gem::Version
-  version: 1.0.14
-  prerelease: 
+  version: 1.0.17
 platform: ruby
 authors:
 - Nathan Buggia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'What''s in the box: (1) Publish to Heroku using Git (2) Author articles
+description: 'What''s in the box: (1) Publish to Heroku using Git (2) Author articles
   in markdown (3) Article categories (4) Multiple permalink formats supported (5)
   Redirects (6) Advanced SEO optimizations and Google Analytics/ Webmaster Tools support.
   Uses Rack, RSpec, Bootstrap, JQuery, Disqus, Thin'
@@ -64,7 +59,6 @@ files:
 - lib/baron/models/article.rb
 - lib/baron/models/theme.rb
 - lib/baron/page_controller.rb
-- lib/baron/utils.rb
 - spec/baron_article_spec.rb
 - spec/baron_blog_engine_spec.rb
 - spec/baron_spec.rb
@@ -111,26 +105,25 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/nbuggia/baron-blog-engine-gem
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Minimalist, yet full-featured, blog engine.
 test_files: []

data/lib/baron/utils.rb

@@ -1,31 +0,0 @@
-# Converts a number into an ordinal, 1=>1st, 2=>2nd, 3=>3rd, etc
-class Fixnum
-  def ordinal
-    case self % 100
-      when 11..13; "#{self}th"
-    else
-      case self % 10
-        when 1; "#{self}st"
-        when 2; "#{self}nd"
-        when 3; "#{self}rd"
-        else    "#{self}th"
-      end
-    end
-  end
-end
-
-# Avoid a collision with ActiveSupport
-
-class String
-  # Support String::bytesize in old versions of Ruby
-  if RUBY_VERSION < "1.9"
-    def bytesize
-      size
-    end
-  end
-  
-  # Capitalize the first letter of each word in a string
-  def titleize     
-    self.split(/(\W)/).map(&:capitalize).join       
-  end
-end