rack-app-front_end 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6dbf80557515cdc26e9a3d860655fcc405e6b5
-  data.tar.gz: 94b8f3f6d3432c16563123064b9013ba6089223d
+  metadata.gz: 8a98853e4d1d6ba49e9ed62fac3721dc0dc69303
+  data.tar.gz: 89f90e9bbdee9d46c78a37361162ce7c2ed1efeb
 SHA512:
-  metadata.gz: 53408b6280b21513df6da1af7f364bd9f60a8f76f66b838783a95d0dc4164c37b0c15228762a4518b524114e51d6dea5beb585e67a6ef665d6b60bc23314830c
-  data.tar.gz: 795681e871974c662a086285ec078f46c7bceb7ca2830e7c0b8a58b3fc888e721291dd518c8e673d155e1f70f8b1f229bc37d1f38c38051b14598889b55c1a4a
+  metadata.gz: 5350fee85341ee409fb3eb249714b297b4121b01dea778ea837045730f769c2666421b5c7d9d8ac2c4791a639ebf9362231eb613c8d123e064163f7e1b03572c
+  data.tar.gz: a860de2ad2cbfa5ac3a4950deb2969f6f9ca16a4b80eba4d212edb44746254942f930c0ee07f6851dde4433cadabdf928745d1fedc47881fd5d8c4a9838a73cb

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

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

@@ -32,7 +32,7 @@ class Rack::App::FrontEnd::FolderMounter
   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, '').sub(/\..*$/, ''))
   end
 
 end

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

@@ -0,0 +1,15 @@
+module Rack::App::FrontEnd::InstanceMethods
+
+  def render(template_path)
+
+    options = {}
+    options[:layout]= self.class.layout if self.class.respond_to?(:layout)
+    extended_template_path = Rack::App::Utils.expand_path(template_path)
+    full_path = File.exist?(extended_template_path) ? extended_template_path : template_path
+    template = Rack::App::FrontEnd::Template.new(full_path, options)
+
+    return template.render(self)
+
+  end
+
+end

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

@@ -0,0 +1,14 @@
+module Rack::App::FrontEnd::SingletonMethods
+
+  def mount_folder(folder_path)
+    Rack::App::FrontEnd::FolderMounter.new(self).mount(Rack::App::Utils.expand_path(folder_path))
+  end
+
+  alias mount_templates_from mount_folder
+
+  def layout(layout_path=nil)
+    @layout = Rack::App::Utils.expand_path(layout_path) unless layout_path.nil?
+    @layout
+  end
+
+end

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

@@ -17,7 +17,7 @@ class Rack::App::FrontEnd::Template
   def render_result(*args, &block)
     return Rack::App::File::Streamer.new(@file_path) unless it_is_a_template?
 
-    layout.render{ Tilt.new(@file_path).render(*args,&block) }
+    layout.render { Tilt.new(@file_path).render(*args, &block) }
   end
 
   def it_is_a_template?

data/lib/rack/app/front_end.rb

@@ -9,21 +9,19 @@ module Rack::App::FrontEnd
   require 'rack/app/front_end/template'
   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
+  require 'rack/app/front_end/instance_methods'
+  require 'rack/app/front_end/singleton_methods'
 
-  def mount_folder(folder_path)
-    Rack::App::FrontEnd::FolderMounter.new(self).mount(Rack::App::FrontEnd::Utils.get_full_path(folder_path))
-  end
+  class << self
 
-  alias mount_templates_from mount_folder
+    [:extended, :included].each do |method|
+      define_method(method) do |klass|
+        klass.__send__(:include, self::InstanceMethods)
+        klass.__send__(:extend, self::SingletonMethods)
+      end
+    end
 
-  def layout(layout_path=nil)
-    @layout = Rack::App::FrontEnd::Utils.get_full_path(layout_path) unless layout_path.nil?
-    @layout
   end
 
 end

data/rack-app-front_end.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'rack-app','>= 0.10.0'
-  spec.add_dependency 'kramdown'
+  spec.add_dependency 'rack-app','>= 0.24.0'
   spec.add_dependency 'tilt'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app-front_end
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +98,9 @@ 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/instance_methods.rb
+- lib/rack/app/front_end/singleton_methods.rb
 - lib/rack/app/front_end/template.rb
 - lib/rack/app/front_end/template/default_layout.rb
 - lib/rack/app/front_end/utils.rb

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

@@ -1,28 +0,0 @@
-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