confluence 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/confluence.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "confluence"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Chen"]

data/lib/confluence/railties/resolver.rb

@@ -10,8 +10,8 @@ module Confluence
           handler = _get_handler_from_nothing
           source = _get_source_from_path(partial_path)
           identifier = _get_identifier name, prefix
-          _get_templates( source, identifier, handler, details )
-          
+          normalized_details = _normalize_details(partial_path, details)
+          _get_templates( source, identifier, handler, normalized_details )
         else
           []
         end
@@ -19,6 +19,10 @@ module Confluence
 
       private
 
+      def _normalize_details( path, details )
+        details.merge( :virtual_path => path )
+      end
+
       def _checks
         @_checks ||= [
           lambda do |not_null|

data/spec/confluence/railties/resolver_spec.rb

@@ -25,6 +25,23 @@ describe Confluence::Railties::Resolver do
 
     end
 
+    describe "#_normalize_details" do
+      let(:get) { lambda { |path, details| resolver.send("_normalize_details",path,details ) } }
+
+      context "expected usage" do
+        let(:details) { {:locale=>[:en], :formats=>[:html], :handlers=>[:erb, :builder, :raw, :ruby, :jbuilder, :coffee, :haml]} }
+        let(:transform) { get.call "dog/cat/bat/bird", details }
+        [:virtual_path, :locale, :formats, :handlers].each do |key|
+          it "should have the #{key} key" do
+            transform.should_not be_empty
+            transform.should have_key key
+            transform[key].should_not be_nil
+            transform[key].should_not be_empty
+          end
+        end
+      end
+    end
+
     describe "#_get_gem_directory" do
       let(:get) { lambda { |parameter| resolver.send("_get_gem_directory", parameter) } }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confluence
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -380,7 +380,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -620723431868669143
+      hash: -2048542954068152514
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: