phcscriptcdn 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8fa89609c5f62ffeeacdaff9cc5054e13bfa2ac
-  data.tar.gz: beee306496faf4b4f997a476c7d6bc93abd08dfd
+  metadata.gz: 5ba4312be53efb01f933c61529b1ec21500bf43d
+  data.tar.gz: 03e1d2eb3febff37e745c16cfcb382f62b82fa6f
 SHA512:
-  metadata.gz: 1c3aa06a800000200fe31c15224536fa22dfdeb2f9fe372d2a14e83fcf19926e331eb2082885291c31cb073544c3c6211d2bc6b77b0041d7dba6e25bfe6f405f
-  data.tar.gz: 6c7430ef14def5bfa6510356dd29d73b147ca5131d1a3573e6b337aa643a727f8956fb09bb76e2fafe63156494b4030dec9ae707cc0b9d2f28e08f1f99e0fdb4
+  metadata.gz: 434b88542ac7791826f9f384a58982ce1ba5e8864f58e965fe9d60fa2d25bde7780f2378a3a3b66e8ff88ec03ef328810a8b0f90474c27ce96b0f9cd9a1984f9
+  data.tar.gz: 75e5c9b6bbcef8207f3d3a42a881c310c802fa4a859b09ad0d14750775ad46776cbf16f73cf560698332bf17b48d10b3c9c0089063d5f99a7e1b8feaad928be3

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,19 +7,19 @@ module Phcscriptcdn
 
 		# Index for Scriptcdn_script URLs
 		def index
-			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:scriptversion_id])
+			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
 			@scriptcdn_scripturls = scriptcdn_scriptversion.scripturls
 		end
 
 		# Scriptcdn_script URL Details Page
 		def show
-			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:scriptversion_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_scriptversion = Scriptcdn::Scriptversion.find(params[:scriptversion_id])
+			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
 			@scriptcdn_scripturl = scriptcdn_scriptversion.scripturls.build
 			respond_to do |format|
 				format.html # new.html.erb
@@ -29,13 +29,13 @@ module Phcscriptcdn
 
 		# Edit Scriptcdn_script URL
 		def edit
-			scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:scriptversion_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_scriptversion = Scriptcdn::Scriptversion.find(params[:scriptversion_id])
+			@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
@@ -63,7 +63,7 @@ module Phcscriptcdn
 
 		# Delete Scriptcdn_script URL
 		def destroy
-			@scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:scriptversion_id])
+			@scriptcdn_scriptversion = Scriptcdn::Scriptversion.find(params[:script_id])
 			@scriptcdn_scripturl = @scriptcdn_scriptversion.scripturls.find(params[:id])
 			@scriptcdn_scripturl.destroy
 			respond_to do |format|

data/app/models/phcscriptcdn/scriptcdn/scriptversion.rb

@@ -1,6 +1,6 @@
 module Phcscriptcdn
 	class Scriptcdn::Scriptversion < ActiveRecord::Base
 		belongs_to :script
-		belongs_to :scripturl
+		has_many :scripturls
 	end
 end

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

@@ -1,6 +1,15 @@
 <%= form_for(@scriptcdn_script) do |f| %>
 
-	<%= render 'phcnotifi/validations', :object => @scriptcdn_script %>
+	<% if @scriptcdn_script.errors.any? %>
+		<div id="error_explanation">
+			<h2><%= pluralize(@scriptcdn_script.errors.count, "error") %> prohibited this scriptcdn_script from being saved:</h2>
+			<ul>
+				<% @scriptcdn_script.errors.full_messages.each do |message| %>
+					<li><%= message %></li>
+				<% end %>
+			</ul>
+		</div>
+	<% end %>
 
 	<div class="form-group">
 		<%= f.label :scrptname, "Script Name" %>
@@ -12,7 +21,7 @@
 	</div>
 	<div class="form-group">
 		<%= f.label :scriptversion_id, "Script Version" %>
-		<%= collection_select(:scriptcdn_script, :scriptversion_id, Phcscriptcdn::Scriptcdn::Scriptversion.order('scrptversionpakname'), :id, :scrptversionpakname, {}, {class: "form-control"}) %>
+		<%= collection_select(:scriptcdn_script, :scriptversion_id, Phcscriptcdn::Scriptcdn::Scriptversion.order('scrptversion'), :id, :scrptversion, {}, {class: "form-control form-control-sm"}) %>
 	</div>
 
 	<div class="actions">

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

@@ -3,20 +3,20 @@
 	<%= render 'phcnotifi/validations', :object => @scriptcdn_scripturl %>
 
 	<div class="field">
-		<%= f.label :scrpturlname, "Script Name" %>
+		<label><%= f.label :scrpturlname, "Script Name" %></label>
 		<%= f.text_field :scrpturlname, class: "form-control" %>
 	</div>
 	<div class="field">
-		<%= f.label :scrpturlphc, "Script URL (AWS)" %>
+		<label><%= f.label :scrpturlphc, "Script URL (AWS)" %></label>
 		<%= f.text_field :scrpturlphc, class: "form-control" %>
 	</div>
 	<div class="field">
-		<%= f.label :scrpturltype, "Script Type" %>
+		<label><%= f.label :scrpturltype, "Script Type" %></label>
 		<%= f.select :scrpturltype, [['CSS','css'],['JS','js'],['font','Font']], class: "form-control" %>
 	</div>
 	<div class="form-group">
-		<%= f.label :scriptversion_id, "Script Version" %>
-		<%= collection_select(:scriptcdn_scripturl, :scriptversion_id, Phcscriptcdn::Scriptcdn::Scriptversion.order('scrptversion'), :id, :scrptversion, {}, {class: "form-control"}) %>
+		<label><%= f.label :scriptversion_id, "Script Version" %></label>
+		<%= collection_select(:scriptcdn_scripturl, :scriptversion_id, Phcscriptcdn::Scriptcdn::Scriptversion.order('scrptversion'), :id, :scrptversion, {}, {class: "form-control form-control-sm"}) %>
 	</div>
 	
 	<div class="actions">

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

@@ -3,19 +3,19 @@
 	<%= render 'phcnotifi/validations', :object => @scriptcdn_scripturl %>
 
 	<div class="field">
-		<%= f.label :scrpturlname, "Script Name" %>
+		<label><%= f.label :scrpturlname, "Script Name" %></label>
 		<%= f.text_field :scrpturlname, class: "form-control" %>
 	</div>
 	<div class="field">
-		<%= f.label :scrpturlphc, "Script URL (AWS)" %>
+		<label><%= f.label :scrpturlphc, "Script URL (AWS)" %></label>
 		<%= f.text_field :scrpturlphc, class: "form-control" %>
 	</div>
 	<div class="field">
-		<%= f.label :scrpturltype, "Script Type" %>
+		<label><%= f.label :scrpturltype, "Script Type" %></label>
 		<%= f.select :scrpturltype, [['CSS','css'],['JS','js'],['font','Font']], class: "form-control" %>
 	</div>
 	<div class="form-group">
-		<%= f.label :scriptversion_id, "Script Version" %>
+		<label><%= f.label :scriptversion_id, "Script Version" %></label>
 		<%= collection_select(:scriptcdn_scripturl, :scriptversion_id, Phcscriptcdn::Scriptcdn::Scriptversion.order('scrptversion'), :id, :scrptversion, {}, {class: "form-control form-control-sm"}) %>
 	</div>
 	

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

@@ -3,12 +3,12 @@
 	<%= render 'phcnotifi/validations', :object => @scriptcdn_scriptversion %>
 
 	<div class="form-group">
-		<%= f.label :scrptversionpakname, "Version Pak Name" %>
+		<label><%= f.label :scrptversionpakname, "Version Pak Name" %></label>
 		<%= f.text_field :scrptversionpakname %>
 	</div>
 
 	<div class="form-group">
-		<%= f.label :scrptversion, "Script Versions" %>
+		<label><%= f.label :scrptversion, "Script Versions" %></label>
 		<%= f.text_field :scrptversion %>
 	</div>
 

data/db/migrate/20160222025658_create_phcscriptcdn_scriptcdn_scripts.rb

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

data/lib/phcscriptcdn/version.rb

@@ -1,3 +1,3 @@
 module Phcscriptcdn
-	VERSION = "0.9.5"
+	VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcscriptcdn
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-21 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 listing software to manage script CDN listings on websites.
+description: PHCScript CDN is script listing software to manage script CDN listings.
 email:
 - bradley.j.potts@gmail.com
 executables: []
@@ -410,7 +410,7 @@ files:
 - lib/phcscriptcdn/engine.rb
 - lib/phcscriptcdn/version.rb
 - lib/tasks/phcscriptcdn_tasks.rake
-homepage: https://phcnetworks.net/script-cdn
+homepage: https://www.phcnetworks.net/content-delivery-networks-scripts
 licenses:
 - GPL-3.0
 metadata: {}