locomotivecms_wagon 1.5.0.rc1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d570dba66f67cbb039827e8662d437905ef855
-  data.tar.gz: fd86e0b2507280c1046bad99a730916b199c1b33
+  metadata.gz: 3eb1d85c3211cccddf3105489a759908fdd12832
+  data.tar.gz: 62a514ee0e9d0a749feb6dc18a09e696cd1b2e0d
 SHA512:
-  metadata.gz: 7debdfefd1c0e609f8c022970d7725e436248e53d67196bdf3427b64d223dc1bd600665d30b1d5acb43a3407e7c3ad1a864df08d6657f7a071beb6d1f1e1857e
-  data.tar.gz: 852a9e0f2405d4e51509ff154da6694b84e662824d95768411f3b98f2b842568621444c62848fbc2b2674d1666c4273cfcb23ccb309e47cc137321b6f79e5f50
+  metadata.gz: 3f0f662eaa63ae25c3ab9b52bd7f732e7352ca956827b4e2b5471575fe542398e823c6b6b321157163c20b2147cb913d2887bc017469d68811962730d68e9d52
+  data.tar.gz: 3d16d23bec319002eb7a0f185044364eb3dcd69b8bfd99612d04f9afca762f7c90fd7fb5a9e3e7730b0557dc674139963dc8cd898335d939be51836da3eb82e6

data/lib/locomotive/wagon/liquid/tags/with_scope.rb

@@ -2,42 +2,46 @@ module Locomotive
   module Wagon
     module Liquid
       module Tags
-        class WithScope < ::Liquid::Block
 
-          SlashedString = /\/[^\/]*\//
-          TagAttributes = /(\w+|\w+\.\w+)\s*\:\s*(#{SlashedString}|#{::Liquid::QuotedFragment})/
+        class WithScope < Solid::Block
 
-          def initialize(tag_name, markup, tokens, options)
-            @tag_options = HashWithIndifferentAccess.new
-            markup.scan(TagAttributes) do |key, value|
-              @tag_options[key] = value
-            end
-            super
+          OPERATORS = %w(all exists gt gte in lt lte ne nin size near within)
+
+          SYMBOL_OPERATORS_REGEXP = /(\w+\.(#{OPERATORS.join('|')})){1}\s*\:/
+
+          # register the tag
+          tag_name :with_scope
+
+          def initialize(tag_name, arguments_string, tokens, context = {})
+            # convert symbol operators into valid ruby code
+            arguments_string.gsub!(SYMBOL_OPERATORS_REGEXP, ':"\1" =>')
+
+            super(tag_name, arguments_string, tokens, context)
           end
 
-          def render(context)
-            context.stack do
-              context['with_scope'] = decode(@tag_options, context)
-              render_all(@nodelist, context)
+          def display(options = {}, &block)
+            current_context.stack do
+              current_context['with_scope'] = self.decode(options)
+              yield
             end
           end
 
-          private
-
-          def decode(attributes, context)
-            attributes.each_pair do |key, value|
-              attributes[key] = (case value
-              when /^true|false$/i    then value == 'true'
-              when /^\/[^\/]*\/$/     then Regexp.new(value[1..-2])
-              when /^["|'](.+)["|']$/ then $1.gsub(/^["|']/, '').gsub(/["|']$/, '')
-              else
-                context[value].nil? ? value : context[value]
-              end)
+          protected
+
+          def decode(options)
+            HashWithIndifferentAccess.new.tap do |hash|
+              options.each do |key, value|
+                hash[key] = (case value
+                  # regexp inside a string
+                when /^\/[^\/]*\/$/ then Regexp.new(value[1..-2])
+                else
+                  value
+                end)
+              end
             end
           end
         end
 
-        ::Liquid::Template.register_tag('with_scope', WithScope)
       end
     end
   end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.5.0.rc1'
+    VERSION = '1.5.0'
   end
 end

data/spec/fixtures/default/app/views/pages/filtered.liquid.haml

@@ -1,11 +1,11 @@
 ---
 title: Various uses of the with_scope tag
 ---
-{% assign begin   = '2012-06-01 00:00:00' %}
-{% assign end     = '2012-06-10 23:59:59' %}
-{% assign prices  = '5.0,5.5' | split: ',' | map: 'to_f' %}
+{% assign begin_date  = '2012-06-01 00:00:00' %}
+{% assign end_date    = '2012-06-10 23:59:59' %}
+{% assign prices      = '5.0,5.5' | split: ',' | map: 'to_f' %}
 
-{% with_scope date.gte: begin, date.lte: end, city: /Kansas/, state.ne: 'Illinois', tags: 'awesome', tags.nin: 'bad', price.in: prices, order_by: 'price.desc' %}
+{% with_scope date.gte: begin_date, date.lte: end_date, city: /Kansas/, state.ne: 'Illinois', tags: 'awesome', tags.nin: 'bad', price.in: prices, order_by: 'price.desc' %}
 events={{ contents.events.count }}.
 {% endwith_scope %}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc1
+  version: 1.5.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -845,9 +845,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2