blog_basic 0.1.13 → 0.1.14

data/app/controllers/blog_basic/app_controller.rb

@@ -8,7 +8,7 @@ module BlogBasic
     end
 
     def signed_in?
-      logger.debug "(controller) Logged in: " + session[:user_id] + " == " +  BlogBasic::BlogConf.data['identity']
+      logger.debug "(controller) Logged in: " + session[:user_id].to_s + " == " +  BlogBasic::BlogConf.data['identity'].to_s
       session[:user_id] == BlogBasic::BlogConf.data['identity']
     end
 

data/app/controllers/blog_basic/blog_posts_controller.rb

@@ -3,7 +3,6 @@ module BlogBasic
     unloadable
 
     helper :all #blog, shared
-    #include BlogBasic::Helpers
 
     layout :choose_layout
 
@@ -34,6 +33,7 @@ module BlogBasic
     end
 
     def show
+      logger.debug "(Show)ing blog post id: " + params[:id].to_s
       @blog_post = BlogPost.find(params[:id])
 
       unless @blog_post.published == 1
@@ -63,7 +63,9 @@ module BlogBasic
 
     def create
       @blog_post = BlogPost.new(params[:blog_post])
-      @blog_post.user_id = current_user.id
+
+      logger.debug "blog_post controller (create) - FIXME"
+      @blog_post.user_id = 1 #current_user.id
       logger.debug "value: #{params[:blog_post][:published]}"
       @blog_post.published_at = Time.now if params[:blog_post][:published].to_i > 0 && @blog_post.published_at.nil?
 
@@ -124,7 +126,7 @@ module BlogBasic
     end
 
     def require_admin
-      if !current_user || !current_user.admin?
+      if !signed_in?
         flash[:notice] = 'You must be an admin to view this page'
         redirect_to blog_posts_path
         return false

data/app/helpers/blog_basic/application_helper.rb

@@ -1,7 +1,7 @@
 module BlogBasic
   module ApplicationHelper
     def signed_in?
-      logger.debug "(helper) Logged in: " + session[:user_id] + " == " +  BlogBasic::BlogConf.data['identity']
+      logger.debug "(helper) Logged in: " + session[:user_id].to_s + " == " +  BlogBasic::BlogConf.data['identity'].to_s
       session[:user_id] == BlogBasic::BlogConf.data['identity']
     end
 

data/app/models/blog_basic/blog_comment.rb

@@ -12,6 +12,32 @@ module BlogBasic
 
     before_save :check_for_spam
 
+    def user_image_tag
+      if self.user && self.user.respond_to?(:blog_image_url) && self.user.blog_image_url
+        # Load image from model
+        ret = "<img src=\"#{self.user.blog_image_url}\" />"
+      elsif BlogConf.data['gravatar']
+        # Gravatar
+        require 'digest/md5'
+        if self.respond_to?(:email) && !self.email.blank?
+          email = self.email
+        elsif self.user && self.user.respond_to?(:email) && !self.user.email.blank?
+          email = self.user.email
+        else
+          return ''
+        end
+
+        hash = Digest::MD5.hexdigest(email.downcase)
+        ret = "<img src=\"http://www.gravatar.com/avatar/#{hash}.jpg\" />"
+      else
+        # No Image
+        return ''
+      end
+
+      return ret.html_safe if ret.respond_to?(:html_safe)
+      return ret
+    end
+
     def validate
       if !self.user
         self.errors.add(:name, 'is required') if self.name.blank?

data/app/models/blog_basic/blog_post.rb

@@ -1,15 +1,12 @@
 module BlogBasic
   class BlogPost < ActiveRecord::Base
 
-    #include BlogBasic::BlogBasicModelHelper
     include ActionView::Helpers::TextHelper
 
     unloadable
 
     attr_accessible :title, :body, :tag_list, :published
 
-    #belongs_to :user
-
     has_many :blog_comments, :dependent => :destroy
     has_many :blog_images, :dependent => :destroy
     has_many :blog_contents
@@ -79,9 +76,9 @@ module BlogBasic
       end
     end
 
-    #def show_user?
-    #  (!BlogConf.data['show_user_who_published'] || BlogConf.data['show_user_who_published'] == true) && self.user
-    #end
+    def show_user?
+      (!BlogConf.data['show_user_who_published'] || BlogConf.data['show_user_who_published'] == true)
+    end
 
 
     def user_name(skip_link=false)

data/app/views/blog_basic/blog_comments/_new_blog_comment.html.erb

@@ -3,9 +3,6 @@
 	<% if !current_user && (!BlogBasic::BlogConf.data['anonymous_comments'] || BlogBasic::BlogConf.data['anonymous_comments'] == false) %>
 		<p>You must be logged in to post a comment.</p>
 	<% else %>
-		<% if current_user %>
-			<p>Posting as <span class="blogPoster"><%=h current_user.name %></span></p>
-		<% end %>
 		<% form_for([@blog_post, blog_comment]) do |f| %>
 			<% if blog_comment.errors.size > 0 %>
 				<div id="errorExplanation">

data/app/views/blog_basic/blog_posts/_admin_links.html.erb

@@ -5,5 +5,6 @@
 			<li><%= link_to 'Edit Drafts', drafts_blog_posts_path %></li>
 			<li><%= link_to 'All Posts', blog_posts_path %></li>
 		</ul>
+        Signed in as: <b><%= current_user %></b>
 	</div>
 <% end %>

data/blog_basic.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["bottiger@gmail.com"]
   s.homepage    = "http://bottiger.org/made/blog_basic"
   s.summary     = "Provides a basic blogging platform"
-  s.description = "Simply generates lorem ipsum text."
+  s.description = "blog_basic is a gem which allows you to set up a generic blog which rdoesnøt require any work in order t ointegrate with your website."
 
 
   s.add_dependency("bluecloth", "~> 2.2.0")  
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency("coderay")
   s.add_dependency("will_paginate", "~> 3.0.3")
 
-  s.add_development_dependency "rspec"
+  s.add_development_dependency("rspec-rails", "~> 2.0")
 
   s.rubyforge_project = "blog_basic"
 

data/lib/blog_basic/version.rb

@@ -1,3 +1,3 @@
 module BlogBasic
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blog_basic
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &3860640 !ruby/object:Gem::Requirement
+  requirement: &7405240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *3860640
+  version_requirements: *7405240
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &3871880 !ruby/object:Gem::Requirement
+  requirement: &7402100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *3871880
+  version_requirements: *7402100
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &3869440 !ruby/object:Gem::Requirement
+  requirement: &7400400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3869440
+  version_requirements: *7400400
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &3890820 !ruby/object:Gem::Requirement
+  requirement: &7413360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *3890820
+  version_requirements: *7413360
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &3888060 !ruby/object:Gem::Requirement
+  requirement: &7410420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *3888060
+  version_requirements: *7410420
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &3899160 !ruby/object:Gem::Requirement
+  requirement: &7408560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3899160
+  version_requirements: *7408560
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
-  requirement: &3897020 !ruby/object:Gem::Requirement
+  requirement: &7422080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3897020
+  version_requirements: *7422080
 - !ruby/object:Gem::Dependency
   name: omniauth-github
-  requirement: &3895560 !ruby/object:Gem::Requirement
+  requirement: &7417720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3895560
+  version_requirements: *7417720
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &3894620 !ruby/object:Gem::Requirement
+  requirement: &7428560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3894620
+  version_requirements: *7428560
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &3892800 !ruby/object:Gem::Requirement
+  requirement: &7426320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,19 +120,20 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *3892800
+  version_requirements: *7426320
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &3891500 !ruby/object:Gem::Requirement
+  name: rspec-rails
+  requirement: &7438820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *3891500
-description: Simply generates lorem ipsum text.
+  version_requirements: *7438820
+description: blog_basic is a gem which allows you to set up a generic blog which rdoesnøt
+  require any work in order t ointegrate with your website.
 email:
 - bottiger@gmail.com
 executables: []