blogr 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6766a41c0808b6e0c5048532b71a26f0cf34287c
-  data.tar.gz: 23ad4eb30ceafa815044bd133022a7820ca6868a
+  metadata.gz: 4cebbeb3d6b2496a02d4e9d689ee0bb26482d254
+  data.tar.gz: 459d80a7d69f452588f4c1d1947f0344b064cc6a
 SHA512:
-  metadata.gz: 1e77f031c30ad50a6ca3abab32bef48a2ae1f3b3f73ede327e3720bc31d808b531ec3ebedac3c9f54ee4f58d8045933e583b51cbbe0874abb943c7938417198a
-  data.tar.gz: 61ebad774dd5d193b34ab6093859c5ffc8330064030c8d40defa84b22d110d7d1036810d3d454872214fc6d42ce85a540ad29425e1c22a5f9fc2d3e7419ef9f8
+  metadata.gz: 946630ffcd403d4b2b5a4f326afcfbce95eb1d5ceead5abaf51725289ad4c051f1778f30d0d666a81d024f57efcc77607d790910dc570504d7dd984dab77e82c
+  data.tar.gz: 559b747dcb337537e3a631d73afbf7935408769c1dc4ffaf9cc944e7d2bde7bc8fd96617b5a1fd51f983d944e9f5ae47e28cd907dc4e9764f9362f59d39f332c

data/README.md

@@ -10,6 +10,8 @@ Some code from [pixelbits/simpleblog](https://github.com/pixelbits/simpleblog).
 
 Blogr is a framework for your blog with an admin. You are required to create the blog frontend.
 
+For a working & in production preview, see [Rails Tuts](http://railstuts.net). The source of the site is on [GitHub](https://github.com/railstuts/site).
+
 ![](http://s.vou.pe/GUpWX.png)
 
 ## To install

data/app/assets/stylesheets/blogr/app.sass

@@ -14,13 +14,13 @@ body
 			float: left
 			margin-right: 10px
 	&.comments span.icon
-		background-image: image-url("icons/black/speech-bubble-left-4.svg")
+		background-image: image-url("blogr/icons/black/speech-bubble-left-4.svg")
 	&.posts span.icon
-		background-image: image-url("icons/black/paper-ripped.svg")
+		background-image: image-url("blogr/icons/black/paper-ripped.svg")
 	&.users span.icon
-		background-image: image-url("icons/black/users.svg")
+		background-image: image-url("blogr/icons/black/users.svg")
 	&.tags span.icon
-		background-image: image-url("icons/black/tag.svg")
+		background-image: image-url("blogr/icons/black/tag.svg")
 
 section.sidebar
 	width: 300px
@@ -34,7 +34,7 @@ section.sidebar
 		height: 85px
 		border-bottom: 1px solid #939495
 		h1
-			background-image: image-url("logo.png")
+			background-image: image-url("blogr/logo.png")
 			background-repeat: no-repeat
 			background-size: 150px 75px
 			width: 150px

data/app/assets/stylesheets/blogr/application.css.scss

@@ -9,7 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require blogr/bootstrap.min
  *= require blogr/app
  *= require blogr/pygments
  *= require jquery.ui.datepicker

data/app/assets/stylesheets/blogr/login.sass

@@ -1,21 +1,12 @@
 body.blogr.login
+	background-color: #293541
+	color: #606468
 	font-size: 14px
-	-webkit-font-smoothing: antialiased
-	a
-		color: #000
-	.alert
-		width: 300px
-		display: block
-		margin: 0 auto
-		margin: -50px auto 20px auto
-		text-align: center
+	line-height: 1.5em
 
 	.login_container
+		margin: 50px auto
 		width: 350px
-		position: absolute
-		top: 50%
-		left: 50%
-		margin: -180px auto 0 -170px
 		.login
 			background: #fff
 			border-radius: 10px
@@ -26,12 +17,42 @@ body.blogr.login
 				width: 200px
 				display: block
 				margin: auto
-			.btn
-				margin-top: 15px
-			input#username
-				border-bottom-left-radius: 0
-				border-bottom-right-radius: 0
-				border-bottom: 0
-			input#password
-				border-top-left-radius: 0
-				border-top-right-radius: 0
+			form
+				input
+					height: 50px
+					border: none
+					font-size: 14px
+					line-height: 1.5em
+					-webkit-appearance: none
+					display: block
+					margin: auto
+
+
+				input#username
+					background-color: #FAFAFA
+					border-radius: 0px 3px 3px 0px
+					-moz-border-radius: 0px 3px 3px 0px
+					-webkit-border-radius: 0px 3px 3px 0px
+					margin-bottom: 1em
+					width: 300px
+
+				input#password
+					background-color: #FAFAFA
+					border-radius: 0px 3px 3px 0px
+					-moz-border-radius: 0px 3px 3px 0px
+					-webkit-border-radius: 0px 3px 3px 0px
+					margin-bottom: 1em
+					width: 300px
+
+				input[type="submit"]
+					border-radius: 3px
+					-moz-border-radius: 3px
+					-webkit-border-radius: 3px
+					background-color: #e57e31
+					color: #eee
+					font-weight: bold
+					margin-bottom: 2em
+					text-transform: uppercase
+					width: 300px
+					&:hover
+						background-color: #D16D21

data/app/controllers/blogr/posts_controller.rb

@@ -6,8 +6,14 @@ module Blogr
 		before_action :set_post, only: [:show, :edit, :update, :destroy]
 
 		def index
-			@posts = Post.order(published_at: :desc)
+			pub = params[:published] == "false" ? false : true
+			@posts = Post.order(published_at: :desc).where(published: pub)
 			@title = "Posts"
+			if pub
+				@subtitle = "Showing Published Posts"
+			else
+				@subtitle = "Showing Draft Posts"
+			end
 		end
 
 		def show
@@ -56,7 +62,7 @@ module Blogr
 		end
 
 		def post_params
-			params.require(:post).permit(:title, :category_id, :permalink, :content, :tag_list, :published, :published_at)
+			params.require(:post).permit(:title, :category_id, :permalink, :content, :tag_list, :post_image, :published, :published_at)
 		end
 
 	end

data/app/controllers/blogr/users_controller.rb

@@ -3,13 +3,18 @@ require_dependency "blogr/application_controller"
 module Blogr
   class UsersController < ApplicationController
 
-  	before_action :set_user, only: [:edit, :update, :destroy]
+  	before_action :set_user, only: [:edit, :show, :update, :destroy]
 
 		def index
 			@title = "Users"
 			@users = Blogr::User.all
 		end
 
+		def show
+			@title = @user.username
+			@posts = @user.posts
+		end
+
 		def new
 			@title = "New User"
 			@user = User.new

data/app/views/blogr/categories/index.json.jbuilder

@@ -0,0 +1 @@
+json.categories @categories, :id, :title, :description, :permalink, :created_at, :updated_at

data/app/views/blogr/categories/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @category, :id, :title, :description, :permalink, :created_at, :updated_at

data/app/views/blogr/comments/index.json.jbuilder

@@ -0,0 +1 @@
+json.comments @comments, :id, :post_id, :user_id, :content, :author_name, :author_email, :created_at, :updated_at

data/app/views/blogr/comments/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @comment, :id, :post_id, :user_id, :content, :author_name, :author_email, :created_at, :updated_at

data/app/views/blogr/posts/_form.html.haml

@@ -29,6 +29,10 @@
 		= f.label :tag_list
 		= f.text_field :tag_list, placeholder: "Tags - seperate by commas", class: "form-control"
 
+	.form-group
+		= f.label :post_image
+		= f.text_field :post_image, class: "form-control"
+
 	.row
 		.col-md-4
 			= f.label :published

data/app/views/blogr/posts/index.html.haml

@@ -1,4 +1,8 @@
 - content_for :links do
+	- if params[:published] == "false"
+		= link_to "Published Posts", posts_path, class: "btn btn-default"
+	- else
+		= link_to "Drafts", posts_path(published: false), class: "btn btn-default"
 	= link_to "New Post", new_post_path, class: "btn btn-default"
 
 %table.table.table-bordered.table-striped

data/app/views/blogr/posts/index.json.jbuilder

@@ -0,0 +1,2 @@
+posts = Blogr::Post.order(published_at: :desc).where(published: true)
+json.posts posts, :id, :title, :content, :permalink, :published_at, :created_at, :updated_at, :category_id, :user_id

data/app/views/blogr/posts/show.html.haml

@@ -1,4 +1,6 @@
 - content_for :links do
+	- if @post.published?
+		= link_to "View Post", [Blogr.config.host, @post.permalink].join("/"), class: "btn btn-default"
 	= link_to "Edit", edit_post_path, class: "btn btn-default"
 
 .markdown= @post.content_rendered

data/app/views/blogr/posts/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @posts, :id, :title, :content, :permalink, :published_at, :created_at, :updated_at

data/app/views/blogr/sessions/new.html.haml

@@ -1,8 +1,8 @@
 .login_container
-	= render "blogr/shared/messages"
 	.login
+		= render "blogr/shared/messages"
 		= image_tag "blogr/logo.png", class: "logo"
 		= form_tag sessions_path, class: "form-inline" do
-			= text_field_tag :username, params[:username], "autocorrect" => "off", "autocapitalize" => "off", placeholder: "Username", class: "form-control"
-			= password_field_tag :password, nil, placeholder: "Password", class: "form-control"
-			= button_tag "Log In", class: "btn btn-primary btn-block"
+			%p= text_field_tag :username, params[:username], "autocorrect" => "off", "autocapitalize" => "off", placeholder: "Username", class: "form-control"
+			%p= password_field_tag :password, nil, placeholder: "Password", class: "form-control"
+			%p= submit_tag "Sign In"

data/app/views/blogr/tags/index.json.jbuilder

@@ -0,0 +1 @@
+json.tags @tags, :id, :name, :permalink, :created_at, :updated_at

data/app/views/blogr/tags/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @tag, :id, :name, :permalink, :created_at, :updated_at

data/app/views/blogr/users/index.html.haml

@@ -10,6 +10,6 @@
 	%tbody
 		- @users.each do |user|
 			= content_tag_for(:tr, user) do
-				%td= link_to user.name, edit_user_path(user)
+				%td= link_to user.name, user_path(user)
 				%td= user.username
 				%td= user.email

data/app/views/blogr/users/index.json.jbuilder

@@ -0,0 +1 @@
+json.users @users, :id, :first_name, :last_name, :username, :email, :created_at, :updated_at

data/app/views/blogr/users/show.html.haml

@@ -0,0 +1,29 @@
+- content_for :links do
+	= link_to "Edit User", edit_user_path, class: "btn btn-default"
+
+%h4 Report Card
+%ul
+	%li
+		%b Name:
+		= @user.name
+	%li
+		%b Email:
+		= @user.email
+	%li
+		%b Joined:
+		= @user.created_at.strftime("%d %B %Y")
+%hr
+%h4
+	= "#{@user.first_name}'s Posts"
+%table.table.table-bordered.table-striped
+	%thead
+		%tr
+			%th Title
+			%th Date
+			%th Published?
+	%tbody
+		- @posts.each do |post|
+			= content_tag_for(:tr, post) do
+				%td= link_to post.title, post
+				%td= post.date_parsed
+				%td= post.published

data/app/views/blogr/users/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @user, :id, :first_name, :last_name, :username, :email, :created_at, :updated_at

data/app/views/layouts/blogr/application.html.haml

@@ -3,7 +3,8 @@
 	%head
 		%meta{charset: "utf-8"}/
 		%meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
-		%title #{@title} - Blogr
+		%title #{@title} - #{Blogr.config.name}
+		= stylesheet_link_tag    "//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css"
 		= stylesheet_link_tag    "blogr/application"
 		= javascript_include_tag "blogr/application"
 		= csrf_meta_tags
@@ -12,7 +13,7 @@
 
 		%section.sidebar
 			.logo
-				%h1= link_to "Blogr", root_url
+				%h1= link_to "#{Blogr.config.name} ", root_url
 				.version= link_to "v#{Blogr::VERSION}", "https://github.com/blogr/engine"
 			.user
 				= gravatar(current_blogr_user.email, {size: 50, class: "avatar"})
@@ -41,7 +42,7 @@
 
 			%footer
 				%p.pull-right Powered by #{link_to "Blogr", "https://github.com/blogr/engine"} v#{Blogr::VERSION}
-				%p © Blogr #{Time.now.year}
+				%p © #{Blogr.config.name} #{Time.now.year}
 
 	- if Rails.env.development?
 		<script>document.write('<script src="http://' + (location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1"></' + 'script>')</script>

data/app/views/layouts/blogr/login.html.haml

@@ -3,7 +3,8 @@
 	%head
 		%meta{charset: "utf-8"}/
 		%meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
-		%title #{@title} - Blogr
+		%title Login - #{Blogr.config.name}
+		= stylesheet_link_tag    "//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css"
 		= stylesheet_link_tag    "blogr/application"
 		= javascript_include_tag "blogr/application"
 		= csrf_meta_tags

data/config/blogr.example.rb

@@ -1,5 +1,5 @@
 Blogr.config.tap do |config|
 
-	config.host = "http://blogr.dev/"
-	
+	config.host = "http://blogr.dev"
+	config.name = "Blogr"
 end

data/config/routes.rb

@@ -3,7 +3,7 @@ Blogr::Engine.routes.draw do
   resources :posts
   resources :categories
   resources :tags
-  resources :users, except: [:show]
+  resources :users
   resources :comments
 
   get "login" => "sessions#new"

data/db/migrate/20140305170329_add_post_image_to_blogr_posts.rb

@@ -0,0 +1,5 @@
+class AddPostImageToBlogrPosts < ActiveRecord::Migration
+  def change
+    add_column :blogr_posts, :post_image, :string
+  end
+end

data/lib/blogr/version.rb

@@ -1,3 +1,3 @@
 module Blogr
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blogr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dean Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,42 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.7
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +276,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails engine for adding blogging to any Rails 4 application
 email:
 - dean@voupe.com
@@ -972,11 +1000,6 @@ files:
 - app/assets/javascripts/blogr/tags.js
 - app/assets/stylesheets/blogr/app.sass
 - app/assets/stylesheets/blogr/application.css.scss
-- app/assets/stylesheets/blogr/bootstrap.min.css
-- app/assets/stylesheets/blogr/fonts/glyphicons-halflings-regular.eot
-- app/assets/stylesheets/blogr/fonts/glyphicons-halflings-regular.svg
-- app/assets/stylesheets/blogr/fonts/glyphicons-halflings-regular.ttf
-- app/assets/stylesheets/blogr/fonts/glyphicons-halflings-regular.woff
 - app/assets/stylesheets/blogr/login.sass
 - app/assets/stylesheets/blogr/pygments.css.erb
 - app/assets/stylesheets/blogr/sessions.css
@@ -1004,30 +1027,41 @@ files:
 - app/views/blogr/categories/_form.html.haml
 - app/views/blogr/categories/edit.html.haml
 - app/views/blogr/categories/index.html.haml
+- app/views/blogr/categories/index.json.jbuilder
 - app/views/blogr/categories/new.html.haml
 - app/views/blogr/categories/show.html.haml
+- app/views/blogr/categories/show.json.jbuilder
 - app/views/blogr/comments/_form.html.haml
 - app/views/blogr/comments/edit.html.haml
 - app/views/blogr/comments/index.html.haml
+- app/views/blogr/comments/index.json.jbuilder
 - app/views/blogr/comments/new.html.haml
 - app/views/blogr/comments/show.html.haml
+- app/views/blogr/comments/show.json.jbuilder
 - app/views/blogr/dashboard/index.html.haml
 - app/views/blogr/posts/_form.html.haml
 - app/views/blogr/posts/edit.html.haml
 - app/views/blogr/posts/index.html.haml
+- app/views/blogr/posts/index.json.jbuilder
 - app/views/blogr/posts/new.html.haml
 - app/views/blogr/posts/show.html.haml
+- app/views/blogr/posts/show.json.jbuilder
 - app/views/blogr/sessions/new.html.haml
 - app/views/blogr/shared/_messages.html.haml
 - app/views/blogr/tags/_form.html.haml
 - app/views/blogr/tags/edit.html.haml
 - app/views/blogr/tags/index.html.haml
+- app/views/blogr/tags/index.json.jbuilder
 - app/views/blogr/tags/new.html.haml
 - app/views/blogr/tags/show.html.haml
+- app/views/blogr/tags/show.json.jbuilder
 - app/views/blogr/users/_form.html.haml
 - app/views/blogr/users/edit.html.haml
 - app/views/blogr/users/index.html.haml
+- app/views/blogr/users/index.json.jbuilder
 - app/views/blogr/users/new.html.haml
+- app/views/blogr/users/show.html.haml
+- app/views/blogr/users/show.json.jbuilder
 - app/views/layouts/blogr/application.html.haml
 - app/views/layouts/blogr/login.html.haml
 - config/blogr.example.rb
@@ -1042,6 +1076,7 @@ files:
 - db/migrate/20131120191219_create_blogr_users.rb
 - db/migrate/20131204185931_create_blogr_comments.rb
 - db/migrate/20131207215104_add_user_id_to_blogr_posts.rb
+- db/migrate/20140305170329_add_post_image_to_blogr_posts.rb
 - db/seeds.rb
 - lib/blogr/configuration.rb
 - lib/blogr/engine.rb
@@ -1101,7 +1136,8 @@ files:
 - spec/models/blogr/user_spec.rb
 - spec/spec_helper.rb
 homepage: http://blogrhq.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []