phcpress 3.8.5 → 4.0.0

data/app/views/phcpress/modules/categories/show.html.erb

@@ -0,0 +1,4 @@
+<p id="notice"><%= notice %></p>
+
+<%= link_to 'Edit', edit_modules_category_path(@modules_category) %> |
+<%= link_to 'Back', modules_categories_path %>

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

@@ -17,7 +17,7 @@
 					</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 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

@@ -11,6 +11,6 @@ Phcpress::Engine.routes.draw do
 	end
 
 	# Categories
-	resources :categories, class_name: 'Phcpress::Category'
+	resources :categories, class_name: 'Phcpress::Modules::Category'
 
 end

data/db/migrate/{20160316131626_create_phcpress_news_posts.rb → 20160716182441_create_phcpress_news_posts.rb}

@@ -1,4 +1,4 @@
-class CreatePhcpressNewsPosts < ActiveRecord::Migration
+class CreatePhcpressNewsPosts < ActiveRecord::Migration[5.0]
 	def change
 		create_table :phcpress_news_posts do |t|
 
@@ -9,8 +9,9 @@ class CreatePhcpressNewsPosts < ActiveRecord::Migration
 			t.string :pstimage
 
 			t.integer :user_id
+			t.integer :category_id
 
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end

data/db/migrate/{20160316131650_create_phcpress_blog_posts.rb → 20160716182510_create_phcpress_blog_posts.rb}

@@ -1,4 +1,4 @@
-class CreatePhcpressBlogPosts < ActiveRecord::Migration
+class CreatePhcpressBlogPosts < ActiveRecord::Migration[5.0]
 	def change
 		create_table :phcpress_blog_posts do |t|
 
@@ -9,8 +9,9 @@ class CreatePhcpressBlogPosts < ActiveRecord::Migration
 			t.string :pstimage
 
 			t.integer :user_id
+			t.integer :category_id
 
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end

data/db/migrate/20160716182848_create_phcpress_modules_categories.rb

@@ -0,0 +1,11 @@
+class CreatePhcpressModulesCategories < ActiveRecord::Migration[5.0]
+  def change
+    create_table :phcpress_modules_categories do |t|
+
+      t.string :catname
+	
+      t.timestamps null: false
+
+    end
+  end
+end

data/lib/phcpress/engine.rb

@@ -42,6 +42,5 @@ module Phcpress
 			g.fixture_replacement :factory_girl, dir: "spec/factories"
 		end
 
-
 	end
 end

data/lib/phcpress/version.rb

@@ -1,3 +1,3 @@
 module Phcpress
-    VERSION = "3.8.5"
+    VERSION = "4.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcpress
 version: !ruby/object:Gem::Version
-  version: 3.8.5
+  version: 4.0.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,94 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: responders
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: multi_json
+  name: phctitleseo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: phcnotifi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.1
-- !ruby/object:Gem::Dependency
-  name: phctitleseo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: authrocket
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +79,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,35 +89,35 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: paper_trail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.18.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.18.4
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -252,26 +218,80 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.5
+- !ruby/object:Gem::Dependency
+  name: country_select
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.2
+- !ruby/object:Gem::Dependency
+  name: gravtastic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '2.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.1
+        version: 2.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '2.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.1
+        version: 2.17.1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -287,45 +307,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
-  type: :development
+        version: 1.12.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -341,73 +361,85 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 9.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 9.0.5
 - !ruby/object:Gem::Dependency
-  name: better_errors
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 1.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -417,7 +449,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -427,7 +459,27 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.6.5
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -448,64 +500,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.53.4
-description: PHCPress(3) is a basic open source news & blog engine.
+description: PHCPress(4) is a basic open source news & blog engine.
 email:
 - developers@phcnetworks.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
+- MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/phcpress_manifest.js
 - app/assets/javascripts/phcpress/application.js
-- app/assets/javascripts/phcpress/categories.js
+- app/assets/stylesheets/phcpress/_custom.scss
 - app/assets/stylesheets/phcpress/application.scss
-- app/assets/stylesheets/phcpress/categories.scss
-- app/assets/stylesheets/phcpress/custom.scss
-- app/assets/stylesheets/scaffolds.scss
 - app/controllers/phcpress/application_controller.rb
 - app/controllers/phcpress/blog/posts_controller.rb
-- app/controllers/phcpress/categories_controller.rb
+- app/controllers/phcpress/modules/categories_controller.rb
 - app/controllers/phcpress/news/posts_controller.rb
 - app/helpers/phcpress/application_helper.rb
-- app/helpers/phcpress/categories_helper.rb
+- app/jobs/phcpress/application_job.rb
+- app/mailers/phcpress/application_mailer.rb
+- app/models/phcpress/application_record.rb
 - app/models/phcpress/blog.rb
 - app/models/phcpress/blog/post.rb
-- app/models/phcpress/category.rb
+- app/models/phcpress/modules.rb
+- app/models/phcpress/modules/category.rb
 - app/models/phcpress/news.rb
 - app/models/phcpress/news/post.rb
 - app/uploaders/phcpress/pstimage_uploader.rb
 - app/views/layouts/phcpress/application.html.erb
-- app/views/layouts/phcpress/blogpost/blog_layout.html.erb
-- app/views/layouts/phcpress/newspost/news_layout.html.erb
 - app/views/phcpress/blog/posts/_form.html.erb
 - app/views/phcpress/blog/posts/edit.html.erb
 - app/views/phcpress/blog/posts/index.html.erb
 - app/views/phcpress/blog/posts/new.html.erb
 - app/views/phcpress/blog/posts/show.html.erb
-- app/views/phcpress/categories/_form.html.erb
-- app/views/phcpress/categories/edit.html.erb
-- app/views/phcpress/categories/index.html.erb
-- app/views/phcpress/categories/new.html.erb
+- app/views/phcpress/modules/categories/_form.html.erb
+- app/views/phcpress/modules/categories/edit.html.erb
+- app/views/phcpress/modules/categories/index.html.erb
+- app/views/phcpress/modules/categories/new.html.erb
+- app/views/phcpress/modules/categories/show.html.erb
 - app/views/phcpress/news/posts/_form.html.erb
 - app/views/phcpress/news/posts/edit.html.erb
 - app/views/phcpress/news/posts/index.html.erb
 - app/views/phcpress/news/posts/new.html.erb
 - app/views/phcpress/news/posts/show.html.erb
 - config/routes.rb
-- db/migrate/20160316131626_create_phcpress_news_posts.rb
-- db/migrate/20160316131650_create_phcpress_blog_posts.rb
-- db/migrate/20160424211134_create_phcpress_categories.rb
-- db/migrate/20160425194021_add_phcpress_category_to_phcpress_blog_posts.rb
-- db/migrate/20160425194321_add_phcpress_category_to_phcpress_news_post.rb
+- db/migrate/20160716182441_create_phcpress_news_posts.rb
+- db/migrate/20160716182510_create_phcpress_blog_posts.rb
+- db/migrate/20160716182848_create_phcpress_modules_categories.rb
 - lib/phcpress.rb
 - lib/phcpress/engine.rb
 - lib/phcpress/version.rb
 - lib/tasks/phcpress_tasks.rake
 homepage: https://www.phcnetworks.net/
 licenses:
-- GPL-3.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []