amber 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f07ec2e5c2a86cec442c924598f935a40955a32
-  data.tar.gz: 4eaecfe55678b175942014c5e17f6e90381021b6
+  metadata.gz: 7e82110afd292b70bbd258f06cf6d37bcbc0b106
+  data.tar.gz: 45b0c8bace315775426dcc05fce64b13c511b2d3
 SHA512:
-  metadata.gz: efa8c04a618b8ba9052c6b4f0f1387bb750e20a3544e6afe79668cee9de9278c44168c2ce00fe70fc14c8dc4a3faebdb6a5b069e059cd913adc37373f8ade543
-  data.tar.gz: 78c14db10c74f733f0cc1899715ccbf771a3bd9b29aebdf84af8d24bd0025845ced2b0df3adfa5c7237e63619defe0932eae0280561f66f1a0051f8d8c21d3b7
+  metadata.gz: e43abb63b953d965d14a6ff4c1cbbad67699a74cb6aa35a42d8ea579df477490bb0f5f7326c641da5bf9e04b9e7c0215337317c0f3cf03540ad95ae01bf02eaa
+  data.tar.gz: a4dd8cfcff9ffea4d687abc2b5e16d0b0e66dff2ee62032f858125c9cf141b14ebd3e1d8a84fe3d719ba3e563cf86cbeb0d245aff1e59cab2776344a156595f9

data/README.md

@@ -19,6 +19,7 @@ features that make it unique:
   different markup languages).
 * Flexible: Ability to set custom page path aliases, render partials, rich
   navigation, and so on.
+* Wiki Linking: Built in wiki-linking, with dead link detection and hierarchical paths.
 
 Amber allows ERB (ruby code) in all page markup types, making it unsuitable for
 any website where you do not trust the source of the page text.

data/lib/amber.rb

@@ -65,3 +65,4 @@ require 'amber/render/apache'
 require 'amber/render/filter/autolink'
 require 'amber/render/filter/bracketlink'
 require 'amber/render/filter/variables'
+require 'amber/render/sass_helper'

data/lib/amber/render/asset.rb

@@ -26,10 +26,12 @@ module Amber
         src_ext = File.extname(src_file)
         renderer = RENDER_MAP[src_ext]
         if renderer
-          content = self.send(renderer[:method], *([src_file] + renderer[:args]))
-          new_dst_file = dst_file.sub(/#{Regexp.escape(src_ext)}$/, renderer[:new_suffix])
-          File.open(new_dst_file,'w') do |w|
-            w.write(content)
+          if File.basename(src_file) !~ /^_/  # skip partials
+            content = self.send(renderer[:method], *([src_file] + renderer[:args]))
+            new_dst_file = dst_file.sub(/#{Regexp.escape(src_ext)}$/, renderer[:new_suffix])
+            File.open(new_dst_file,'w') do |w|
+              w.write(content)
+            end
           end
         elsif File.basename(src_file) == '.htaccess'
           # existing htaccess file must be copied, not linked, since

data/lib/amber/render/helpers/html_helper.rb

@@ -16,6 +16,12 @@ module Amber
         end
       end
 
+      #
+      # link_to like rails
+      def link_to(label, url, options=nil)
+        link({label => url}, options)
+      end
+
       #
       # three forms:
       #
@@ -30,15 +36,15 @@ module Amber
       #
       def link(name, options=nil)
         options = nil if options && !options.is_a?(Hash)
+        klass = nil
         if name.is_a? Hash
           klass = name.delete(:class)
           label, name = name.to_a.first
           if label.is_a? Symbol
             label = I18n.t label
           end
-        else
-          klass = options[:class] if options
         end
+        klass ||= options[:class] if options
         if name =~ /^#/ || name =~ /^http/ || name =~ /\./
           path = name
           label ||= name

data/lib/amber/render/sass_helper.rb

@@ -0,0 +1,11 @@
+require 'sass'
+
+module Amber
+  module SassFunctions
+    def image_url(path)
+      Sass::Script::String.new("url(/assets/images/#{path.value})")
+    end
+  end
+end
+
+::Sass::Script::Functions.send :include, Amber::SassFunctions

data/lib/amber/render/view.rb

@@ -116,7 +116,7 @@ module Amber
             return path_with_locale if File.exist?(path_with_locale)
           end
         end
-        Amber.logger.error("No such path `#{path2}` from `#{page.content_file(locale)}`.")
+        Amber.logger.error("No such path `#{search_path}` from `#{page.content_file(locale)}`.")
         return nil
       end
 

data/lib/amber/site.rb

@@ -94,6 +94,8 @@ module Amber
         else
           nil
         end
+      elsif @pages_by_path[filter]
+        @pages_by_path[filter]
       else
         @pages_by_name[filter]
       end
@@ -160,7 +162,7 @@ module Amber
       base_page.config = config
 
       # load menu and locals
-      I18n.load_path += Dir[File.join(config.locales_dir, '/*.{rb,yml,yaml}')] if config.locales_dir
+      I18n.load_path += Dir[File.join(config.locales_dir, '/**/*.{rb,yml,yaml}')] if config.locales_dir
 
       # add the full directory tree
       base_page.scan_directory_tree do |page, asset_dir|
@@ -179,7 +181,7 @@ module Amber
     # registers a page with the site, indexing the page path in our various hashes
     #
     def add_page(page)
-      @pages_by_name[page.name] = page
+      @pages_by_name[page.name] ||= page
       @pages_by_path[page.path.join('/')] = page
       add_aliases(I18n.default_locale, page, @pages_by_path)
       page.locales.each do |locale|

data/lib/amber/version.rb

@@ -1,5 +1,5 @@
 module Amber
   unless defined?(Amber::VERSION)
-    VERSION = '0.3.11'
+    VERSION = '0.3.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amber
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Elijah Sparrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -152,6 +152,7 @@ files:
 - lib/amber/render/helpers/language_helper.rb
 - lib/amber/render/helpers/navigation_helper.rb
 - lib/amber/render/layout.rb
+- lib/amber/render/sass_helper.rb
 - lib/amber/render/table_of_contents.rb
 - lib/amber/render/template.rb
 - lib/amber/render/view.rb
@@ -271,7 +272,7 @@ files:
 - locales/rails-i18n/zh-YUE.yml
 homepage: https://github.com/leapcode/amber
 licenses:
-- AGPL
+- AGPL-1.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -289,9 +290,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Static website generator
 test_files: []
-has_rdoc: