rack-app-front_end 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ef4d45f171e6d23cac5c08eab2f9d269099766
-  data.tar.gz: 572457c778986b295db92390cf679b7118872abd
+  metadata.gz: 2d6dbf80557515cdc26e9a3d860655fcc405e6b5
+  data.tar.gz: 94b8f3f6d3432c16563123064b9013ba6089223d
 SHA512:
-  metadata.gz: a2a5a6ea812512d89edf8fbe192b600b52aacf9aae51368e215a88eaf9271aae61b7f713fd99adb13fb26c5274f9bd4ed4f951bee0c1692dfa51f01b44a718b8
-  data.tar.gz: 32e23043f82402a7e133cf471544001f22030b3f72c9e823fbb933b728d3438372fd61a450aa47b32c9f0f81168a2ecd99dcd5e41ed4e450507a43ecd01aa7d1
+  metadata.gz: 53408b6280b21513df6da1af7f364bd9f60a8f76f66b838783a95d0dc4164c37b0c15228762a4518b524114e51d6dea5beb585e67a6ef665d6b60bc23314830c
+  data.tar.gz: 795681e871974c662a086285ec078f46c7bceb7ca2830e7c0b8a58b3fc888e721291dd518c8e673d155e1f70f8b1f229bc37d1f38c38051b14598889b55c1a4a

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+#--format documentation
 --color

data/.travis.yml

@@ -1,4 +1,19 @@
 language: ruby
+script: rspec spec
+
 rvm:
-  - 2.1.2
-before_install: gem install bundler -v 1.10.6
+
+  - 1.9
+  - 2.0
+  - 2.1
+
+  - ruby-head
+  - jruby-head
+
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - adamluzsi@gmail.com

data/README.md

@@ -1,4 +1,4 @@
-# Rack::App::FrontEnd
+# Rack::App::FrontEnd [![Build Status](https://travis-ci.org/adamluzsi/rack-app-front_end.rb.svg?branch=master)](https://travis-ci.org/adamluzsi/rack-app-front_end.rb)
 
 This is an extend module for Rack::App to have FrontEnd framework extensions for the core app class
 
@@ -29,6 +29,12 @@ class App < Rack::App
   mount_folder '/from/project/root/path'
   mount_folder 'relative/folder/from/this/file/to/folder'
   
+  
+  get '/some_url' do
+    @items = []
+    render 'some.html.erb'
+  end
+  
 end
 
 ```

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.5.0

data/lib/rack/app/front_end.rb

@@ -1,12 +1,19 @@
 require 'rack/app'
 module Rack::App::FrontEnd
 
+  require 'tilt'
+  require 'tilt/plain'
+
   require 'rack/app/front_end/version'
   require 'rack/app/front_end/utils'
   require 'rack/app/front_end/template'
-  require 'rack/app/front_end/layout'
   require 'rack/app/front_end/view'
   require 'rack/app/front_end/folder_mounter'
+  require 'rack/app/front_end/endpoint_methods'
+
+  def self.extended(klass)
+    klass.__send__(:include, ::Rack::App::FrontEnd::EndpointMethods)
+  end
 
   def mount_folder(folder_path)
     Rack::App::FrontEnd::FolderMounter.new(self).mount(Rack::App::FrontEnd::Utils.get_full_path(folder_path))
@@ -15,12 +22,8 @@ module Rack::App::FrontEnd
   alias mount_templates_from mount_folder
 
   def layout(layout_path=nil)
-    @layout = Rack::App::FrontEnd::Layout.new(Rack::App::FrontEnd::Utils.get_full_path(layout_path)) unless layout_path.nil?
-    @layout || Rack::App::FrontEnd::Layout.new(nil)
-  end
-
-  def default_layout
-    # code here
+    @layout = Rack::App::FrontEnd::Utils.get_full_path(layout_path) unless layout_path.nil?
+    @layout
   end
 
-end
+end

data/lib/rack/app/front_end/endpoint_methods.rb

@@ -0,0 +1,28 @@
+module Rack::App::FrontEnd::EndpointMethods
+
+  def render(template_path)
+
+    template_full_path = if template_path.to_s[0] == '/'
+                           project_file_path = Rack::App::Utils.pwd(template_path)
+                           File.exist?(project_file_path) ? project_file_path : template_path
+
+                         else
+
+                           app_dirname = File.join(
+                               File.dirname([caller[0]].flatten.first.split(/\.(?:rb|ru):\d/)[0]),
+                               Rack::App::FrontEnd::Utils.underscore(self.class)
+                           )
+
+                           File.join(app_dirname, template_path)
+
+                         end
+
+    options = {}
+    options[:layout]= self.class.layout if self.class.respond_to?(:layout)
+    template = Rack::App::FrontEnd::Template.new(template_full_path, options)
+
+    return template.render(self)
+
+  end
+
+end

data/lib/rack/app/front_end/folder_mounter.rb

@@ -1,5 +1,7 @@
 class Rack::App::FrontEnd::FolderMounter
 
+  LAST_MODIFIED_HEADER = "Last-Modified"
+
   def initialize(app_class)
     @app_class = app_class
   end
@@ -8,8 +10,7 @@ class Rack::App::FrontEnd::FolderMounter
     template_paths_for(absolute_folder_path).each do |template_path|
 
       request_path = request_path_by(absolute_folder_path, template_path)
-      template = Rack::App::FrontEnd::Template.new(template_path, fallback_handler: Rack::App::File::Streamer)
-      create_endpoint_for(request_path, template)
+      create_endpoint_for(request_path, template_path)
 
     end
   end
@@ -17,31 +18,21 @@ class Rack::App::FrontEnd::FolderMounter
   protected
 
   def template_paths_for(source_folder_path)
-    Dir.glob(File.join(source_folder_path, '**', '*'))
-        .select { |p| not File.directory?(p) }
+    Dir.glob(File.join(source_folder_path, '**', '*')).select { |p| not File.directory?(p) }
   end
 
-  def create_endpoint_for(request_path, template)
+  def create_endpoint_for(request_path, template_path)
     @app_class.class_eval do
 
       get(request_path) do
-        result = template.render(self)
-        if result.respond_to?(:each)
-          response.body = result
-        else
-          response.write(self.class.layout.render(result))
-        end
-        response.finish
+        render(template_path)
       end
 
     end
   end
 
   def request_path_by(source_folder_path, template_path)
-    Rack::Utils.clean_path_info template_path
-                                    .sub(source_folder_path, '')
-                                    .split(File::Separator).join('/')
-
+    Rack::Utils.clean_path_info(template_path.sub(source_folder_path, '').split(File::Separator).join('/'))
   end
 
 end

data/lib/rack/app/front_end/template.rb

@@ -1,7 +1,7 @@
 require 'tilt'
 class Rack::App::FrontEnd::Template
 
-  require 'rack/app/front_end/template/plain_text'
+  require 'rack/app/front_end/template/default_layout'
 
   def render(*args, &block)
     return render_result(*args, &block)
@@ -9,29 +9,23 @@ class Rack::App::FrontEnd::Template
 
   protected
 
-  def initialize(file_path,fallback_handler: Rack::App::FrontEnd::Template::PlainText)
-    @fallback_handler = fallback_handler
+  def initialize(file_path, options={})
     @file_path = file_path
+    @options = options
   end
 
   def render_result(*args, &block)
-    if it_is_a_template?
-      render_with_tilt_templates(args, block)
-    else
-      @fallback_handler.new(@file_path).render(*args, &block)
-    end
+    return Rack::App::File::Streamer.new(@file_path) unless it_is_a_template?
+
+    layout.render{ Tilt.new(@file_path).render(*args,&block) }
   end
 
   def it_is_a_template?
     not Tilt.templates_for(@file_path).empty?
   end
 
-  def render_with_tilt_templates(args, block)
-    file_content = File.read(@file_path)
-    Tilt.templates_for(@file_path).each do |template_engine|
-      file_content = template_engine.new { file_content }.render(*args, &block)
-    end
-    return file_content
+  def layout
+    @options[:layout] ? Tilt.new(@options[:layout]) : DefaultLayout
   end
 
-end
+end

data/lib/rack/app/front_end/template/default_layout.rb

@@ -0,0 +1,8 @@
+module Rack::App::FrontEnd::Template::DefaultLayout
+  extend self
+
+  def render(&block)
+    block.call
+  end
+
+end

data/lib/rack/app/front_end/utils.rb

@@ -4,11 +4,22 @@ module Rack::App::FrontEnd::Utils
 
   def get_full_path(file_path,caller_index=1)
     return nil if file_path.nil?
-    if file_path.to_s[0] == File::Separator
+    if file_path.to_s[0] == '/'
       Rack::App::Utils.pwd(file_path)
     else
-      File.join(File.dirname(caller[caller_index].split(':')[0]),file_path)
+      File.expand_path(File.join(File.dirname(caller[caller_index].split(':')[0]),file_path))
     end
   end
 
+  # Based on ActiveSupport, removed inflections.
+  # https://github.com/rails/rails/blob/v4.1.0.rc1/activesupport/lib/active_support/inflector/methods.rb
+  def underscore(camel_cased_word)
+    word = camel_cased_word.to_s.gsub('::', '/')
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+
 end

data/lib/rack/app/front_end/version.rb

@@ -1,4 +1,2 @@
-Rack ||= Module.new
-Rack::App ||= Class.new
-Rack::App::FrontEnd ||= Module.new
+require 'rack/app/front_end'
 Rack::App::FrontEnd::VERSION = File.read(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'VERSION')).strip

data/rack-app-front_end.gemspec

@@ -1,12 +1,9 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rack/app/front_end/version'
 
 Gem::Specification.new do |spec|
 
   spec.name          = "rack-app-front_end"
-  spec.version       = Rack::App::FrontEnd::VERSION
+  spec.version       = File.read(File.join(File.dirname(__FILE__), 'VERSION')).strip
   spec.authors       = ["Adam Luzsi"]
   spec.email         = ["adamluzsi@gmail.com"]
 
@@ -19,13 +16,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency "maruku"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'rack-app'
+  spec.add_dependency 'rack-app','>= 0.10.0'
   spec.add_dependency 'kramdown'
   spec.add_dependency 'tilt'
 

metadata

@@ -1,45 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: rack-app-front_end
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -126,10 +112,10 @@ files:
 - bin/console
 - bin/setup
 - lib/rack/app/front_end.rb
+- lib/rack/app/front_end/endpoint_methods.rb
 - lib/rack/app/front_end/folder_mounter.rb
-- lib/rack/app/front_end/layout.rb
 - lib/rack/app/front_end/template.rb
-- lib/rack/app/front_end/template/plain_text.rb
+- lib/rack/app/front_end/template/default_layout.rb
 - lib/rack/app/front_end/utils.rb
 - lib/rack/app/front_end/version.rb
 - lib/rack/app/front_end/view.rb
@@ -145,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/rack/app/front_end/layout.rb

@@ -1,21 +0,0 @@
-class Rack::App::FrontEnd::Layout < Rack::App::FrontEnd::Template
-
-  def render(content)
-    return render_result(content)
-  end
-
-  protected
-
-  def render_result(content)
-    if it_is_a_template? and layout_file_is_exists?
-      render_with_tilt_templates([], -> { content })
-    else
-      return content
-    end
-  end
-
-  def layout_file_is_exists?
-    File.exists?(@file_path)
-  end
-
-end

data/lib/rack/app/front_end/template/plain_text.rb

@@ -1,27 +0,0 @@
-class Rack::App::FrontEnd::Template::PlainText
-
-  include Enumerable
-
-  def each(&block)
-    file { |f| f.each(&block) }
-  end
-
-  def render(object=nil)
-    file { |f| f.read }
-  end
-
-  protected
-
-  def initialize(file_path)
-    @file_path = file_path
-    @file = File.open(file_path)
-  end
-
-  def file(&block)
-    @file.reopen(@file_path) if @file.closed?
-    return block.call(@file)
-  ensure
-    @file.close
-  end
-
-end