opal-jquery 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a59c85f98bfc9492071646b6bfb475fa901bc9
-  data.tar.gz: 482d3c0bdc6c64a56e785909f111af4c2ff2abf9
+  metadata.gz: 15f89460a5383c4cac26b038d21b86d96543a44a
+  data.tar.gz: bffe7c3427abcdd767fbf8db2ae69b8ee4c54e6b
 SHA512:
-  metadata.gz: 4532a13456f025938b72ca671bd9bba3921f47fc78992e74172763f0559e254a418bbd5f261024b30fbf6222600ed54a724a34d5b114d8290350df4a47b71634
-  data.tar.gz: 8608e4673b228258dec7a972fc3257f9be3cb6dc5af1f190b76c7811eef3fbe200757b11b2dd38a9ca23e3012d4bdfdea4000fee8ddc9921cfcfb7b169c59da4
+  metadata.gz: 5220c73d6ef31b04c166e38e37ca8f0a2481768fa018550abf9fe48864e513679cff67d95126eb2179a432507c82dd2974f4ca67c9aecaabef15d0659e6e4003
+  data.tar.gz: 383b2fe50f6f72ee987310fc4835c41271d740d3be1e4f907f083af1b3aa686a8011891c442826586b4df2e683cba833090399f84029f3c7c1edc6b5d2705a02

data/Rakefile

@@ -2,12 +2,12 @@ require 'bundler'
 Bundler.require
 Bundler::GemHelper.install_tasks
 
-require 'opal/spec/rake_task'
-Opal::Spec::RakeTask.new(:default) do |s|
+require 'opal/rspec/rake_task'
+Opal::RSpec::RakeTask.new(:default) do |s|
   s.index_path = 'spec/jquery/index.html'
 end
 
-Opal::Spec::RakeTask.new(:zepto) do |s|
+Opal::RSpec::RakeTask.new(:zepto) do |s|
   s.index_path = 'spec/zepto/index.html'
 end
 

data/config.ru

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler.require
 
 run Opal::Server.new { |s|
-  s.main = 'opal/spec/sprockets_runner'
+  s.main = 'opal/rspec/sprockets_runner'
   s.append_path 'spec'
   s.debug = false
   s.index_path = 'spec/jquery/index.html'

data/lib/opal/jquery/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module JQuery
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/opal-jquery.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.require_paths  = ['lib']
 
   s.add_runtime_dependency 'opal', '~> 0.5.0'
-  s.add_development_dependency 'opal-spec', '~> 0.3.0'
+  s.add_development_dependency 'opal-rspec'
 end

data/opal/opal-jquery/element.rb

@@ -1,22 +1,18 @@
-class Element
-  %x{
-    var root = $opal.global, dom_class;
+%x{
+  var root = $opal.global, dom_class;
 
-    if (root.jQuery) {
-      dom_class = jQuery
-    }
-    else if (root.Zepto) {
-      dom_class = Zepto.zepto.Z;
-    }
-    else {
-      throw new Error("jQuery must be included before opal-jquery");
-    }
-
-    self._proto = dom_class.prototype, def = self._proto;
-    dom_class.prototype._klass = self;
+  if (root.jQuery) {
+    dom_class = jQuery
+  }
+  else if (root.Zepto) {
+    dom_class = Zepto.zepto.Z;
+  }
+  else {
+    throw new Error("jQuery must be included before opal-jquery");
   }
+}
 
-  include Kernel
+class Element < `dom_class`
   include Enumerable
 
   def self.find(selector)

data/opal/opal-jquery/http.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'native'
 
 class HTTP
   attr_reader :body, :error_message, :method, :status_code, :url, :xhr

data/spec/element/animations_spec.rb

@@ -9,33 +9,37 @@ describe "Element animation methods" do
     ### HACKY
     # jQUery's animate method doesn't *always* finish on time
     # so the values are being compared using greater than
-    
+
     it "should animate a set of properties and values" do
       foo = Element.find "#animate-foo"
       foo.animate :width => "200px"
 
       set_timeout 400 do
-        (foo.css("width").to_f > 199).should be_true
+        (foo.css("width").to_f > 199).should eq(true)
       end
     end
 
-    it "should allow you to set a speed in the params" do
+    async "should allow you to set a speed in the params" do
       foo = Element.find "#animate-foo"
       foo.animate :width => "200px", :speed => 100
 
       set_timeout 105 do
-        (foo.css("width").to_f > 199).should be_true
+        run_async {
+          (foo.css("width").to_f > 199).should eq(true)
+        }
       end
     end
 
-    it "should accept a block as a callback" do
+    async "should accept a block as a callback" do
       foo = Element.find "#animate-foo"
-      foo.animate :width => "200px" do
+      foo.animate :width => "200px", :speed => 100 do
         foo.add_class "finished"
       end
 
       set_timeout 405 do
-        foo.class_name.should equal("finished")
+        run_async {
+          foo.class_name.should eq("finished")
+        }
       end
     end
   end

data/spec/element/attributes_spec.rb

@@ -72,14 +72,14 @@ describe Element do
   describe "#add_class" do
     it "should add the given class name to the element" do
       foo = Element.find '#foo'
-      foo.has_class?('lemons').should be_false
+      foo.has_class?('lemons').should eq(false)
       foo.add_class 'lemons'
-      foo.has_class?('lemons').should be_true
+      foo.has_class?('lemons').should eq(true)
     end
 
     it "should not duplicate class names on an element" do
       bar = Element.find '#bar'
-      bar.has_class?('apples').should be_true
+      bar.has_class?('apples').should eq(true)
       bar.add_class 'apples'
       bar.class_name.should == 'apples'
     end
@@ -93,9 +93,9 @@ describe Element do
 
   describe '#has_class?' do
     it "should return true if the element has the given class" do
-      Element.find('#has-foo').has_class?("apples").should be_true
-      Element.find('#has-foo').has_class?("oranges").should be_false
-      Element.find('#has-bar').has_class?("lemons").should be_true
+      Element.find('#has-foo').has_class?("apples").should eq(true)
+      Element.find('#has-foo').has_class?("oranges").should eq(false)
+      Element.find('#has-bar').has_class?("lemons").should eq(true)
     end
   end
 
@@ -152,16 +152,16 @@ describe Element do
   describe '#toggle_class' do
     it 'adds the given class name to the element if not already present' do
       foo = Element.find('#foo')
-      foo.has_class?('oranges').should be_false
+      foo.has_class?('oranges').should eq(false)
       foo.toggle_class 'oranges'
-      foo.has_class?('oranges').should be_true
+      foo.has_class?('oranges').should eq(true)
     end
 
     it 'removes the class if the element already has it' do
       bar = Element.find('#bar')
-      bar.has_class?('apples').should be_true
+      bar.has_class?('apples').should eq(true)
       bar.toggle_class 'apples'
-      bar.has_class?('apples').should be_false
+      bar.has_class?('apples').should eq(false)
     end
   end
 

data/spec/element/method_missing_spec.rb

@@ -25,8 +25,8 @@ describe "Element#exposes" do
   end
 
   it "only forwards calls when a native method exists" do
-    lambda {
+    expect {
       Element.new.some_unknown_plugin
-    }.should raise_error(NoMethodError)
+    }.to raise_error(Exception)
   end
 end

data/spec/http_spec.rb

@@ -13,7 +13,7 @@ describe HTTP do
     async 'can add a success callback after the request is sent' do
       http = HTTP.get('spec/fixtures/simple.txt')
       http.callback do |response|
-        run_async { response.ok?.should be_true }
+        run_async { response.should be_ok }
       end
     end
   end
@@ -22,7 +22,7 @@ describe HTTP do
     async 'can add a failure callback after the request is sent' do
       http = HTTP.get('spec/fixtures/bad_url.txt')
       http.errback do |response|
-        run_async { response.ok?.should be_false }
+        run_async { response.should_not be_ok }
       end
     end
   end
@@ -38,13 +38,13 @@ describe HTTP do
   describe '#ok?' do
     async 'returns true when the request was a sucess' do
       HTTP.get('spec/fixtures/simple.txt') do |response|
-        run_async { response.ok?.should be_true }
+        run_async { response.should be_ok }
       end
     end
 
     async 'returns false when the request failed' do
       HTTP.get('spec/fixtures/non_existant.txt') do |response|
-        run_async { response.ok?.should be_false }
+        run_async { response.should_not be_ok }
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'opal-spec'
+require 'opal-rspec'
 require 'opal-jquery'
 
 module JqueryHelpers
@@ -30,6 +30,6 @@ module JqueryHelpers
   end
 end
 
-class OpalSpec::Example
-  extend JqueryHelpers
+RSpec.configure do |config|
+  config.extend JqueryHelpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-jquery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: opal-spec
+  name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 description: Opal DOM library for jquery
 email: adam.beynon@gmail.com
 executables: []