puffer_pages 0.5.0 → 0.5.1

data/.travis.yml

@@ -7,8 +7,12 @@ gemfile:
   - Gemfile
   - gemfiles/Gemfile.rails-3-1
   - gemfiles/Gemfile.rails-3-2
-  # - gemfiles/Gemfile.rails-head
+  - gemfiles/Gemfile.rails-head
 
 env:
   - LOCALIZE=true
-  - LOCALIZE=false
+  - LOCALIZE=false
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/Gemfile.rails-head

data/CHANGELOG.md

@@ -1,9 +1,25 @@
 ## 0.6.0 \[ In Development \] \[ Branch: master \]
 
+### New features
+
+## 0.5.1
+
+### New features
+
+*   Added abulity to cancel puffer_page rendering with `render puffer_page: false` option.
+
+*   Added pluralization support to liquid backend (Exoth).
+
+*   Added `image` liquid tag - alias to image_path helper (andrewgr).
+
+### Bugfixes
+
 ## 0.5.0
 
 ### New features
 
+*   PufferPages is mountable engine now, so `mount PufferPages::Engine => '/'`
+
 *   `scope` tag. Just creates variables scope inside its block.
 
 *   Origins - full import-export system. Just add your remote server and syncronize all the pages.

data/README.md

@@ -1,3 +1,4 @@
+[![Code Climate](https://codeclimate.com/github/puffer/puffer_pages.png)](https://codeclimate.com/github/puffer/puffer_pages)
 [![Build Status](https://secure.travis-ci.org/puffer/puffer_pages.png)](http://travis-ci.org/puffer/puffer_pages)
 
 # PufferPages is lightweight but powerful rails >= 3.1 CMS

data/gemfiles/Gemfile.rails-3-1

@@ -3,5 +3,5 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'puffer', github: 'puffer/puffer'
-gem 'activeuuid', github: 'jashmenn/activeuuid'
 gem 'rails', '~> 3.1.0'
+gem 'activeuuid'

data/gemfiles/Gemfile.rails-3-2

@@ -3,5 +3,5 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'puffer', github: 'puffer/puffer'
-gem 'activeuuid', github: 'jashmenn/activeuuid'
 gem 'rails', '~> 3.2.0'
+gem 'activeuuid'

data/gemfiles/Gemfile.rails-head

@@ -3,5 +3,5 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'puffer', github: 'puffer/puffer'
-gem 'activeuuid', github: 'jashmenn/activeuuid'
 gem 'rails', github: 'rails/rails'
+gem 'activeuuid'

data/lib/puffer_pages.rb

@@ -65,6 +65,7 @@ require 'puffer_pages/liquid/tags/url'
 require 'puffer_pages/liquid/tags/yield'
 require 'puffer_pages/liquid/tags/array'
 require 'puffer_pages/liquid/tags/assets'
+require 'puffer_pages/liquid/tags/image'
 require 'puffer_pages/liquid/tags/helper'
 require 'puffer_pages/liquid/tags/render'
 require 'puffer_pages/liquid/tags/scope'

data/lib/puffer_pages/engine.rb

@@ -7,7 +7,7 @@ module PufferPages
     config.puffer_pages = ActiveSupport::OrderedOptions.new
     config.puffer_pages.raise_errors = false
 
-    config.after_initialize do
+    initializer 'puffer_pages.install_i18n_backend', after: 'build_middleware_stack' do
       if PufferPages.install_i18n_backend
         I18n.backend = I18n::Backend::Chain.new(PufferPages.i18n_backend, I18n.backend)
       end

data/lib/puffer_pages/extensions/pagenator.rb

@@ -24,7 +24,7 @@ module PufferPages
 
       def _normalize_options options
         super
-        if options[:puffer_page] || _puffer_pages_action?
+        if options[:puffer_page] || (options[:puffer_page] != false && _puffer_pages_action?)
           scope = options[:puffer_scope].presence || _puffer_pages_options[:scope].presence
           page = options.values_at(:puffer_page, :partial, :action, :file).delete_if(&:blank?).first
           options[:puffer_page] = _puffer_pages_template(page, scope)

data/lib/puffer_pages/liquid/backend.rb

@@ -2,6 +2,7 @@ module PufferPages
   module Liquid
     class Backend
       include ::I18n::Backend::Simple::Implementation
+      include ::I18n::Backend::Pluralization
 
       def load_translations; end
       def store_translations(*args); end

data/lib/puffer_pages/liquid/tags/image.rb

@@ -0,0 +1,37 @@
+module PufferPages
+  module Liquid
+    module Tags
+
+      class Image < ::Liquid::Tag
+        Syntax = /^(#{::Liquid::QuotedFragment})/
+
+        def initialize(tag_name, markup, tokens)
+          if markup =~ Syntax
+            @path = $1
+          else
+            raise SyntaxError.new("Syntax Error in 'image' - Valid syntax: image '/path/to/image'")
+          end
+
+          @attributes = {}
+          markup.scan(::Liquid::TagAttributes) do |key, value|
+            @attributes[key] = value
+          end
+
+          super
+        end
+
+        def render(context)
+          attributes = {}
+          @attributes.each do |key, value|
+            attributes[key] = context[value]
+          end
+
+          context.registers[:tracker].register("<%= image_tag #{@path}, #{attributes} %>")
+        end
+      end
+
+    end
+  end
+end
+
+Liquid::Template.register_tag('image', PufferPages::Liquid::Tags::Image)

data/lib/puffer_pages/liquid/tags/translate.rb

@@ -27,6 +27,13 @@ module PufferPages
           end
           processed = context[:processed]
 
+          if options[:count].is_a?(String)
+            begin
+              options[:count] = (options[:count] =~ /\./ ? Float(options[:count]) : Integer(options[:count]))
+            rescue ArgumentError
+            end
+          end
+
           if processed && key.first == '.'
             I18n.translate i18n_key(processed, key.last(-1)),
               options.merge!(:default => i18n_defaults(processed, key.last(-1)))

data/lib/puffer_pages/version.rb

@@ -1,3 +1,3 @@
 module PufferPages
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/controllers/puffer_pages_controller_spec.rb

@@ -129,6 +129,18 @@ describe 'PufferPagesController' do
       it { should_not render_page }
     end
 
+    context do
+      controller do
+        puffer_pages
+
+        def index
+          render nothing: true, puffer_page: false
+        end
+      end
+
+      it { should_not render_page }
+    end
+
     context do
       controller do
         puffer_pages

data/spec/lib/liquid/backend_spec.rb

@@ -17,4 +17,16 @@ describe PufferPages::Liquid::Backend do
       backend.translate(:en, 'hello')
     end.should == 'PufferPages world'
   end
+
+  context 'backend installation' do
+    context 'fallbacks' do
+      specify do
+        contextualize(page_translations: translations) do
+          I18n.with_locale :ru do
+            I18n.translate('hello')
+          end
+        end.should == 'PufferPages world'
+      end
+    end
+  end
 end

data/spec/lib/liquid/tags/image_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe PufferPages::Liquid::Tags::Image do
+  describe 'snippet' do
+    let!(:root) { Fabricate :root }
+
+    specify { root.render("{% image 'i.png' %}").should == "<%= image_tag 'i.png', {} %>" }
+    specify { root.render("{% image 'i.png', alt:'txt' %}").should == "<%= image_tag 'i.png', {\"alt\"=>\"txt\"} %>" }
+    specify { root.render("{% image 'i.png', alt:var %}", var: 'txt').should == "<%= image_tag 'i.png', {\"alt\"=>\"txt\"} %>" }
+  end
+end

data/spec/lib/liquid/tags/translate_spec.rb

@@ -2,10 +2,6 @@ require 'spec_helper'
 
 describe PufferPages::Liquid::Tags::Translate do
 
-  def render_page(page, drops = {})
-    page.render({ self: page }.merge(drops))
-  end
-
   before do
     @backend = I18n.backend
     I18n.backend = I18n::Backend::Simple.new
@@ -104,4 +100,31 @@ describe PufferPages::Liquid::Tags::Translate do
     specify { root.render.should == 'some params hello' }
   end
 
+  context 'count in options' do
+    let!(:root) { Fabricate :root }
+    before do
+      I18n.backend.store_translations(:en, layouts:
+        { application: { hello: {one: 'one %{count}', other: 'many %{count}'} } })
+    end
+
+    context 'with integer count' do
+      let!(:layout) { Fabricate :application, body: "{% t '.hello' count: 1 %}" }
+      specify { root.render.should == 'one 1' }
+    end
+
+    context 'with float count' do
+      let!(:layout) { Fabricate :application, body: "{% t '.hello' count: 1.0 %}" }
+      specify { root.render.should == 'one 1.0' }
+    end
+
+    context 'with integer as string count' do
+      let!(:layout) { Fabricate :application, body: "{% t '.hello' count: '1' %}" }
+      specify { root.render.should == 'one 1' }
+    end
+
+    context 'with float as string count' do
+      let!(:layout) { Fabricate :application, body: "{% t '.hello' count: '1.0' %}" }
+      specify { root.render.should == 'one 1.0' }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffer_pages
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -409,6 +409,7 @@ files:
 - lib/puffer_pages/liquid/tags/array.rb
 - lib/puffer_pages/liquid/tags/assets.rb
 - lib/puffer_pages/liquid/tags/helper.rb
+- lib/puffer_pages/liquid/tags/image.rb
 - lib/puffer_pages/liquid/tags/include.rb
 - lib/puffer_pages/liquid/tags/javascript.rb
 - lib/puffer_pages/liquid/tags/partials.rb
@@ -495,6 +496,7 @@ files:
 - spec/lib/handlers_spec.rb
 - spec/lib/liquid/backend_spec.rb
 - spec/lib/liquid/interpolation_spec.rb
+- spec/lib/liquid/tags/image_spec.rb
 - spec/lib/liquid/tags/include_spec.rb
 - spec/lib/liquid/tags/partials_spec.rb
 - spec/lib/liquid/tags/scope_spec.rb
@@ -526,7 +528,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 171098880849645771
+      hash: -3853080892470689805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -535,7 +537,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 171098880849645771
+      hash: -3853080892470689805
 requirements: []
 rubyforge_project: puffer_pages
 rubygems_version: 1.8.24
@@ -612,6 +614,7 @@ test_files:
 - spec/lib/handlers_spec.rb
 - spec/lib/liquid/backend_spec.rb
 - spec/lib/liquid/interpolation_spec.rb
+- spec/lib/liquid/tags/image_spec.rb
 - spec/lib/liquid/tags/include_spec.rb
 - spec/lib/liquid/tags/partials_spec.rb
 - spec/lib/liquid/tags/scope_spec.rb