Merge pull request #476 from reactioncommerce/pre-beta

Beta 0.9.0
reactioncommerce · Oct 7, 2015 · 4b6ac25 · 4b6ac25
2 parents f7c3356 + ee7af5a
commit 4b6ac25
Show file tree

Hide file tree

Showing 14 changed files with 172 additions and 178 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -149,9 +149,9 @@
       "beforeColon": false,
       "afterColon": true
     }],
-    "new-cap": [2, { // http://eslint.org/docs/rules/new-cap
+    "new-cap": [0, { // http://eslint.org/docs/rules/new-cap  (turned off for now, as it complains on all Match)
       "newIsCap": true,
-      "capIsNewExceptions": ["Optional"],
+      "capIsNewExceptions": ["Match", "OneOf", "Optional"],
     }],
     "no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines
       "max": 2

diff --git a/.meteor/versions b/.meteor/versions
@@ -1,9 +1,13 @@
 [email protected]
 [email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
-alanning:[email protected]
-aldeed:[email protected]
+[email protected]
+[email protected]
+alanning:[email protected]
+aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
@@ -68,6 +72,8 @@ [email protected]
 [email protected]
 fortawesome:[email protected]
 [email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -78,8 +84,8 @@ iron:[email protected]
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
-iron:[email protected].9
-iron:[email protected].9
+iron:[email protected].10
+iron:[email protected].10
 iron:[email protected]
 jparker:[email protected]
 jparker:[email protected]
@@ -111,10 +117,11 @@ [email protected]_1
 [email protected]_6
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
 ongoworks:[email protected]
-ongoworks:security@1.2.0
+ongoworks:security@1.3.0
 ongoworks:[email protected]
 [email protected]
 [email protected]
@@ -123,15 +130,15 @@ raix:[email protected]
 [email protected]
 [email protected]
 reactioncommerce:[email protected]
-reactioncommerce:core@0.8.0
-reactioncommerce:core-theme@1.7.0
-reactioncommerce:reaction-accounts@1.1.0
+reactioncommerce:core@0.9.0
+reactioncommerce:core-theme@1.8.0
+reactioncommerce:reaction-accounts@1.2.0
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
-reactioncommerce:reaction-paypal@1.1.0
+reactioncommerce:reaction-paypal@1.2.0
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
-reactioncommerce:reaction-stripe@2.1.0
+reactioncommerce:reaction-stripe@2.2.0
 [email protected]
 [email protected]
 [email protected]
@@ -149,6 +156,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
 underscorestring:[email protected]
@@ -157,3 +165,4 @@ utilities:[email protected]
 utilities:[email protected]
 [email protected]
 [email protected]
+[email protected]
diff --git a/common/config.js b/common/config.js
@@ -8,3 +8,9 @@ Avatar.setOptions({
   fallbackType: "image",
   cssClassPrefix: "reactionAvatar"
 });
+// client configuration
+if (Meteor.isClient) {
+  ITEMS_INCREMENT = 10;
+  // sets default number of product displayed on a grid
+  Session.setDefault("productScrollLimit", ITEMS_INCREMENT);
+}
diff --git a/docs/developer/globals.md b/docs/developer/globals.md
@@ -10,7 +10,7 @@ ReactionCore.Collections = {}; //Collections defined in common/collections
 ReactionCore.Helpers = {}; //Misc.helpers defined in common/helpers
 ReactionCore.MetaData = {}; // SEO, Metadata object
 ReactionCore.Locale = {}; //i18n translation object
-ReactionCore.Events = {}; // Logger instantiation (server)
+ReactionCore.Log = {}; // Logger instantiation (server)
 ```
 
 _core/common/collections/products.js:_

diff --git a/docs/developer/i18n.md b/docs/developer/i18n.md
@@ -5,7 +5,7 @@ We use the [http://i18next.com/](http://i18next.com/) i18n library for translati
 - usage - template helper: `{{i18n 'cartDrawer.empty' 'Your cart is empty.'}}`
 - usage - reference:  `<thead data-i18n>cartSubTotals.head</thead>`
 - usage - implied tag: `<td data-i18n>Item Count</td>`
-- usage - alerts `Alerts.add "Message!", "danger", i18n_key: "productDetail.outOfStock"`
+- usage - alerts `Alerts.add "Message!", "danger", i18nKey: "productDetail.outOfStock"`
 - usage - js `i18n.t(gridPackage.pkgDisabled)`
 
 _Keys should be camelCase, no spaces, no periods._

diff --git a/docs/developer/logging.md b/docs/developer/logging.md
@@ -2,7 +2,7 @@
 ## Bunyan
 [Bunyan](//github.com/trentm/node-bunyan) provides a JSON friendly log handler in Reaction Core.
 
-The ongoworks:bunyan package exports `loggers`, and is instantiated by the `ReactionCore.Events` global that can be used anywhere in Reaction code.
+The ongoworks:bunyan package exports `loggers`, and is instantiated by the `ReactionCore.Log` global that can be used anywhere in Reaction code.
 
 To enable logging set/add `isDebug: true` in `settings.json`.  Value can be any valid `bunyan level` in settings.json, or true/false.
 
@@ -28,5 +28,5 @@ Example:
 
 ```
 
-ReactionCore.Events.info "Something we want to see during development"
+ReactionCore.Log.info "Something we want to see during development"
 ```
diff --git a/docs/developer/methods.md b/docs/developer/methods.md
@@ -160,20 +160,20 @@ Usage:
 Meteor.call "updateMetaFields", productId
 ```
 
-### cloneVariant
-The cloneVariant method copies variants, but will also create and clone child variants (options)
+### products/cloneVariant
+The products/cloneVariant method copies variants, but will also create and clone child variants (options)
 
 Usage:
 
 ```
 # to clone a variant
-Meteor.call "cloneVariant", productId, variantId
+Meteor.call "products/cloneVariant", productId, variantId
 
 # to create a child option from a variant
-Meteor.call "cloneVariant", productId, variantId, parentId
+Meteor.call "products/cloneVariant", productId, variantId, parentId
 ```
 
-cloneVariant takes a product id, a variant id to clone a variant. Adding a parent id will make the new clone as an option of that parent.
+products/cloneVariant takes a product id, a variant id to clone a variant. Adding a parent id will make the new clone as an option of that parent.
 
 ### updateVariant
 The updateVariant method updates an individual variant with new values and merges into the original.

diff --git a/docs/developer/overview.md b/docs/developer/overview.md
@@ -17,9 +17,9 @@ See [themes.md](themes.md) for details on the themes and LESS implementation.
 
 ### Logging
 Client and server logging.
-- `ReactionCore.Events.info("This is some info")`
-- `ReactionCore.Events.warn("Warn Will Robinson")`
-- `ReactionCore.Events.debug("Stuff", stuffObject)`
+- `ReactionCore.Log.info("This is some info")`
+- `ReactionCore.Log.warn("Warn Will Robinson")`
+- `ReactionCore.Log.debug("Stuff", stuffObject)`
 
 More options and use examples at [logging.md](logging.md).
 

diff --git a/docs/developer/routing.md b/docs/developer/routing.md
@@ -1,5 +1,6 @@
 # Routing
-[*common/routing.coffee](//github.com/reactioncommerce/reaction/blob/master/common/routing.coffee) can be customized to change layouts.
+
+[*common/routing.js](https://github.com/reactioncommerce/reaction/blob/master/common/routing.js) can be customized to change layouts.
 
 If you are adding reaction-core to your own meteor application, `iron:router` is installed as a dependency of `reactioncommerce:core`.
 

diff --git a/docs/developer/templates.md b/docs/developer/templates.md
@@ -1,7 +1,7 @@
 # Templates
 To add or change features, or make non CSS layout updates you can create your own templates. [Iron Router](//github.com/EventedMind/iron-router) manages paths, layouts, and which templates load where.
 
-Review the [Iron Router docs](//github.com/EventedMind/iron-router/blob/devel/DOCS.md) for background information, then reference the file [_packages/reaction-core/common/routing.coffee_](//github.com/reactioncommerce/reaction-core/blob/master/common/routing.coffee). Here you will be able to see how all the default routes, paths, and template layouts are configured.
+Review the [Iron Router docs](https://github.com/EventedMind/iron-router/blob/devel/DOCS.md) for background information, then reference the file [_packages/reaction-core/common/routing.js](https://github.com/reactioncommerce/reaction-core/blob/master/common/routing.js). Here you will be able to see how all the default routes, paths, and template layouts are configured.
 
 ## Extending and customizing templates
 To extend and customize the html for any reaction/meteor template, add a template extension map to `client/templates.coffee`

diff --git a/server/fixtures.js b/server/fixtures.js
@@ -1,13 +1,13 @@
 /**
-* Reaction startup
-*
-* Load app private fixtures
-*/
+ * Reaction startup
+ *
+ * Load app private fixtures
+ */
 
-Meteor.startup(function() {
+Meteor.startup(function () {
   try {
     return Fixtures.loadSettings(Assets.getText("settings/reaction.json"));
   } catch (error) {
-    ReactionCore.Events.debug("loadSettings reaction.json not loaded.", error);
+    ReactionCore.Log.debug("loadSettings reaction.json not loaded.", error);
   }
 });