dry-view 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a55b8f70f9a2c483db8b54a34cc46470b67824
-  data.tar.gz: 8bb2990860563bfd3efc8fcc42f2d08a2642b743
+  metadata.gz: f3b4e09263f41a0b0972c1270fa32e5911ad028b
+  data.tar.gz: b7787ff1b20f6fae7c4c67461ac7e2c1cf51e498
 SHA512:
-  metadata.gz: 407e38a1b4c40c3cb95146218771f0099a61345abededc7cde29ecbfbcf1448288208786ef35cd463dcfe8c2d532c44fb57dc66790f62b53b42ba97b5726825e
-  data.tar.gz: 2c4c61cb1325de92fab40a23ede167b93be155f0e0981ff5ef5f51faee9126748756f3a03000962b136132936e78a29746a21371e08095b008a130d716968a63
+  metadata.gz: d79d4a61109cce4b3885d5c0bba544563ebd8d253465acb33c1022f62a61f369de0c972a2ea6657d1d6fb76841a4e4e5baaea7d5df16864e6f2f0b43e54ae881
+  data.tar.gz: 84a995bd47ddd4909cc8658bb2af52dc369b96b9c37d4f74add32a8fc21ce682837fbb7226c16aab164c0389197b5d9183b3bc82009ed608c7fb2d6c9002c3dc

data/.travis.yml

@@ -9,7 +9,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
-  - rbx-2
+  - rbx
   - jruby-9000
   - ruby-head
   - jruby-head

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# 0.1.1 / 2016-07-07
+
+### Changed
+
+- Configure default template encoding to be UTF-8, fixing some issues with template rendering on deployed sites (gotar)
+
+# 0.1.0 / 2016-03-28
+
+### Added
+
+– `Dry::View::Layout` supports multiple view template formats. Configure format/engine pairs (e.g. `{html: :slim, text: :erb}`) on the `formats` setting. The first format becomes the default. Request specific formats when calling the view, e.g. `my_view.call(format: :text)`.
+
+### Changed
+
+– Extracted from rodakase and renamed to dry-view. `Rodakase::View` is now `Dry::View`.

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 group :test do
   gem 'byebug', platform: :mri
+  gem 'rack', '>= 1.0.0', '<= 2.0.0'
   gem 'slim'
 
   gem 'codeclimate-test-reporter', platform: :rbx

data/lib/dry/view/layout.rb

@@ -12,8 +12,6 @@ module Dry
     class Layout
       include Dry::Equalizer(:config)
 
-      Scope = Struct.new(:page)
-
       DEFAULT_DIR = 'layouts'.freeze
 
       extend Dry::Configurable
@@ -59,8 +57,10 @@ module Dry
       def call(options = {})
         renderer = self.class.renderer(options.fetch(:format, default_format))
 
+        template_content = renderer.(template_path, template_scope(options, renderer))
+
         renderer.(layout_path, layout_scope(options, renderer)) do
-          renderer.(template_path, template_scope(options, renderer))
+          template_content
         end
       end
 
@@ -94,7 +94,11 @@ module Dry
       private
 
       def layout_scope(options, renderer)
-        Scope.new(layout_part(:page, renderer, options.fetch(:scope, scope)))
+        part_hash = {
+          page: layout_part(:page, renderer, options.fetch(:scope, scope))
+        }
+
+        part(layout_dir, renderer, part_hash)
       end
 
       def template_scope(options, renderer)

data/lib/dry/view/renderer.rb

@@ -37,7 +37,7 @@ module Dry
       end
 
       def tilt(path)
-        tilts.fetch(path) { tilts[path] = Tilt[engine].new(path) }
+        tilts.fetch(path) { tilts[path] = Tilt[engine].new(path, nil, default_encoding: "utf-8") }
       end
 
       def lookup(name)

data/lib/dry/view/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module View
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/spec/integration/view_spec.rb

@@ -1,15 +1,13 @@
 RSpec.describe 'dry-view' do
   let(:view_class) do
-    klass = Class.new(Dry::View::Layout)
-
-    klass.configure do |config|
-      config.root = SPEC_ROOT.join('fixtures/templates')
-      config.name = 'app'
-      config.template = 'users'
-      config.formats = {html: :slim, txt: :erb}
+    Class.new(Dry::View::Layout) do
+      configure do |config|
+        config.root = SPEC_ROOT.join('fixtures/templates')
+        config.name = 'app'
+        config.template = 'users'
+        config.formats = {html: :slim, txt: :erb}
+      end
     end
-
-    klass
   end
 
   let(:scope) do

data/spec/spec_helper.rb

@@ -9,9 +9,15 @@ rescue LoadError; end
 
 SPEC_ROOT = Pathname(__FILE__).dirname
 
-require 'dry-view'
+require 'erb'
 require 'slim'
 
+# Prefer plain ERB processor rather than erubis (which has problems on JRuby)
+require 'tilt'
+Tilt.register 'erb', Tilt::ERBTemplate
+
+require 'dry-view'
+
 RSpec.configure do |config|
   config.disable_monkey_patching!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-view
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -132,6 +132,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md