bade 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77771024dceda938d8320695d2acbd5731588cbb
-  data.tar.gz: 6c0b8f8c0f7cb9d17053599a754f0d28e25ea11c
+  metadata.gz: 7fce9a16c6a092fa176cd6adf94f87f09dc805ef
+  data.tar.gz: dd198f4a76c878eac584c0a03c5269f6174055c2
 SHA512:
-  metadata.gz: 260bd643d97374af1e3209d25d3ad3c98090808191c8f13482e910e10e707f5fa41cf8160007325bf02066eeb0af01ccd603f93a84746bb6f26a8b95286c4259
-  data.tar.gz: 6d9fbcf48c636f38c608bbb37b7096c2e2aadfc208d4bf749fc9e74c87fc2314765752b93fb7124a4a8d663de82749e310bfb12afae38052b26ed4353ef1c78d
+  metadata.gz: 18c57022d6ababf11353a754bf99890fab414b21b6e4e64542f2543a8f79a74b53f1548555ffee7bfb0757932d651290bdf7b4b464889c11bbd8e105f1d755e1
+  data.tar.gz: 4fc5473929741d309c794671c2508dea40a60f42ea2f8910756f8fcbc42c32aa1accf9bfd4fa9d41501ec3cef2324e9bb0a669a483be19a21739bd41062051e7

data/Bade.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 	spec.authors     = ['Roman Kříž']
 	spec.email       = ['samnung@gmail.com']
 	spec.summary     = %q{Minimalistic template engine for Ruby.}
-	spec.homepage    = 'https://github.com/samnung/bade'
+	spec.homepage    = 'https://github.com/epuber-io/bade'
 	spec.license     = 'MIT'
 
 	spec.files         = Dir['bin/**/*'] + Dir['lib/**/*'] + %w(Bade.gemspec Gemfile README.md)

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'coveralls', require: false

data/README.md

@@ -1,7 +1,8 @@
 
 # Bade
 
-[![Build Status](https://semaphoreci.com/api/v1/projects/61441d8f-9c6b-41c2-b677-1ef8516649e5/559728/badge.svg)](https://semaphoreci.com/samnung/bade)      
+[![Gem Version](https://badge.fury.io/rb/bade.svg)](http://badge.fury.io/rb/bade) [![Build Status](https://travis-ci.org/epuber-io/bade.svg?branch=master)](https://travis-ci.org/epuber-io/bade) [![Coverage Status](https://coveralls.io/repos/epuber-io/bade/badge.svg?branch=master&service=github)](https://coveralls.io/github/epuber-io/bade?branch=master) [![Inline docs](http://inch-ci.org/github/epuber-io/bade.svg?branch=master)](http://inch-ci.org/github/epuber-io/bade)
+
 
 Minimalistic template engine written in Ruby for Ruby. Developed mainly to help with creating e-books. Highly influenced by [Jade](http://jade-lang.com) and [Slim](http://slim-lang.com).
 
@@ -34,7 +35,7 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/samnung/bade. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/epuber-io/bade. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## TODO

data/lib/bade/renderer.rb

@@ -35,13 +35,13 @@ module Bade
     # @return [self]
     #
     def self.from_file(file)
-      file_obj = if file.is_a?(String)
-                   File.new(file, 'r')
-                 else
-                   file
-                 end
+      path = if file.is_a?(File)
+               file.path
+             else
+               file
+             end
 
-      from_source(file_obj.read, file_obj.path)
+      from_source(nil, path)
     end
 
 
@@ -71,13 +71,7 @@ module Bade
     # @return [Bade::Node]
     #
     def root_document
-      @parsed ||= (
-        if file_path.nil?
-          _parse_document_from_text(source_text)
-        else
-          _parse_document_from_file(file_path)
-        end
-      )
+      @parsed ||= _parsed_document(source_text, file_path)
     end
 
     # @return [String]
@@ -108,41 +102,34 @@ module Bade
     #
     # @return [Bade::Document]
     #
-    def _parse_document_from_file(file_path)
-      parser = Parser.new(file_path: file_path)
-
-      new_path = if File.exists?(file_path)
-               file_path
-             elsif File.exists?("#{file_path}.bade")
-               "#{file_path}.bade"
-             end
+    def _parsed_document(content, file_path)
+      content = if file_path.nil? && content.nil?
+                  raise LoadError, "Don't know what to do with nil values for both content and path"
+                elsif !file_path.nil? && content.nil?
+                  File.read(file_path)
+                else
+                  content
+                end
 
-      raise "Not existing file with path #{file_path}" if new_path.nil?
-
-      parsed_document = @parsed_documents[new_path]
+      parsed_document = @parsed_documents[file_path]
       return parsed_document unless parsed_document.nil?
 
-      document = parser.parse(File.read(new_path))
+      parser = Parser.new(file_path: file_path)
+
+      document = parser.parse(content)
 
       parser.dependency_paths.each do |path|
-        sub_path = File.expand_path(path, File.dirname(new_path))
-        document.sub_documents << _parse_document_from_file(sub_path)
+        sub_path = File.expand_path(path, File.dirname(file_path))
+        new_path = if File.exists?(sub_path)
+                     sub_path
+                   elsif File.exists?("#{sub_path}.bade")
+                     "#{sub_path}.bade"
+                   end
+
+        document.sub_documents << _parsed_document(nil, new_path)
       end
 
       document
     end
-
-    # @param text [String]
-    #
-    # @return [Bade::Document]
-    #
-    def _parse_document_from_text(text)
-      parser = Parser.new
-      document = parser.parse(text)
-
-      raise 'You cannot use import when it is loaded from source text' if parser.dependency_paths.length > 0
-
-      document
-    end
   end
 end

data/lib/bade/version.rb

@@ -1,4 +1,4 @@
 
 module Bade
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ files:
 - lib/bade/runtime/block.rb
 - lib/bade/runtime/render_binding.rb
 - lib/bade/version.rb
-homepage: https://github.com/samnung/bade
+homepage: https://github.com/epuber-io/bade
 licenses:
 - MIT
 metadata: {}
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Minimalistic template engine for Ruby.