Merge branch 'angular_next' of github.com:cloudinary/cloudinary_angular into angular_next

Author: eitanp461

CONTRIBUTING.md

@@ -4,8 +4,8 @@ Contributions are welcome and greatly appreciated!
 
 ## Reporting a bug
 
-- Ensure that the bug was not already reported by searching in GitHub under [Issues](https://github.com/cloudinary/cloudinary-angular-2/issues) and the Cloudinary [Support forms](https://support.cloudinary.com).
-- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/cloudinary/cloudinary-angular-2/issues/new).
+- Ensure that the bug was not already reported by searching in GitHub under [Issues](https://github.com/cloudinary/cloudinary_angular/issues) and the Cloudinary [Support forms](https://support.cloudinary.com).
+- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/cloudinary/cloudinary_angular/issues/new).
   Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
 - If you require assistance in the implementation of the Cloudinary Angular SDK please [submit a support request](https://support.cloudinary.com/hc/en-us/requests/new) in the Cloudinary web site.
 
@@ -14,7 +14,7 @@ Contributions are welcome and greatly appreciated!
 We would love to hear your requests!
 Please be aware that some features may not be applicable to all users.
 
-- Open a GitHub [issue](https://github.com/cloudinary/cloudinary-angular-2/issues/new) describing the benefits (and possible drawbacks) of the requested feature
+- Open a GitHub [issue](https://github.com/cloudinary/cloudinary_angular/issues/new) describing the benefits (and possible drawbacks) of the requested feature
 
 ## Fixing a bug / Implementing a new feature
 
@@ -29,21 +29,22 @@ When contributing code, either to fix a bug or to implement a new feature, pleas
 
 #### Fork the Project
 
-Fork [project on Github](https://github.com/cloudinary/cloudinary-angular-2) and check out your copy.
+Fork [project on Github](https://github.com/cloudinary/cloudinary_angular) and check out your copy.
 
 ```
-git clone https://github.com/contributor/cloudinary_ng.git
-cd cloudinary_ng
-git remote add upstream https://github.com/cloudinary/cloudinary-angular-2.git
+git clone https://github.com/contributor/cloudinary_angular.git
+cd cloudinary_angular
+git checkout angular_next
+git remote add upstream https://github.com/cloudinary/cloudinary_angular.git
 ```
 
 #### Create a Topic Branch
 
 Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
 
 ```
-git checkout master
-git pull upstream master
+git checkout angular_next
+git pull upstream angular_next
 git checkout -b my-feature-branch
 ```
 #### Rebase
@@ -52,7 +53,7 @@ If you've been working on a change for a while, rebase with upstream/master.
 
 ```
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/angular_next
 git push origin my-feature-branch -f
 ```
 
@@ -99,10 +100,10 @@ git push origin my-feature-branch
 
 #### Make a Pull Request
 
-Go to https://github.com/contributor/cloudinary_ng and select your feature branch. Click the 'Pull Request' button and fill out the form. 
+Go to https://github.com/contributor/cloudinary_angular and select your feature branch. Click the 'Pull Request' button and fill out the form. 
 Pull requests are usually reviewed within a few days.
 
-Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+Ensure that the PR title starts with "[angular_next]" and that the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
 
 #### Check on Your Pull Request
 

README.md

@@ -27,7 +27,7 @@ The SDK serves as a layer on top of one of Cloudinary's Javascript libraries:
 ## Installation ######################################################################
 
 ```shell
-npm install cloudinary_ng --save
+npm install @cloudinary/angular --save
 ```
 
 ## Setup ######################################################################
@@ -58,7 +58,7 @@ Example Coudinary configuration in your application's module definition:
 
 ```javascript
 import { NgModule } from '@angular/core';
-...
+// ...
 import { CloudinaryModule, CloudinaryConfiguration, provideCloudinary } from 'cloudinary-ng';
 
 @NgModule({
@@ -68,19 +68,19 @@ import { CloudinaryModule, CloudinaryConfiguration, provideCloudinary } from 'cl
     providers: [
         provideCloudinary(require('cloudinary-core'), { cloud_name: 'your_cloud_name' } as CloudinaryConfiguration)
     ],
-    bootstrap: [...]
+    bootstrap: [/* ... */]
 })
 export class AppModule { }
 ```
 
 See [samples folder](samples) for a complete reference project.
 
-### - Creating new image tags with cl-image & cl-transformation ##################################
+### Creating new image tags with cl-image & cl-transformation ##################################
 
 The [cl-image](src/cloudinary-image.component.ts) component generates an `<image>` tag with requested transformation, type, and format. 
 The image tag can contain optional `<cl-transformation>` tags that will be used as chained transformations:
 
-```javascript
+```html
     <cl-image public-id="readme" class="thumbnail inline" angle="20" format="jpg">
         <cl-transformation height="150" width="150" crop="fill" effect="sepia" radius="20"></cl-transformation>
         <cl-transformation overlay="text:arial_60:readme" gravity="north" y="20"></cl-transformation>
@@ -89,29 +89,29 @@ The image tag can contain optional `<cl-transformation>` tags that will be used
 
 Will be compiled by Angular to:
 
-```javascript
+```html
     <cl-image _ngcontent-ywn-2="" public-id="readme" class="thumbnail inline" format="jpg" angle="20" ng-reflect-public-id="readme">
         <img src="http://res.cloudinary.com/{your_cloud_name}/image/upload/c_fill,e_sepia,h_150,r_20,w_150/g_north,l_text:arial_60:readme,y_20/a_20/readme.jpg">
     </cl-image>
 ```
 
-### - Creating new video tags with cl-video & cl-transformation ##################################
+### Creating new video tags with cl-video & cl-transformation ##################################
 
 The [cl-video](src/cloudinary-video.component.ts) component generates a `<video>` tag with requested transformation, type, and format.
 
 The generated `<video>` is created with configurable child `<source>` elements for all relevant formats supported by web browsers (`webm`, `mp4` and `ogv`), as well as a poster thumbnail image.
 
 The video tag can contain optional `<cl-transformation>` tags that will be used as chained transformations:
 
-```javascript
+```html
     <cl-video cloud-name="my_other_cloud" public-id="watchme" secure="true" class="my-videos">
         <cl-transformation overlay="text:arial_60:watchme" gravity="north" y="20"></cl-transformation>
     </cl-video>
 ```
 
 Will be compiled by Angular to:
 
-```javascript
+```html
     <video class="my-videos" public-id="watchme" ng-reflect-public-id="watchme" 
             poster="https://res.cloudinary.com/my_other_cloud/video/upload/g_north,l_text:arial_60:watchme,y_20/watchme.jpg">
         <source src="https://res.cloudinary.com/my_other_cloud/video/upload/g_north,l_text:arial_60:watchme,y_20/watchme.webm" type="video/webm">
@@ -125,7 +125,7 @@ You can update attributes dynamically for `<cl-image>` and `<cl-video>` elements
 new transformations.
 
 The following example from the sample projects demonstrates setting the opacity to 50% when hovering on top of an element:
-```javascript
+```html
     <cl-image
         public-id={{photo.public_id}}
         (mouseenter)="photo.isMouseOver = true"
@@ -138,13 +138,13 @@ The following example from the sample projects demonstrates setting the opacity
 
 These directives transform the given URI to a cloudinary URL. For example:
 
-```javascript
+```html
     <img clSrc="http://cloudinary.com/images/logo.png" type="fetch" fetch-format="auto" quality="auto">
 ```
 
 Will be compiled by Angular to:
 
-```javascript
+```html
     <img clSrc="http://cloudinary.com/images/logo.png" fetch-format="auto" quality="auto" type="fetch" ng-reflect-clSrc="http://cloudinary.com/images/logo.png" 
     src="http://res.cloudinary.com/{your_cloud_name}/image/fetch/f_auto,q_auto/http://cloudinary.com/images/logo.png">
 ```
@@ -203,7 +203,7 @@ Additional resources are available at:
 
 ## Support #######################################################################
 
-You can [open an issue through GitHub](https://github.com/cloudinary/cloudinary_ng/issues).
+You can [open an issue through GitHub](https://github.com/cloudinary/cloudinary_angular/issues).
 
 Contact us [https://cloudinary.com/contact](https://cloudinary.com/contact)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudinary/angular",
-  "version": "1.0.0-rc1",
-  "description": "The formal Cloudinary-Angular SDK to enhance your applications with image and video components powered by Cloudinary",
+  "version": "2.0.0-rc1",
+  "description": "The formal Cloudinary Angular SDK to enhance your applications with image and video components powered by Cloudinary",
   "keywords": [
     "cloudinary",
     "angular",
@@ -34,14 +34,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/cloudinary/cloudinary-angular-2.git"
+    "url": "git://github.com/cloudinary/cloudinary_angular.git"
   },
   "author": "Cloudinary",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/cloudinary/cloudinary-angular-2/issues"
+    "url": "https://github.com/cloudinary/cloudinary_angular/issues"
   },
-  "homepage": "https://github.com/cloudinary/cloudinary-angular-2",
+  "homepage": "https://github.com/cloudinary/cloudinary_angular",
   "dependencies": {
     "@angular/common": "^2.2.4",
     "@angular/core": "^2.2.4",

samples/photo_album/package.json

@@ -13,7 +13,7 @@
     "@angular/platform-browser": "^2.3.0",
     "@angular/platform-browser-dynamic": "^2.3.0",
     "@angular/router": "^3.2.3",
-    "@cloudinary/angular": "^1.0.0-rc1",
+    "@cloudinary/angular": "^2.0.0-rc1",
     "cloudinary-core": "^2.1.9",
     "core-js": "^2.4.1",
     "ng2-file-upload": "^1.1.4-2",
@@ -42,4 +42,4 @@
     "start": "webpack-dev-server --open",
     "start:e2e": "webpack-dev-server"
   }
-}
+}

samples/photo_album_with_jquery/package.json

@@ -13,7 +13,7 @@
     "@angular/platform-browser-dynamic": "^2.3.0",
     "@angular/router": "^3.0.2",
     "blueimp-file-upload": "^9.11.2",
-    "@cloudinary/angular": "^1.0.0-rc1",
+    "@cloudinary/angular": "^2.0.0-rc1",
     "cloudinary-jquery-file-upload": "^2.1.9",
     "core-js": "^2.4.1",
     "jquery": ">=1.9",
@@ -35,4 +35,4 @@
     "tsc": "tsc",
     "tsc:w": "tsc -w"
   }
-}
+}