mote 1.0.0.rc1 → 1.0.0

data/lib/mote.rb

@@ -18,11 +18,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 class Mote
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0"
 
   PATTERN = /^\s*(%)(.*?)$|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
 
-  def self.parse(template, vars = [])
+  def self.parse(template, context = self, vars = [])
     terms = template.split(PATTERN)
 
     parts = "Proc.new do |params, __o|\n params ||= {}; __o ||= ''\n"
@@ -42,16 +42,16 @@ class Mote
 
     parts << "__o; end"
 
-    compile(TOPLEVEL_BINDING, parts)
+    compile(context, parts)
   end
 
   def self.compile(context, parts)
-    context.eval(parts)
+    context.instance_eval(parts)
   end
 
   module Helpers
-    def mote(filename, params = {})
-      mote_cache[filename] ||= Mote.parse(File.read(filename), params.keys)
+    def mote(filename, params = {}, context = self)
+      mote_cache[filename] ||= Mote.parse(File.read(filename), context, params.keys)
       mote_cache[filename][params]
     end
 

data/test/mote_test.rb

@@ -67,12 +67,12 @@ scope do
     context = Object.new
     def context.user; "Bruno"; end
 
-    example = Mote.parse("{{ context.user }}", [:context])
+    example = Mote.parse("{{ context.user }}", context, [:context])
     assert_equal "Bruno", example.call(context: context)
   end
 
   test "locals" do
-    example = Mote.parse("{{ user }}", [:user])
+    example = Mote.parse("{{ user }}", TOPLEVEL_BINDING, [:user])
     assert_equal "Bruno", example.call(user: "Bruno")
   end
 
@@ -107,8 +107,28 @@ end
 
 include Mote::Helpers
 
+class Cutest::Scope
+  def foo
+    "foo"
+  end
+end
+
 scope do
+  prepare do
+    mote_cache.clear
+  end
+
   test "helpers" do
     assert_equal "\n  *\n\n  *\n\n  *\n\n", mote("test/basic.mote", :n => 3)
   end
+
+  test "using functions in the context" do
+    assert_equal "foo\n", mote("test/foo.mote")
+  end
+
+  test "passing in a context" do
+    assert_raise NameError do
+      mote("test/foo.mote", {}, TOPLEVEL_BINDING)
+    end
+  end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: mote
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2152390280 !ruby/object:Gem::Requirement
+  requirement: &2156124580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152390280
+  version_requirements: *2156124580
 description: Mote is a very simple and fast template engine.
 email:
 - michel@soveran.com
@@ -54,9 +54,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11