phcscriptcdn 0.7.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09da21c3399d5ab5eca95becb5c4274eb791f379
-  data.tar.gz: 0b5a4da11e9bfaf8c138b01353e0a684753ce967
+  metadata.gz: a191c27978c6acd31f2aea3224b9f0252d356a92
+  data.tar.gz: b95b7eff69d84465180db404e91803d9d8e0bc5e
 SHA512:
-  metadata.gz: 0219de6333de078a3471597cdbbe568ad9f5f5be8888767c7b6b53a43a9c217f040b8703e64e46e077e7607772e9e4d57ec6358e2f5462d2b7aa7e20b7805112
-  data.tar.gz: f33b027c17519147459b4b898da2266ad55a5eb10eebba16d497bce946422c0076c5d2aaa50be9cf34cf51e303e899b0687b71015dad836dc7d71a477da76125
+  metadata.gz: b1e677e81029c825acf7e5430959d51c84988af0dd131145f487ca852a30c1c0ed23717e97ae581e19a60f7b1880c75fcd3581f3e759c0d980b82d9ba053aada
+  data.tar.gz: 08a29af0776bc780ad3f0fcfc66c3ff58fcbf83a735643d57b4e5a6bf9447786f59e400c47a0e6cfb1dc8b618e11a599f680f07a34c75b8c5ce822662b6a4988

data/app/controllers/phcscriptcdn/application_controller.rb

@@ -1,4 +1,9 @@
 module Phcscriptcdn
-  class ApplicationController < ActionController::Base
-  end
+	class ApplicationController < ActionController::Base
+
+		# Load Helpers
+		helper Phctitler::Engine.helpers
+		helper Phcnotifi::Engine.helpers
+
+	end
 end

data/app/controllers/phcscriptcdn/scriptcdn/scripts_controller.rb

@@ -4,7 +4,7 @@ module Phcscriptcdn
 	class Scriptcdn::ScriptsController < ApplicationController
 
 		# Filters and Security
-		before_action :set_scriptcdn_script, only: [:show, :edit, :update, :destroy]
+		before_action :set_scriptcdn_scriptversion, only: [:show, :edit, :update, :destroy]
 
 		# ScriptCDN Index
 		def index

data/app/controllers/phcscriptcdn/scriptcdn/scripturls_controller.rb

@@ -7,20 +7,20 @@ module Phcscriptcdn
 
 		# Index for Scriptcdn_script URLs
 		def index
-			scriptcdn_script = Scriptcdn::Script.find(params[:script_id])
-			@scriptcdn_scripturls = scriptcdn_script.scripturls
+			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
+			@scriptcdn_scripturls = scriptcdn_scriptversion.scripturls
 		end
 
 		# Scriptcdn_script URL Details Page
 		def show
-			scriptcdn_script = Scriptcdn::Script.find(params[:script_id])
-			@scriptcdn_scripturl = scriptcdn_script.scripturls.find(params[:id])
+			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
+			@scriptcdn_scripturl = scriptcdn_scriptversion.scripturls.find(params[:id])
 		end
 
 		# New Scriptcdn_script URL
 		def new
-			scriptcdn_script = Scriptcdn::Script.find(params[:script_id])
-			@scriptcdn_scripturl = scriptcdn_script.scripturls.build
+			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
+			@scriptcdn_scripturl = scriptcdn_scriptversion.scripturls.build
 			respond_to do |format|
 				format.html # new.html.erb
 				format.xml  { render :xml => @scriptcdn_script }
@@ -29,14 +29,14 @@ module Phcscriptcdn
 
 		# Edit Scriptcdn_script URL
 		def edit
-			scriptcdn_script = Scriptcdn::Script.find(params[:script_id])
-			@scriptcdn_scripturl = scriptcdn_script.scripturls.find(params[:id])
+			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
+			@scriptcdn_scripturl = scriptcdn_scriptversion.scripturls.find(params[:id])
 		end
 
 		# POST Scriptcdn_script URL
 		def create
-			@scriptcdn_script = Scriptcdn::Script.find(params[:script_id])
-			@scriptcdn_scripturl = @scriptcdn_script.scripturls.create(scriptcdn_scripturl_params)
+			@scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
+			@scriptcdn_scripturl = @scriptcdn_scriptversion.scripturls.create(scriptcdn_scripturl_params)
 			respond_to do |format|
 				if @scriptcdn_scripturl.save
 					format.html { redirect_to scriptcdn_script_scripturls_path, notice: 'Script URL was Successfully Created.' }
@@ -63,8 +63,8 @@ module Phcscriptcdn
 
 		# Delete Scriptcdn_script URL
 		def destroy
-			@scriptcdn_script = Scriptcdn::Script.find(params[:script_id])
-			@scriptcdn_scripturl = @scriptcdn_script.scripturls.find(params[:id])
+			@scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
+			@scriptcdn_scripturl = @scriptcdn_scriptversion.scripturls.find(params[:id])
 			@scriptcdn_scripturl.destroy
 			respond_to do |format|
 				format.html { redirect_to scriptcdn_script_scripturls_path, notice: 'Script URL was Successfully Deleted.'  }
@@ -81,7 +81,7 @@ module Phcscriptcdn
 
 		# Whitelist
 		def scriptcdn_scripturl_params
-			params.require(:scriptcdn_scripturl).permit(:scrpturlname, :scrpturlphc, :scrpturltype, :scriptversion_id, :script_id)
+			params.require(:scriptcdn_scripturl).permit(:scrpturlname, :scrpturlphc, :scrpturltype, :scriptversion_id)
 		end
 	end
-end
+end

data/app/controllers/phcscriptcdn/scriptcdn/scriptversions_controller.rb

@@ -25,7 +25,7 @@ module Phcscriptcdn
 			@scriptcdn_scriptversion = Scriptcdn::Scriptversion.new(scriptcdn_scriptversion_params)
 
 			if @scriptcdn_scriptversion.save
-				redirect_to scriptcdn_scriptversions_path, notice: 'Scriptversion was successfully created.'
+				redirect_to scriptcdn_scriptversions_path, notice: 'Script version was successfully created.'
 			else
 				render :new
 			end
@@ -34,7 +34,7 @@ module Phcscriptcdn
 		# PATCH/PUT Script Version
 		def update
 			if @scriptcdn_scriptversion.update(scriptcdn_scriptversion_params)
-				redirect_to scriptcdn_scriptversions_path, notice: 'Scriptversion was successfully updated.'
+				redirect_to scriptcdn_scriptversions_path, notice: 'Script version was successfully updated.'
 			else
 				render :edit
 			end
@@ -43,7 +43,7 @@ module Phcscriptcdn
 		# DELETE Script Version
 		def destroy
 			@scriptcdn_scriptversion.destroy
-			redirect_to scriptcdn_scriptversions_path, notice: 'Scriptversion was successfully destroyed.'
+			redirect_to scriptcdn_scriptversions_path, notice: 'Script version was successfully destroyed.'
 		end
 
 		private
@@ -55,7 +55,7 @@ module Phcscriptcdn
 
 		# Whitelist
 		def scriptcdn_scriptversion_params
-			params.require(:scriptcdn_scriptversion).permit(:scrptversion)
+			params.require(:scriptcdn_scriptversion).permit(:scrptversion, :scrptversionpakname)
 		end
 
 	end

data/app/views/phcscriptcdn/scriptcdn/scripts/_form.html.erb

@@ -12,15 +12,15 @@
 	<% end %>
 
 	<div class="form-group">
-		<label><%= f.label :scrptname, "Script Name" %></label>
+		<%= f.label :scrptname, "Script Name" %>
 		<%= f.text_field :scrptname, class: "form-control" %>
 	</div>
 	<div class="form-group">
-		<label><%= f.label :scrptdescription, "Script Description" %></label>
+		<%= f.label :scrptdescription, "Script Description" %>
 		<%= f.text_area :scrptdescription, class: "form-control" %>
 	</div>
 	<div class="form-group">
-		<label><%= f.label :scriptversion_id, "Script Version" %></label>
+		<%= f.label :scriptversion_id, "Script Version" %>
 		<%= collection_select(:scriptcdn_script, :scriptversion_id, Phcscriptcdn::Scriptcdn::Scriptversion.order('scrptversion'), :id, :scrptversion, {}, {class: "form-control form-control-sm"}) %>
 	</div>
 

data/app/views/phcscriptcdn/scriptcdn/scripturls/_form.html.erb

@@ -1,15 +1,6 @@
-<%= form_for([@scriptcdn_scripturl.script, @scriptcdn_scripturl], url: scriptcdn_script_scripturls_path) do |f| %>
+<%= form_for([@scriptcdn_scripturl.script, @scriptcdn_scripturl], url: scriptcdn_scriptversion_scripturls_path) do |f| %>
 
-	<% if @scriptcdn_scripturl.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@scriptcdn_scripturl.errors.count, "error") %> prohibited this scriptcdn_scripturl from being saved:</h2>
-			<ul>
-				<% @scriptcdn_scripturl.errors.full_messages.each do |message| %>
-					<li><%= message %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<%= render 'phcnotifi/validations', :object => @scriptcdn_scripturl %>
 
 	<div class="field">
 		<label><%= f.label :scrpturlname, "Script Name" %></label>

data/app/views/phcscriptcdn/scriptcdn/scripturls/_formpatch.html.erb

@@ -1,15 +1,6 @@
-<%= form_for([@scriptcdn_scripturl.script, @scriptcdn_scripturl], url: scriptcdn_script_scripturl_path, method: :patch) do |f| %>
+<%= form_for([@scriptcdn_scripturl.script, @scriptcdn_scripturl], url: scriptcdn_scriptversion_scripturl_path, method: :patch) do |f| %>
 
-	<% if @scriptcdn_scripturl.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@scriptcdn_scripturl.errors.count, "error") %> prohibited this scriptcdn_scripturl from being saved:</h2>
-			<ul>
-				<% @scriptcdn_scripturl.errors.full_messages.each do |message| %>
-					<li><%= message %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<%= render 'phcnotifi/validations', :object => @scriptcdn_scripturl %>
 
 	<div class="field">
 		<label><%= f.label :scrpturlname, "Script Name" %></label>

data/app/views/phcscriptcdn/scriptcdn/scriptversions/_form.html.erb

@@ -1,19 +1,14 @@
 <%= form_for(@scriptcdn_scriptversion) do |f| %>
 
-	<% if @scriptcdn_scriptversion.errors.any? %>
-		<div id="error_explanation">
-			<h2><%= pluralize(@scriptcdn_scriptversion.errors.count, "error") %> prohibited this scriptcdn_scriptversion from being saved:</h2>
+	<%= render 'phcnotifi/validations', :object => @scriptcdn_scriptversion %>
 
-			<ul>
-				<% @scriptcdn_scriptversion.errors.full_messages.each do |message| %>
-					<li><%= message %></li>
-				<% end %>
-			</ul>
-		</div>
-	<% end %>
+	<div class="form-group">
+		<label><%= f.label :scrptversionpakname, "Version Pak Name" %></label>
+		<%= f.text_field :scrptversionpakname %>
+	</div>
 
 	<div class="form-group">
-		<label><%= f.label :scrptversion, "Version" %></label>
+		<label><%= f.label :scrptversion, "Script Versions" %></label>
 		<%= f.text_field :scrptversion %>
 	</div>
 

data/app/views/phcscriptcdn/scriptcdn/scriptversions/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="wrapper wrapper-content">
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<i class="fa fa-code"></i> Edit Script Version
+			<i class="fa fa-code"></i> Edit Script Version Pak Information
 		</div>
 		<div class="panel-body">
 			<%= render 'form' %>

data/app/views/phcscriptcdn/scriptcdn/scriptversions/index.html.erb

@@ -11,7 +11,8 @@
 
 				<thead>
 					<tr>
-						<th>Script Version</th>
+						<th>Script Version Packages</th>
+						<th></th>
 						<th></th>
 					</tr>
 				</thead>
@@ -19,6 +20,7 @@
 				<tbody>
 					<% @scriptcdn_scriptversions.each do |scriptcdn_scriptversion| %>
 						<tr>
+							<td><%= scriptcdn_scriptversion.scrptversionpakname %></td>
 							<td><%= scriptcdn_scriptversion.scrptversion %></td>
 							<td>
 								<%= link_to 'Edit', edit_scriptcdn_scriptversion_path(scriptcdn_scriptversion), class: "btn btn-w-m btn-primary btn-xs btn-phc-custom" %>

data/app/views/phcscriptcdn/scriptcdn/scriptversions/new.html.erb

@@ -1,7 +1,7 @@
 <div class="wrapper wrapper-content">
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<i class="fa fa-code"></i> Create a New Script Version
+			<i class="fa fa-code"></i> Create a New Script Version Pak
 		</div>
 		<div class="panel-body">
 			<%= render 'form' %>

data/config/routes.rb

@@ -1,14 +1,12 @@
 Phcscriptcdn::Engine.routes.draw do
-	
-	# Notification System
-	mount Phcnotifi::Engine, :at => '/' 
+
 
 	# Script CDN Listing System
 	namespace :scriptcdn do
-		resources :scripts do
+		resources :scripts
+		resources :scriptversions do
 			resources :scripturls
 		end
-		resources :scriptversions
 	end
 
 end

data/db/migrate/20160222025658_create_phcscriptcdn_scriptcdn_scripts.rb

@@ -4,6 +4,7 @@ class CreatePhcscriptcdnScriptcdnScripts < ActiveRecord::Migration
 
 			t.string :scrptname
 			t.text :scrptdescription
+			
 			t.references :scriptversion, index: true
 
 			t.timestamps null: false

data/db/migrate/20160222030223_create_phcscriptcdn_scriptcdn_scriptversions.rb

@@ -2,6 +2,7 @@ class CreatePhcscriptcdnScriptcdnScriptversions < ActiveRecord::Migration
 	def change
 		create_table :phcscriptcdn_scriptcdn_scriptversions do |t|
 
+			t.string :scrptversionpakname
 			t.string :scrptversion
 
 			t.timestamps null: false

data/db/migrate/20160222030446_create_phcscriptcdn_scriptcdn_scripturls.rb

@@ -6,7 +6,6 @@ class CreatePhcscriptcdnScriptcdnScripturls < ActiveRecord::Migration
 			t.string :scrpturlphc
 			t.string :scrpturltype
 			t.references :scriptversion, index: true
-			t.references :script, index: true
 
 			t.timestamps null: false
 

data/lib/phcscriptcdn/engine.rb

@@ -1,12 +1,16 @@
-# Load UI Dependecies
-require 'jquery-rails'
-require 'sass-rails'
-require 'bootstrap-sass'
-require 'font-awesome-rails'
-
 module Phcscriptcdn
 	class Engine < ::Rails::Engine
-		
+				
+		# Load UI Dependecies
+		require 'jquery-rails'
+		require 'sass-rails'
+		require 'bootstrap-sass'
+		require 'font-awesome-rails'
+
+		# PHCEngines
+		require 'phcnotifi'
+		require 'phctitler'
+
 		# Give PHCScriptCDN Own Namespace
 		isolate_namespace Phcscriptcdn
 
@@ -22,9 +26,11 @@ module Phcscriptcdn
 			g.fixture_replacement :factory_girl, dir: "spec/factories"
 		end
 		
-		# Load PHCScriptCDN Helper Files (Prevents Problems)
+		# Load Helper Files
 		config.to_prepare do
 			ApplicationController.helper(ApplicationHelper)
+			Phcnotifi::ApplicationController.helper(ApplicationHelper)
+			Phctitler::ApplicationController.helper(ApplicationHelper)
 		end
 
 	end

data/lib/phcscriptcdn/version.rb

@@ -1,3 +1,3 @@
 module Phcscriptcdn
-	VERSION = "0.7.0"
+	VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcscriptcdn
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.1
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -354,7 +354,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.53'
-description: PHC ScriptCDN is a Script CDN listing engine for ruby on rails apps.
+description: PHCScript CDN is script listing software to manage script CDN listings.
 email:
 - bradley.j.potts@gmail.com
 executables: []