liquor 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ef7fa085b465a0646c8be617a2613d9e356d88a
-  data.tar.gz: d56329e733409b09c995753153a7f7554a204e56
+  metadata.gz: dacc35e01493e5bc4d0aa69629450accc671d9b4
+  data.tar.gz: ca5b99b8cf52417a767f499a76725ba459bf85a9
 SHA512:
-  metadata.gz: f6053357a0eda36facb65118faa915a9e39968bc600b867cc326c5af3c361ca875e6bc9ac46a90c9bb6bc016650d04ae33ff79a8b3effe0d392e7d20ab8f2cc2
-  data.tar.gz: bd3996c257bdeb3dab80e77b463322e6681a7ac73258c7e1f3245a2c1e78b3fac6a3bdfbb3ee9cdeb8aa305ece2924e9a5c37ec8477597242cbc88f789139a4a
+  metadata.gz: 78535449b81a601dd6c0699f4f00a471bbada7ab6b0ea68be950a3e14bec33824fe3f9d1f075e57fa517875727c58486214237943463eb9d4c7b802db60756a8
+  data.tar.gz: 443c4fba66a47056414296c036200d294dd73bfb289f65ebb8db59e3e079e26dc6d2ecbb02a43f1d1385c654321f63a66543518b34e45cf14d1faf4f73fe0143

data/lib/liquor/stdlib/builtin_functions.rb

@@ -232,11 +232,24 @@ module Liquor
       end
     end
 
-    # DEPRECATED
     function "includes",
-              unnamed_arg: :tuple,
+              unnamed_arg: [:tuple, :external],
               mandatory_named_args: { element: :any } do |arg, kw|
-      arg.include?(kw[:element])
+      if arg.respond_to? :include?
+        arg.include?(kw[:element])
+      else
+        raise Liquor::TypeError.new("includes() requires an external that exports include? method")
+      end
+    end
+
+    function "index_of",
+             unnamed_arg: [:tuple, :external],
+             mandatory_named_args: { element: :any } do |arg, kw|
+      if arg.respond_to? :index
+        arg.index(kw[:element])
+      else
+        raise Liquor::TypeError.new("includes() requires an external that exports index method")
+      end
     end
 
     #

data/lib/liquor/version.rb

@@ -1,3 +1,3 @@
 module Liquor
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/builtins_spec.rb

@@ -197,6 +197,7 @@ describe Liquor do
     exec(%!{{ '12 Jun' | strftime format: '%d' }}!).should == "12"
     exec(%!{{ to_number("12") + 10 }}!).should == "22"
     exec(%!{% if includes([ 1, 2, 3 ] element: 2) then: %}yes{% end if %}!).should == "yes"
+    exec(%!{{ index_of([1, 2, 3] element: 2) }}!).should == "1"
     exec(%!{{ [ 1, 2, 3 ] | reverse | join }}!).should == "3 2 1"
     exec(%!{{ [ 1, null, 3 ] | compact | join }}!).should == "1 3"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquor
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Peter Zotov
@@ -10,146 +10,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Liquor is a template system based on well-defined, strongly dynamically
@@ -162,9 +162,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -228,17 +228,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Liquor is a template system based on well-defined, strongly dynamically typed