btakita-jelly 0.6.0 → 0.6.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 6

data/lib/jelly/jelly_helper.rb

@@ -1,9 +1,10 @@
 module JellyHelper
 
   def application_jelly_files(jelly_files_path_from_javascripts = '', rails_root = RAILS_ROOT)
+    rails_root = File.expand_path(rails_root)
     (
-      Dir["#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/components/**/*.js"] +
-      Dir["#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/pages/**/*.js"]
+      Dir[File.expand_path("#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/components/**/*.js")] +
+      Dir[File.expand_path("#{rails_root}/public/javascripts/#{jelly_files_path_from_javascripts}/pages/**/*.js")]
     ).map do |path|
       path.gsub("#{rails_root}/public/javascripts/", "").gsub(/\.js$/, "")
     end

data/spec/helpers/jelly_helper_spec.rb

@@ -14,11 +14,22 @@ describe JellyHelper do
   end
 
   describe "#application_jelly_files" do
-    it "returns the javascript files in /javascipts/pages and /javascipts/components" do
-      my_rails_root = File.join(File.dirname(__FILE__), '/../fixtures')
-      files = helper.application_jelly_files("foo", my_rails_root)
-      files.should_not be_empty
-      files.should =~ ['foo/components/paw', 'foo/components/teeth', 'foo/pages/lions', 'foo/pages/tigers', 'foo/pages/bears']
+    context "when passing in a jelly path" do
+      it "returns the javascript files in /javascipts/:jelly_path/pages and /javascipts/:jelly_path/components" do
+        my_rails_root = File.join(File.dirname(__FILE__), '/../fixtures')
+        files = helper.application_jelly_files("foo", my_rails_root)
+        files.should_not be_empty
+        files.should =~ ['foo/components/paw', 'foo/components/teeth', 'foo/pages/lions', 'foo/pages/tigers', 'foo/pages/bears']
+      end
+    end
+
+    context "when not passing in a jelly path" do
+      it "returns the javascript files in /javascipts/pages and /javascipts/components" do
+        my_rails_root = File.join(File.dirname(__FILE__), '/../fixtures')
+        files = helper.application_jelly_files("", my_rails_root)
+        files.should_not be_empty
+        files.should =~ ['components/component1', 'pages/page1']
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: btakita-jelly
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Pivotal Labs, Inc