locomotivecms-solid 0.2.2.1 → 4.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434d1b9f43610e469477ddadfe0e080c5137de05
-  data.tar.gz: 8f8cf72a3656ee3f283a81ae89613c64a766aadd
+  metadata.gz: 0e66c02929c30ed50d56ae70f03eda812d1f3415
+  data.tar.gz: 26cbcbbd0795d27181ff58b45749e654129e17fb
 SHA512:
-  metadata.gz: 534003b5afdfef1931a75ba7fca2c4b4b0e6e96bdbae1de453826cc7fe205866e5c069b2aed3c7d7991d2a62043dd8dddad1ee83dcc56b22fcbe5390282687a7
-  data.tar.gz: 277599d7cfd02d0d927f32cceeab7d0fb1d183169ae7018d3db9140d951df5f5b6e88519d07a77347c979bd728028c57ce7714d6e4102b7e24081aab7e54c575
+  metadata.gz: 41ea08b22297efb4f658a297934b6f46444ecbf9295d0af64877ef1a971718e235f15200553883e2025059c1f961b047ad4a9ae49e545827f5e3421cec962828
+  data.tar.gz: 0d639fee1c41c8300dd77db23d2f495eb54d4617d5e4a8afde50f10408293e5588b3d3c99c0ef2d2629d389385b271a3a61569aaec3985894daa2a470e7c4fb3

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in solid.gemspec
 gemspec
 
-# gem 'locomotivecms-liquid', path: '/Users/didier/Documents/LocomotiveCMS/gems/liquid'
+gem 'liquid', path: '/Users/didier/Documents/LocomotiveCMS/gems/liquid'

data/lib/solid/conditional_block.rb

@@ -1,35 +1,34 @@
 class Solid::ConditionalBlock < Liquid::Block
-  include Solid::Element
 
-  def initialize(tag_name, variable, tokens, context = {})
-    @blocks = []
-    push_block!
-    super
-  end
+  include Solid::Element
 
   def render(context)
     with_context(context) do
       display(*arguments.interpolate(context)) do |condition_satisfied|
-        block = condition_satisfied ? @blocks.first : @blocks[1]
-        render_all(block, context) if block
+        render_with_condition(condition_satisfied, context)
       end
     end
   end
 
+  def render_with_condition(condition_satisfied, context)
+    _body = nil
+
+    if condition_satisfied
+      _body = @condition_satisfied_body
+    else
+      return '' if @condition_satisfied_body.nil?
+    end
+
+    (_body || @body).render(context)
+  end
+
   def unknown_tag(tag, markup, tokens)
     if tag == 'else'
-      push_block!
+      @condition_satisfied_body = @body.clone
+      @body.instance_variable_set(:@nodelist, [])
     else
       super
     end
   end
 
-  private
-
-  def push_block!
-    block = []
-    @blocks.push(block)
-    @nodelist = block
-  end
-
 end

data/lib/solid/default_security_rules.rb

@@ -10,9 +10,13 @@ Solid::MethodWhitelist
       :second, :seconds, :minute, :minutes, :hour, :hours, :day, :days, :week, :weeks,
       :bytes, :kilobytes, :megabytes, :gigabytes, :terabytes, :petabytes, :exabytes],
     Integer => [:multiple_of?, :month, :months, :year, :years, :to_json],
+    String  => [:gsub, :strip, :chop, :chomp, :start_with?, :end_with?,
+      :[], :length, :size, :empty?, :=~, :split, :upcase, :downcase, :capitalize, :squeeze, :tr,
+      :exclude?, :truncate]
   ).deny(
     Module => [:const_get, :const_set, :const_defined?, :freeze, :ancestors],
     Class => [:new, :allocate, :superclass],
+    String => [:freeze]
   )
 
 if defined?(JSON::Ext::Generator::GeneratorMethods::Fixnum) &&

data/lib/solid/element.rb

@@ -5,9 +5,9 @@ module Solid::Element
     base.send(:include, Solid::Iterable)
   end
 
-  def initialize(tag_name, arguments_string, tokens, context = {})
-     super
-     @arguments = Solid::Arguments.parse(arguments_string)
+  def initialize(tag_name, arguments_string, options)
+    super
+    @arguments = Solid::Arguments.parse(arguments_string)
   end
 
   def arguments

data/lib/solid/liquid_extensions/assign_tag.rb

@@ -5,10 +5,10 @@ module Solid
 
       tag_name :assign
 
-      def initialize(tag_name, assignment, tokens, context = {})
+      def initialize(tag_name, assignment, options)
         @assigned_variable, expression = assignment.split('=', 2)
         @assigned_variable = @assigned_variable.strip
-        super(tag_name, expression, tokens, context)
+        super(tag_name, expression, options)
       end
 
       def display(expression_result)

data/lib/solid/liquid_extensions/if_tag.rb

@@ -1,22 +1,25 @@
 module Solid
   module LiquidExtensions
     class IfTag < Liquid::Block
+
       include Solid::Element
       extend TagHighjacker
 
       tag_name :if
 
-      def initialize(tag_name, expression, tokens, context = {})
+      def initialize(tag_name, expression, context = {})
         @blocks = []
         push_block!(expression)
         super
       end
 
       def render(context)
+        attach_body_to_last_block
+
         with_context(context) do
-          @blocks.each do |expression, blocks|
+          @blocks.each do |expression, body|
             if expression.evaluate(context)
-              return render_all(blocks, context)
+              return body.render(context)
             end
           end
         end
@@ -34,9 +37,17 @@ module Solid
       protected
 
       def push_block!(expression)
-        block = []
-        @blocks.push([Solid::Parser.parse(expression), block])
-        @nodelist = block
+        attach_body_to_last_block
+
+        @blocks.push([Solid::Parser.parse(expression), nil])
+      end
+
+      def attach_body_to_last_block
+        # the @body always represents the nodelist of the previous expression
+        if last_block = @blocks.last
+          last_block[1] = @body.clone
+          @body.instance_variable_set(:@nodelist, [])
+        end
       end
 
     end

data/lib/solid/liquid_extensions/unless_tag.rb

@@ -4,8 +4,8 @@ module Solid
 
       tag_name :unless
 
-      def initialize(tag_name, expression, tokens, context = {})
-        super(tag_name, "!(#{expression})", tokens, context)
+      def initialize(tag_name, expression, options)
+        super(tag_name, "!(#{expression})", options)
       end
 
     end

data/lib/solid/liquid_extensions/variable.rb

@@ -5,7 +5,9 @@ module Solid
 
       def initialize(markup, options={})
         super
-        @expression = Solid::Parser.parse(@name)
+        if markup =~ /(#{::Liquid::QuotedFragment})(.*)/om
+          @expression = Solid::Parser.parse($1)
+        end
       end
 
       def render(context)

data/lib/solid/version.rb

@@ -1,3 +1,3 @@
 module Solid
-  VERSION = '0.2.2.1'
+  VERSION = '4.0.0.alpha'
 end

data/locomotivecms-solid.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "i18n"
   s.add_development_dependency "ruby_parser", "~> 3.2"
-  s.add_development_dependency "activesupport", "~> 3"
+  s.add_development_dependency "activesupport", "~> 4.2"
 
-  s.add_runtime_dependency "locomotivecms-liquid", "~> 2.6.0"
+  # TODO
+  s.add_runtime_dependency "locomotivecms-liquid", "4.0.0.alpha"
 end

data/spec/solid/block_spec.rb

@@ -20,7 +20,7 @@ describe Solid::Block do
 
     let(:tokens) { ["dummy", "{% enddummy %}", "outside"] }
 
-    subject{ DummyBlock.new('dummy', 'condition', tokens) }
+    subject{ DummyBlock.parse('dummy', 'condition', tokens, {}) }
 
     it 'yielding should render the block content' do
       subject.render(Liquid::Context.new('condition' => true)).should be == 'dummy'

data/spec/solid/conditional_block_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 class IfPresent < Solid::ConditionalBlock
 
+  tag_name :ifpresent
+
   def display(string)
     yield(!string.strip.empty?)
   end
@@ -14,9 +16,9 @@ describe Solid::ConditionalBlock do
 
   describe '#display' do
 
-    let(:tokens) { ["present", "{% else %}", "blank", "{% endifpresent %}"] }
+    let(:template) { "{% ifpresent mystring %}present{% else %}blank{% endifpresent %}"}
 
-    subject{ IfPresent.new('ifpresent', 'mystring', tokens) }
+    subject { Liquid::Template.parse(template) }
 
     it 'yielding true should render the main block' do
       context = Liquid::Context.new('mystring' => 'blah')
@@ -28,10 +30,15 @@ describe Solid::ConditionalBlock do
       subject.render(context).should be == 'blank'
     end
 
-    it 'yielding false without a `else` block does not render anything' do
-      context = Liquid::Context.new('mystring' => '')
-      subject = IfPresent.new('ifpresent', 'mystring', ['present', '{% endifpresent %}'])
-      subject.render(context).should be_nil
+    context 'without a `else` block' do
+
+      let(:template) { "{% ifpresent mystring %}present{% endifpresent %}"}
+
+      it 'yielding false should not render anything' do
+        context = Liquid::Context.new('mystring' => '')
+        subject.render(context).should be == ''
+      end
+
     end
 
   end

data/spec/solid/default_security_rules_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'active_support'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
 
 describe Solid, 'default security rules' do
@@ -105,7 +107,8 @@ describe Solid, 'default security rules' do
   describe 'Range instances' do
     subject { 1..10 }
 
-    it_should_behave_like 'a ruby object', 'an enumerable'
+    # FIXME (Did): length and to_json are not methods of the Range class anymore
+    # it_should_behave_like 'a ruby object', 'an enumerable'
     it_should_safely_respond_to :first, :last, :begin, :end, :max, :min, :cover?, :include?, :member?
   end
 

data/spec/solid/element_examples.rb

@@ -22,7 +22,7 @@ shared_examples "a Solid element" do
     let(:element) do
       described_class.context_attribute :current_user
       Solid::Arguments.stub(:parse).with('ARGUMENTS_STRING')
-      element = described_class.new('name', 'ARGUMENTS_STRING', ['{% endname %}'])
+      element = described_class.parse('name', 'ARGUMENTS_STRING', ['{% endname %}'], {})
     end
 
     it 'should define a custom accessor to the rendered context' do
@@ -42,11 +42,11 @@ shared_examples "a Solid element" do
 
     it 'should instanciate a Solid::Arguments with his arguments_string' do
       Solid::Arguments.should_receive(:parse).with('ARGUMENTS_STRING')
-      described_class.new('name', 'ARGUMENTS_STRING', ['{% endname %}'])
+      described_class.parse('name', 'ARGUMENTS_STRING', ['{% endname %}'], {})
     end
 
     it 'should store his Solid:Arguments instance' do
-      element = described_class.new('name', '1', ['{% endname %}'])
+      element = described_class.parse('name', '1', ['{% endname %}'], {})
       element.arguments.should be_a(Solid::Arguments)
     end
 
@@ -56,7 +56,7 @@ shared_examples "a Solid element" do
 
     it 'should force developper to define it in child class' do
       Solid::Arguments.stub(:parse).with('ARGUMENTS_STRING')
-      element = described_class.new('name', 'ARGUMENTS_STRING', ['{% endname %}'])
+      element = described_class.parse('name', 'ARGUMENTS_STRING', ['{% endname %}'], {})
       expect{
         element.display
       }.to raise_error(NotImplementedError)

data/spec/solid/tag_spec.rb

@@ -12,7 +12,7 @@ describe Solid::Tag do
 
   it_behaves_like "a Solid element"
 
-  subject{ DummyTag.new('dummy', '1, "foo", myvar, myopts: false', 'token') }
+  subject{ DummyTag.parse('dummy', '1, "foo", myvar, myopts: false', 'token', {}) }
 
   it 'should works' do
     subject.render('myvar' => 'bar').should be == '[1, "foo", "bar", {:myopts=>false}]'
@@ -23,4 +23,4 @@ describe Solid::Tag do
     subject.render('myvar' => 'bar').should be == 'result'
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms-solid
 version: !ruby/object:Gem::Version
-  version: 0.2.2.1
+  version: 4.0.0.alpha
 platform: ruby
 authors:
 - Jean Boussier
@@ -10,92 +10,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !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: 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: i18n
   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: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: locomotivecms-liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 4.0.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 4.0.0.alpha
 description: The Solid gem from the TigerLily team but modified to work with LocomotiveCMS
 email:
 - jean.boussier@tigerlilyapps.com
@@ -105,9 +105,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -167,17 +167,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Helpers for easily creating custom Liquid tags and block