Move core files under opal/jquery dir rather than opal-jquery

adambeynon · adambeynon · commit 44ba2041c749 · 2014-12-07T16:11:32.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # EDGE
 
+*   Move all files under `opal/jquery` require namespace, rather than
+    current `opal-jquery` require paths.
+
 *   Add `Browser::Window` class, and make `::Window` an instance of it.
 
 *   Make `Document` include `Browser::DocumentMethods` which is a simple
diff --git a/lib/opal/jquery.rb b/lib/opal/jquery.rb
@@ -1,4 +1,13 @@
-require 'opal'
-require 'opal/jquery/version'
+if RUBY_ENGINE == 'opal'
+  require 'opal/jquery/window'
+  require 'opal/jquery/document'
+  require 'opal/jquery/element'
+  require 'opal/jquery/event'
+  require 'opal/jquery/http'
+  require 'opal/jquery/kernel'
+else
+  require 'opal'
+  require 'opal/jquery/version'
 
-Opal.append_path File.expand_path('../../../opal', __FILE__).untaint
+  Opal.append_path File.expand_path('../..', __FILE__).untaint
+end
diff --git a/lib/opal/jquery/constants.rb b/lib/opal/jquery/constants.rb
diff --git a/lib/opal/jquery/document.rb b/lib/opal/jquery/document.rb
@@ -1,5 +1,5 @@
-require 'opal-jquery/constants'
-require 'opal-jquery/element'
+require 'opal/jquery/constants'
+require 'opal/jquery/element'
 
 module Browser
   # {Document} includes these methods to extend {Element}.
diff --git a/lib/opal/jquery/element.rb b/lib/opal/jquery/element.rb
@@ -1,5 +1,5 @@
 require 'native'
-require 'opal-jquery/constants'
+require 'opal/jquery/constants'
 
 # {Element} is a toll-free bridged class that maps to native jQuery instances.
 #
diff --git a/lib/opal/jquery/event.rb b/lib/opal/jquery/event.rb
@@ -1,4 +1,4 @@
-require 'opal-jquery/constants'
+require 'opal/jquery/constants'
 
 # {Event} wraps native jQuery events into a ruby api. Instances of events
 # can be accessed by {#to_n}.
diff --git a/lib/opal/jquery/http.rb b/lib/opal/jquery/http.rb
@@ -1,7 +1,7 @@
 require 'json'
 require 'native'
 require 'promise'
-require 'opal-jquery/constants'
+require 'opal/jquery/constants'
 
 # {HTTP} is used to perform a `XMLHttpRequest` in ruby. It is a simple wrapper
 # around jQuerys' `$.ajax` call. `XMLHttpRequest` is not wrapped directly as
diff --git a/lib/opal/jquery/kernel.rb b/lib/opal/jquery/kernel.rb
diff --git a/lib/opal/jquery/local_storage.rb b/lib/opal/jquery/local_storage.rb
@@ -11,8 +11,8 @@ module Browser
   # LocalStorage is not included by default when you require opal-jquery, so
   # you will need to require it explicitly in your code:
   #
-  #     require 'opal-jquery'
-  #     require 'opal-jquery/local_storage'
+  #     require 'opal/jquery'
+  #     require 'opal/jquery/local_storage'
   #
   #     puts LocalStorage
   #     # => #<LocalStorage>
diff --git a/lib/opal/jquery/rspec.rb b/lib/opal/jquery/rspec.rb
@@ -8,7 +8,7 @@ module Browser
   #
   #     require 'application'
   #     require 'opal-rspec'
-  #     require 'opal-jquery/rspec'
+  #     require 'opal/jquery/rspec'
   #
   # Once required, the module is registered with `rspec` for all example
   # groups.
diff --git a/lib/opal/jquery/window.rb b/lib/opal/jquery/window.rb
@@ -1,4 +1,4 @@
-require 'opal-jquery/element'
+require 'opal/jquery/element'
 
 module Browser
   # {Window} instances are {Native} objects used to wrap native window instances.
diff --git a/opal/opal-jquery.rb b/opal/opal-jquery.rb
diff --git a/spec/local_storage_spec.rb b/spec/local_storage_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'opal-jquery/local_storage'
+require 'opal/jquery/local_storage'
 
 describe LocalStorage do
   before { subject.clear }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 require 'opal-rspec'
-require 'opal-jquery'
-require 'opal-jquery/rspec'
+require 'opal/jquery'
+require 'opal/jquery/rspec'
 
 module JQueryTestHelpers
   def find(selector)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`require 'native'`
`2`		`-require 'opal-jquery/constants'`
	`2`	`+require 'opal/jquery/constants'`
`3`	`3`
`4`	`4`	`# {Element} is a toll-free bridged class that maps to native jQuery instances.`
`5`	`5`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'opal-jquery/constants'`
	`1`	`+require 'opal/jquery/constants'`
`2`	`2`
`3`	`3`	`# {Event} wraps native jQuery events into a ruby api. Instances of events`
`4`	`4`	`# can be accessed by {#to_n}.`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ module Browser`
`11`	`11`	`# LocalStorage is not included by default when you require opal-jquery, so`
`12`	`12`	`# you will need to require it explicitly in your code:`
`13`	`13`	`#`
`14`		`- # require 'opal-jquery'`
`15`		`- # require 'opal-jquery/local_storage'`
	`14`	`+ # require 'opal/jquery'`
	`15`	`+ # require 'opal/jquery/local_storage'`
`16`	`16`	`#`
`17`	`17`	`# puts LocalStorage`
`18`	`18`	`# # => #<LocalStorage>`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ module Browser`
`8`	`8`	`#`
`9`	`9`	`# require 'application'`
`10`	`10`	`# require 'opal-rspec'`
`11`		`- # require 'opal-jquery/rspec'`
	`11`	`+ # require 'opal/jquery/rspec'`
`12`	`12`	`#`
`13`	`13`	# Once required, the module is registered with `rspec` for all example
`14`	`14`	`# groups.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'opal-jquery/element'`
	`1`	`+require 'opal/jquery/element'`
`2`	`2`
`3`	`3`	`module Browser`
`4`	`4`	`# {Window} instances are {Native} objects used to wrap native window instances.`