rack-app-front_end 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcf5a9dd6e5307c8eb8fc926f8aeddd9f1b49535
-  data.tar.gz: bcc3dbffa8b7e148e8c2025ed6519111681b65c7
+  metadata.gz: 8263ef1b0f815302a5f193b612eea031505235d3
+  data.tar.gz: 44c45827ede78fbfb9e03c5a128b13141e4ba2a0
 SHA512:
-  metadata.gz: 8245eb48ef9ac27281d5de3711396cc5406500d2387f51b31519025691b2052652f32da0e6a9b30d274f21735022fd1c58b621d6dc122116b903d9ded4893d47
-  data.tar.gz: 156849ec6e4458f39acdae7b9b32e4c2cf1f960a9480e3b8347219b06080214f0eae0a411c1e7b03733e7eea3ef7f9ba0c9784c30776aaa70cd2dfee094b35ed
+  metadata.gz: 010619359363d3cab25b6e9e658ba453d59ed6b0f10fa941d6ca19cbb513e42ad9b94c209de8656c83ebf2a7a20a1108124e1a91b6a92ce3ab7bfb55b8128b9a
+  data.tar.gz: 3bdcfe2c79bad69d8e0f4d142218436176fae383ed12969ddaf68d0de0f125d45952545207a752a32df5eccf9222938b80133c4d1a489c5b41b0265aa6010640

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
-gemspec
+source 'http://rubygems.org'
+gemspec

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.12.0

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

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

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

@@ -19,4 +19,10 @@ module Rack::App::FrontEnd::SingletonMethods
     nil
   end
 
+  def helpers(&block)
+    @helpers ||= Module.new
+    @helpers.class_eval(&block) unless block.nil?
+    @helpers
+  end
+
 end

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

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

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

@@ -7,21 +7,21 @@ class Rack::App::FrontEnd::Template
     @cache ||= Tilt::Cache.new
   end
 
-  def render(*args, &block)
-    return render_result(*args, &block)
+  def render(scope, *args, &block)
+    return render_result(scope, *args, &block)
   end
 
   protected
 
-  def initialize(file_path, options={})
+  def initialize(file_path, klass)
     @file_path = file_path
-    @options = options
+    @class = klass
   end
 
-  def render_result(*args, &block)
+  def render_result(scope, *args, &block)
     return Rack::App::File::Streamer.new(@file_path) unless it_is_a_template?
-
-    layout.render { template.render(*args, &block) }
+    scope.extend(@class.helpers) if @class.respond_to?(:helpers)
+    layout.render(scope, *args) { template.render(scope, *args, &block) }
   end
 
   def it_is_a_template?
@@ -33,7 +33,9 @@ class Rack::App::FrontEnd::Template
   end
 
   def layout
-    @options[:layout] ? get_template(@options[:layout]) : DefaultLayout
+    return DefaultLayout if @class.respond_to?(:layout) and @class.layout.nil?
+    return DefaultLayout if @file_path =~ /^#{Regexp.escape(Rack::App::Utils.namespace_folder(@class.layout))}/
+    get_template(@class.layout)
   end
 
   def get_template(file_path)

data/lib/rack/app/front_end.rb

@@ -5,11 +5,8 @@ module Rack::App::FrontEnd
   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/view'
   require 'rack/app/front_end/folder_mounter'
-
   require 'rack/app/front_end/instance_methods'
   require 'rack/app/front_end/singleton_methods'
 

data/rack-app-front_end.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Rack::App FrontEnd framework to create beautiful website with style}
   spec.description   = %q{Rack::App FrontEnd framework to create beautiful website with style}
   spec.homepage      = 'http://www.rack-app.com/'
+  spec.license       = 'Apache License 2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -18,11 +19,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'rack-app','>= 1.2.1'
+  spec.add_dependency 'rack-app','>= 1.2.2'
   spec.add_dependency 'tilt'
 
 end

data/spike/test.html.erb

@@ -0,0 +1,3 @@
+<p><%= test %></p>
+<p><%= asdf %></p>
+<p><%= hello_world! %></p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app-front_end
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -103,12 +104,12 @@ files:
 - 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
 - lib/rack/app/front_end/version.rb
-- lib/rack/app/front_end/view.rb
 - rack-app-front_end.gemspec
+- spike/test.html.erb
 homepage: http://www.rack-app.com/
-licenses: []
+licenses:
+- Apache License 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

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

@@ -1,25 +0,0 @@
-module Rack::App::FrontEnd::Utils
-
-  extend self
-
-  def get_full_path(file_path,caller_index=1)
-    return nil if file_path.nil?
-    if file_path.to_s[0] == '/'
-      Rack::App::Utils.pwd(file_path)
-    else
-      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/view.rb

@@ -1,13 +0,0 @@
-class Rack::App::FrontEnd::View
-
-  def render(view_file_basename)
-    file_path = File.join(class_current_folder, view_file_basename)
-
-    Rack::App::FrontEnd::Template.new(file_path).render(self)
-  end
-
-  def class_current_folder
-    method(:call).source_location.first.sub(/.rb$/,'')
-  end
-
-end