fuel 0.3.28 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0505ce01882eba5d7556e4523d72a4ca3d638660
-  data.tar.gz: cfc3cf2c44738d67d15876691ba8429fdfb7f97e
+  metadata.gz: 119ebf4f62cc4f134697c9a3163400ef4d1d0503
+  data.tar.gz: 89e4b2c53f79bf21e32e5d08522785122894c93d
 SHA512:
-  metadata.gz: 9bd796cc21130dec9b5436d38837350f14698119f17bc81df628976b0d7a6b7776208697be2b15a0ce085a80c0737c23aa96330fbfe16ab6cfc88c62c3f2faeb
-  data.tar.gz: b6c13a46b70585a82abd1fdb8628b85db257956dfdb120ecfa836b8708e12ac48c052bbc5d188a092faf6d6ca46bac31bca2b03894c35537c38892d6c3b5fa1a
+  metadata.gz: 18e51a26135a038f6969cce6c1fbb8fed62000e404b095ccdf24d33da1217f6b668d30e51658210243124163512bfbb4463eff97f85d19314164ed761f128171
+  data.tar.gz: 6da165c5c109ea23f78834880018e9e2bd30506418ded8e6f2a4c06de07ecfc06e92e31ccb42c72948dbaa41f96ece0c7722f6f22e647d7ee34643fab03b4170

data/app/controllers/fuel/admin/authors_controller.rb

@@ -35,7 +35,7 @@ module Fuel
         @author.attributes = @params_hash
 
         if @author.save
-          redirect_to fuel.admin_authors_path, notice: "Author was updated and #{@message}"
+          redirect_to fuel.edit_admin_author_path(@author), notice: "Author was updated and #{@message}"
         else
           render action: "edit"
         end

data/app/controllers/fuel/admin/posts_controller.rb

@@ -67,6 +67,7 @@ module Fuel
 
         def update_published_at
           published_at_string = @params_hash[:published_at]
+          return unless published_at_string.present?
           published_at_datetime = DateTime.strptime(published_at_string, "%m/%d/%Y")
           @params_hash[:published_at] = published_at_datetime
         end

data/app/controllers/fuel/posts_controller.rb

@@ -16,7 +16,7 @@ module Fuel
 
     def show
       @post = Fuel::Post.find_by_slug(params[:id]) || Fuel::Post.find_by_id(params[:id]) || not_found
-      @title = truncate_on_space(@post.seo_title, 70)
+      @title = truncate_on_space(@post.seo_title || @post.title, 70)
       @description = @post.seo_description
       @disqus_name = Fuel.configuration.disqus_name
     end

data/app/models/fuel/author.rb

@@ -18,6 +18,7 @@ module Fuel
     end
 
     validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/
+    validates :first_name, :last_name, :title, presence: true
 
     def s3_credentials
       {:bucket => Fuel.configuration.aws_bucket, :access_key_id => Fuel.configuration.aws_access_key, :secret_access_key => Fuel.configuration.aws_secret_access_key}

data/app/models/fuel/post.rb

@@ -18,22 +18,23 @@ module Fuel
     end
     validates_attachment_content_type :featured_image, :content_type => /\Aimage\/.*\Z/
 
-    validates_presence_of :title, :content, :author_id, if: :is_published
+    validates_presence_of :title, :content, :author_id, :published_at, if: :is_published
     paginates_per Fuel.configuration.paginates_per.to_i
 
-    scope :recent_published_posts, -> { where(published: true).order("created_at DESC") }
-    scope :recent, -> { order("created_at DESC") }
+    scope :recent_published_posts, -> { published.recent }
+    scope :published, -> { where(published: true) }
+    scope :recent, -> { order("published_at DESC").order("created_at DESC") }
 
     def s3_credentials
       {:bucket => Fuel.configuration.aws_bucket, :access_key_id => Fuel.configuration.aws_access_key, :secret_access_key => Fuel.configuration.aws_secret_access_key}
     end
 
     def next
-      self.class.recent.where("created_at <= ? AND id != ?", created_at, id).first
+      self.class.recent.where("published_at <= ? AND id != ?", published_at, id).first
     end
 
     def previous
-      self.class.recent.where("created_at >= ? AND id != ?", created_at, id).last
+      self.class.recent.where("published_at >= ? AND id != ?", published_at, id).last
     end
 
     def should_generate_new_friendly_id?

data/lib/fuel/version.rb

@@ -1,3 +1,3 @@
 module Fuel
-  VERSION = "0.3.28"
+  VERSION = "0.3.29"
 end

data/spec/codeclimate_env.rb

@@ -0,0 +1 @@
+ENV["CODECLIMATE_REPO_TOKEN"] = "a18d4ae96dd06db174789c3819d6347347232494f24a2c6f536e85f3455f6890"

data/spec/controllers/fuel/admin/authors_controller_spec.rb

@@ -0,0 +1,148 @@
+require 'spec_helper'
+
+describe Fuel::Admin::AuthorsController, type: :controller do
+
+  routes { Fuel::Engine.routes }
+
+  let(:authors) { create_list(:author, number_authors) }
+  let(:number_authors) { 5 }
+
+  before(:each) do
+    credentials = ActionController::HttpAuthentication::Basic.encode_credentials Fuel.configuration.username, Fuel.configuration.password
+    request.env['HTTP_AUTHORIZATION'] = credentials
+    authors
+  end
+
+  describe 'GET #index' do
+    it "populates an array of authors" do
+      get :index
+      expect(assigns(:authors).count).to eq(number_authors)
+    end
+    it "renders the :index view" do
+      get :index
+      expect(response).to render_template(:index)
+    end
+  end
+
+  describe 'GET #new' do
+    it "it assigns a new Author to @author" do
+      get :new
+      expect(assigns(:author)).to be_a_new(Author)
+    end
+    it "renders the :new view" do
+      get :new
+      expect(response).to render_template(:new)
+    end
+  end
+
+  describe 'GET #edit' do
+
+    let(:author) { create(:author) }
+
+    it "assigns the requested author to @author" do
+      get :edit, id: author
+      expect(assigns(:author)).to eq(author)
+    end
+
+    it "renders the :edit template" do
+      get :edit, id: author
+      expect(response).to render_template(:edit)
+    end
+  end
+
+  describe 'POST #create' do
+
+    let(:original_count) { Author.count }
+
+    before(:each) do
+      original_count
+      post :create, fuel_author: author_hash
+    end
+
+    context "with valid attributes" do
+
+      let(:author_hash) { attributes_for(:author) }
+
+      it "saves the new author in the database" do
+        new_count = Author.count
+        expect(new_count - original_count).to eq(1)
+      end
+
+      it "redirects to the index page" do
+        expect(response).to redirect_to(admin_authors_path)
+      end
+    end
+
+    context "with invalid attributes" do
+      let(:author_hash) { attributes_for(:author, first_name: nil) }
+
+      it "does not save the new author in the database" do
+        new_count = Author.count
+        expect(new_count - original_count).to eq(0)
+      end
+      it "re-renders the :new template" do
+        expect(response).to render_template(:new)
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+
+    let(:author) { create(:author) }
+    let(:author_hash) { attributes_for(:author) }
+
+    before(:each) do
+      author_hash
+    end
+
+    context "with valid attributes" do
+      it "updates the author in the database" do
+        test_first_name = "UniqueString123"
+        put :update, id: author, fuel_author: author_hash.merge(first_name: test_first_name)
+        author.reload
+        expect(author.first_name).to eq(test_first_name)
+      end
+
+      it "redirects to the author edit page" do
+        put :update, id: author, fuel_author: author_hash
+        expect(response).to redirect_to(edit_admin_author_path(author))
+      end
+    end
+
+    context "with invalid attributes" do
+      it "does not update the author" do
+        first_name = "Hopefully I don't persist"
+        put :update, id: author, fuel_author: author_hash.merge(first_name: first_name, last_name: nil)
+        author.reload
+        expect(author.first_name).to_not eq(first_name)
+      end
+
+      it "re-renders the #edit template" do
+        put :update, id: author, fuel_author: author_hash.merge(first_name: nil)
+        expect(response).to render_template(:edit)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+
+    subject(:author) { create(:author) }
+
+    before(:each) do
+      author
+    end
+
+    it "deletes the authors" do
+      original_count = Author.count
+      delete :destroy, id: author
+      new_count = Author.count
+      expect(original_count - new_count).to eq(1)
+    end
+
+    it "redirects to admin/authors#index" do
+      delete :destroy, id: author
+      expect(response).to redirect_to(admin_authors_path)
+    end
+  end
+
+end

data/spec/controllers/fuel/admin/posts_controller_spec.rb

@@ -1,18 +1,22 @@
 require 'spec_helper'
 
-describe Fuel::Admin::PostsController do
+describe Fuel::Admin::PostsController, type: :controller do
 
   routes { Fuel::Engine.routes }
 
+  let(:posts) { create_list(:post, number_posts) }
+  let(:number_posts) { 5 }
+
   before(:each) do
     credentials = ActionController::HttpAuthentication::Basic.encode_credentials Fuel.configuration.username, Fuel.configuration.password
     request.env['HTTP_AUTHORIZATION'] = credentials
+    posts
   end
 
   describe 'GET #index' do
     it "populates an array of posts" do
       get :index
-      expect(assigns(:posts).count).to eq(Post.count)
+      expect(assigns(:posts).count).to eq(number_posts)
     end
     it "renders the :index view" do
       get :index
@@ -50,20 +54,20 @@ describe Fuel::Admin::PostsController do
     context "with valid attributes" do
       before(:each) do
         @original_count = Post.count
-        post :create, post: attributes_for(:post)
+        post :create, fuel_post: attributes_for(:post)
       end
       it "saves the new post in the database" do
         new_count = Post.count
         expect(new_count - @original_count).to eq(1)
       end
-      it "redirects to the show page" do
-        expect(response).to redirect_to(fuel.admin_posts_path)
+      it "redirects to the index page" do
+        expect(response).to redirect_to(admin_posts_path)
       end
     end
     context "with invalid attributes" do
       before(:each) do
         @original_count = Post.count
-        post :create, post: attributes_for(:invalid_post)
+        post :create, fuel_post: attributes_for(:invalid_post)
       end
       it "does not save the new post in the database" do
         new_count = Post.count
@@ -76,48 +80,60 @@ describe Fuel::Admin::PostsController do
   end
 
   describe 'PUT #update' do
+
+    let(:post) { create(:post) }
+    let(:published_post) { create(:published_post) }
+    let(:post_hash) { attributes_for(:post) }
+    let(:published_post_hash) { attributes_for(:published_post, published_at: DateTime.now.strftime("%m/%d/%Y")) }
+
     before(:each) do
-      @post = create(:post)
+      post_hash
+      published_post_hash
     end
+
     context "with valid attributes" do
       it "updates the post in the database" do
         test_title = "Is this thing on?"
-        put :update, id: @post, post: attributes_for(:post, title: test_title)
-        @post.reload
-        expect(@post.title).to eq(test_title)
+        put :update, id: post, fuel_post: post_hash.merge(title: test_title)
+        post.reload
+        expect(post.title).to eq(test_title)
       end
-      it "redirects to the post" do
-        put :update, id: @post, post: attributes_for(:post)
-        expect(response).to redirect_to(fuel.admin_posts_path)
+      it "redirects to the post edit page" do
+        put :update, id: post, fuel_post: post_hash
+        expect(response).to redirect_to(edit_admin_post_path(post))
       end
     end
     context "with invalid attributes" do
       it "does not update the post" do
-        author = "Tom Cullen"
-        put :update, id: @post, post: attributes_for(:post, title: nil, author: author)
-        @post.reload
-        expect(@post.author).to_not eq(author)
+        content = "Hopefully I don't persist"
+        put :update, id: post, fuel_post: published_post_hash.merge(content: content, title: nil)
+        post.reload
+        expect(post.content).to_not eq(content)
       end
       it "re-renders the #edit template" do
-        put :update, id: @post, post: attributes_for(:post, title: nil)
+        put :update, id: post, fuel_post: published_post_hash.merge(title: nil)
         expect(response).to render_template(:edit)
       end
     end
   end
 
   describe 'DELETE #destroy' do
+
+    subject(:post) { create(:post) }
+
     before(:each) do
-      @post = create(:post)
+      post
     end
+
     it "deletes the posts" do
       original_count = Post.count
-      delete :destroy, id: @post
+      delete :destroy, id: post
       new_count = Post.count
       expect(original_count - new_count).to eq(1)
     end
     it "redirects to admin/posts#index" do
-      delete :destroy, id: @post
-      expect(response).to redirect_to(fuel.admin_posts_path)
+      delete :destroy, id: post
+      expect(response).to redirect_to(admin_posts_path)
     end
   end
 

data/spec/controllers/fuel/posts_controller_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
-describe Fuel::PostsController do
+describe Fuel::PostsController, type: :controller do
 
   routes { Fuel::Engine.routes }
 
   describe 'GET #index' do
+
+    let(:number_posts) { 10 }
+    let(:posts) { create_list(:published_post, number_posts) }
+    let(:unpublished_post) { create(:post) }
+
     before(:each) do
-      @num_published_posts = 10
-      @num_published_posts.times do |post|
-        create(:post)
-      end
-      create(:unpublished_post)
+      posts
+      unpublished_post
     end
 
     it "populates an array of posts" do
@@ -28,22 +30,25 @@ describe Fuel::PostsController do
   end
 
   describe 'GET #show' do
+
+    let(:post) { create(:published_post) }
+
     before :each do
-      @post = create(:post)
+      post
     end
 
     it "assigns the requested post to @post using slug" do
-      get :show, id: @post.slug
-      expect(assigns(:post)).to eq @post
+      get :show, id: post.slug
+      expect(assigns(:post)).to eq post
     end
 
     it "assigns the requested post to @post using ID" do
-      get :show, id: @post.id
-      expect(assigns(:post)).to eq @post
+      get :show, id: post.id
+      expect(assigns(:post)).to eq post
     end
 
     it "truncates title to 70 characters or less" do
-      get :show, id: @post.slug
+      get :show, id: post.slug
       title_length = assigns(:title).length
       expect(title_length).to be < 70
     end

data/spec/dummy/config/environments/test.rb

@@ -33,4 +33,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+  config.active_record.maintain_test_schema = false
+
 end

data/spec/factories.rb

@@ -1,18 +1,32 @@
+require 'faker'
+
 FactoryGirl.define do
 
   factory :post, class: Fuel::Post do
-    title "This is a title"
-    author "Ryan Francis"
-    tag "Coding"
-    content "Some content for a blog post"
-    published true
+    published false
+
+    factory :published_post do
+      author
+      title Faker::Lorem.sentence
+      content "<p>Some content for a blog post</p>"
+      published true
+      published_at { DateTime.now - rand(1..100).days }
+    end
 
     factory :invalid_post do
+      published true
       title nil
     end
+
     factory :unpublished_post do
       published false
     end
   end
 
+  factory :author, class: Fuel::Author do
+    first_name Faker::Name.first_name
+    last_name Faker::Name.last_name
+    title Faker::Name.title
+  end
+
 end

data/spec/models/fuel/author_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+module Fuel
+  describe Author, type: :model do
+
+    subject { build(:author) }
+
+    it { is_expected.to be_valid }
+    it { is_expected.to validate_presence_of(:first_name) }
+    it { is_expected.to validate_presence_of(:last_name) }
+    it { is_expected.to validate_presence_of(:title) }
+    it { is_expected.to have_many(:posts) }
+
+  end
+end

data/spec/models/fuel/post_spec.rb

@@ -1,43 +1,98 @@
 require 'spec_helper'
 
 module Fuel
-  describe Post do
-    it "is valid with a title, author, tag, content, and published" do
-      post = build(:post)
-      expect(post).to be_valid
+  describe Post, type: :model do
+
+    context "draft" do
+      subject { build(:post) }
+      it { is_expected.to be_valid }
     end
 
-    required_attributes = [:title, :author, :content]
-    required_attributes.each do |attr|
-      it "is invalid without a #{attr}" do
-        post = build(:post, attr => nil)
-        expect(post).to have(1).errors_on(attr)
-      end
-      it "is valid without a #{attr} when not published (i.e. saved as a draft)" do
-        post = build(:post, attr => nil, published: false)
-        expect(post).to have(0).errors_on(attr)
+    context "slug" do
+      subject { create(:post) }
+
+      it "is expected to generate a slug" do
+        expect(subject.slug.length).to be > 0
       end
     end
 
-    describe "Scope recent published posts" do
+    context "published" do
+      subject { build(:published_post) }
+
+      it { is_expected.to be_valid }
+      it { is_expected.to validate_presence_of(:title) }
+      it { is_expected.to validate_presence_of(:content) }
+      it { is_expected.to validate_presence_of(:author_id) }
+      it { is_expected.to validate_presence_of(:published_at) }
+      it { is_expected.to belong_to(:author) }
+    end
+
+
+    describe "scopes" do
+
+      let(:published_posts) { create_list(:published_post, number_posts) }
+      let(:number_posts) { 10 }
+      let(:draft) { create(:post) }
+
       before(:each) do
-        @num_published_posts = 3
-        @num_published_posts.times do |post|
-          create(:post)
-        end
-        create(:unpublished_post)
-        @posts = Fuel::Post.recent_published_posts
+        published_posts
       end
-      it "returns an array of posts" do
-        expect(@posts.count).to be > (0)
+
+      context "published" do
+        subject(:published) { Fuel::Post.published }
+
+        it "returns an array of posts" do
+          expect(published.count).to be > (0)
+        end
+
+        it "only displays published posts" do
+          expect(published.count).to eq(number_posts)
+        end
       end
-      it "only displays published posts" do
-        expect(@posts.count).to eq(@num_published_posts)
+
+      context "recent" do
+        subject(:recent) { Fuel::Post.recent }
+
+        it "sorts the posts by published_at datetime" do
+          is_ordered = recent[0].published_at > recent[1].published_at && recent[1].published_at > recent[2].published_at
+          expect(is_ordered).to be_truthy
+        end
       end
-      it "sorts the posts by created_at datetime" do
-        is_ordered = @posts[0].created_at > @posts[1].created_at && @posts[1].created_at > @posts[2].created_at
-        expect(is_ordered).to be_true
+
+      context "next" do
+        let(:post) { Fuel::Post.published.recent.first }
+        subject(:next_post) { post.next }
+
+        before(:each) do
+          post
+          next_post
+        end
+
+        it "should have a published_at date less than or equal to the current posts' published_at date" do
+          expect(next_post.published_at).to be <= post.published_at
+        end
+
+        it "should not be the same post as the current post" do
+          expect(next_post.id).to_not eq(post.id)
+        end
+
+        it "there should be no other posts with a published_at date less than the current post's published_at date yet greater than the next posts' published_at date" do
+          all_posts = Fuel::Post.published
+          better_option = all_posts.detect do |p|
+            [post.id, next_post.id].exclude?(p.id) && p.published_at < post.published_at && p.published_at > next_post.published_at
+          end
+          expect(better_option).to be_blank
+        end
+
       end
+
+    end
+
+    describe "instance methods" do
+
+      let(:post) { create(:post) }
+
+
     end
 
   end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
-# require 'codeclimate_env.rb'
-# require 'codeclimate-test-reporter'
-# CodeClimate::TestReporter.start
-# This file is copied to spec/ when you run 'rails generate rspec:install'
+if File.exist?('codeclimate_env.rb')
+  require 'codeclimate_env.rb'
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+end
+
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
@@ -9,10 +11,21 @@ require 'factory_girl'
 require 'factories'
 require 'database_cleaner'
 require 'rspec/autorun'
+require 'pry-nav'
+require 'pry-rails'
+require 'pry-stack_explorer'
+require 'pry-theme'
+require 'shoulda-matchers'
+require 'rspec/collection_matchers'
+
 include Fuel
-ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
+# ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
 RSpec.configure do |config|
+
+  config.before :each, type: :controller do
+    controller.class.include Fuel::Engine.routes.url_helpers
+  end
   # ## Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: