phcpresspro 2.2.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbc5c5691532ca622ff1323e58e5866e771c346a
-  data.tar.gz: 17a2ad5f720e2cb1a4fb59cf130220b9e35906dc
+  metadata.gz: 7cbaf20f2d62b8938bd8f4d78daa59399fc48bb8
+  data.tar.gz: 1614697c03e4a4bcc201725744c092ec2be9657d
 SHA512:
-  metadata.gz: ff0f21e8bf7bf22ff340443f76a2f6646166d59f518c2a9918f9849ec7d02ec35b0d762cc98d106747538a9c046fe95ea3636d4246deaa7e570e2d0f39559609
-  data.tar.gz: d7e4b78868e592b0087819180b33c2de0f28102bdad87b2f0cf34f36ce416ad5aca4a77bdb22ddc88affacc5f0229a5a2be71c17d4d4b33fe56ab9e7bfe29453
+  metadata.gz: 3fe2dea34889665649b4ae38730859a56417faaacf88bb94e8dc074cebc8170e23eff20328c0caa2d599687853b0d9853b7ded758e6e25d7d88569997025abb4
+  data.tar.gz: ade10837d57d1fde4f547885e1e6d4b43060cc14a47c54859b1eac418a716070499c9709241fab014904fae38671135c703f4a1492d980f38533788e1def6bea

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/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    = 'phcpresspro'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+	rdoc.rdoc_dir = 'rdoc'
+	rdoc.title    = 'Phcpresspro'
+	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/phcpresspro_manifest.js

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

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

@@ -1,3 +1,16 @@
+// 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 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. 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 jquery
 //= require jquery_ujs
 //= require bootstrap-sprockets
+//= require_tree .

data/app/assets/stylesheets/phcpresspro/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/phcpresspro/application_controller.rb

@@ -2,7 +2,6 @@ module Phcpresspro
 	class ApplicationController < ActionController::Base
 
 		# Prevent CSRF attacks by raising an exception.
-		# For APIs, you may want to use :null_session instead.
 		before_filter :require_user
 		protect_from_forgery with: :exception
 
@@ -30,4 +29,4 @@ module Phcpresspro
 		helper Phcnotifi::Engine.helpers
 
 	end
-end
+end

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

@@ -1,57 +1,51 @@
-# Load General Controller for Engine
 require_dependency "phcpresspro/application_controller"
 
-# Code for Blog Posting
 module Phcpresspro
 	class Blog::PostsController < ApplicationController
 
 		# Filters & Security
-		layout 'layouts/phcpresspro/blogpost/blog_layout'
+		layout 'layouts/phcpresspro/newspost/news_layout'
 		before_action :require_user
-		before_action :set_blog_post, only: [:edit, :update, :destroy]
+		before_action :set_news_post, only: [:edit, :update, :destroy]
 
-		# Blog Post Index (/blog/posts)
+		# News Post Index
 		def index
-			@blog_posts = Blog::Post.all
+			@news_posts = News::Post.all
 		end
 
-		# Single Blog Post (/blog/posts/1)
-		#def show
-		#end
-
-		# Create a New Blog Post (/blog/posts/new)
+		# New News Article
 		def new
-			@blog_post = Blog::Post.new
+			@news_post = News::Post.new
 		end
 
-		# Edit Blog Post (/blog/posts/1/edit)
+		# Edit News Article
 		def edit
 		end
 
-		# Create News Post /news/posts/new
+		# Create News Article
 		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.'
+			@news_post = News::Post.new(news_post_params)
+			@news_post.user_id = current_user.id
+			if @news_post.save  
+				redirect_to news_posts_path, notice: 'News Article was Successfully Created.'
 				else
 					render 'new'
 			end
 		end
 
-		# PATCH/PUT
+		# Update News Article
 		def update
-			if @blog_post.update(blog_post_params)
-				redirect_to blog_posts_path, notice: 'Blog post was successfully updated.'
+			if @news_post.update(news_post_params)
+				redirect_to news_posts_path, notice: 'News Article was Successfully Updated.'
 			else
 				render :edit
 			end
 		end
 
-		# DELETE
+		# Delete News Destroy
 		def destroy
-			@blog_post.destroy
-			redirect_to blog_posts_path, notice: 'Blog post was successfully destroyed.'
+			@news_post.destroy
+			redirect_to news_posts_path, notice: 'News Article was Successfully Destroyed.'
 		end
 
 		private
@@ -62,13 +56,13 @@ module Phcpresspro
 		end
 
 		# Common Callbacks
-		def set_blog_post
-			@blog_post = Blog::Post.find(params[:id])
+		def set_news_post
+			@news_post = News::Post.find(params[:id])
 		end
 
-		# Whitelist on what can be posted
-		def blog_post_params
-			params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage, :user_id)
+		# Whitelist
+		def news_post_params
+			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id, :category_id)
 		end
 
 	end

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

@@ -0,0 +1,67 @@
+require_dependency "phcpresspro/application_controller"
+
+module Phcpresspro
+	class Modules::CategoriesController < ApplicationController
+
+		# Security and Filters
+		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_category, 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_category, 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.fetch(:modules_category, {:catname})
+		end
+
+	end
+end

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

@@ -66,4 +66,4 @@ module Phcpresspro
 		end
 
 	end
-end
+end

data/app/helpers/phcpresspro/application_helper.rb

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

data/app/jobs/phcpresspro/application_job.rb

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

data/app/mailers/phcpresspro/application_mailer.rb

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

data/app/models/phcpresspro/application_record.rb

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

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

@@ -1,8 +1,11 @@
 module Phcpresspro
-	class Blog::Post < ActiveRecord::Base
+	class Blog::Post < ApplicationRecord
 
 		# For Image Uploads
-		mount_uploader :pstimage, Phcpresspro::PstimageUploader
+		mount_uploader :pstimage, Phcpress::PstimageUploader
+
+		# Associate Post Authour to User
+		belongs_to :user, class_name: 'Phcengine::User'
 
 	end
 end

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

@@ -0,0 +1,4 @@
+module Phcpresspro
+	class Modules::Category < ApplicationRecord
+	end
+end

data/app/models/phcpresspro/modules.rb

@@ -0,0 +1,7 @@
+module Phcpresspro
+	module Modules
+		def self.table_name_prefix
+			'phcpresspro_modules_'
+		end
+	end
+end

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

@@ -1,8 +1,11 @@
 module Phcpresspro
-	class News::Post < ActiveRecord::Base
+	class News::Post < ApplicationRecord
 
 		# For Image Uploads
-		mount_uploader :pstimage, Phcpresspro::PstimageUploader
+		mount_uploader :pstimage, Phcpress::PstimageUploader
+		
+		# Associate Post Authour to User
+		belongs_to :user, class_name: 'Phcengine::User'
 
 	end
 end

data/app/uploaders/phcpresspro/pstimage_uploader.rb

@@ -1,30 +1,15 @@
 class Phcpresspro::PstimageUploader < CarrierWave::Uploader::Base
 
-	# Storage Type
-	storage :file
-	# storage :fog
+    # Include Cloudinary (Install Cloudinary Gem in Gemfile)
+    include Cloudinary::CarrierWave
 
-	# Where files will be uploaded
-	def store_dir
-		"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-	end
+    # Image Version
+    version :standard do
+        process :resize_to_fill => [100, 150, :north]
+    end
 
-	# White List of Safe Extension
-	def extension_white_list
-		%w(jpg jpeg gif png)
-	end
-	
-	# Hash filenames
-	def filename
-		"#{secure_token}.#{file.extension}" if original_filename.present?
-	end
-
-	protected
-
-	# Secure Token for File Hashing
-	def secure_token
-		var = :"@#{mounted_as}_secure_token"
-		model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.uuid)
-	end
+    version :thumbnail do
+        resize_to_fit(50, 50)
+    end
 
 end

data/app/views/phcpresspro/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, Phcpresspro::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/phcpresspro/{categories → modules/categories}/_form.html.erb

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

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

@@ -17,12 +17,12 @@
 				</thead>
 
 				<tbody>
-					<% @categories.each do |category| %>
+					<% @modules_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>

data/app/views/phcpresspro/news/posts/_form.html.erb

@@ -17,7 +17,7 @@
 					</div>
 					<div class="form-group">
 						<%= f.label :pstcategory, "Post Category" %>
-						<%= collection_select(:pstcategory, :pstcategory_id, Phcpresspro::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 News Article", class: "btn btn-primary btn-sm" %>
@@ -31,10 +31,14 @@
 				</div>
 				<div class="panel-body">
 					<div class="form-group">
-						<%= f.label :pstimage, "Featured Image" %>
+						<label><%= f.label :pstimage, "Featured Image" %></label>
 						<%= f.file_field :pstimage, class: "form-control" %>
 					</div>
-					<%= image_tag(@news_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>
 

data/config/routes.rb

@@ -1,16 +1,11 @@
 Phcpresspro::Engine.routes.draw do
-
-	# Blog Routes
-	namespace :blog do
-		resources :posts, class_name: 'Phcpresspro::News::Post'
-	end
-
-	# News Routes
-	namespace :news do
-		resources :posts, class_name: 'Phcpresspro::Blog::Post'
-	end
-
-	# Categories
-	resources :categories, class_name: 'Phcpresspro::Category'
-
+  namespace :modules do
+    resources :categories
+  end
+  namespace :blog do
+    resources :posts
+  end
+  namespace :news do
+    resources :posts
+  end
 end

data/db/migrate/{20160316131626_create_phcpresspro_news_posts.rb → 20160716182409_create_phcpresspro_news_posts.rb}

@@ -1,4 +1,4 @@
-class CreatePhcpressproNewsPosts < ActiveRecord::Migration
+class CreatePhcpressproNewsPosts < ActiveRecord::Migration[5.0]
 	def change
 		create_table :phcpresspro_news_posts do |t|
 
@@ -9,9 +9,12 @@ class CreatePhcpressproNewsPosts < ActiveRecord::Migration
 			t.string :pstimage
 
 			t.integer :pstcategory_id
+
 			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
 
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end

data/db/migrate/{20160316131650_create_phcpresspro_blog_posts.rb → 20160716182518_create_phcpresspro_blog_posts.rb}

@@ -1,4 +1,4 @@
-class CreatePhcpressproBlogPosts < ActiveRecord::Migration
+class CreatePhcpressproBlogPosts < ActiveRecord::Migration[5.0]
 	def change
 		create_table :phcpresspro_blog_posts do |t|
 
@@ -9,7 +9,10 @@ class CreatePhcpressproBlogPosts < ActiveRecord::Migration
 			t.string :pstimage
 
 			t.integer :pstcategory_id
+
 			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
 
 			t.timestamps null: false
 

data/db/migrate/20160716182936_create_phcpresspro_modules_categories.rb

@@ -0,0 +1,15 @@
+class CreatePhcpressproModulesCategories < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcpresspro_modules_categories do |t|
+
+			t.string :catname
+
+			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
+
+			t.timestamps
+
+		end
+	end
+end

data/lib/phcpresspro/engine.rb

@@ -12,6 +12,7 @@ module Phcpresspro
 		
 		# Load Image Processing
 		require 'carrierwave'
+		require 'cloudinary'
 
 		# Give Everything a Namespace
 		isolate_namespace Phcpresspro
@@ -42,6 +43,5 @@ module Phcpresspro
 			g.fixture_replacement :factory_girl, dir: "spec/factories"
 		end
 
-
 	end
 end

data/lib/phcpresspro/version.rb

@@ -1,3 +1,3 @@
 module Phcpresspro
-    VERSION = "2.2.5"
+    VERSION = "3.0.0"
 end