blog_basic 0.1.9 → 0.1.13

data/.gitignore

@@ -0,0 +1,11 @@
+test/debug.log
+db/test.sqlite3
+db/*.sqlite3.db
+test/*.sqlite3.db
+
+build.sh
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+

data/Gemfile

@@ -19,6 +19,5 @@ gem "omniauth", "~> 1.0.0"
 gem "omniauth-openid", "~> 1.0.0"
 gem "omniauth-github", "~> 1.0.0"
 
-gem 'activeadmin'
 gem 'sass-rails'
 gem 'meta_search',    '>= 1.1.0.pre'

data/Gemfile.lock

@@ -0,0 +1,177 @@
+PATH
+  remote: .
+  specs:
+    blog_basic (0.0.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    acts-as-taggable-on (2.1.1)
+      rails
+    addressable (2.2.6)
+    arel (2.2.1)
+    bluecloth (2.2.0)
+    builder (3.0.0)
+    cocaine (0.2.1)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.3)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    execjs (1.2.12)
+      multi_json (~> 1.0)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
+      rack (>= 1.1.0, < 2)
+    hashie (1.2.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.3)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    meta_search (1.1.1)
+      actionpack (~> 3.1.0)
+      activerecord (~> 3.1.0)
+      activesupport (~> 3.1.0)
+      polyamorous (~> 0.5.0)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    multipart-post (1.1.4)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
+    omniauth (1.0.1)
+      hashie (~> 1.2)
+      rack
+    omniauth-github (1.0.1)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.0)
+    omniauth-oauth2 (1.0.0)
+      oauth2 (~> 0.5.0)
+      omniauth (~> 1.0)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    paperclip (2.4.5)
+      activerecord (>= 2.3.0)
+      activesupport (>= 2.3.2)
+      cocaine (>= 0.0.2)
+      mime-types
+    polyamorous (0.5.0)
+      activerecord (~> 3.0)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    ruby-openid (2.1.8)
+    sass (3.1.11)
+    sass-rails (3.1.5)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (~> 3.1.10)
+      tilt (~> 1.3.2)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    uglifier (1.1.0)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    will_paginate (3.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acts-as-taggable-on
+  blog_basic!
+  bluecloth (~> 2.2.0)
+  coffee-script
+  jquery-rails
+  json
+  meta_search (>= 1.1.0.pre)
+  omniauth (~> 1.0.0)
+  omniauth-github (~> 1.0.0)
+  omniauth-openid (~> 1.0.0)
+  paperclip (~> 2.3)
+  rspec
+  sass
+  sass-rails
+  uglifier
+  will_paginate

data/README.md

@@ -3,18 +3,23 @@ blog_basic
 
 blog_basic is a fork of the rails plugin BlogKit (https://github.com/ryanstout/blog_kit)
 
-blog_basic
+It aims to be a gem which provides a simple and generic blogging service for people to run on their website.
+It is made as easy as possible to deploy, and requires no external intregration to work.
+
+blog_basic is self contained inside its own namespace and rails engine, and uses you google account 
+(or any other providor omniauth supports) for easy and seemless authentication
+
+Features
 ========
 
-BlogKitty is a rails plugin to add a blog to your application.  The goal is to provide common blog
+Blog_basic is a rails plugin to add a blog to your application.  The goal is to provide common blog
 functionality that integrates into your existing app while keeping things simple.
 
 BlogKitty has the following features.
 
 + Admin for Blog Articles
 + Search engine friendly urls
-+ Uses existing user model
-+ Comments via existing user model
++ Comments
 + Uses your existing layouts
 + Easily customizable css
 + Akismet (spam filtering) Support
@@ -25,9 +30,17 @@ BlogKitty has the following features.
 + Tags
 + Image upload (via paperclip, or something that adds has_attached_file to models)
 
+Status
+======
+
+Blog_basic is currently fully working. However, it still needs to mature quite a bit. The testing is lacking, 
+there is still a lot of code cleaning to do, configuration should be improved etc.
 
-Install for Rails3
-==================
+Futhermore I need to get some feedback from people actually using it. Currently I'm just scratching my own itch, but would love to
+hear what other people want from a blogging system.
+
+Installation
+============
 
 Add blog_basic to your Gemfile
 
@@ -35,14 +48,11 @@ Add blog_basic to your Gemfile
 
 then run "bundle install" to make sure you are up to date. Install blog_basic my running the generator blog_basic:install
 
-   rails g blog_basic:install
+    rails g blog_basic:install
 
 and migrate your database
 
-   rake db:migrate
-
-edit config/initializers/blog_omniauth.rb
-and config/blog_basic.yml
+    rake db:migrate
 
 Now adjust config/routes.rb for your desired path and config/blog_basic.yml for the rest of the configuration
 
@@ -57,118 +67,21 @@ Blog_basic makes the following assumptions
 Setup
 =====
 
-BlogKit is designed to work with your existing user model, at the moment, it assumes this will be
-called User.  Your User class and application controller simply need to respond to some methods to
-be able to use BlogKit.  These methods, while not standardized are very common, and come with plugins
-like Authlogic and restful_authentication.
-
-ApplicationController should respond to:
-    #require_user
-    #current_user
-    #title - (optional passes in the pages title as the first argument)
+Blog_baisc tries to be as unintrusive as possible with regards to your current authentication system.
 
-User model should respond to:
-    #admin?  - returns true if the user can edit posts and delete comments
-    #name	 - the users name
-    #blog_image_url (optional, the users photo, show next to comments/posts)
-    #email (options - for gravatar support)
-    
-Once you have everything setup, you can see and manage the blog at /blog_posts  Make sure that you have
-all of the requirements below met.
-
-Rails 3 is supported via the rails3 branch, if you are using legacy routing, you may need to copy in routes
-from config/routes.rb to your main routes.rb file.
-
-To be able to use the delete links on posts, you will need to add the following to the top of your layout:
-
-    <%= csrf_meta_tag %>
-
-Also be sure that you have the proper javascript handling code for link_to '', :method => destroy
+In the future it will integrate with your existing user model, but currently it only uses your github account to
+authenticate thus eliminating the use of a User model, and makes the authentication process as simple as possible.
 
 Requirements
 ============
 
-Rails 3.x
-
-- Will_Paginate
-
-Optional:
-
-- Ultraviolet (and its deps, for code highlighting)
-
-    Install Oniguruma if 1.8.x
-    http://www.geocities.jp/kosako3/oniguruma/
-    
-    source 'http://gems.github.com'
-    gem "spox-ultraviolet", :require => false
-    
-- BlueCloth 2 (for markdown)
-
-    gem 'bluecloth'
-
-- Paperclip
-
-    gem 'paperclip', :git => 'http://github.com/thoughtbot/paperclip.git', :branch => 'rails3'
+blog_basic has been written for Rails 3.2 and later.
 
 Customization
 =============
 
 Be sure to edit config/blog_kit.yml, many common settings can be changed there.
 
-** View Customization **
-
-BlogKit is built as a rails engine plugin (for rails 2.3.x, not the previous engines plugin).  You can see
-the models, views, and controllers in vendor/plugins/blog_kit/app/  You can change them by copying any of 
-them into your apps /app directory.  Rails will look in /app before looking in vendor/plugins/blog_kit/app/
-Once they are copied into /app, you can customize the appearance/behavior of the blog pages.
-
-Troubleshooting
-===============
-
-Q. Creating a blog post does not work, it instead renders the index page.
-A. Make sure you aren't using the old style default routes in rails (match '/:controller(/:action(/:id))')
-   If you are using default routes, then simply copy the following into your routes.rb file before the default route
-
-  	resources :blog_posts do
-		resources :blog_comments
-		resources :blog_images
-		
-		collection do
-			get :drafts
-		end
-		
-		member do
-			get :tag
-		end
-	end
-
-Tag List
-========
-
-By default, the layout does not display a list of all tags.  This can be easily added to any layout in the 
-application by including this in the controller:
-
-    helper :blog
-
-Then in the view:
-
-    <%= blog_tags_list %>
-    
-You can optionally pass in a limit on the number of tags to show.
-
-Also keep in mind that you can specify a layout just for the blog kit pages.
-
-Titles
-======
-
-You can have blog_kit set the page title, just create a method in application_helper like:
-
-    def title(ttl)
-        @page_title = ttl
-    end
-
-If anyone knows of a better convention for this, let me know.  This is what nifty_generators uses
-
 Code Highlighting Example
 =========================
 
@@ -183,3 +96,5 @@ doc/THEMES
 
 
 Copyright (c) 2010 Ryan Stout, released under the MIT license
+
+Copyright (c) 2012 Arvid Boettiger, still released under the MIT license :)

data/Rakefile

@@ -5,19 +5,25 @@ require 'rake/testtask'
 #require 'spec'
 #require 'spec/rake/spectask'
 
-require 'rubygems'
+#require 'rubygems'
 require 'echoe'
 
-Echoe.new('blog_basic', '0.1.9') do |p|
-  p.description    = "Sets up a basic but functional blogging platform."
-  p.url            = "http://bottiger.org/made/blog_basic"
-  p.author         = "Arvid Boettiger"
-  p.email          = "bottiger@gmail.com"
-  p.ignore_pattern = ["tmp/*", "script/*"]
-  p.runtime_dependencies = ['bluecloth ~>2.2.0', 'will_paginate', "paperclip >=2.3", "sass-rails", "meta_search ~>1.1.1", "acts-as-taggable-on ~>2.1.1", "omniauth ~>1.0.0", "omniauth-openid ~>1.0.0", "omniauth-github ~>1.0.0", "coderay"]
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+#Echoe.new('blog_basic', '0.1.9') do |p|
+#  p.name           = "Blog Basic"
+#  p.description    = "Sets up a basic but functional blogging platform."
+#  p.url            = "http://bottiger.org/made/blog_basic"
+#  p.author         = "Arvid Boettiger"
+#  p.email          = "bottiger@gmail.com"
+#  p.ignore_pattern = ["tmp/*", "script/*"]
+#  p.runtime_dependencies = ['bluecloth ~>2.2.0', 'will_paginate', "paperclip >=2.3", "sass-rails", "meta_search ~>1.1.1", "acts-as-taggable-on ~>2.1.1", "omniauth ~>1.0.0", "omniauth-openid ~>1.0.0", "omniauth-github ~>1.0.0", "coderay"]
+#
+#  p.require_signed = true
+#end
 
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+#Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
 
 
 #desc 'Test the blog_kit plugin.'
@@ -28,14 +34,14 @@ Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
 #  t.verbose = true
 #end
 
-desc 'Generate documentation for the blog_basic plugin.'
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'BlogBasic'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+#desc 'Generate documentation for the blog_basic plugin.'
+#RDoc::Task.new(:rdoc) do |rdoc|
+#  rdoc.rdoc_dir = 'rdoc'
+#  rdoc.title    = 'BlogBasic'
+#  rdoc.options << '--line-numbers' << '--inline-source'
+#  rdoc.rdoc_files.include('README')
+#  rdoc.rdoc_files.include('lib/**/*.rb')
+#end
 
 #desc 'Default: run specs.'
 #task :default => :spec

data/app/controllers/blog_basic/app_controller.rb

@@ -4,24 +4,19 @@ module BlogBasic
     helper :all
 
     def require_user
-      User.new
+      session[:user_id]
     end
 
     def signed_in?
-      !session[:user_id].nil?
+      logger.debug "(controller) Logged in: " + session[:user_id] + " == " +  BlogBasic::BlogConf.data['identity']
+      session[:user_id] == BlogBasic::BlogConf.data['identity']
     end
 
     def current_user
       logger.info "Current user ID: " + session[:user_id].to_s
       if signed_in?
-        @current_user ||= User.find(session[:user_id])
+        session[:user_id]
       end
     end
-
-    #    def current_user
-    #      logger.info "(from app_controller.rb) Current user ID: " + session[:user_id].to_s
-    #      return session[:user_id].nil? ? User.new : User.find(session[:user_id])
-    #    end
-
   end
 end

data/app/controllers/blog_basic/sessions_controller.rb

@@ -7,21 +7,13 @@ module BlogBasic
 
     def create
       auth = request.env["omniauth.auth"]
-      logger.debug "Auth:" + auth.inspect
-      user = User.where(:identifier_url => auth["uid"].to_s).first
-      logger.debug "newlinedddd"
-      logger.debug "Here, uid:" + auth["uid"].to_s + ", email:" + auth["info"].inspect
-      user ||= User.create!(:identifier_url => auth["uid"].to_s)
-      logger.debug "userid" + user.id.to_s
       #user ||= User.create!(:identifier_url => auth["uid"],
       #                      :email => auth["info"]["email"],
       #                      :first_name => auth["info"]["first_name"],
       #                      :last_name => auth["info"]["last_name"])
       #user = User.create_with_omniauth(auth)
-      session[:user_id] = user.id
-      logger.debug "before"
+      session[:user_id] = auth["info"]["email"]
       redirect_to '/', :notice => "Signed in!"
-      logger.debug "after"
     end
 
     def destroy

data/app/helpers/blog_basic/application_helper.rb

@@ -1,13 +1,14 @@
 module BlogBasic
   module ApplicationHelper
     def signed_in?
-      !session[:user_id].nil?
+      logger.debug "(helper) Logged in: " + session[:user_id] + " == " +  BlogBasic::BlogConf.data['identity']
+      session[:user_id] == BlogBasic::BlogConf.data['identity']
     end
 
     def current_user
       logger.info "Current user ID: " + session[:user_id].to_s 
       if signed_in?
-        @current_user ||= User.find(session[:user_id])
+        session[:user_id]
       end
     end
 

data/app/helpers/blog_basic/shared_helper.rb

@@ -2,9 +2,7 @@ module BlogBasic
   module SharedHelper
 
     def require_user
-      #return true
-      logger.info session[:user_id].to_s
-      @current_user ||= User.new(session[:user_id])
+      session[:user_id]
     end
 
     def title(page_title)

data/app/models/blog_basic/blog_comment.rb

@@ -1,6 +1,6 @@
 module BlogBasic
   class BlogComment < ActiveRecord::Base
-    include BlogBasic::BlogBasicModelHelper
+    #include BlogBasic::BlogBasicModelHelper
 
     unloadable
 

data/app/models/blog_basic/blog_post.rb

@@ -1,13 +1,14 @@
 module BlogBasic
   class BlogPost < ActiveRecord::Base
-    include BlogBasic::BlogBasicModelHelper
+
+    #include BlogBasic::BlogBasicModelHelper
     include ActionView::Helpers::TextHelper
 
     unloadable
 
     attr_accessible :title, :body, :tag_list, :published
 
-    belongs_to :user
+    #belongs_to :user
 
     has_many :blog_comments, :dependent => :destroy
     has_many :blog_images, :dependent => :destroy
@@ -78,17 +79,18 @@ 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) && self.user
+    #end
 
 
     def user_name(skip_link=false)
-      if !skip_link && BlogConf.data['link_to_user']
-        return "<a href=\"/users/#{self.user.id}\">#{CGI.escapeHTML(self.user.name)}</a>"
-      else
-        return self.user.name
-      end
+      return BlogConf.data['name']
+      #if !skip_link && BlogConf.data['link_to_user']
+      #  return "<a href=\"/users/#{self.user.id}\">#{CGI.escapeHTML(self.user.name)}</a>"
+      #else
+      #  return self.user.name
+      #end
     end
 
     def parsed_body(length=0)

data/app/models/blog_basic/user.rb

@@ -6,20 +6,21 @@ module BlogBasic
   
 
     def default_values
-        self.status ||= BlogBasic::BlogConf.data['fallback_name']
+        self.status ||= BlogBasic::BlogConf.data['name']
     end
 
-    def self.create_with_omniauth(auth)
-      create! do |user|
-        user.provider = auth["provider"]
-        user.uid = auth["uid"]
-        user.name = auth["user_info"]["name"]
-      end
-    end
+    ## To be deleted
+    #def self.create_with_omniauth(auth)
+    #  create! do |user|
+    #    user.provider = auth["provider"]
+    #    user.uid = auth["uid"]
+    #    user.name = auth["user_info"]["name"]
+    #  end
+    #end
 
-    def admin?
-      !self.identifier_url.nil?
-    end
+    #def admin?
+    #  !self.identifier_url.nil?
+    #end
 
     def name
       self.name

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

@@ -1,4 +1,4 @@
-<% if current_user && current_user.admin? %>
+<% if signed_in? %>
 	<div class="blogAdminLinks">
 		<ul class="blogList">
 			<li class="blogListFirst"><%= link_to 'New Blog Post', new_blog_post_path %></li>

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

@@ -2,9 +2,6 @@
   <% content_for :head do %><%= carnonical_link(blog_post) %><% end %>
 <% end %>
 <div class="blogPost">
-  <div class="blogUserImage">
-    <%= blog_post.user_image_tag %>
-  </div>
 
   <h1 class="blogPostTitle header">
     <%= link_to(h(blog_post.title), blog_post) %>
@@ -24,7 +21,7 @@
   <% if params[:action] == 'show' %>
   <p class="blogPostPostedAt">
   <% if blog_post.show_user? %>
-    By <span class="blogPoster"><a rel="author" style="color: red" href="http://who.is.bottiger.org"><%= blog_post.user_name %></a></span>
+    By <span class="blogPoster"><a rel="author" style="color: red" href=/"><%= blog_post.user_name %></a></span>
   <% end %>
   if you liked it, hit the +1 like a man!&nbsp;
   <g:plusone></g:plusone>
@@ -46,7 +43,7 @@
     <% end %>
 
 
-    <% if current_user && current_user.admin? %>
+    <% if signed_in? %>
       <li><%= link_to('Edit Post', edit_blog_post_path(blog_post))%></li>
       <li><%= link_to('Delete', blog_post_path(blog_post), :method => :delete, :confirm => "Are you sure you want to delete the post: #{blog_post.title}") %></li>
     <% end %>