fedux_org-stdlib 0.6.37 → 0.6.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4c511387484f5ebcf4421964588e8dd7e178df
-  data.tar.gz: e4184422b88695bb932ef623a28667633dfd522d
+  metadata.gz: aa5e47bfdb9fb2bef0245b9251bc1b6568795422
+  data.tar.gz: b793ab10a4b1184e6e1927907ffdeade19e75f87
 SHA512:
-  metadata.gz: 45cc4cfb8ed3eea954d2dd808ed6fe21bb50e32260b100c09f2bc866af5233c24444c78b37e73dd316d4eb9856739689eb1b48c0c1969a9bfb352898ab655266
-  data.tar.gz: d7a394752d938915d1de5b90398ceb7f657dfaaec4a2747f9ca75b2596c0e53a2a67a91e2868be6b57373d34cd61eaebc80e1fd3030874d696f901702389dd85
+  metadata.gz: 6de22d0c95aa66f30bf08205e13b3507a262112d6d330c56c0760e32e0b62e8347c407d6a748a2df0f2b21d474927fc8c19860aaafd8cbebba2deef3a7541d07
+  data.tar.gz: 81c8a7486e8977b7f13650e5f2e2b8be0bfe25ce348915db915b050d90112fd4add22eb0937c7745ffa4e38b5daa05bd775f70473ddb0e0cd67f3b9bf743ac53

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.6.36)
+    fedux_org-stdlib (0.6.37)
       activesupport
 
 GEM

data/lib/fedux_org_stdlib/file_template.rb

@@ -78,10 +78,10 @@ module FeduxOrgStdlib
       @logger            = logger
       @working_directory = working_directory
 
-      @file ||= _available_template_file
+      @file ||= available_template_file
 
       unless @file
-        logger.debug "No template file found at #{_allowed_template_file_paths.to_list}, therefor I'm going to use an empty template object instead." 
+        logger.debug "No template file found at #{allowed_template_file_paths.to_list}, therefor I'm going to use an empty template object instead." 
         @content = ''
 
         return 
@@ -98,7 +98,7 @@ module FeduxOrgStdlib
     # @return [String]
     #   The path to the preferred template file
     def preferred_template_file
-      _allowed_template_file_paths[1]
+      allowed_template_file_paths[1]
     end
 
     private
@@ -109,16 +109,16 @@ module FeduxOrgStdlib
     #   The name of the template file. It defaults to `<template_name>.yaml`. If
     #   you want to use a different file name you need to overwrite this
     #   method.
-    def _template_file
-      "#{_template_name}#{_template_file_suffix}"
+    def template_file
+      "#{template_name}#{template_file_suffix}"
     end
 
     # The suffix of the template file
     #
     # @return [String]
     #   The suffix of the template file
-    def _template_file_suffix
-      '.tt'
+    def template_file_suffix
+      '*.tt'
     end
 
     # The base name of the template
@@ -132,12 +132,12 @@ module FeduxOrgStdlib
     #   class ClientTemplate; end
     #
     # This will result in `client` as base name for the template file.
-    def _template_name
-      unless (name = _class_name.sub(/Template/, '').underscore.singularize).blank?
+    def template_name
+      unless (name = class_name.sub(/Template/, '').underscore.singularize).blank?
         return name
       end
 
-      fail Exceptions::ClassNameIsMissing, JSON.dump(klass: _class_name)
+      fail Exceptions::ClassNameIsMissing, JSON.dump(klass: class_name)
     end
 
     # The name of your application
@@ -153,8 +153,8 @@ module FeduxOrgStdlib
     # This will be converted to
     #
     #    my_application
-    def _application_name
-      _module_name.underscore
+    def application_name
+      module_name.underscore
     end
 
     # The paths where to look for the template file
@@ -162,35 +162,62 @@ module FeduxOrgStdlib
     # @return [Array]
     #   A list of paths where the template object should look for its template
     #   file.
-    def _allowed_template_file_paths
+    def allowed_template_file_paths
       paths = []
-      paths << ::File.expand_path(::File.join(working_directory, 'templates', _template_file))
-      paths << ::File.expand_path(::File.join('~', '.config', _application_name, 'templates', _template_file))
-      paths << ::File.expand_path(::File.join('~', format('.%s', _application_name), 'templates', _template_file))
-      paths << ::File.expand_path(::File.join('/etc', _application_name, 'templates', _template_file))
-      paths << ::File.expand_path(::File.join(_fallback_template_directory, _template_file)) if _fallback_template_directory
+
+      paths << resolve_path(working_directory, 'templates', template_file)
+      paths << resolve_path('~', '.config', application_name, 'templates', template_file)
+      paths << resolve_path('~', format('.%s', application_name), 'templates', template_file)
+      paths << resolve_path('/etc', application_name, 'templates', template_file)
+      paths << resolve_path(fallback_template_directory, template_file) if fallback_template_directory
 
       paths
     end
 
+    def resolve_path(*path)
+      ::File.expand_path(::File.join(*path))
+    end
+
 
     # Use this path as fall back path
-    def _fallback_template_directory; end
+    def fallback_template_directory; end
 
-    def _class_name
+    def class_name
       self.class.name.to_s.demodulize
     end
 
-    def _module_name
+    def module_name
       self.class.to_s.deconstantize
     end
 
-    def _available_template_file
-      _allowed_template_file_paths.find { |f| ::File.exists? f }
+    def available_template_file
+      allowed_template_file_paths.map { |f| Dir.glob(f).first }.find { |f| !f.blank? && ::File.exists?(f) }
     end
 
-    def self._reserved_key_words
+    def self.reserved_key_words
       (methods | instance_methods | private_methods | private_instance_methods ) - (Class.methods | Class.private_methods ) | [:to_s]
     end
+
+    def basename
+      File.basename(file, '.tt')
+    end
+
+    def extname
+      File.extname(basename)
+    end
+
+    def extname?(*ext)
+      ext.any? { |e| e == extname }
+    end
+
+    public
+
+    def proposed_extname
+      ext = File.extname(basename)
+
+      return '.erb' if ext.blank?
+
+      ext
+    end
   end
 end

data/lib/fedux_org_stdlib/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # FeduxOrgStdlib
 module FeduxOrgStdlib
-  VERSION = '0.6.37'
+  VERSION = '0.6.38'
 end

data/spec/template_file_spec.rb

@@ -3,22 +3,21 @@ require 'spec_helper'
 require 'fedux_org_stdlib/file_template'
 
 RSpec.describe FileTemplate do
-
   context '#preferred_template_file' do
     it 'has a default template file which is the preferred place to store the template' do
       with_environment 'HOME' => working_directory do
         template_klass = Class.new(FileTemplate) do
-          def _class_name
+          def class_name
             'TestTemplate'
           end
 
-          def _module_name
+          def module_name
             'MyApplication'
           end
         end
 
         template = template_klass.new
-        expect(template.preferred_template_file).to eq File.expand_path('~/.config/my_application/templates/test.tt')
+        expect(template.preferred_template_file).to eq File.expand_path('~/.config/my_application/templates/test*.tt')
       end
     end
 
@@ -26,17 +25,17 @@ RSpec.describe FileTemplate do
       with_environment 'HOME' => working_directory do
         template_klass = Class.new(FileTemplate) do
 
-          def _class_name
+          def class_name
             'TestTemplate'
           end
 
-          def _module_name
+          def module_name
             'MyApplication::MySub'
           end
         end
 
         template = template_klass.new
-        expect(template.preferred_template_file).to eq File.expand_path('~/.config/my_application/my_sub/templates/test.tt')
+        expect(template.preferred_template_file).to eq File.expand_path('~/.config/my_application/my_sub/templates/test*.tt')
       end
     end
   end
@@ -49,11 +48,11 @@ RSpec.describe FileTemplate do
         EOS
 
         template_klass = Class.new(FileTemplate) do
-          def _class_name
+          def class_name
             'TestTemplate'
           end
 
-          def _module_name
+          def module_name
             'MyApplication'
           end
         end
@@ -70,11 +69,32 @@ RSpec.describe FileTemplate do
         EOS
 
         template_klass = Class.new(FileTemplate) do
-          def _class_name
+          def class_name
+            'TestTemplate'
+          end
+
+          def module_name
+            'MyApplication'
+          end
+        end
+
+        template = template_klass.new
+        expect(template.content).to include 'hello world'
+      end
+    end
+
+    it 'supports star operator in suffix: ~/.my_application/templates/test*.tt' do
+      with_environment 'HOME' => working_directory do
+        create_file '.my_application/templates/test.erb.tt', <<-EOS.strip_heredoc
+        <%= hello world %>
+        EOS
+
+        template_klass = Class.new(FileTemplate) do
+          def class_name
             'TestTemplate'
           end
 
-          def _module_name
+          def module_name
             'MyApplication'
           end
         end
@@ -93,11 +113,11 @@ RSpec.describe FileTemplate do
         EOS
 
         template_klass = Class.new(FileTemplate) do
-          def _class_name
+          def class_name
             'TestTemplate'
           end
 
-          def _module_name
+          def module_name
             'MyApplication'
           end
         end
@@ -107,4 +127,44 @@ RSpec.describe FileTemplate do
       end
     end
   end
+
+  context '#proposed_extname' do
+    it 'propose a erb as default extname' do
+      with_environment 'HOME' => working_directory do
+        create_file '.my_application/templates/test.tt'
+
+        template_klass = Class.new(FileTemplate) do
+          def class_name
+            'TestTemplate'
+          end
+
+          def module_name
+            'MyApplication'
+          end
+        end
+
+        template = template_klass.new
+        expect(template.proposed_extname).to eq '.erb'
+      end
+    end
+
+    it 'extracts the extname from file name' do
+      with_environment 'HOME' => working_directory do
+        create_file '.my_application/templates/test.md.tt'
+
+        template_klass = Class.new(FileTemplate) do
+          def class_name
+            'TestTemplate'
+          end
+
+          def module_name
+            'MyApplication'
+          end
+        end
+
+        template = template_klass.new
+        expect(template.proposed_extname).to eq '.md'
+      end
+    end
+  end
 end

data/spec/version_management/rubygem_version_file_spec.rb

@@ -34,6 +34,7 @@ RSpec.describe FeduxOrgStdlib::VersionManagement::RubygemVersionFile do
                                         # encoding: utf-8
                                         # MyLibrary
                                         module MyLibrary
+                                          # MyClass
                                           module MyClass
                                             VERSION = '0.0.0'
                                           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.6.37
+  version: 0.6.38
 platform: ruby
 authors:
 - Max Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport