th_simple_blog 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjE4ZDM5YzgwOTQ2NGE2NDE2ZWQ1MjllMzQ4MzU2MDEzNmVmZGViMw==
+    ZmRkYWYzMTM1OGM4NDQyNTNkZjJkZTE3MGMwMDEwZjAzYjkxYzM1Yg==
   data.tar.gz: !binary |-
-    MDE1ODRkYzYzYzQ2NDdhOTU1ZDY4ZmY2MmZmMTE4OTNlOTU2NTFkYQ==
+    M2U5NWJmMTc2ZjBkNjE4M2E0MjIwNmYyMjAzNTY2NjZiNDVlNGU2Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGUxNjYxMDVlM2Q4ZDhkMGIyYmRkMTIzY2VkZmM5ODljYjA5YTg1MmY3NmFh
-    ZDQ2NmQ0ZmVjYjY2NzE0NTYwYmVlMTRmMTgyMmNmYmU0M2EwMzJlYzNhZGNl
-    NDhhNzUxNTk1MmNmMmFhZmJiMDBlMjA5M2EwMTU0NWFmMGUyMDg=
+    ODUzNjQyZDk3NWVlMTI4NTM5Njc3ZmI2YjEzZTZiYjA4NDdkZGEwZmMwZTE2
+    OTg3ZDgyMzA3ZWMxYzliMDg5MDBjNmU3M2YyZmQwOTFkOWJhZGRjM2NiODUz
+    NDZlNzRhNTYzYzFhODg5Y2RlYzU5ZTc4YjliZDU1ODZmYzUxYTU=
   data.tar.gz: !binary |-
-    NzBjNTY5NjFmMWM2MmM0OWUwNTgyNjFiZGJkMDMyYWFjZTg4NDBmYWMxNGFk
-    ZGZkNzdjM2U2OTg0ZmMwZmY0ZWEwYTc5NmRiZDk5ZGYyMjRiMjg2ZmYxMjEz
-    NDlmODgzZmY1YWM4MzYyY2M2ZWRiOWE4ZGU3NWVhYzRlNDVjYzA=
+    NjAwZjVkNDhlYjcyZTZhMzcxYWIxM2Q1MWVmNTZkYTk4NDdkMzg4Yjg5YjAy
+    ZDk0OGM2MDkxNjU1OTM2MDZlYTA5ZGJkNDAyNGE3NjFiNjZmNjgyZDc1YTEz
+    ZmVjOGQzODM1NjZlYzMwODU3YTNlNDVkNTY3MzRmMjhkNzcyNDk=

data/app/assets/javascripts/simple_blog/index.js

@@ -0,0 +1,8 @@
+//= require jquery
+//= require jquery_ujs
+//
+//= require bootstrap
+//= require bootstrap-lightbox
+//
+//= require ./simple_posts
+//= require_self

data/app/assets/javascripts/simple_blog/simple_posts.js

@@ -0,0 +1,15 @@
+$(function() {
+	if(!$("#simple_blog_simple_posts_edit, #simple_blog_simple_posts_new").length)
+		return;
+
+	$("#simple_blog_simple_post_tags_list").each(function() {
+		$(this).tagsManager({
+			prefilled: $(this).val().split(/,/g),
+			preventSubmitOnEnter: true,
+			typeahead: true,
+			typeaheadSource: $(this).data("tags"),
+			hiddenTagListName: $(this).prop("name")
+		});
+		$(this).prop("name", "").val("");
+	});
+})

data/app/assets/stylesheets/simple_blog/index.css.scss

@@ -0,0 +1,2 @@
+@import "simple_posts";
+@import "bootstrap-lightbox";

data/app/assets/stylesheets/simple_blog/simple_posts.css.scss

@@ -0,0 +1,5 @@
+#simple_blog_simple_posts_show {
+	.thumbnail {
+		margin: 0 20px 20px 0;
+	}
+}

data/app/controllers/simple_blog/simple_posts_controller.rb

@@ -2,8 +2,8 @@ class SimpleBlog::SimplePostsController < InheritedResources::Base
 	defaults :resource_class => SimpleBlog::SimplePost
 	include SimpleAdminPanel::ControllerExtensions
 	alias_method_chain :collection, :search_and_pagination
+	before_filter :ensure_defaults, only: :new
 	before_filter :ensure_user, only: [:new, :create]
-	before_filter :ensure_published_at, only: [:new]
 
 	protected
 	def end_of_association_chain
@@ -12,10 +12,15 @@ class SimpleBlog::SimplePostsController < InheritedResources::Base
 
 	private
 	def ensure_user
-		build_resource.user ||= current_user
+		build_resource.tap do |post|
+			post.user ||= current_user
+		end
 	end
 
-	def ensure_published_at
-		build_resource.published_at ||= (Time.current + 1.hour).beginning_of_hour
+	def ensure_defaults
+		build_resource.tap do |post|
+			post.author_name ||= current_user.name
+			post.published_at ||= (Time.current + 1.hour).beginning_of_hour
+		end	
 	end
 end

data/app/models/simple_blog/simple_post.rb

@@ -1,10 +1,32 @@
 class SimpleBlog::SimplePost < ActiveRecord::Base
+	include SimpleContentManagement::ContentText
+
+	mount_uploader :thumbnail, SimpleBlog::SimplePostThumbnailUploader
+
 	belongs_to :user
+	has_and_belongs_to_many :tags, class_name: "SimpleBlog::SimplePostTag"
 
 	scope :active, where(deleted: false)
-	scope :published, ->{ where("published_at IS NOT NULL AND published_at < ?", DateTime.current) }
+	scope :published, ->{ where("published_at IS NOT NULL AND published_at < ? AND (expires_at IS NULL OR expires_at > ?)", DateTime.current, DateTime.current) }
+
+	attr_accessible :title, :content_html, :published_at, :expires_at, :tags_list, :author_name, :thumbnail, :thumbnail_cache
+
+	def to_param
+		"#{id}-#{title.parameterize}"
+	end
+
+	def tags_list
+		tags.pluck("name").join ","
+	end
 
-	attr_accessible :title, :content_html, :published_at
+	def tags_list= tags_list
+		tag_names = tags_list.split %r{\s*,\s*}
+		existing_tags = SimpleBlog::SimplePostTag.where(name: tag_names).all
+		existing_tag_names = existing_tags.map &:name
+		self.tags = (existing_tags + tag_names.map{ |tag_name|
+			SimpleBlog::SimplePostTag.create(name: tag_name) unless existing_tag_names.include? tag_name
+		}.compact)
+	end
 
 	def destroy
 		update_attribute :deleted, true

data/app/models/simple_blog/simple_post_tag.rb

@@ -0,0 +1,11 @@
+class SimpleBlog::SimplePostTag < ActiveRecord::Base
+	attr_accessible :name
+
+	has_and_belongs_to_many :posts, class_name: "SimpleBlog::SimplePost"
+
+	validates_presence_of :name
+
+	def to_param
+		"#{id}-#{name.parameterize}"
+	end
+end

data/app/views/simple_blog/simple_posts/_form.html.erb

@@ -1,11 +1,26 @@
 <%= simple_form_for [:admin, @simple_post], url: @simple_post.new_record? ? simple_blog_simple_posts_path : simple_blog_simple_post_path(@simple_post) do |f| %>
 	<%= f.input :title, input_html: { class: "input-xlarge" } %>
+	<%= f.input :tags_list, input_html: { data: { tags: SimpleBlog::SimplePostTag.pluck("name") } } %>
+	<%= f.input :author_name %>
+
+	<%= f.input :thumbnail do %>
+		<%= image_tag(@simple_post.thumbnail_url :thumb) if @simple_post.thumbnail? %>
+		<%= f.input_field :thumbnail %>
+		<%= f.hidden_field :thumbnail_cache %>
+	<% end %>
+
 	<%= f.input :content_html, input_html: { cols: 120, rows: 7, class: "input-xxlarge redactor" } %>
+
 	<%= f.input :published_at, wrapper: :append, hint: "Laat leeg om de post niet te publiceren." do %>
 		<%= f.input_field :published_at, as: :string, value: (resource.published_at ? l(resource.published_at, format: "%Y-%m-%d %H:%M") : ""), placeholder: "YYYY-MM-DD HH:MM", class: "input-medium" %>
 		<span class="add-on"><%= l(resource.published_at.presence || Time.current, format: "%Z") %></span>
 	<% end %>
 
+	<%= f.input :expires_at, wrapper: :append, hint: "Laat leeg om de post niet automatisch te verwijderen." do %>
+		<%= f.input_field :expires_at, as: :string, value: (resource.expires_at ? l(resource.expires_at, format: "%Y-%m-%d %H:%M") : ""), placeholder: "YYYY-MM-DD HH:MM", class: "input-medium" %>
+		<span class="add-on"><%= l(resource.published_at.presence || Time.current, format: "%Z") %></span>
+	<% end %>
+
 	<div class="form-actions">
 		<%= f.button :submit %>
 	</div>

data/app/views/simple_blog/simple_posts/index.html.erb

@@ -1,8 +1,10 @@
 <%= table_list_for @simple_posts, sortable: false, resource_class: SimpleBlog::SimplePost do |t| %>
 	<%= t.item :title, as: :link %>
 	<%= t.item :user, :name %>
+	<%= t.item :author_name %>
 	<%= t.item :created_at, as: :short_datetime %>
 	<%= t.item :published_at, as: :short_datetime %>
+	<%= t.item :expires_at, as: :short_datetime %>
 	<%= t.item :updated_at, as: :short_datetime %>
 	<%= t.item as: :actions %>
 <% end %>

data/app/views/simple_blog/simple_posts/show.html.erb

@@ -1 +1,13 @@
+<% @simple_post.tags.each do |tag| %>
+	<%= content_tag :span, tag.name, class: "label" %>
+<% end %>
+
+<div id="simple-post-thumbnail-lightbox" class="lightbox hide fade"  tabindex="-1" role="dialog" aria-hidden="true">
+	<%= link_to image_tag("simple_blog/button_lightbox_close.png"), "#simple-post-thumbnail-lightbox", class: "close", data: { toggle: "lightbox" } %>
+	<div class="lightbox-content">
+		<%= image_tag @simple_post.thumbnail_url(:content) %>
+	</div>
+</div>
+
+<%= link_to image_tag(@simple_post.thumbnail_url(:thumb), class: "thumbnail pull-left"), "#simple-post-thumbnail-lightbox", data: { toggle: "lightbox" } if @simple_post.thumbnail? %>
 <%= @simple_post.content_html.html_safe %>

data/config/locales/simple_blog/nl/models/simple_post.yml

@@ -10,7 +10,11 @@ nl:
         title: Titel
         published_at: Publicatiedatum
         published_at_abbr: Publicatie
+        expires_at: Verloopdatum
+        expires_atr_abbr: Verloopt
         created_at: Aangemaakt
         updated_at: Laatst gewijzigd
         updated_at_abbr: Gewijzigd
-        user_name: Gebruiker
+        user_name: Gebruiker
+        tags_list: Tags
+        author_name: Auteur

data/lib/simple_blog/simple_post_thumbnail_uploader.rb

@@ -0,0 +1,25 @@
+class SimpleBlog::SimplePostThumbnailUploader < CarrierWave::Uploader::Base
+	include CarrierWave::MiniMagick
+	storage :file
+
+	# Override the directory where uploaded files will be stored.
+	# This is a sensible default for uploaders that are meant to be mounted:
+	def store_dir
+		"system/blog/post_thumbnails/#{model.id}"
+	end
+
+	# Create different versions of your uploaded files:
+	version :thumb do
+		process :resize_to_fill => [160, 160]
+	end
+
+	version :content do
+		process :resize_to_limit => [800, 800]
+	end
+
+	# Add a white list of extensions which are allowed to be uploaded.
+	# For images you might use something like this:
+	def extension_white_list
+		%w(png gif jpg jpeg)
+	end
+end

data/lib/simple_blog/version.rb

@@ -1,3 +1,3 @@
 module SimpleBlog
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/simple_blog.rb

@@ -1,4 +1,5 @@
 require "simple_blog/engine"
+require "simple_blog/simple_post_thumbnail_uploader"
 
 module SimpleBlog
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: th_simple_blog
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - toby hinloopen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.12
 - !ruby/object:Gem::Dependency
-  name: activerecord-jdbcsqlite3-adapter
+  name: th_simple_content_management
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,11 +45,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/simple_blog/application.js
-- app/assets/stylesheets/simple_blog/application.css
+- app/assets/images/simple_blog/button_lightbox_close.png
+- app/assets/javascripts/simple_blog/index.js
+- app/assets/javascripts/simple_blog/simple_posts.js
+- app/assets/stylesheets/simple_blog/index.css.scss
+- app/assets/stylesheets/simple_blog/simple_posts.css.scss
 - app/controllers/simple_blog/simple_posts_controller.rb
 - app/helpers/simple_blog/application_helper.rb
 - app/models/simple_blog/simple_post.rb
+- app/models/simple_blog/simple_post_tag.rb
 - app/views/simple_blog/simple_posts/_form.html.erb
 - app/views/simple_blog/simple_posts/edit.html.erb
 - app/views/simple_blog/simple_posts/index.html.erb
@@ -58,6 +62,7 @@ files:
 - config/locales/simple_blog/nl/models/simple_post.yml
 - config/routes.rb
 - lib/simple_blog/engine.rb
+- lib/simple_blog/simple_post_thumbnail_uploader.rb
 - lib/simple_blog/version.rb
 - lib/simple_blog.rb
 - lib/tasks/simple_blog_tasks.rake

data/app/assets/javascripts/simple_blog/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/app/assets/stylesheets/simple_blog/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */