phcpress 3.8.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6bd984764253256558f0569953525bed6dad220
-  data.tar.gz: 93fbef55a0a7f9dfd26de80b283b67f0feea119f
+  metadata.gz: f51ee17fa7b7216e9d8acee8cf62dd32e5e0050e
+  data.tar.gz: 62595f2af30b49c4437e0139c6fc18bfc6e472f5
 SHA512:
-  metadata.gz: d6224de366106564f075f5f28e47c1c528218538bc994b3feb509ccb863b1e0d2dee4b789d5d4488fb7f8bc9892e4d8e9498720f5d46f6078518325cd1b9c3bd
-  data.tar.gz: 76716b30b5198a1b64c2c214cef620469231d10785db7638209e7f0ca935bf243d1a47e547c4799899f2826c48827d0fb04dbb302d70f1db69028c992a31f10d
+  metadata.gz: 7e641049a74ba00b09807b55a05b53d303eb01c815dcbe97b412313d688f230e0ae17fd5658c346efd8756b5312ecb7dde7e5367ab5f8ef1e9f1e052e2a00d29
+  data.tar.gz: 79bd5162c729e5bfe1ae6a6df892eb7a5984adcc75abca37013a57b0a3f787dc78b2620c46c64255fe4e1e87a38d6e81e128d92d9ea55286c78628e8b91b5a32

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2016 BradPotts - PHCNetworks
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -3,12 +3,12 @@
 [![Issue Count](https://codeclimate.com/github/PHCNetworks/phc-press/badges/issue_count.svg)](https://codeclimate.com/github/PHCNetworks/phc-press)
 [![Gem Version](https://badge.fury.io/rb/phcpress.svg)](https://badge.fury.io/rb/phcpress)  
   
-### PHCPress(3) (Blog & News Post Engine) Documentation
+### PHCPress(4) (Blog & News Post Engine) Documentation
 PHCPress is a basic open source news & blog engine.
   
 #### Step 1 - Add PHCPress Engine to your gemfile  
 
-	gem 'phcpress', '~> 3.8', '>= 3.8.1'
+	gem 'phcpress', '~> 3.8', '>= 3.8.5'
 	bundle exec install
   
 #### Step 2 - Copy over database migration files  
@@ -27,3 +27,4 @@ PHCPress default Carrierwave settings can be overwritten (suggested).
   
 - [How to Override PHCPress Uploader](https://github.com/PHCNetworks/phc-press/wiki/Image-Uploader---Override)
 - [How to Override - Cloudinary Example](https://github.com/PHCNetworks/phc-press/wiki/Image-Uploader-(Cloudinary))
+- 

data/Rakefile

@@ -1,26 +1,33 @@
 begin
-  require 'bundler/setup'
+	require 'bundler/setup'
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+	puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
 require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Phcpress'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+	rdoc.rdoc_dir = 'rdoc'
+	rdoc.title    = 'Phcpress'
+	rdoc.options << '--line-numbers'
+	rdoc.rdoc_files.include('README.md')
+	rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/test_app/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/testapp/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
+require 'bundler/gem_tasks'
 
+require 'rake/testtask'
 
-Bundler::GemHelper.install_tasks
+Rake::TestTask.new(:test) do |t|
+	t.libs << 'lib'
+	t.libs << 'test'
+	t.pattern = 'test/**/*_test.rb'
+	t.verbose = false
+end
 
+task default: :test

data/app/assets/config/phcpress_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts/phcpress .js
+//= link_directory ../stylesheets/phcpress .scss

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

@@ -5,12 +5,12 @@
 // or any plugin's vendor/assets/javascripts directory 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
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap-sprockets
+//= require_tree .

data/app/assets/stylesheets/phcpress/application.scss

@@ -1,10 +1,23 @@
 /*
-*= require_self
-*/
+ * 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 any plugin's vendor/assets/stylesheets directory 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 bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */
 
-// Load Standard
+// Bootstrap & Font Awesome
+@import "bootstrap-sprockets";
 @import "bootstrap";
 @import "font-awesome";
 
-// Load Custom
+// Custom Alterations
 @import "custom";

data/app/controllers/phcpress/application_controller.rb

@@ -2,11 +2,10 @@ module Phcpress
 	class ApplicationController < ActionController::Base
 
 		# Prevent CSRF attacks by raising an exception.
-		# For APIs, you may want to use :null_session instead.
 		before_action :authenticate_user!, if: -> { defined?(Devise) }
 		protect_from_forgery with: :exception
 		
-		# Make Current User Sitewide
+		# Current User
 		def current_user
 			return unless session[:user_id]
 			@current_user ||= User.find(session[:user_id])
@@ -17,4 +16,4 @@ module Phcpress
 		helper Phcnotifi::Engine.helpers
 
 	end
-end
+end

data/app/controllers/phcpress/blog/posts_controller.rb

@@ -6,8 +6,8 @@ module Phcpress
 	class Blog::PostsController < ApplicationController
 
 		# Filters & Security
-		layout 'layouts/phcpress/blogpost/blog_layout'
-		before_action :authenticate_user!, if: -> { defined?(Devise) }
+		#layout 'layouts/phcpress/blogpost/blog_layout'
+		#before_action :authenticate_user!
 		before_action :set_blog_post, only: [:edit, :update, :destroy]
 
 		# Blog Post Index (/blog/posts)
@@ -31,7 +31,6 @@ module Phcpress
 		# Create News Post /news/posts/new
 		def create
 			@blog_post = Blog::Post.new(blog_post_params)
-			@blog_post.user_id = current_user.id
 			if @blog_post.save  
 				redirect_to blog_posts_path, notice: 'Blog post was successfully created.'
 				else
@@ -63,7 +62,7 @@ module Phcpress
 
 		# Whitelist on what can be posted
 		def blog_post_params
-			params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage, :user_id)
+			params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage, :remove_pstimage, category_id, :user_id)
 		end
 	
 		# Current User

data/app/controllers/phcpress/modules/categories_controller.rb

@@ -0,0 +1,68 @@
+require_dependency "phcpress/application_controller"
+
+module Phcpress
+	class Modules::CategoriesController < ApplicationController
+
+		# Security and Filters
+		layout 'layouts/phcpress/category/category_layout'
+		before_action :authenticate_user!
+		before_action :set_modules_category, only: [:show, :edit, :update, :destroy]
+
+		# Categories Index
+		def index
+			@modules_categories = Modules::Category.all
+		end
+
+		# Detail News/Blog Category
+		def show
+		end
+
+		# New News/Blog Category
+		def new
+			@modules_category = Modules::Category.new
+		end
+
+		# Edit News/Blog Category
+		def edit
+		end
+
+		# Create News/Blog Category
+		def create
+			@modules_category = Modules::Category.new(modules_category_params)
+
+			if @modules_category.save
+				redirect_to modules_categories_url, notice: 'Category was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# Update News/Blog Category
+		def update
+			if @modules_category.update(modules_category_params)
+				redirect_to modules_categories_url, notice: 'Category was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# Delete News/Blog Category
+		def destroy
+			@modules_category.destroy
+			redirect_to modules_categories_url, notice: 'Category was successfully destroyed.'
+		end
+
+		private
+
+		# Common Callbacks
+		def set_modules_category
+			@modules_category = Modules::Category.find(params[:id])
+		end
+
+		# Whitelist
+		def modules_category_params
+			params.require(:modules_category).permit(:catname, :user_id)
+		end
+
+	end
+end

data/app/controllers/phcpress/news/posts_controller.rb

@@ -4,8 +4,8 @@ module Phcpress
 	class News::PostsController < ApplicationController
 
 		# Filters & Security
-		layout 'layouts/phcpress/newspost/news_layout'
-		before_action :authenticate_user!, if: -> { defined?(Devise) }
+		#layout 'layouts/phcpress/newspost/news_layout'
+		#before_action :authenticate_user!
 		before_action :set_news_post, only: [:edit, :update, :destroy]
 
 		# News Post Index
@@ -25,7 +25,7 @@ module Phcpress
 		# Create News Article
 		def create
 			@news_post = News::Post.new(news_post_params)
-			@news_post.user_id = current_user
+			#@news_post.user_id = current_user
 			if @news_post.save  
 				redirect_to news_posts_path, notice: 'News Article was Successfully Created.'
 				else
@@ -57,7 +57,7 @@ module Phcpress
 
 		# Whitelist
 		def news_post_params
-			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id, :category_id)
+			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :remove_pstimage, :category_id, :user_id)
 		end
 
 		# Current User

data/app/helpers/phcpress/application_helper.rb

@@ -1,4 +1,4 @@
 module Phcpress
-  module ApplicationHelper
-  end
+	module ApplicationHelper
+	end
 end

data/app/jobs/phcpress/application_job.rb

@@ -0,0 +1,4 @@
+module Phcpress
+	class ApplicationJob < ActiveJob::Base
+	end
+end

data/app/mailers/phcpress/application_mailer.rb

@@ -0,0 +1,6 @@
+module Phcpress
+	class ApplicationMailer < ActionMailer::Base
+		default from: 'no-reply@phcnetworks.net'
+		layout 'mailer'
+	end
+end

data/app/models/phcpress/application_record.rb

@@ -0,0 +1,5 @@
+module Phcpress
+	class ApplicationRecord < ActiveRecord::Base
+		self.abstract_class = true
+	end
+end

data/app/models/phcpress/blog/post.rb

@@ -4,8 +4,5 @@ module Phcpress
 		# For Image Uploads
 		mount_uploader :pstimage, Phcpress::PstimageUploader
 
-		# Associate Post Authour to User
-		belongs_to :user, class_name: 'Phcengine::User'
-
 	end
 end

data/app/models/phcpress/modules.rb

@@ -0,0 +1,7 @@
+module Phcpress
+	module Modules
+		def self.table_name_prefix
+			'phcpress_modules_'
+		end
+	end
+end

data/app/models/phcpress/modules/category.rb

@@ -0,0 +1,5 @@
+module Phcpress
+	class Modules::Category < ApplicationRecord
+
+	end
+end

data/app/models/phcpress/news/post.rb

@@ -4,8 +4,7 @@ module Phcpress
 		# For Image Uploads
 		mount_uploader :pstimage, Phcpress::PstimageUploader
 		
-		# Associate Post Authour to User
-		belongs_to :user, class_name: 'Phcengine::User'
+
 
 	end
 end

data/app/views/layouts/phcpress/application.html.erb

@@ -2,7 +2,7 @@
 <html>
 	<head>
 
-		<title>PHCPress - News Post & Blogging System</title>
+		<title>PHCPress SSO - Blog & News Engine</title>
 
 		<%= stylesheet_link_tag    "phcpress/application", media: "all" %>
 		<%= javascript_include_tag "phcpress/application" %>

data/app/views/phcpress/blog/posts/_form.html.erb

@@ -5,6 +5,7 @@
 		<%= render 'phcnotifi/validations', :object => @blog_post %>
 	
 		<div class="col-md-3">
+
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<i class="fa fa-paper-plane-o"></i> Publish Panel
@@ -16,13 +17,14 @@
 					</div>
 					<div class="form-group">
 						<%= f.label :pstcategory, "Post Category" %>
-						<%= collection_select(:pstcategory, :pstcategory_id, Phcpress::Category.order('catname'), :id, :catname, {}, {class: "form-control form-control-sm"}) %>
+						<%= collection_select(:pstcategory, :pstcategory_id, Phcpress::Modules::Category.order('catname'), :id, :catname, {}, {class: "form-control form-control-sm"}) %>
 					</div>
 					<div class="actions">
 						<%= f.submit "Publish Blog Article", class: "btn btn-primary btn-sm" %>
 					</div>
 				</div>
 			</div>
+
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<i class="fa fa-camera-retro"></i> Post Images
@@ -32,11 +34,18 @@
 						<label><%= f.label :pstimage, "Featured Image" %></label>
 						<%= f.file_field :pstimage, class: "form-control" %>
 					</div>
-					<%= image_tag(@blog_post.pstimage_url, class: "img-responsive img-thumbnail") %>
+					<% if f.object.pstimage? %>
+						<%= image_tag f.object.pstimage, class: "img-responsive img-thumbnail" %>
+						<%= f.label :remove_pstimage %>
+						<%= f.check_box :remove_pstimage %>
+					<% end %>
 				</div>
 			</div>
+
 		</div>
+
 		<div class="col-md-9 ">
+
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<i class="fa fa-pencil-square-o"></i> Blog Post Publisher
@@ -56,6 +65,7 @@
 					</div>
 				</div>
 			</div>
+
 		</div>
 
 	<% end %>

data/app/views/phcpress/{categories → modules/categories}/_form.html.erb

@@ -1,9 +1,9 @@
 <div class="row">
 	<div class="col-lg-12">
-		<%= form_for(@category) do |f| %>
+		<%= form_for(@modules_category) do |f| %>
 
 			<!-- PHC-Notifi Render Validation -->
-			<%= render 'phcnotifi/validations', :object => @category %>
+			<%= render 'phcnotifi/validations', :object => @modules_category %>
 
 			<div class="form-group">
 				<label><%= f.label :catname, "Category Name" %></label>

data/app/views/phcpress/{categories → modules/categories}/index.html.erb

@@ -17,19 +17,19 @@
 				</thead>
 
 				<tbody>
-					<% @categories.each do |category| %>
+					<% @categories.each do |modules_category| %>
 						<tr>
-							<td><%= category.catname %></td>
+							<td><%= modules_category.catname %></td>
         					<td><div class="btn-group" role="group" aria-label="Blog Articles">
-								<%= link_to 'Edit', edit_category_path(category) , class: "btn btn-primary btn-xs" %>
-								<%= link_to 'Trash', category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %>
+								<%= link_to 'Edit', edit_modules_category_path(category) , class: "btn btn-primary btn-xs" %>
+								<%= link_to 'Trash', modules_category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %>
 								</div>
 							</td>
 						</tr>
 					<% end %>
 				</tbody>
 			</table>
-			<%= link_to 'New Category', new_category_path, class: "btn btn-primary" %>
+			<%= link_to 'New Category', new_modules_category_path, class: "btn btn-primary" %>
 		</div>
 
 	</div>