lithium 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d20b742247809e17b6784aeae96cac85981cedc
-  data.tar.gz: b6009b546724ffde5b29820e23d6ecfa57862f69
+  metadata.gz: a9a47f71420cbd144d940d513b2f1569f348a399
+  data.tar.gz: 956094a0d4327dadc0f26f2ab5acefc305d49e45
 SHA512:
-  metadata.gz: 909d65c818d90627ca6279187225b2d31f48187bcc82a0c7dcd1fcb22355382a77a4cd7aa5c5df22ab6bbad6c3a45c06724a56eea3217cb6a9b06c41666f0e9c
-  data.tar.gz: 0ca0144f25c8f229de6898fa0fad1bbd815c3b7e698b5d997be48a9f461225b20e611e66edb70814aa04a91e181889a09ab702aa138b1adbafb1988ab690ce8a
+  metadata.gz: ebedb81f9c447364a9cb331d02d4e3b463bfe590bb44c65d1ee98e8b77ac2434c7cfb58538c3b61b02d631266b0e38e099c3c7de31c99c0e88715f19932ee330
+  data.tar.gz: 150447d52ba82931ce4c226e1ae2b0b4af33b47b20c6e74c1f8fc50622a4de06db68009c948a974dae1231aafe6cdc9d9367badb8b4435f71c27f0ae4d869bf8

data/lib/lithium.rb

@@ -1,6 +1,5 @@
 # Modules
-require 'lithium/modules/templates/slim'
-require 'lithium/modules/templates/erb'
+require 'lithium/modules/template'
 
 require 'lithium/base'
 require 'lithium/version'

data/lib/lithium/modules/template.rb

@@ -0,0 +1,30 @@
+require 'tilt'
+require 'slim'
+module Lithium
+  module Modules
+    module Template
+      def self.default_layout layout = nil
+          "layouts/layout.slim" if layout.nil?
+      end
+
+      def render template, locals = {}, options = {}, &block
+        template_cache.fetch(template) do
+          ::Slim::Template.new(template, options)
+        end.render(self, locals, &block)
+      end
+
+      def view *args
+        options = args[1]
+        layout = options[:layout].nil? ? "layouts/layout.slim" : options[:layout]
+
+        render "#{layout}" do
+          render *args
+        end
+      end
+
+      def template_cache
+        Thread.current[:templates_cache] ||= Tilt::Cache.new
+      end
+    end
+  end
+end

data/lib/lithium/version.rb

@@ -1,3 +1,3 @@
 module Lithium
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lithium
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sedat CIFTCI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -63,8 +63,7 @@ files:
 - README.md
 - lib/lithium.rb
 - lib/lithium/base.rb
-- lib/lithium/modules/templates/erb.rb
-- lib/lithium/modules/templates/slim.rb
+- lib/lithium/modules/template.rb
 - lib/lithium/version.rb
 homepage: https://github.com/amerobin/lithium
 licenses:

data/lib/lithium/modules/templates/erb.rb

@@ -1,11 +0,0 @@
-module Lithium
-  module Modules
-    module Templates
-      module Erb
-        def render template
-          ERB.new(File.open(template).read).result(binding)
-        end
-      end
-    end
-  end
-end

data/lib/lithium/modules/templates/slim.rb

@@ -1,19 +0,0 @@
-require 'tilt'
-require 'slim'
-module Lithium
-  module Modules
-    module Templates
-      module Slim
-        def render template, locals = {}, options = {}, &block
-          template_cache.fetch(template) do
-            ::Slim::Template.new(template, options)
-          end.render(self, locals, &block)
-        end
-
-        def template_cache
-          Thread.current[:templates_cache] ||= Tilt::Cache.new
-        end
-      end
-    end
-  end
-end