Merge pull request #34 from gionkunz/master

Added better support for usage outside of rails (i.e. Middleman)
hiravgandhi · Jan 27, 2014 · 27bf075 · 27bf075 · jedisct1 · Feb 2, 2014
2 parents 8ddf99e + 137f7cf
commit 27bf075
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.idea
diff --git a/lib/angularjs-rails.rb b/lib/angularjs-rails.rb
@@ -2,7 +2,10 @@
 
 module AngularJS
   module Rails
-    class Engine < ::Rails::Engine
+    if defined? Rails::Engine
+      require "angularjs-rails/engine"
+    elsif defined? Sprockets
+      require "angularjs-rails/sprockets"
     end
   end
 end
diff --git a/lib/angularjs-rails/engine.rb b/lib/angularjs-rails/engine.rb
@@ -0,0 +1,6 @@
+module AngularJS
+  module Rails
+    class Engine < ::Rails::Engine
+    end
+  end
+end
diff --git a/lib/angularjs-rails/sprockets.rb b/lib/angularjs-rails/sprockets.rb
@@ -0,0 +1,3 @@
+require 'sprockets'
+
+Sprockets.append_path File.expand_path("../../../vendor/assets/javascript", __FILE__)
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ spec/reports @@
     test/tmp
     test/version_tmp
     tmp
+    /.idea
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		require 'sprockets'

		Sprockets.append_path File.expand_path("../../../vendor/assets/javascript", __FILE__)