opal · Oct 7, 2014 · Oct 7, 2014 · Oct 7, 2014 · Oct 7, 2014 · Oct 7, 2014
Showing with 18 additions and 16 deletions.

+2 −5 Gemfile

+3 −0 config.ru

+3 −2 opal-jquery.gemspec

+2 −1 opal/opal-jquery/element.rb

+8 −8 spec/element/animations_spec.rb
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec
 
-gem 'opal'
-gem 'opal-rspec', '0.3.0.beta2'
-
-gem 'rake'
+gem 'opal', github: 'opal/opal'
diff --git a/config.ru b/config.ru
@@ -1,6 +1,9 @@
 require 'bundler'
 Bundler.require
 
+require 'opal-rspec'
+Opal.append_path File.expand_path('../spec', __FILE__)
+
 run Opal::Server.new { |s|
   s.main = 'opal/rspec/sprockets_runner'
   s.append_path 'spec'

diff --git a/opal-jquery.gemspec b/opal-jquery.gemspec
@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths  = ['lib']
 
-  s.add_runtime_dependency 'opal', ['>= 0.5.0', '< 1.0.0']
-  s.add_development_dependency 'opal-rspec', '~> 0.3.0'
+  s.add_runtime_dependency 'opal', '~> 0.7.0.dev'
+  s.add_development_dependency 'opal-rspec', '~> 0.4.0.beta1'
   s.add_development_dependency 'yard'
+  s.add_development_dependency 'rake'
 end
diff --git a/opal/opal-jquery/element.rb b/opal/opal-jquery/element.rb
@@ -35,10 +35,11 @@ def self.parse(str)
   end
 
   def self.expose(*methods)
+    method = nil
     %x{
       for (var i = 0, length = methods.length, method; i < length; i++) {
         method = methods[i];
-        self._proto['$' + method] = self._proto[method];
+        #{alias_native method, method}
       }
 
       return nil;

diff --git a/spec/element/animations_spec.rb b/spec/element/animations_spec.rb
@@ -23,11 +23,11 @@
       foo = Element.find "#animate-foo"
       foo.animate :width => "200px", :speed => 100
 
-      set_timeout 105 do
-        run_async {
+      run_async {
+        set_timeout 150 do
           (foo.css("width").to_f > 199).should eq(true)
-        }
-      end
+        end
+      }
     end
 
     async "should accept a block as a callback" do
@@ -36,11 +36,11 @@
         foo.add_class "finished"
       end
 
-      set_timeout 405 do
-        run_async {
+      run_async {
+        set_timeout 405 do
           foo.class_name.should eq("finished")
-        }
-      end
+        end
+      }
     end
   end
 end