Merge pull request #78 from emberjs-addons/ember-edge

Use Emberjs 1.0.0.rc.6
emberjs-addons · Jul 9, 2013 · 4478048 · 4478048
2 parents 3093cd7 + ee7ca33
commit 4478048
Show file tree

Hide file tree

Showing 43 changed files with 368 additions and 37,387 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,5 @@ tmp/
 tests/source/
 tests/ember-bootstrap-tests.js
 .DS_Store
-
-# .github-upload-token stores OAuth token, used by github_downloads gem
 .github-upload-token
+*.gem
diff --git a/.jshintrc b/.jshintrc
@@ -1,60 +1,64 @@
 {
-    "predef": [
-        "console",
-        "Ember",
-        "Bootstrap",
-        "Handlebars",
-        "Metamorph",
-        "ember_assert",
-        "ember_warn",
-        "ember_deprecate",
-        "ember_deprecateFunc",
-        "require",
-        "equal",
-        "test",
-        "testBoth",
-        "testWithDefault",
-        "raises",
-        "deepEqual",
-        "start",
-        "stop",
-        "ok",
-        "strictEqual",
-        "module",
-        "expect",
-        "minispade",
+  predef: [
+    "console",
+    "requireModule",
+    "Ember",
+    "Handlebars",
+    "Bootstrap",
+    "Metamorph",
+    "ember_assert",
+    "ember_warn",
+    "ember_deprecate",
+    "ember_deprecateFunc",
+    "require",
+    "equal",
+    "notEqual",
+    "asyncTest",
+    "test",
+    "raises",
+    "deepEqual",
+    "start",
+    "stop",
+    "ok",
+    "strictEqual",
+    "module",
+    "expect",
+    "minispade",
+    "async",
+    "invokeAsync",
+    "jQuery",
+    "expectAssertion",
 
-        "clickRelLink",
-        "appendIntoDOM",
-        "isAppendedToDOM",
-        "isDestroyed",
-        "documentHasSelector",
-        "destroyIfNecessary"
-    ],
-
-    "node" : false,
-    "es5" : true,
-    "browser" : true,
-
-    "boss" : true,
-    "curly": false,
-    "debug": false,
-    "devel": false,
-    "eqeqeq": true,
-    "evil": true,
-    "forin": false,
-    "immed": false,
-    "laxbreak": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": false,
-    "nomen": false,
-    "onevar": false,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "sub": true,
-    "strict": false,
-    "white": false
+    "clickRelLink",
+    "appendIntoDOM",
+    "isAppendedToDOM",
+    "isDestroyed",
+    "documentHasSelector",
+    "destroyIfNecessary"
+  ],
+  node: false,
+  es5: true,
+  browser: true,
+  boss: true,
+  curly: false,
+  debug: false,
+  devel: false,
+  eqeqeq: true,
+  evil: true,
+  forin: false,
+  immed: false,
+  laxbreak: false,
+  newcap: true,
+  noarg: true,
+  noempty: false,
+  nonew: false,
+  nomen: false,
+  onevar: false,
+  plusplus: false,
+  regexp: false,
+  undef: true,
+  sub: true,
+  strict: false,
+  white: false,
+  eqnull: true
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,4 @@
+---
 rvm:
   - 1.9.3
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - bundle exec rackup &
-  - sleep 5
-script: phantomjs tests/qunit/run-qunit.js "http://localhost:9292/tests/index.html?package=ember-bootstrap"
+script: rake test[all]
diff --git a/Assetfile b/Assetfile
@@ -1,96 +1,11 @@
-Encoding.default_external = "UTF-8" if defined?(Encoding)
-
-require "rake-pipeline-web-filters"
-require "json"
-require "uglifier"
-
-class EmberProductionFilter < Rake::Pipeline::Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      result = File.read(input.fullpath)
-      result.gsub!(%r{^(\s)*Ember\.(assert|deprecate|warn)\((.*)\).*$}, "")
-      output.write result
-    end
-  end
-end
-
-class EmberLicenseFilter < Rake::Pipeline::Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      file = File.read(input.fullpath)
-      license = File.read("generators/license.js")
-      output.write "#{license}\n\n#{file}"
-    end
-  end
-end
-
-class JSHintRC < Rake::Pipeline::Filter
-  def generate_output(inputs, output)
-    inputs.each do |input|
-      file = File.read(input.fullpath)
-      jshintrc = File.read(".jshintrc")
-      output.write "var JSHINTRC = #{jshintrc};\n\n#{file}"
-    end
-  end
-end
-
 distros = {
   :full    => %w(ember-bootstrap)
 }
 
-output "dist"
-
-input "packages" do
-  output "tests"
+#MEGAHAX
+ember_spade_postprocess = "filter EmberAddMicroLoader, :global => true"
 
-  match "*/tests/**/*.js" do
-    minispade :rewrite_requires => true, :string => true, :module_id_generator => proc { |input|
-      id = input.path.dup
-      id.sub!(/\.js$/, '')
-      id.sub!(/\/main$/, '')
-      id.sub!('/tests', '/~tests')
-      id
-    }
-
-    concat "ember-bootstrap-tests.js"
-  end
-
-  match "ember-bootstrap-tests.js" do
-    filter JSHintRC
-  end
-end
-
-input "packages" do
-  match "*/lib/**/*.js" do
-    minispade :rewrite_requires => true, :string => true, :module_id_generator => proc { |input|
-      id = input.path.dup
-      id.sub!('/lib/', '/')
-      id.sub!(/\.js$/, '')
-      id.sub!(/\/main$/, '')
-      id
-    }
-
-    concat "ember-bootstrap-spade.js"
-  end
-end
-
-input "packages" do
-  match "*/lib/**/main.js" do
-    neuter(
-      :additional_dependencies => proc { |input|
-        Dir.glob(File.join(File.dirname(input.fullpath),'**','*.js'))
-      },
-      :path_transform => proc { |path, input|
-        package, path = path.split('/', 2)
-        current_package = input.path.split('/', 2)[0]
-        current_package == package && path ? File.join(package, "lib", "#{path}.js") : nil
-      },
-      :closure_wrap => true
-    ) do |filename|
-      File.join("modules/", filename.gsub('/lib/main.js', '.js'))
-    end
-  end
-end
+instance_eval File.read(::EmberDev.support_path.join('Assetfile'))
 
 distros.each do |name, modules|
   name = "ember-bootstrap"
@@ -99,16 +14,22 @@ distros.each do |name, modules|
     module_paths = modules.map{|m| "#{m}.js" }
     match "{#{module_paths.join(',')}}" do
       concat(module_paths){ ["#{name}.js", "#{name}.prod.js"] }
+      filter EmberAddMicroLoader
+    end
+
+    match "#{name}.js" do
+      filter VersionInfo
     end
 
     # Strip dev code
     match "#{name}.prod.js" do
-      filter(EmberProductionFilter) { ["#{name}.prod.js", "#{name}.min.js"] }
+      filter(EmberStripDebugMessagesFilter) { ["#{name}.prod.js", "min/#{name}.js"] }
     end
 
     # Minify
-    match "#{name}.min.js" do
+    match "min/#{name}.js" do
       uglify{ "#{name}.min.js" }
+      filter VersionInfo
       filter EmberLicenseFilter
     end
   end

diff --git a/Gemfile b/Gemfile
@@ -1,15 +1,8 @@
 source "http://rubygems.org"
 
 gem "rake-pipeline", :git => "https://github.com/livingsocial/rake-pipeline.git"
-gem "rake-pipeline-web-filters", :git => "https://github.com/wycats/rake-pipeline-web-filters.git"
-gem "colored"
-gem "uglifier", "~> 1.0.3"
+gem "ember-dev",     :git => "https://github.com/emberjs/ember-dev.git", :branch => 'master'
 
-group :development do
-  gem "rack"
-  gem "versionomy"
-  gem "github_downloads"
-  gem "ember-docs", :git => "https://github.com/emberjs/docs-generator.git"
-  gem "kicker"
-  gem "json"
-end
+gem 'ember-source', '1.0.0.rc6.2'
+
+gemspec