jeanine 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9120ffa8994858a7560330fa0afbe1bf18e2f94
-  data.tar.gz: fd326e260cc8c90a5b70b8b8ad4a1cd5b0b9869a
+SHA256:
+  metadata.gz: 0ec0b02b10f6cbf4e488db86b4bff6a5bb2f81184448dcdc8d431aa650ce8b64
+  data.tar.gz: 0d3408a137162c82388e86a3fcb74b5f14bf07e18cd0581866b4b027f29aa3ba
 SHA512:
-  metadata.gz: 8b11b5b73abed4a7df44caf5a7b53ad6d2d52616fc23658e8c0d864239c0dc7b3fdfb6837c6d611f593944ad2518d92cc9af945ec3185a7bdfd783f913c3309c
-  data.tar.gz: 2ca9b7d2196c08e57bda6f983cfb0a1da71c06772bb6b42b76deb0aa941d5cb454eef4041d9834f8b3eeea9644d5a86b22e48de5f6b951a32e39481d9ac631a4
+  metadata.gz: 1b5a6e3c6d7202516b24bd68c8573885195041d6c8f5a756de96792cd66681b2f2802904e65fd8b07b95bf180d84c3b15ccbc1bcb9809a0b31d1a443810cd1d1
+  data.tar.gz: 4d907b99574cf1b2bf9e2fd7a76523d680c767f79f1565f41ac1474fde345929a8eab329c01c915523a7cd707daa1fc5dd0a43e1cabd6c7cd276601f2bc6d2a1

data/lib/jeanine.rb

@@ -8,6 +8,9 @@ require 'jeanine/app'
 require 'tilt'
 
 module Jeanine
+  def self.view_paths
+    @_view_paths ||= Set.new(["views"])
+  end
   def self.tilt_cache
     @title_cache ||= Tilt::Cache.new
   end

data/lib/jeanine/app.rb

@@ -6,17 +6,22 @@ require 'jeanine/response'
 require 'jeanine/renderer'
 require 'jeanine/routing'
 require 'jeanine/session'
+require 'jeanine/view_paths'
 
 module Jeanine
   class App
     include Session
+    include Rescuing
     include Routing::Evaluation
+
     attr_reader :request, :response
 
     class << self
       include Callbacks
       include Routing::DSL
       include Rescuing
+      include ViewPaths
+
       alias :_new :new
       def new(*args, &block)
         initialize!
@@ -41,8 +46,6 @@ module Jeanine
       end
     end
 
-    include Rescuing
-
     def call(env)
       begin
         @env = env

data/lib/jeanine/callbacks.rb

@@ -9,14 +9,6 @@ module Jeanine
       }
     end
 
-    def _register_callback(type, paths = [], &block)
-      if paths == []
-        _callbacks["#{type}_all".to_sym] << { block: block }
-      else
-        _callbacks[type] << { paths: paths, block: block }
-      end
-    end
-
     def before(*paths, &block)
       _register_callback(:before, paths, &block)
     end
@@ -24,5 +16,14 @@ module Jeanine
     def after(*paths, &block)
       _register_callback(:after, paths, &block)
     end
+
+    private
+    def _register_callback(type, paths = [], &block)
+      if paths == []
+        _callbacks["#{type}_all".to_sym] << { block: block }
+      else
+        _callbacks[type] << { paths: paths, block: block }
+      end
+    end
   end
 end

data/lib/jeanine/mimes.rb

@@ -1,7 +1,9 @@
+require 'rack'
+
 module Jeanine
   class Mimes
     MimeTypeNotFound = Class.new(StandardError)
-    MIME_TYPES_INVERTED = Rack::Mime::MIME_TYPES.invert
+    MIME_TYPES_INVERTED = ::Rack::Mime::MIME_TYPES.invert
 
     def self.load!
       register(:json, Rack::Mime::MIME_TYPES[".json"])

data/lib/jeanine/renderer.rb

@@ -81,6 +81,16 @@ module Jeanine
       Thread.current[:tilt_cache] ||= Tilt::Cache.new
     end
 
+    def find_template!(template)
+      Jeanine.view_paths.to_a.each do |path|
+        template_with_path = "#{path}/#{template}"
+        if File.exist?(template_with_path)
+          return template_with_path
+        end
+      end
+      raise "Template not found in view paths. Looking for #{template} in #{Jeanine.view_paths.to_a.join(', ')}"
+    end
+
     def html(engine, template_name, options = {}, locals = {}, &block)
       locals          = options.delete(:locals) || locals || {}
       layout          = options[:layout]
@@ -94,6 +104,7 @@ module Jeanine
         unless layout.include?("layouts/")
           layout = "layouts/#{layout}"
         end
+        layout = find_template!(layout)
         options = options.merge(layout: false, scope: scope)
         catch(:layout_missing) { return html(engine, layout, options, locals) { output } }
       end
@@ -104,7 +115,8 @@ module Jeanine
       Tilt::Cache.new.fetch engine, template_name, options do
         template = Tilt[engine]
         raise "Template engine not found: #{engine}" if template.nil?
-        template.new("views/#{template_name}", options)
+        template_name = find_template!(template_name)
+        template.new(template_name, options)
       end
     end
 

data/lib/jeanine/routing/evaluation.rb

@@ -34,7 +34,7 @@ module Jeanine
         while index < matches.captures.size
           param = route[:params][index]
           @request.params[param] = matches.captures[index]
-          if index == match.captures.size
+          if index == matches.captures.size
             @request.params[param].gsub!(@request.format)
           end
           index += 1

data/lib/jeanine/version.rb

@@ -1,3 +1,3 @@
 module Jeanine
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/jeanine/view_paths.rb

@@ -0,0 +1,7 @@
+module Jeanine
+  module ViewPaths
+    def append_view_path(path)
+      Jeanine.view_paths << path
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jeanine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Brody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -53,7 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,6 +124,7 @@ files:
 - lib/jeanine/session.rb
 - lib/jeanine/version.rb
 - lib/jeanine/view.rb
+- lib/jeanine/view_paths.rb
 homepage: https://github.com/joshmn/jeanine
 licenses:
 - MIT
@@ -118,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A framework.