opulent 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfd7c4bb2a3d68371199e60dbde0142284838c33
-  data.tar.gz: 439afecffbd0e1365d8776a2fea806fdac0b0abc
+  metadata.gz: 649d50c129f267ce100a631b1b11b6d36594e77c
+  data.tar.gz: cdb46f5248ab2559adb826d865537a789cb78e7f
 SHA512:
-  metadata.gz: 2cb8538328cd64913156f39e660fb2be5d020ddc13cf8548d11c72d26867c2dece4c665075c274176e6cbb29aea33dca79eaadd92d5784c223c3dc8c1ac5f6ab
-  data.tar.gz: 4f9d9ff6ac176401c74296ed8d9ce46728644c6b2b85ced95f96f0c709db9df5f1b418920c0cf9b8f494eaac4670a410d9eae1caf2d1b35b9720cba1d6eeee5a
+  metadata.gz: 6af493f6245ab7c7978c6b069aee3cbcf05310cca64f1369decf27a649d60596f7886c236c7f02c899ac5210d20d5b5c05c8ea549694961222b636eacb983f82
+  data.tar.gz: cb49b39f19db597c5e4ed84dd765ab7fdbc230be033c208117d01d72eb314ec765673168ed5d92ccae2bf9622fe5fbef13ad35e1af690397cd41df90600dce1c

data/.travis.yml

@@ -1,5 +1,16 @@
 language: ruby
+
 rvm:
- - "2.1.0"
- - rbx
+  - ruby-head
+  - 2.2.2
+  - 2.1.6
+  - 2.0.0
+  - rbx-2
+  - rbx
+  - 1.9.3
+  - jruby-head
+  - jruby-19mode
+
 script: bundle exec rspec spec
+
+sudo: false

data/benchmarks/run-benchmarks.rb

@@ -98,21 +98,23 @@ class Benchmarks
     @benches.each do |group_name, group_benches|
       puts "\nRunning #{group_name} benchmarks\n\n"
 
-      puts "Warming up -------------------------------------"
-      Benchmark.bm do |x|
-        group_benches.each do |name, block|
-          x.report("#{group_name} #{name}") {
-            W.times do block.call end
-          }
+      unless group_name == :parsing
+        puts "Warming up -------------------------------------"
+        Benchmark.bm do |x|
+          group_benches.each do |name, block|
+            x.report("#{group_name} #{name}") {
+              W.times do block.call end
+            }
+          end
         end
-      end
 
-      puts "Measuring -------------------------------------"
-      Benchmark.bm do |x|
-        group_benches.each do |name, block|
-          x.report("#{group_name} #{name}") {
-            N.times do block.call end
-          }
+        puts "Measuring -------------------------------------"
+        Benchmark.bm do |x|
+          group_benches.each do |name, block|
+            x.report("#{group_name} #{name}") {
+              N.times do block.call end
+            }
+          end
         end
       end
 

data/lib/opulent/compiler/doctype.rb

@@ -27,6 +27,8 @@ module Opulent
                 '?xml version="1.0" encoding="utf-8" ?'
               when :'xml ISO-8859-1'
                 '?xml version="1.0" encoding="iso-8859-1" ?'
+              else
+                "!DOCTYPE #{node[@value]}"
               end
 
       @node_stack << :doctype

data/lib/opulent/exec.rb

@@ -17,7 +17,7 @@ module Opulent
       while arguments[i]
         case arguments[i]
 
-        # opulent input.op output.op
+        # opulent input.op output.html
         when EXTENSION
           @input = arguments[i]
           is_keyword = KEYWORDS.include? arguments[i + 1]
@@ -69,11 +69,14 @@ module Opulent
 
         Logger.error :exec, @input, :input unless File.file? @input
 
-        opulent_layout = Opulent.new @layout
-        opulent_page = Opulent.new @input
+        input_file = File.read @input
+        opulent_page = Opulent.new input_file
+
         scope = Object.new
 
         if @layout
+          layout_file = File.read @layout
+          opulent_layout = Opulent.new layout_file
           output = proc do
             opulent_layout.render scope, @locals do
               opulent_page.render scope, @locals do

data/lib/opulent/logger.rb

@@ -98,7 +98,7 @@ No output file specified. Writing result to terminal.
           message = <<-LOG
 You can use the following commands with the Opulent Command  Line Interface:
 
-opulent input.op output.op      Render an input file and write the result to
+opulent input.op output.html    Render an input file and write the result to
                                 the output file.
 opulent layout [-l] layout.op   Render an input file using given input
                                 layout file.

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = '1.7.4'
+  VERSION = '1.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler