Ember 2 10 (#175)

* Updating ember to 2.10 * Updating dependencies * Cleaning packages * Fixing tests * Setting checkbox properties after module init * Adding change log * Adding release version
Semantic-Org · Jan 6, 2017 · 3d8cf85 · 3d8cf85
1 parent eb2a942
commit 3d8cf85
Show file tree

Hide file tree

Showing 14 changed files with 118 additions and 245 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,6 +13,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log
-lcov.dat
diff --git a/.travis.yml b/.travis.yml
@@ -1,38 +1,47 @@
 language: node_js
 node_js:
   - "4"
+
 sudo: required
+
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
+
 env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-2.4
-  - EMBER_TRY_SCENARIO=ember-2.5
-  - EMBER_TRY_SCENARIO=ember-2.6
-  - EMBER_TRY_SCENARIO=ember-2.7
-  - EMBER_TRY_SCENARIO=ember-2.8
+  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
+  - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
   - EMBER_TRY_SCENARIO=ember-release
-  - ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
-  - ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
+
 matrix:
   fast_finish: true
   allow_failures:
-    - env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
-    - env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-beta
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
 before_install:
   - 'export DISPLAY=:99.0'
   - sh -e /etc/init.d/xvfb start
   - npm config set spin false
-  - npm install -g npm@^2
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
   - npm install -g codeclimate-test-reporter
+
 install:
-  - npm install -g bower
   - npm install
   - bower install
+
 script:
-  - 'ember try:one $EMBER_TRY_SCENARIO --- ember test'
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+
 dist: trusty
 addons:
   apt:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Change Log
 All notable changes to this project will be documented in this file. The project adhere's to Semantic Versioning. See Versioning for more information.
 
+## [2.0.1]
+### Changed
+ - Updated Ember to 2.10 and dependencies
+
+### Fixed
+ - Mutable cell symbol change
+ - Checkbox and Radio initial property initialization
+
+### Removed
+ - Blanket dependency
+
+## [2.0.0] - 2016-10-18
+
 ## [2.0.0-beta.3]
 ### Fixed
   - hasOwnProperty now properly works for objects without prototype

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016
+Copyright (c) 2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/addon/mixins/base.js b/addon/mixins/base.js
@@ -171,7 +171,7 @@ Semantic.BaseMixin = Ember.Mixin.create({
     // if its a mutable object, get the actual value
     if (typeof value === 'object') {
       let objectKeys = Ember.A(Object.keys(value));
-      if (objectKeys.any((objectkey) => objectkey.indexOf('MUTABLE_CELL') === 0)) {
+      if (objectKeys.any((objectkey) => objectkey.indexOf('MUTABLE_CELL') >= 0)) {
         value = Ember.get(value, 'value');
       }
     }
@@ -261,7 +261,7 @@ Semantic.BaseMixin = Ember.Mixin.create({
     }
   },
 
-  _swapAttrs(attrName) {
+  _setAttrBindable(attrName) {
     if (this.get('_settableAttrs').includes(attrName)) {
       this.get('_settableAttrs').removeObject(attrName);
       this.get('_bindableAttrs').addObject(attrName);

diff --git a/addon/mixins/checkbox.js b/addon/mixins/checkbox.js
@@ -22,12 +22,22 @@ var CheckboxMixin = Ember.Mixin.create(Base, {
   didInitSemantic() {
     this._super(...arguments);
     // We need to fake that its bindable for checked and disabled
-    this._swapAttrs('checked');
-    this._swapAttrs('disabled');
-    this._swapAttrs('enabled');
+    this._setAttrBindable('checked');
+    this._setAttrBindable('disabled');
+    this._setAttrBindable('enabled');
     if (this.get('readonly') != null) {
       this.get('_settableAttrs').addObject('readonly');
     }
+    // Init initial value set properties correctly
+    if (this.get('checked') != null) {
+      this.setSemanticAttr('checked', this.get('checked'));
+    }
+    if (this.get('disabled') != null) {
+      this.setSemanticAttr('disabled', this.get('disabled'));
+    }
+    if (this.get('enabled') != null) {
+      this.setSemanticAttr('enabled', this.get('enabled'));
+    }
   },
 
   getSemanticAttr(attrName) {

diff --git a/bower.json b/bower.json
@@ -1,12 +1,9 @@
 {
   "name": "semantic-ui-ember",
   "dependencies": {
-    "ember": "~2.8.0",
+    "ember": "~2.10.0",
     "ember-cli-shims": "0.1.3",
     "highlightjs": "^9.4.0",
-    "semantic-ui": "2.2.4"
-  },
-  "devDependencies": {
-    "blanket": "5e94fc30f2e694bb5c3718ddcbf60d467f4b4d26"
+    "semantic-ui": "2.2.7"
   }
 }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,172 +1,58 @@
 /*jshint node:true*/
 module.exports = {
-  "command": "ember test",
-  "scenarios": [
+  scenarios: [
     {
-      "name": "default",
-      "bower": {
-        "dependencies": {}
-      }
-    },
-    {
-      "name": "ember-1.13",
-      "bower": {
-        "dependencies": {
-          "ember": "~1.13.0",
-          "ember-data": "~1.13.0",
-          "ember-cli-shims": "0.0.6"
-        }
-      },
-      npm: {
-        dependencies: {
-          "ember-hash-helper-polyfill": "0.1.1"
-        }
-      }
-    },
-    {
-      name: "ember-2.0",
+      name: 'ember-lts-2.4',
       bower: {
         dependencies: {
-          ember: "~2.0.0",
-          "ember-data": "~2.0.0",
-          "ember-cli-shims": "0.0.6"
-        }
-      },
-      npm: {
-        dependencies: {
-          "ember-hash-helper-polyfill": "0.1.1"
+          'ember': 'components/ember#lts-2-4'
+        },
+        resolutions: {
+          'ember': 'lts-2-4'
         }
       }
     },
     {
-      name: "ember-2.1",
+      name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          ember: "~2.1.0",
-          "ember-data": "~2.1.0",
-          "ember-cli-shims": "0.0.6"
+          'ember': 'components/ember#lts-2-8'
+        },
+        resolutions: {
+          'ember': 'lts-2-8'
         }
       }
     },
     {
-      name: "ember-2.2",
+      name: 'ember-release',
       bower: {
         dependencies: {
-          ember: "~2.2.0",
-          "ember-data": "~2.2.0",
-          "ember-cli-shims": "0.0.6"
-        }
-      },
-      npm: {
-        dependencies: {
-          "ember-hash-helper-polyfill": "0.1.1"
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
         }
       }
     },
     {
-      name: "ember-2.3",
+      name: 'ember-beta',
       bower: {
         dependencies: {
-          ember: "~2.3.0",
-          "ember-data": "~2.3.0"
-        }
-      }
-    },
-    {
-      "name": "ember-2.4",
-      "bower": {
-        "dependencies": {
-          "ember": "~2.4.0",
-          "ember-data": "~2.4.0"
-        }
-      }
-    },
-    {
-      "name": "ember-2.5",
-      "bower": {
-        "dependencies": {
-          "ember": "~2.5.0",
-          "ember-data": "~2.5.0"
-        }
-      }
-    },
-    {
-      "name": "ember-2.6",
-      "bower": {
-        "dependencies": {
-          "ember": "~2.6.0",
-          "ember-data": "~2.6.0"
-        }
-      }
-    },
-    {
-      "name": "ember-2.7",
-      "bower": {
-        "dependencies": {
-          "ember": "~2.7.0",
-          "ember-data": "~2.7.0"
-        }
-      }
-    },
-    {
-      "name": "ember-2.8",
-      "bower": {
-        "dependencies": {
-          "ember": "~2.8.0",
-          "ember-data": "~2.8.0"
-        }
-      }
-    },
-    {
-      "name": "ember-release",
-      "bower": {
-        "dependencies": {
-          "ember": "components/ember#release",
-          "ember-data": "components/ember-data#release",
-          "jquery": "<3"
-        },
-        "resolutions": {
-          "ember": "release",
-          "ember-data": "release"
-        }
-      }
-    },
-    {
-      "name": "ember-beta",
-      "bower": {
-        "dependencies": {
-          "ember": "components/ember#beta",
-          "ember-data": "components/ember-data#beta"
+          'ember': 'components/ember#beta'
         },
-        "resolutions": {
-          "ember": "beta",
-          "ember-data": "beta"
-        }
-      }
-    },
-    {
-      "name": "ember-canary",
-      "bower": {
-        "dependencies": {
-          "ember": "components/ember#canary",
-          "ember-data": "components/ember-data#canary"
-        },
-        "resolutions": {
-          "ember": "canary",
-          "ember-data": "canary"
+        resolutions: {
+          'ember': 'beta'
         }
       }
     },
     {
-      name: 'ember-alpha',
-      allowedToFail: true,
+      name: 'ember-canary',
       bower: {
         dependencies: {
-          "ember": "alpha",
-          "ember-data": "components/ember-data#release",
+          'ember': 'components/ember#canary'
         },
         resolutions: {
-          "ember": "alpha"
+          'ember': 'canary'
         }
       }
     },
@@ -178,22 +64,6 @@ module.exports = {
         }
       }
     },
-    {
-      "name": "semantic-2.2.2",
-      "bower": {
-        "dependencies": {
-          "semantic-ui": "2.2.2"
-        }
-      }
-    },
-    {
-      "name": "semantic-2.2.3",
-      "bower": {
-        "dependencies": {
-          "semantic-ui": "2.2.3"
-        }
-      }
-    },
     {
       "name": "semantic-2.2.4",
       "bower": {