Skip to content

Commit

Permalink
Some text-related changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
jwaliszko committed Sep 20, 2017
1 parent eb408ff commit 32a0f09
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 63 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Release version](https://img.shields.io/github/release/jwaliszko/ExpressiveAnnotations.svg)](https://github.com/jwaliszko/ExpressiveAnnotations/releases/latest)
[![License](http://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)

A small .NET and JavaScript library which provides annotation-based conditional validation mechanisms. Given attributes allow to forget about imperative way of step-by-step verification of validation conditions in many cases. Since fields validation requirements are applied as metadata, domain-related code is more condensed.
A small .NET and JavaScript library which provides full-stack, annotation-based, conditional validation mechanisms. Given attributes, powered by expressions engine, allow to forget about imperative way of step-by-step verification of validation conditions in many cases. Since fields validation requirements are applied as metadata, domain-related code is more condensed.

### Table of contents
- [What is the context behind this work?](#what-is-the-context-behind-this-implementation)
Expand Down Expand Up @@ -501,7 +501,7 @@ Because client-side handles expressions in its unchanged form (as provided to at

Client-side validation is fully supported. Enable it for your web project within the next few steps:

1. Reference both assemblies to your project: core [**ExpressiveAnnotations.dll**](src/ExpressiveAnnotations) and subsidiary [**ExpressiveAnnotations.MvcUnobtrusive.dll**](src/ExpressiveAnnotations.MvcUnobtrusive).
1. Reference both assemblies to your project: core [**ExpressiveAnnotations.dll**](src/ExpressiveAnnotations) (defines validation attributes driven by expressions) and subsidiary [**ExpressiveAnnotations.MvcUnobtrusive.dll**](src/ExpressiveAnnotations.MvcUnobtrusive) (defines model validators for ASP.NET MVC).
2. In Global.asax register required validators (`IClientValidatable` interface is not directly implemented by the attributes, to avoid coupling of ExpressionAnnotations assembly with System.Web.Mvc dependency):

```C#
Expand Down Expand Up @@ -531,7 +531,7 @@ Client-side validation is fully supported. Enable it for your web project within
```

Despite the fact this provider automatically registers adapters for expressive validation attributes, it additionally respects their processing priorities when validation is performed (i.e. the [`Priority`](#signatures) property actually means something in practice).
3. Include [**expressive.annotations.validate.js**](src/expressive.annotations.validate.js?raw=true) script in your page (it should be included in bundle below jQuery validation files):
3. Include [**expressive.annotations.validate.js**](src/expressive.annotations.validate.js?raw=true) script (makes client-side validation to work out of the box) in your page. It should be included in bundle below jQuery validation files:

```JavaScript
<script src="/Scripts/jquery.validate.js"></script>
Expand Down
33 changes: 0 additions & 33 deletions bower.json

This file was deleted.

8 changes: 4 additions & 4 deletions build/ExpressiveAnnotations.dll.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<metadata>
<id>ExpressiveAnnotations.dll</id>
<version>$version$</version>
<title>ExpressiveAnnotations core assembly</title>
<title>Server-side component of ExpressiveAnnotations</title>
<authors>Jarosław Waliszko</authors>
<owners>Jarosław Waliszko</owners>
<iconUrl>https://raw.githubusercontent.com/jwaliszko/ExpressiveAnnotations/master/logo.png</iconUrl>
<licenseUrl>https://github.com/jwaliszko/ExpressiveAnnotations/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/jwaliszko/ExpressiveAnnotations</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>ExpressiveAnnotations is a small .NET and JavaScript library which provides annotation-based conditional validation mechanisms. Given attributes allow to forget about imperative way of step-by-step verification of validation conditions in many cases. Since fields validation requirements are applied as metadata, domain-related code is more condensed.
<description>ExpressiveAnnotations is a small .NET and JavaScript library which provides full-stack annotation-based conditional validation mechanisms. Given attributes, powered by expressions engine, allow to forget about imperative way of step-by-step verification of validation conditions in many cases. Since fields validation requirements are applied as metadata, domain-related code is more condensed.

This package contains only single component, mainly ExpressiveAnnotations.dll core annotations assembly.</description>
<summary>Server-only component of ExpressiveAnnotations - a small .NET and JavaScript library which provides annotation-based conditional validation mechanisms.</summary>
This package contains single component, i.e. ExpressiveAnnotations.dll - assembly with validation attributes powered by expressions engine.</description>
<summary>Server-side component of ExpressiveAnnotations - annotation-based conditional validation library.</summary>
<releaseNotes>https://github.com/jwaliszko/ExpressiveAnnotations/releases</releaseNotes>
<language>en-US</language>
<tags>DataAnnotations Validation</tags>
Expand Down
9 changes: 6 additions & 3 deletions build/ExpressiveAnnotations.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
<metadata>
<id>ExpressiveAnnotations</id>
<version>$version$</version>
<title>ExpressiveAnnotations for ASP.NET MVC</title>
<title>Full-stack declarative validation for ASP.NET MVC</title>
<authors>Jarosław Waliszko</authors>
<owners>Jarosław Waliszko</owners>
<iconUrl>https://raw.githubusercontent.com/jwaliszko/ExpressiveAnnotations/master/logo.png</iconUrl>
<licenseUrl>https://github.com/jwaliszko/ExpressiveAnnotations/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/jwaliszko/ExpressiveAnnotations</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>ExpressiveAnnotations is a small .NET and JavaScript library which provides annotation-based conditional validation mechanisms. Given attributes allow to forget about imperative way of step-by-step verification of validation conditions in many cases. Since fields validation requirements are applied as metadata, domain-related code is more condensed.
<description>ExpressiveAnnotations is a small .NET and JavaScript library which provides full-stack, annotation-based, conditional validation mechanisms. Given attributes, powered by expressions engine, allow to forget about imperative way of step-by-step verification of validation conditions in many cases. Since fields validation requirements are applied as metadata, domain-related code is more condensed.

This package contains 3 components: ExpressiveAnnotations.dll - core annotations assembly, ExpressiveAnnotations.MvcUnobtrusive.dll - MVC validators assembly and expressive.annotations.validate.js - unobtrusive validation script.</description>
This package contains 3 components:
- ExpressiveAnnotations.dll - assembly with validation attributes powered by expressions engine,
- ExpressiveAnnotations.MvcUnobtrusive.dll - assembly with model validators for ASP.NET MVC,
- expressive.annotations.validate.js - unobtrusive validation script.</description>
<summary>A small .NET and JavaScript library which provides annotation-based conditional validation mechanisms.</summary>
<releaseNotes>https://github.com/jwaliszko/ExpressiveAnnotations/releases</releaseNotes>
<language>en-US</language>
Expand Down
29 changes: 15 additions & 14 deletions build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,32 @@ cp expressive.annotations.validate.min.js ../src/expressive.annotations.validate
echo -e "\n------ package building..."
coreVersion=`strings ../src/ExpressiveAnnotations/bin/Release/ExpressiveAnnotations.dll | egrep '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | cut -f1,2,3 -d"."`
./nuget.exe pack ExpressiveAnnotations.nuspec -version $productVersion -symbols
./nuget.exe pack ExpressiveAnnotations.dll.nuspec -version $coreVersion -symbols
./nuget.exe pack ExpressiveAnnotations.dll.nuspec -version $coreVersion

scriptVersion=`strings ../src/expressive.annotations.validate.js | egrep -o -m1 '[0-9]+\.[0-9]+\.[0-9]+'`
sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-pre/'$scriptVersion'/' ../bower.json > bower.json
sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-pre/'$scriptVersion'/' ../package.json > package.json
sed -E 's/\$version\$/'$scriptVersion'/' ../package.json > package.json

unobVersion=`strings ../src/ExpressiveAnnotations.MvcUnobtrusive/bin/Release/ExpressiveAnnotations.MvcUnobtrusive.dll | egrep '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | cut -f1,2,3 -d"."`

echo "This product version contains following components:
ExpressiveAnnotations.dll v"$coreVersion", ExpressiveAnnotations.MvcUnobtrusive.dll v"$unobVersion", expressive.annotations.validate.js v"$scriptVersion"" > readme.txt
unix2dos readme.txt
echo "EA v"$productVersion" (full-stack product version) consists of the following components:
ExpressiveAnnotations.dll v"$coreVersion", ExpressiveAnnotations.MvcUnobtrusive.dll v"$unobVersion", expressive.annotations.validate.js v"$scriptVersion"" > NOTES
unix2dos NOTES

echo -e "\n------ archive creation..."
mkdir -p $productVersion/dist
mv net* $productVersion/dist
mv expressive.annotations.validate* $productVersion/dist
mv *.txt $productVersion/dist
cp ../doc/api/api.chm $productVersion/dist
mkdir -p $productVersion/ExpressiveAnnotations/dist
mv net* $productVersion/ExpressiveAnnotations/dist
mv expressive.annotations.validate* $productVersion/ExpressiveAnnotations/dist
mv NOTES $productVersion/ExpressiveAnnotations
cp ../doc/api/api.chm $productVersion/ExpressiveAnnotations
cp ../README.md $productVersion/ExpressiveAnnotations
cp ../LICENSE $productVersion/ExpressiveAnnotations
cp ../logo.png $productVersion/ExpressiveAnnotations
mv *.nupkg $productVersion
mv *.json $productVersion
cd $productVersion
mv dist ExpressiveAnnotations
zip -r ExpressiveAnnotations.zip ExpressiveAnnotations
mv ExpressiveAnnotations dist
cd ..

# nuget setapikey ...
# nuget push ExpressiveAnnotations.x.x.x.nupkg
# nuget push ExpressiveAnnotations.x.x.x.nupkg -source https://www.nuget.org
# nuget push ExpressiveAnnotations.dll.x.x.x.nupkg -source https://www.nuget.org
Binary file modified doc/api/api.chm
Binary file not shown.
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{
"name": "expressive-annotations",
"version": "2.7.4-pre",
"name": "expressive-annotations-validate",
"version": "$version$",
"license": "MIT",
"homepage": "https://github.com/jwaliszko/ExpressiveAnnotations",
"description": "Client-side component of ExpressiveAnnotations - annotation-based conditional validation library.",
"description": "Client-side component of ExpressiveAnnotations",
"author": "Jarosław Waliszko <[email protected]>",
"main": "src/expressive.annotations.validate.js",
"main": "dist/expressive.annotations.validate.js",
"files": [
"dist/expressive.annotations.validate.js",
"dist/expressive.annotations.validate.min.js"
],
"repository": {
"type": "git",
"url": "git://github.com/jwaliszko/ExpressiveAnnotations.git"
Expand All @@ -16,9 +20,9 @@
"jquery-validation": ">=1.10.0"
},
"keywords": [
"conditional",
"validation",
"mvc",
"aspnetmvc",
"dataannotations"
]
}
2 changes: 1 addition & 1 deletion src/expressive.annotations.validate.min.js

Large diffs are not rendered by default.

0 comments on commit 32a0f09

Please sign in to comment.