RubyGems - exposition - Versions diffs - 0.0.5.2.pre.alpha → 0.0.5.4.pre.alpha - Mend

exposition 0.0.5.2.pre.alpha → 0.0.5.4.pre.alpha

Files changed (417) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250b1ec6174fdde8903091b36659356507fab501
-  data.tar.gz: ebab3977952dd1c99d01792fda7f379e8a9a8daa
+  metadata.gz: 9cd27b4912cd0deb97eec85c2416b836926f75da
+  data.tar.gz: dd5a457bc1e1a0f32e3a9e27aa47a265bc70498f
 SHA512:
-  metadata.gz: ec29b0edb8ef8d900ad8327a6c7255ed7031188327d4c33d5c52f97c1d72c6f2f5189ce75cd9d7822e848bf12ffce70e2558dd12cf5c702cad714cefb71dd340
-  data.tar.gz: 561619cc90f3d0434836e1a7809b323b792509ce6e315210da1d71320a0a103b0e6f6e55a0cf232c0f996c413e4d2308e34bb8d6257394f8e2a6c10ca71a741b
+  metadata.gz: a09e9c7fec9a93d07fced7789c9cc488989e4b282508c21d22144dc525d33e9e68c5e72910a9cf3683729f3dfe06f8283588cd67a588be04735c92025a704c46
+  data.tar.gz: c308935c15ce9bb5c40edfe2b946e3dd3150e79fcc9f2357d95cd9dd86a359aef93290189a53ebe9f0ae19df6ba047596d97693a54c898c8da6310045814ac8a

data/app/controllers/exposition/admin/sessions_controller.rb CHANGED Viewed

@@ -6,8 +6,9 @@ module Exposition
     end
     def create
-      user = User.find_by(email: params[:session][:email].downcase)
-      if user && user.authenticate(params[:session][:password])
+      permitted = params.require(:session).permit([:email, :password])
+      user = User.find_by(email: permitted[:email].downcase)
+      if user && user.authenticate(permitted[:password])
         # Log the user in and redirect to the user's show page.
         user.set_encrypted_remember_token!

data/app/helpers/exposition/layout_header_helper.rb ADDED Viewed

@@ -0,0 +1,11 @@
+module Exposition
+  module LayoutHeaderHelper
+    def title(title)
+      content_for(:title, title.to_s)
+    end
+    def page_description(description)
+      content_for(:page_description, description.to_s)
+    end
+  end
+end

data/app/helpers/exposition/tag_helper.rb ADDED Viewed

@@ -0,0 +1,34 @@
+module Exposition
+  module TagHelper
+    def display_tags_for(taggable)
+      taggable_type = taggable.class.name.underscore.to_sym
+      draw_tag_markup(tags: taggable.tags, taggable_type: taggable_type)
+    end
+    private
+    def draw_tag_markup(tags:, taggable_type:)
+      content_tag(:div, class: 'tags') do
+        draw_tags(tags: tags, taggable_type: taggable_type)
+      end
+    end
+    def draw_tags(tags:, taggable_type:)
+      rendered_tags = ''
+      if tags.any?
+        tags.each do |tag|
+          rendered_tags << content_tag(:span) do
+            draw_tag_url(tag: tag, taggable_type: taggable_type)
+          end
+        end
+      end
+      return rendered_tags.html_safe
+    end
+    def draw_tag_url(tag:, taggable_type:)
+      link_to(tag.label, exposition.tag_path(tag, type: taggable_type))
+    end
+  end
+end

data/app/views/exposition/admin/posts/index.html.haml CHANGED Viewed

@@ -18,6 +18,6 @@
           %td= truncate(post.summary, length: 40, separator: ' ')
           %td= "#{post.author.name}"
           %td= "#{post.slug}"
-          %td= "#{post.tags.to_sentence}"
+          %td= "#{post.tags.to_a.to_sentence}"
           %td= link_to "Edit", exposition.edit_admin_post_path(post)
   = paginate @posts

data/app/views/exposition/posts/show.html.haml CHANGED Viewed

@@ -1,3 +1,6 @@
+- title(@post.title)
+- page_description(@post.summary)
 %article.post
   %section.content
     %h2= @post.title

data/app/views/layouts/exposition/application.html.haml CHANGED Viewed

@@ -1,10 +1,17 @@
 <!doctype html>
 %html
   %head
-    %title= t('title')
+    %title= content_for(:title) || t('title')
+    %meta{"http-equiv" => "x-ua-compatible", content: "ie=edge"}
+    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0, maximum-scale=1.0"}
+    %meta{charset: "utf-8"}
+    %meta{name: "description", content: (content_for(:page_description) || t('page_description'))}
+    %meta{name: "robots", content: "index,follow,noodp"}
+    %meta{name: "generator", content: "Exposition"}
+    %meta{name: "subject", content: t('site_subject')}
+    %base{href: request.base_url}
     = stylesheet_link_tag "exposition/application"
     = csrf_meta_tags
-    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0, maximum-scale=1.0"}
   %body
     %header
       %nav

data/config/locales/en.yml CHANGED Viewed

@@ -1,5 +1,5 @@
 # Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
+# "Exposition" and are automatically loaded by Rails. If you want to use locales other
 # than English, add the necessary files in this directory.
 #
 # To use the locales, use `I18n.t`:
@@ -21,6 +21,8 @@
 en:
   title: 'Your Title'
+  page_description: 'My Blog'
+  site_subject: 'Interesting Stuff'
   owner: 'Your Name'
   date:
     formats:

data/lib/exposition/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Exposition
-  VERSION = "0.0.5.2-alpha"
+  VERSION = "0.0.5.4-alpha"
 end

data/spec/controllers/exposition/admin/posts_controller_spec.rb CHANGED Viewed

@@ -43,7 +43,7 @@ RSpec.describe Exposition::Admin::PostsController, type: :controller do
                                               body: 'Body',
                                               author_id: user.id)
-        post :create, post: valid_post_attributes
+        post :create, params: { post: valid_post_attributes }
         expect(assigns(:post)).to be_persisted
         expect(assigns(:post).title).to eq('Title')
@@ -59,7 +59,7 @@ RSpec.describe Exposition::Admin::PostsController, type: :controller do
         invalid_post_attributes = attributes_for(:post,
                                               title: '',
                                               body: 'Body')
-        post :create, post: invalid_post_attributes
+        post :create, params: { post: invalid_post_attributes }
         expect(assigns(:post)).to be_a_new(Exposition::Post)
         expect(assigns(:post).title).to eq('')
@@ -72,19 +72,24 @@ RSpec.describe Exposition::Admin::PostsController, type: :controller do
       author = create(:user)
       post_attributes = attributes_for(:post)
-      post :create, post: post_attributes
+      post :create, params: { post: post_attributes }
       expect(assigns(:authors)).to eq([author])
     end
-    it { finds_tags_for { post :create, post: attributes_for(:post) } }
+    it do
+      finds_tags_for do
+        post :create, params: { post: attributes_for(:post) }
+      end
+    end
   end
   describe "GET #edit" do
     it "finds the post" do
       blog_post = create(:post)
-      get :edit, id: blog_post
+      get :edit, params: { id: blog_post }
       expect(assigns(:post)).to eq(blog_post)
     end
@@ -93,19 +98,19 @@ RSpec.describe Exposition::Admin::PostsController, type: :controller do
       author = create(:user)
       post = create(:post, author: author)
-      get :edit, id: post
+      get :edit, params: { id: post }
       expect(assigns(:authors)).to eq([author])
     end
-    it { finds_tags_for { get :edit, id: create(:post) } }
+    it { finds_tags_for { get :edit, params: { id: create(:post) } } }
   end
   describe "GET #update" do
     it "finds the post" do
       blog_post = create(:post)
-      patch :update, id: blog_post, post: {title: 'hello'}
+      patch :update, params: { id: blog_post, post: {title: 'hello'} }
       expect(assigns(:post)).to eq(blog_post)
     end
@@ -114,7 +119,7 @@ RSpec.describe Exposition::Admin::PostsController, type: :controller do
       author = create(:user)
       post = create(:post, author: author)
-      patch :update, id: post, post: {title: 'hello'}
+      patch :update, params: { id: post, post: {title: 'hello'} }
       expect(assigns(:authors)).to eq([author])
     end
@@ -123,9 +128,9 @@ RSpec.describe Exposition::Admin::PostsController, type: :controller do
       user = create(:user)
       blog_post = create(:post)
-      patch :update, id: blog_post, post: {title: "hello!",
-                                           body: "1,2,3,4",
-                                           author_id: user.id}
+      patch :update, params: { id: blog_post, post: {title: "hello!",
+                                              body: "1,2,3,4",
+                                              author_id: user.id} }
       blog_post.reload
@@ -137,7 +142,7 @@ RSpec.describe Exposition::Admin::PostsController, type: :controller do
     it do
       finds_tags_for do
         blog_post = create(:post)
-        patch :update, id: blog_post, post: {title: 'hello'}
+        patch :update, params: { id: blog_post, post: {title: 'hello'} }
       end
     end
   end

data/spec/controllers/exposition/admin/sessions_controller_spec.rb CHANGED Viewed

@@ -14,12 +14,14 @@ RSpec.describe Exposition::Admin::SessionsController, type: :controller do
     it "finds the user by the session email" do
       user = create(:user, email: 'user@user.com', password: 'password')
-      post :create, session: {email: user.email, password: user.password}
+      post :create, params: {
+        session: {email: user.email, password: user.password}
+      }
       expect(response).to redirect_to(admin_posts_path)
     end
     it "generates an error message with incorrect login credentials" do
-      post :create, session: {email: '', password: ''}
+      post :create, params: {session: {email: '', password: ''}}
       expect(flash[:error]).to be_present
@@ -39,8 +41,8 @@ RSpec.describe Exposition::Admin::SessionsController, type: :controller do
       delete :destroy
       expect(session['user_id']).to be_nil
-      expect(cookies['user_id']).to be_nil
-      expect(cookies['remember_token']).to be_nil
+      expect(response.cookies['user_id']).to be_nil
+      expect(response.cookies['remember_token']).to be_nil
     end
   end
 end

data/spec/controllers/exposition/admin/tags_controller_spec.rb CHANGED Viewed

@@ -31,7 +31,7 @@ RSpec.describe Exposition::Admin::TagsController, type: :controller do
         user = create(:user)
         valid_tag_attributes = attributes_for(:tag, label: 'Label')
-        post :create, tag: valid_tag_attributes
+        post :create, params: { tag: valid_tag_attributes }
         expect(assigns(:tag)).to be_persisted
         expect(assigns(:tag).label).to eq('Label')
@@ -43,7 +43,7 @@ RSpec.describe Exposition::Admin::TagsController, type: :controller do
     context "with invalid attributes" do
       it "re-renders the new action" do
         invalid_tag_attributes = attributes_for(:tag, label: '')
-        post :create, tag: invalid_tag_attributes
+        post :create, params: { tag: invalid_tag_attributes }
         expect(assigns(:tag)).to be_a_new(Categorical::Tag)
         expect(assigns(:tag).label).to eq('')
@@ -56,7 +56,7 @@ RSpec.describe Exposition::Admin::TagsController, type: :controller do
     it "finds the tag" do
       tag = create(:tag)
-      get :edit, id: tag
+      get :edit, params: { id: tag }
       expect(assigns(:tag)).to eq(tag)
     end
@@ -66,7 +66,7 @@ RSpec.describe Exposition::Admin::TagsController, type: :controller do
     it "finds the tag" do
       tag = create(:tag)
-      patch :update, id: tag, tag: {label: 'new label'}
+      patch :update, params: { id: tag, tag: {label: 'new label'} }
       expect(assigns(:tag)).to eq(tag)
     end
@@ -75,7 +75,7 @@ RSpec.describe Exposition::Admin::TagsController, type: :controller do
       it "updates the tags attributes when given" do
         tag = create(:tag, label: 'old label')
-        patch :update, id: tag, tag: {label: "new label"}
+        patch :update, params: { id: tag, tag: {label: "new label"} }
         tag.reload
         expect(tag.label).to eq("new label")
@@ -86,7 +86,7 @@ RSpec.describe Exposition::Admin::TagsController, type: :controller do
       it "renders the edit page" do
         tag = create(:tag, label: 'old label')
-        patch :update, id: tag, tag: {label: ""}
+        patch :update, params: { id: tag, tag: {label: ""} }
         expect(response).to render_template(:edit)
       end
@@ -97,7 +97,7 @@ RSpec.describe Exposition::Admin::TagsController, type: :controller do
     it "deletes the specified tag" do
       tag = create(:tag)
-      delete :destroy, id: tag
+      delete :destroy, params: { id: tag }
       expect(response).to redirect_to(admin_tags_path)
       expect(Categorical::Tag.all).to eq([])

data/spec/controllers/exposition/posts_controller_spec.rb CHANGED Viewed

@@ -28,7 +28,7 @@ RSpec.describe Exposition::PostsController, type: :controller do
     it "finds the published post based off the given id" do
       blog_post = create(:post, published: true)
-      get :show, id: blog_post
+      get :show, params: { id: blog_post }
       expect(assigns(:post)).to eq(blog_post)
     end
@@ -36,7 +36,7 @@ RSpec.describe Exposition::PostsController, type: :controller do
     it "cannot find an unpublished post" do
       blog_post = create(:post, published: false)
-      expect { get :show, id: blog_post }.
+      expect { get :show, params: { id: blog_post } }.
         to raise_error(ActiveRecord::RecordNotFound)
     end
   end

data/spec/controllers/exposition/tags_controller_spec.rb CHANGED Viewed

@@ -7,7 +7,7 @@ RSpec.describe Exposition::TagsController, type: :controller do
     it "finds the given tag" do
       tag = create(:tag)
-      get :show, id: tag
+      get :show, params: { id: tag }
       expect(assigns(:tag)).to eq(tag)
     end
@@ -23,7 +23,7 @@ RSpec.describe Exposition::TagsController, type: :controller do
       tagged_newer_post.published_at = Date.today
       tagged_older_post.save!
       tagged_newer_post.save!
-      get :show, id: tag
+      get :show, params: { id: tag }
       expect(assigns(:taggables)).to eq([tagged_newer_post, tagged_older_post])
     end
@@ -32,7 +32,7 @@ RSpec.describe Exposition::TagsController, type: :controller do
       tag = create(:tag)
       posts = FactoryGirl.create_list(:post, 11, published: true, tags: [tag])
-      get :show, id: tag
+      get :show, params: { id: tag }
       expect(assigns(:taggables).count).to eq(10)
     end

data/spec/dummy/Gemfile CHANGED Viewed

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem 'rails', '4.2.5'
+gem 'rails', '~> 5.0.0'
 gem 'exposition', path: "../.."
 gem 'pg'

data/spec/dummy/Gemfile.lock CHANGED Viewed

@@ -1,19 +1,18 @@
 PATH
-  remote: /Users/jklina/Development/exposition
+  remote: ../..
   specs:
-    exposition (0.0.5.pre.alpha)
+    exposition (0.0.5.3.pre.alpha)
       bcrypt (~> 3.1)
       bitters
       bourbon (~> 4.2)
-      categorical
+      categorical (~> 0.0.6.rc)
       haml-rails (~> 0.9)
-      high_voltage (~> 2.3.0)
-      human_urls
+      human_urls (~> 0.1.4.pre.alpha.0)
       jquery-rails (~> 4.1)
-      kaminari (~> 0.16)
+      kaminari
       neat (~> 1.7.2)
       pg
-      rails (~> 4.2.5)
+      rails (~> 5.0.0)
       redcarpet (~> 3.0)
       rouge (~> 1.8.0)
       uglifier
@@ -21,56 +20,58 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5)
-      actionview (= 4.2.5)
-      activesupport (= 4.2.5)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5)
-      activesupport (= 4.2.5)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5)
-      activesupport (= 4.2.5)
-      globalid (>= 0.3.0)
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
-      builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
-      arel (~> 6.0)
-    activesupport (4.2.5)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
+    arel (7.0.0)
     bcrypt (3.1.11)
     bitters (1.2.0)
       bourbon (>= 4.2)
       sass (>= 3.4)
       thor
-    bourbon (4.2.6)
+    bourbon (4.2.7)
       sass (~> 3.4)
       thor (~> 0.19)
     builder (3.2.2)
-    categorical (0.0.4)
-      rails (>= 4.1)
-    concurrent-ruby (1.0.0)
+    categorical (0.0.6.rc)
+      rails (~> 5.0.0)
+    concurrent-ruby (1.0.2)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     haml (4.0.7)
@@ -81,85 +82,90 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    high_voltage (2.3.0)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
-    human_urls (0.1.2)
-      rails (>= 4.1)
+    human_urls (0.1.4.pre.alpha.0)
+      rails (>= 5.0)
     i18n (0.7.0)
-    jquery-rails (4.1.0)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.99)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     neat (1.7.4)
       bourbon (>= 4.0)
       sass (>= 3.3)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     pg (0.18.4)
-    rack (1.6.4)
+    pkg-config (1.1.7)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5)
-      actionmailer (= 4.2.5)
-      actionpack (= 4.2.5)
-      actionview (= 4.2.5)
-      activejob (= 4.2.5)
-      activemodel (= 4.2.5)
-      activerecord (= 4.2.5)
-      activesupport (= 4.2.5)
+    rails (5.0.0)
+      actioncable (= 5.0.0)
+      actionmailer (= 5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      activemodel (= 5.0.0)
+      activerecord (= 5.0.0)
+      activesupport (= 5.0.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5)
-      actionpack (= 4.2.5)
-      activesupport (= 4.2.5)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.2.2)
     redcarpet (3.3.4)
     rouge (1.8.0)
-    ruby_parser (3.8.1)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    sass (3.4.21)
+    sass (3.4.22)
     sexp_processor (4.7.0)
-    sprockets (3.5.2)
+    sprockets (3.6.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.1)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 PLATFORMS
   ruby
@@ -167,7 +173,7 @@ PLATFORMS
 DEPENDENCIES
   exposition!
   pg
-  rails (= 4.2.5)
+  rails (~> 5.0.0)
 BUNDLED WITH
    1.11.2