RubyGems - liquor - Versions diffs - 0.1.0 → 0.1.1 - Mend

liquor 0.1.0 → 0.1.1

Files changed (13) hide show

data/.travis.yml CHANGED Viewed

@@ -9,5 +9,4 @@ gemfile:
 branches:
   only:
     - master
-    - rails
     - rails32

data/AUTHORS CHANGED Viewed

@@ -1,2 +1,2 @@
 Liquid was originally developed by Tobias Luetke
-This fork was developed at Evil Martians by Timothy N. Tsvetkov <timothy.tsvetkov@gmail.com>
+This fork was developed at Evil Martians by Timothy N. Tsvetkov <timothy.tsvetkov@gmail.com>

data/CHANGELOG CHANGED Viewed

@@ -1,3 +1,5 @@
+* Rails 3.2+ support [Ivan Evtukhovich, Timothy N. Tsvetkov]
 * Forked and added powerful Drops with relations and some new tags. See more in docs [Timothy N. Tsvetkov]
 * Ruby 1.9.1 bugfixes

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liquor (0.1.0)
+    liquor (0.1.1)
       rails (~> 3.2.0)
 GEM

data/LICENSE CHANGED Viewed

@@ -1,4 +1,5 @@
-Copyright (c) 2012 Ivan Evtukhovich
+Copyright (c) 2005, 2006 Tobias Luetke
+Copyright (c) Timothy N. Tsvetkov
 MIT License

data/README.md CHANGED Viewed

@@ -1,5 +1,4 @@
-[https://secure.travis-ci.org/evilmartians/liquor.png](http://travis-ci.org/evilmartians/liquor)
+<a href="http://travis-ci.org/evilmartians/liquor"><img src="https://secure.travis-ci.org/evilmartians/liquor.png"></a>
 # Liquor template engine
@@ -21,7 +20,7 @@ Or install it yourself as:
 ## What does it look like?
-````
+```html
 	<ul id="products">
 	  {% for product in products %}
 	    <li>
@@ -32,17 +31,17 @@ Or install it yourself as:
  	    </li>
 	  {% endfor %}
 	</ul>
-````
+```
 ## Howto use Liquor
 Liquid supports a very simple API based around the Liquor::Template class.
 For standard use you can just pass it the content of a file and call render with a parameters hash.
-````
+```ruby
 	@template = Liquid::Template.parse("hi {{name}}") # Parses and compiles the template
 	@template.render( 'name' => '2kan' )              # => "hi 2kan"
-````
+```
 ## Differs from Liquid
@@ -54,20 +53,20 @@ Liquor drops are really powerful now. Now you can define access to methods, name
 #### Attributes
 To define attributes you need just add line with with attributes you want to provide access to:
-````
+```ruby
   class MyDrop < Liquor::Drop
     self.liquor_attributes << :title << :body
   end
-````
+```
 #### Named Scopes
 To define access to named scopes (result automatically will be converted to array of liquor drops):
-````
+```ruby
   class MyDrop < Liquor::Drop
     self.liquor_scopes << :recent << :limit << :scoped_to_user
   end
-````
+```
 Named scopes works like filters in templates. Don't worry about passing drop objects in templates as params in real calls they will be converted back to objects and then result will be converted to array of drops.
@@ -94,22 +93,22 @@ Within the context of a layout, yield identifies a section where content from th
 The simplest way to use this is to have a single yield, into which the entire contents of the view currently  being rendered is inserted.
 In your layout:
-````
+```erb
   <title>{% yield title %}</title>
   <body>{% yield %}</body>
-````
+```
 In the view:
-````
+```erb
   {% content_for title %} The title {% end_content_for %}
   The body
-````
+```
 Will produce:
-````
+```html
   <title>The title</title>
   <body>The body</body>
-````
+```
 ### Filters

data/Rakefile CHANGED Viewed

@@ -16,18 +16,16 @@ end
 namespace :profile do
   task :default => [:run]
   desc "Run the liquor profile/perforamce coverage"
   task :run do
     ruby "performance/shopify.rb"
   end
-  desc "Run KCacheGrind"
+  desc "Run KCacheGrind"
   task :grind => :run  do
     system "kcachegrind /tmp/liquor.rubyprof_calltreeprinter.txt"
   end
 end

data/lib/extras/liquid_view.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 # and use liquid as an template system for .liquid files
 #
 # Example
-#
+#
 #   ActionView::Base::register_template_handler :liquid, LiquidView
 class LiquidView
   PROTECTED_ASSIGNS = %w( template_root response _session template_class action_name request_origin session template
@@ -10,7 +10,7 @@ class LiquidView
                           ignore_missing_templates flash _params logger before_filter_chain_aborted headers )
   PROTECTED_INSTANCE_VARIABLES = %w( @_request @controller @_first_render @_memoized__pick_template @view_paths
                                      @helpers @assigns_added @template @_render_stack @template_format @assigns )
   def self.call(template)
     "LiquidView.new(self).render(template, local_assigns)"
   end
@@ -18,10 +18,10 @@ class LiquidView
   def initialize(view)
     @view = view
   end
   def render(template, local_assigns = nil)
     @view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
     # Rails 2.2 Template has source, but not locals
     if template.respond_to?(:source) && !template.respond_to?(:locals)
       assigns = (@view.instance_variables - PROTECTED_INSTANCE_VARIABLES).inject({}) do |hash, ivar|
@@ -31,15 +31,15 @@ class LiquidView
     else
       assigns = @view.assigns.reject{ |k,v| PROTECTED_ASSIGNS.include?(k) }
     end
     source = template.respond_to?(:source) ? template.source : template
     local_assigns = (template.respond_to?(:locals) ? template.locals : local_assigns) || {}
     if content_for_layout = @view.instance_variable_get("@content_for_layout")
       assigns['content_for_layout'] = content_for_layout
     end
     assigns.merge!(local_assigns.stringify_keys)
     liquid = Liquid::Template.parse(source)
     liquid.render(assigns, :filters => [@view.controller.master_helper_module], :registers => {:action_view => @view, :controller => @view.controller})
   end

data/lib/extras/liquor_view.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 # and use liquor as an template system for .liquor files
 #
 # Example
-#
+#
 #   ActionView::Base::register_template_handler :liquor, LiquorView
 class LiquorView
   PROTECTED_ASSIGNS = %w( template_root response _session template_class action_name request_origin session template
@@ -10,7 +10,7 @@ class LiquorView
                           ignore_missing_templates flash _params logger before_filter_chain_aborted headers )
   PROTECTED_INSTANCE_VARIABLES = %w( @_request @controller @_first_render @_memoized__pick_template @view_paths
                                      @helpers @assigns_added @template @_render_stack @template_format @assigns )
   def self.call(template)
     "LiquorView.new(self).render(template, local_assigns)"
   end
@@ -18,10 +18,10 @@ class LiquorView
   def initialize(view)
     @view = view
   end
   def render(template, local_assigns = nil)
     @view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
     # Rails 2.2 Template has source, but not locals
     if template.respond_to?(:source) && !template.respond_to?(:locals)
       assigns = (@view.instance_variables - PROTECTED_INSTANCE_VARIABLES).inject({}) do |hash, ivar|
@@ -31,15 +31,15 @@ class LiquorView
     else
       assigns = @view.assigns.reject{ |k,v| PROTECTED_ASSIGNS.include?(k) }
     end
     source = template.respond_to?(:source) ? template.source : template
     local_assigns = (template.respond_to?(:locals) ? template.locals : local_assigns) || {}
     if content_for_layout = @view.instance_variable_get("@content_for_layout")
       assigns['content_for_layout'] = content_for_layout
     end
     assigns.merge!(local_assigns.stringify_keys)
     liquor = Liquor::Template.parse(source)
     liquor.render(assigns, :filters => [@view.controller.master_helper_module], :registers => {:action_view => @view, :controller => @view.controller})
   end

data/lib/liquor/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Liquor
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/liquor.gemspec CHANGED Viewed

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/liquor/version', __FILE__)
 Gem::Specification.new do |gem|
-  gem.authors       = ["Ivan Evtukhovich"]
-  gem.email         = ["evtuhovich@gmail.com"]
+  gem.authors       = ["Timothy N. Tsvetkov", "Yaroslav Markin", "Ivan Evtukhovich"]
+  gem.email         = ["timothy.tsvetkov@gmail.com"]
   gem.description   = %q{Liquor is a safe (not evaling) template language based on Liquid template language}
   gem.summary       = %q{Liquor is a safe (not evaling) template language based on Liquid template language. Safe means that templates cannot affect security of the server they are rendered on. So it is usable when you need to give an ability to edit templates to your users (HTML or email).}
   gem.homepage      = "https://github.com/evilmartians/liquor"

metadata CHANGED Viewed

@@ -1,48 +1,37 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: liquor
-version: !ruby/object:Gem::Version
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease:
-  segments:
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors:
+authors:
+- Timothy N. Tsvetkov
+- Yaroslav Markin
 - Ivan Evtukhovich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2012-05-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement
+  requirement: &70145564706620 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 15
-        segments:
-        - 3
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
-  requirement: *id001
   prerelease: false
-description: Liquor is a safe (not evaling) template language based on Liquid template language
-email:
-- evtuhovich@gmail.com
+  version_requirements: *70145564706620
+description: Liquor is a safe (not evaling) template language based on Liquid template
+  language
+email:
+- timothy.tsvetkov@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
-files:
+files:
 - .travis.yml
 - AUTHORS
 - CHANGELOG
@@ -52,7 +41,6 @@ files:
 - LICENSE
 - MIT-LICENSE
 - README.md
-- README.rdoc
 - Rakefile
 - example/server/example_servlet.rb
 - example/server/liquid_servlet.rb
@@ -173,38 +161,32 @@ files:
 - test/yield_test.rb
 homepage: https://github.com/evilmartians/liquor
 licenses: []
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.23
+rubygems_version: 1.8.17
 signing_key:
 specification_version: 3
-summary: Liquor is a safe (not evaling) template language based on Liquid template language. Safe means that templates cannot affect security of the server they are rendered on. So it is usable when you need to give an ability to edit templates to your users (HTML or email).
-test_files:
+summary: Liquor is a safe (not evaling) template language based on Liquid template
+  language. Safe means that templates cannot affect security of the server they are
+  rendered on. So it is usable when you need to give an ability to edit templates
+  to your users (HTML or email).
+test_files:
 - test/assign_test.rb
 - test/block_test.rb
 - test/capture_test.rb

data/README.rdoc DELETED Viewed

@@ -1,114 +0,0 @@
-https://secure.travis-ci.org/evilmartians/liquor.png
-Travis[http://travis-ci.org/evilmartians/liquor]
-=Liquor template engine
-Liquor is a safe (not evaling) template language based on Liquid template language. Safe means that templates cannot affect security of the server they are rendered on. So it is usable when you need to give an ability to edit templates to your users (HTML or email).
-==What does it look like?
-	<ul id="products">
-	  {% for product in products %}
-	    <li>
-	      <h2>{{product.name}}</h2>
-	      Only {{product.price | price }}
-	      {{product.description | prettyprint | paragraph }}
- 	    </li>
-	  {% endfor %}
-	</ul>
-==Howto use Liquor
-Liquid supports a very simple API based around the Liquor::Template class.
-For standard use you can just pass it the content of a file and call render with a parameters hash.
-	@template = Liquid::Template.parse("hi {{name}}") # Parses and compiles the template
-	@template.render( 'name' => '2kan' )              # => "hi 2kan"
-==Differs from Liquid
-You can find Liquid docs here: http://github.com/tobi/liquid/wiki
-===Liquor Drops
-Liquor drops are really powerful now. Now you can define access to methods, named scopes and relations.
-====Attributes
-To define attributes you need just add line with with attributes you want to provide access to:
-  class MyDrop < Liquor::Drop
-    self.liquor_attributes << :title << :body
-  end
-====Named Scopes
-To define access to named scopes (result automatically will be converted to array of liquor drops):
-  class MyDrop < Liquor::Drop
-    self.liquor_scopes << :recent << :limit << :scoped_to_user
-  end
-Named scopes works like filters in templates. Don't worry about passing drop objects in templates as params in real calls they will be converted back to objects and then result will be converted to array of drops.
-====Relations
-We have now has_many, has_one and belongs_to relations. You don't need to pass any additional parameters to has_one or belongs_to relations because you just define ability to call real methods (results will be converted to liquid drops).
-But has_many method a bit more complicated since it defines a special proxy object from which you can call your named_scopes. There are several options for has_many relation:
-* class_name — A drop class name (ex. PostDrop)
-* sort_scope — Default scope for sorting objects in relations. If you class responds_to recent it will be used as the default one.
-* source_class_name — Class name of the source class (ex. Post)
-* with_scope — this scope always will be used for this relation
-===Named Scope
-Sometimes you need to pass a Named Scope object to a template. Now it is possible. When you assign a NamedScope to a template it assigns as is. But you are not able to execute any methods except array methods and paginate method, the last one was added for  for better integration with will_paginate plugin.
-===Tags
-Two new tags were added: content_for and yield.
-Within the context of a layout, yield identifies a section where content from the view should be inserted.
-The simplest way to use this is to have a single yield, into which the entire contents of the view currently  being rendered is inserted.
-In your layout:
-  <title>{% yield title %}</title>
-  <body>{% yield %}</body>
-In the view:
-  {% content_for title %} The title {% end_content_for %}
-  The body
-Will produce:
-  <title>The title</title>
-  <body>The body</body>
-===Filters
-Few filters were added:
-* yield — yield for content_for tag
-* in_groups_of — splits over the array in groups of size num padding any remaining slots with fill_with unless it is false
-* in_groups — splits or iterates over the array in number of groups, padding any remaining slots with fill_with unless it is false
-* include — returns true if the given object is present in self (that is, if any object == anObject), false otherwise.
-* to_json — return a JSON string representing the model drop (using accepted attributes, methods and named_scopes) to_include is a list of related drops through associations
-* url_escape — escape url
-* reverse — returns a new array containing self’s elements in reverse order.
-* decode_html_entities — decodes html entities
-* split — divides str into substrings based on a delimiter, returning an array of these substrings.
-* compact — returns a copy of self with all nil elements removed.
-* concat — concatenates two arrays
-===Expressions
-You can execute expressions in tags using standard filters syntax but spaces around separator are not allowed.
-This is correct expression:
-  {% assign playlist_array = site.playlists|by_name:artist.name %}
-And this is not:
-  {% assign playlist_array = site.playlists | by_name:artist.name %}
-You can use expressions in other tags for example in for loops:
-   {% for artist in site.artists.active.with_orders|scoped_to:genre %}