jekyll-fdroid 0.2.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5223ec6f44fa3c3131928d083cee93e06c28045b
-  data.tar.gz: 1acae1bbdda2af1529df4d8fc955e27d6e428514
+SHA256:
+  metadata.gz: f72286c732de382d651b8377c0083ed8faeb58cab5a865dd8e72978dd84e1a60
+  data.tar.gz: 57873902b7c8d5249f269293afc0b2d172db25c1371f37b70ec959f00192dfcc
 SHA512:
-  metadata.gz: 52dd3848f495b9cf4a2c973faf5f3324e90bdacacbd21545e63a93a455771c4d1522739aba09968727e8e48f4d7bc496320142138ec9425cc7ce420fcad98bf6
-  data.tar.gz: c6227570b89a1c4edad316e55678bca5bd1278f28511d3474f41f58d6eda57bcd625c760626bebde750f80a960b6dd8fb828a08c87ca82ca1bc62e10d6469e78
+  metadata.gz: 551e0cba8c4add0d485a7dec9e12d95107b6be1a38620a730e58fe9174b648a861aa054dac69e9e519058adb6dc010c89843958fed78f3ba581ce1ccad4991d6
+  data.tar.gz: '0098617770f3bd1f3bbeddfd0278a9dcdf2cf50f1cc2ed5c8c842051210f7ea36e2f8ad6d59112237b94724bf223b97036031cfb1d271bffd602261153545b87'

data/lib/fdroid/App.rb

@@ -39,21 +39,21 @@ module FDroid
       localized = App.localized_graphic_path(@available_locales, @app['localized'], 'icon')
       if localized
         "#{package_name}/#{localized}"
-      else
+      elsif field('icon')
         "icons-640/#{field('icon')}"
       end
     end
 
     def name
-      App.localized(@available_locales, @app['localized'], 'name') || field('name')
+      field('name') || App.localized(@available_locales, @app['localized'], 'name')
     end
 
     def summary
-      App.localized(@available_locales, @app['localized'], 'summary') || field('summary')
+      field('summary') || App.localized(@available_locales, @app['localized'], 'summary')
     end
 
     def description
-      desc = App.localized(@available_locales, @app['localized'], 'description') || field('description')
+      desc = field('description') || App.localized(@available_locales, @app['localized'], 'description')
 
       if desc != nil
         desc = App.process_app_description(desc)
@@ -70,7 +70,6 @@ module FDroid
       return code
     end
 
-
     # Generates a hash of dumb strings to be used in templates.
     # If a specific value is not present, then it will have a nil value.
     # If a value can be localized, then it will choose the most appropriate
@@ -79,39 +78,42 @@ module FDroid
     # @return [Hash]
     def to_data
       {
-          # These fields are taken as is from the metadata. If not present, they are
-          'package_name' => package_name,
-          'author_email' => field('authorEmail'),
-          'author_name' => field('authorName'),
-          'author_website' => field('authorWebSite'),
-          'bitcoin' => field('bitcoin'),
-          'donate' => field('donate'),
-          'flattr' => field('flattr'),
-          'categories' => field('categories'),
-          'anti_features' => field('anti_features'),
-          'suggested_version_code' => suggested_version_code,
-          'suggested_version_name' => @packages.detect { |p| p.version_code == suggested_version_code }&.version_name,
-          'issue_tracker' => field('issueTracker'),
-          'changelog' => field('changelog'),
-          'license' => field('license'),
-          'source_code' => field('sourceCode'),
-          'website' => field('webSite'),
-          'added' => field('added'),
-          'last_updated' => field('lastUpdated'),
-          'whats_new' => App.process_app_description(App.localized(@available_locales, @app['localized'], 'whatsNew')),
-
-          'icon' => icon,
-          'title' => name,
-          'summary' => summary,
-
-          'description' => description,
-          'feature_graphic' => App.localized_graphic_path(@available_locales, @app['localized'], 'featureGraphic'),
-          'phone_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'phoneScreenshots'),
-          'seven_inch_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'sevenInchScreenshots'),
-
-          'packages' => @packages.sort.reverse.map { |p| p.to_data },
-
-          'beautiful_url' => "/packages/#{package_name}"
+        # These fields are taken as is from the metadata. If not present, they are
+        'package_name' => package_name,
+        'author_email' => field('authorEmail'),
+        'author_name' => field('authorName'),
+        'author_website' => field('authorWebSite'),
+        'translation' => field('translation'),
+        'bitcoin' => field('bitcoin'),
+        'litecoin' => field('litecoin'),
+        'donate' => field('donate'),
+        'flattrID' => field('flattrID'),
+        'liberapayID' => field('liberapayID'),
+        'categories' => field('categories'),
+        'anti_features' => field('anti_features'),
+        'suggested_version_code' => suggested_version_code,
+        'suggested_version_name' => @packages.detect { |p| p.version_code == suggested_version_code }&.version_name,
+        'issue_tracker' => field('issueTracker'),
+        'changelog' => field('changelog'),
+        'license' => field('license'),
+        'source_code' => field('sourceCode'),
+        'website' => field('webSite'),
+        'added' => field('added'),
+        'last_updated' => field('lastUpdated'),
+        'whats_new' => App.process_app_description(App.localized(@available_locales, @app['localized'], 'whatsNew')),
+
+        'icon' => icon,
+        'title' => name,
+        'summary' => summary,
+
+        'description' => description,
+        'feature_graphic' => App.localized_graphic_path(@available_locales, @app['localized'], 'featureGraphic'),
+        'phone_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'phoneScreenshots'),
+        'seven_inch_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'sevenInchScreenshots'),
+
+        'packages' => @packages.sort.reverse.map { |p| p.to_data },
+
+        'beautiful_url' => "/packages/#{package_name}"
       }
     end
 
@@ -134,11 +136,10 @@ module FDroid
       string.gsub /fdroid\.app:([\w._]*)/, '/packages/\1'
     end
 
-    # Ensure double newlines "\n\n" are converted to "<br />" tags.
+    # Ensure newlines in descriptions are preserved (converted to "<br />" tags)
+    # Handles UNIX, Windows and MacOS newlines, with a one-to-one replacement
     def self.format_description_to_html(string)
-      string
-        .gsub("\n\n", '<br />')
-        .gsub(/\r?\n/, ' ')
+      string.gsub(/(?:\n\r?|\r\n?)/, '<br />')
     end
 
     # @param [string] available_locales
@@ -156,34 +157,30 @@ module FDroid
 
       return nil
     end
-    
+
     # Prefixes the result with "chosen_locale/" before returning.
     # @see localized
     def self.localized_graphic_path(available_locales, localized, field)
       return nil unless available_locales != nil
-      
       available_locales.each do |l|
         if localized[l].key?(field)
           return "#{l}/#{localized[l][field]}"
         end
       end
-      
       return nil
     end
-    
+
     # Similar to localized_graphic_path, but prefixes each item in the resulting array
     # with "chosen_locale/field/".
     # @see localized
     # @see localized_graphic_path
     def self.localized_graphic_list_paths(available_locales, localized, field)
       return nil unless available_locales != nil
-      
       available_locales.each do |l|
         if localized[l].key?(field)
           return localized[l][field].map { |val| "#{l}/#{field}/#{val}" }
         end
       end
-      
       return nil
     end
 

data/lib/fdroid/IndexV1.rb

@@ -70,6 +70,5 @@ module FDroid
 
       @repo = Repo.new(index['repo'])
     end
-
   end
-end
+end

data/lib/fdroid/Package.rb

@@ -23,7 +23,7 @@ module FDroid
       @package = package
     end
 
-    def <=> (other)
+    def <=>(other)
       self.version_code <=> other.version_code
     end
 
@@ -42,19 +42,23 @@ module FDroid
       end
 
       {
-        'version_name' => version_name,
-        'version_code' => version_code,
         'added' => added,
+        'anti_features' => @package['antiFeatures'],
         'apk_name' => @package['apkName'],
+        'file_extension' => File.extname(@package['apkName'].to_s).strip.upcase[1..-1],
         'hash' => @package['hash'],
         'hash_type' => @package['hashType'],
-        'min_sdk_version' => @package['minSdkVersion'],
         'max_sdk_version' => @package['maxSdkVersion'],
-        'target_sdk_version' => @package['targetSdkVersion'],
-        'native_code' => @package['nativecode'],
+        'min_sdk_version' => @package['minSdkVersion'],
+        'nativecode' => @package['nativecode'],
+        'srcname' => @package['srcname'],
         'sig' => @package['sig'],
+        'signer' => @package['signer'],
         'size' => @package['size'],
+        'target_sdk_version' => @package['targetSdkVersion'],
         'uses_permission' => permission,
+        'version_name' => version_name,
+        'version_code' => version_code,
       }
     end
 
@@ -62,7 +66,7 @@ module FDroid
       if @package['uses-permission'] == nil then
         []
       else
-        @package['uses-permission'].map {|perm| Permission.new(perm).to_data }
+        @package['uses-permission'].map { |perm| Permission.new(perm).to_data }
       end
     end
 
@@ -72,4 +76,4 @@ module FDroid
       @app.key?(name) ? name : nil
     end
   end
-end
+end

data/lib/fdroid/Permission.rb

@@ -24,9 +24,9 @@ module FDroid
 
     def to_data
       {
-          'permission' => @permission,
-          'min_sdk' => @min_sdk,
+        'permission' => @permission,
+        'min_sdk' => @min_sdk,
       }
     end
   end
-end
+end

data/lib/fdroid/Repo.rb

@@ -24,7 +24,7 @@ module FDroid
     def name
       @repo['name']
     end
-    
+
     def address
       @repo['address']
     end
@@ -36,10 +36,13 @@ module FDroid
     def description
       @repo['description']
     end
-    
+
+    def timestamp
+      @repo['timestamp']
+    end
+
     def date
       added = Date.strptime("#{@repo['timestamp'] / 1000}", '%s')
     end
-
   end
-end
+end

data/lib/jekyll/FDroidBrowsingPage.rb

@@ -16,16 +16,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Jekyll
+  class FDroidBrowsingPage < ReadYamlPage
+    def initialize(site, base)
+      @site = site
+      @base = base
+      @dir = "packages"
+      @name = "index.html"
 
-	class FDroidBrowsingPage < ReadYamlPage
-		def initialize(site, base)
-			@site = site
-			@base = base
-			@dir = "packages"
-			@name = "index.html"
-
-			self.process(@name)
-			self.read_yaml((File.expand_path "../../_pages", File.dirname(__FILE__)), 'browse.html')
-		end
-	end
+      self.process(@name)
+      self.read_yaml((File.expand_path "../../_pages", File.dirname(__FILE__)), 'browse.html')
+    end
+  end
 end

data/lib/jekyll/FDroidFilters.rb

@@ -16,164 +16,165 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Jekyll
+  module Filters
+    # Convert an Android SDK level into an Android version.
+    #
+    # input - Android SDK Level.
+    #
+    # Returns the Android version.
+    def android_sdk_level_to_version(input)
+      sdkLevel = @@AndroidSdkLevelToVersionRelation[input]
+      if not sdkLevel.nil?
+        return sdkLevel
+      end
+      return '?'
+    end
 
-	module Filters
+    # Hash with relation between Android SDK Level and Android version
+    # https://source.android.com/setup/build-numbers
+    @@AndroidSdkLevelToVersionRelation = {
+      '1' => '1.0',
+      '2' => '1.1',
+      '3' => '1.5',
+      '4' => '1.6',
+      '5' => '2.0',
+      '6' => '2.0.1',
+      '7' => '2.1',
+      '8' => '2.2',
+      '9' => '2.3',
+      '10' => '2.3.3',
+      '11' => '3.0',
+      '12' => '3.1',
+      '13' => '3.2',
+      '14' => '4.0',
+      '15' => '4.0.3',
+      '16' => '4.1',
+      '17' => '4.2',
+      '18' => '4.3',
+      '19' => '4.4',
+      '20' => '4.4W',
+      '21' => '5.0',
+      '22' => '5.1',
+      '23' => '6.0',
+      '24' => '7.0',
+      '25' => '7.1',
+      '26' => '8.0',
+      '27' => '8.1',
+    }
 
-		# Convert an Android SDK level into an Android version.
-		#
-		# input - Android SDK Level.
-		#
-		# Returns the Android version.
-		def android_sdk_level_to_version(input)
-			sdkLevel = @@AndroidSdkLevelToVersionRelation[input]
-			if not sdkLevel.nil?
-				return sdkLevel
-			end
-			return '?'
-		end
+    # Convert a file size to a human-readable String.
+    # Source: https://codereview.stackexchange.com/q/9107
+    #
+    # input - File size in Bytes.
+    #
+    # Returns human-readable String.
+    def file_size_human_readable(input)
+      input = input.to_f
+      i = PREFIX.length - 1
+      while input > 512 && i > 0
+        i -= 1
+        input /= 1024
+      end
+      return ((input > 9 || input.modulo(1) < 0.1 ? '%d' : '%.1f') % input) + ' ' + PREFIX[i]
+    end
+    PREFIX = %W(TiB GiB MiB KiB B).freeze
 
-		# Hash with relation between Android SDK Level and Android version
-		@@AndroidSdkLevelToVersionRelation = {
-			'1' => '1.0',
-			'2' => '1.1',
-			'3' => '1.5',
-			'4' => '1.6',
-			'5' => '2.0',
-			'6' => '2.0.1',
-			'7' => '2.1',
-			'8' => '2.2',
-			'9' => '2.3',
-			'10' => '2.3.3',
-			'11' => '3.0',
-			'12' => '3.1',
-			'13' => '3.2',
-			'14' => '4.0',
-			'15' => '4.0.3',
-			'16' => '4.1',
-			'17' => '4.2',
-			'18' => '4.3',
-			'19' => '4.4',
-			'20' => '4.4W',
-			'21' => '5.0',
-			'22' => '5.1',
-			'23' => '6.0',
-			'24' => '7.0',
-			'25' => '7.1'
-		}
+    # Convert a SPDX license identifier to its full name.
+    #
+    # input - SPDX license identifier.
+    #
+    # Returns full license name.
+    def get_license_name(input)
+      if input.nil? or input.empty?
+        return 'Unknown'
+      end
+      spdxLicense = @@SpdxLicenseNameToGnuUrlRelation[input]
+      if input.end_with? "+"
+        spdxLicense = @@SpdxLicenseNameToGnuUrlRelation[input.chomp('+')]
+      end
+      if not spdxLicense.nil?
+        if input.end_with? "+"
+          return spdxLicense['name'] + ' or later version'
+        end
+        return spdxLicense['name']
+      end
+      return input
+    end
 
-		# Convert a file size to a human-readable String.
-		# Source: https://codereview.stackexchange.com/q/9107
-		#
-		# input - File size in Bytes.
-		#
-		# Returns human-readable String.
-		def file_size_human_readable(input)
-			input = input.to_f
-			i = PREFIX.length - 1
-			while input > 512 && i > 0
-				i -= 1
-				input /= 1024
-			end
-			return ((input > 9 || input.modulo(1) < 0.1 ? '%d' : '%.1f') % input) + ' ' + PREFIX[i]
-		end
-		PREFIX = %W(TiB GiB MiB KiB B).freeze
+    # Convert a SPDX license identifier to its URL on GNU.org.
+    #
+    # input - SPDX license identifier.
+    #
+    # Returns URL on GNU.org.
+    def get_license_url(input)
+      if input.nil? or input.empty?
+        return ''
+      end
+      if input.end_with? "+"
+        input = input.chomp('+')
+      end
+      spdxLicense = @@SpdxLicenseNameToGnuUrlRelation[input]
+      if not spdxLicense.nil?
+        return spdxLicense['url']
+      end
+      return 'https://spdx.org/licenses/' + input + '.html'
+    end
 
-		# Convert a SPDX license identifier to its full name.
-		#
-		# input - SPDX license identifier.
-		#
-		# Returns full license name.
-		def get_license_name(input)
-			if input.nil? or input.empty?
-				return 'Unknown'
-			end
-			spdxLicense = @@SpdxLicenseNameToGnuUrlRelation[input]
-			if input.end_with? "+"
-				spdxLicense = @@SpdxLicenseNameToGnuUrlRelation[input.chomp('+')]
-			end
-			if not spdxLicense.nil?
-				if input.end_with? "+"
-					return spdxLicense['name'] + ' or later version'
-				end
-				return spdxLicense['name']
-			end
-			return input
-		end
-
-		# Convert a SPDX license identifier to its URL on GNU.org.
-		#
-		# input - SPDX license identifier.
-		#
-		# Returns URL on GNU.org.
-		def get_license_url(input)
-			if input.nil? or input.empty?
-				return ''
-			end
-			if input.end_with? "+"
-				input = input.chomp('+')
-			end
-			spdxLicense = @@SpdxLicenseNameToGnuUrlRelation[input]
-			if not spdxLicense.nil?
-				return spdxLicense['url']
-			end
-			return 'https://spdx.org/licenses/' + input + '.html'
-		end
-
-		# Hash with relation between SPDX license identifier and its full name and URL, mostly on GNU.org.
-		# For the beginning, I only used OSI approved and frequently used licenses.
-		@@SpdxLicenseNameToGnuUrlRelation = {
-			'AGPL-3.0' => {
-				'name' => 'GNU Affero General Public License v3.0',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#AGPLv3.0'
-				},
-			'Apache-2.0' => {
-				'name' => 'Apache License 2.0',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#apache2'
-				},
-			'BSD-2-Clause' => {
-				'name' => 'BSD 2-clause "Simplified" License',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#FreeBSD'
-				},
-			'BSD-3-Clause' => {
-				'name' => 'BSD 3-clause "New" or "Revised" License',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#ModifiedBSD'
-				},
-			'GPL-2.0' => {
-				'name' => 'GNU General Public License v2.0',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#GPLv2'
-				},
-			'GPL-3.0' => {
-				'name' => 'GNU General Public License v3.0',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#GNUGPLv3'
-				},
-			'ISC' => {
-				'name' => 'ISC License',
-				'url' => 'https://www.gnu.org/licenses/license-list.en.html#ISC'
-				},
-			'LGPL-2.1' => {
-				'name' => 'GNU Lesser General Public License v2.1',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#LGPLv2.1'
-				},
-			'LGPL-3.0' => {
-				'name' => 'GNU Lesser General Public License v3.0',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#LGPLv3'
-				},
-			'MIT' => {
-				'name' => 'MIT License',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#X11License'
-				},
-			'MPL-1.1' => {
-				'name' => 'Mozilla Public License 1.1',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#MPL'
-				},
-			'MPL-2.0' => {
-				'name' => 'Mozilla Public License 2.0',
-				'url' => 'https://www.gnu.org/licenses/license-list.html#MPL-2.0'
-				}
-		}
-	end
+    # Hash with relation between SPDX license identifier and its full name and URL, mostly on GNU.org.
+    # For the beginning, I only used OSI approved and frequently used licenses.
+    @@SpdxLicenseNameToGnuUrlRelation = {
+      'AGPL-3.0' => {
+        'name' => 'GNU Affero General Public License v3.0',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#AGPLv3.0'
+      },
+      'Apache-2.0' => {
+        'name' => 'Apache License 2.0',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#apache2'
+      },
+      'BSD-2-Clause' => {
+        'name' => 'BSD 2-clause "Simplified" License',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#FreeBSD'
+      },
+      'BSD-3-Clause' => {
+        'name' => 'BSD 3-clause "New" or "Revised" License',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#ModifiedBSD'
+      },
+      'GPL-2.0' => {
+        'name' => 'GNU General Public License v2.0',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#GPLv2'
+      },
+      'GPL-3.0' => {
+        'name' => 'GNU General Public License v3.0',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#GNUGPLv3'
+      },
+      'ISC' => {
+        'name' => 'ISC License',
+        'url' => 'https://www.gnu.org/licenses/license-list.en.html#ISC'
+      },
+      'LGPL-2.1' => {
+        'name' => 'GNU Lesser General Public License v2.1',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#LGPLv2.1'
+      },
+      'LGPL-3.0' => {
+        'name' => 'GNU Lesser General Public License v3.0',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#LGPLv3'
+      },
+      'MIT' => {
+        'name' => 'MIT License',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#X11License'
+      },
+      'MPL-1.1' => {
+        'name' => 'Mozilla Public License 1.1',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#MPL'
+      },
+      'MPL-2.0' => {
+        'name' => 'Mozilla Public License 2.0',
+        'url' => 'https://www.gnu.org/licenses/license-list.html#MPL-2.0'
+      }
+    }
+  end
 end
 
 Liquid::Template.register_filter(
-	Jekyll::Filters
+  Jekyll::Filters
 )

data/lib/jekyll/FDroidLastUpdatedPackagesTag.rb

@@ -16,18 +16,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Jekyll
+  class FDroidLastUpdatedPackagesTag < Liquid::Tag
+    def initialize(tag_name, text, tokens)
+      super
+    end
 
-	class FDroidLastUpdatedPackagesTag < Liquid::Tag
-
-		def initialize(tag_name, text, tokens)
-			super
-		end
-
-		def render(context)
-			template = Liquid::Template.parse(IO.read((File.expand_path "../../_layouts/sidebar-lastupdated-packages.html", File.dirname(__FILE__))))
-			template.render(context)
-		end
-	end
+    def render(context)
+      template = Liquid::Template.parse(IO.read((File.expand_path "../../_layouts/sidebar-lastupdated-packages.html", File.dirname(__FILE__))))
+      template.render(context)
+    end
+  end
 end
 
 Liquid::Template.register_tag('fdroid_show_last_updated_packages', Jekyll::FDroidLastUpdatedPackagesTag)

data/lib/jekyll/FDroidLatestPackagesTag.rb

@@ -16,18 +16,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Jekyll
+  class FDroidLatestPackagesTag < Liquid::Tag
+    def initialize(tag_name, text, tokens)
+      super
+    end
 
-	class FDroidLatestPackagesTag < Liquid::Tag
-
-		def initialize(tag_name, text, tokens)
-			super
-		end
-
-		def render(context)
-			template = Liquid::Template.parse(IO.read((File.expand_path "../../_layouts/sidebar-latest-packages.html", File.dirname(__FILE__))))
-			template.render(context)
-		end
-	end
+    def render(context)
+      template = Liquid::Template.parse(IO.read((File.expand_path "../../_layouts/sidebar-latest-packages.html", File.dirname(__FILE__))))
+      template.render(context)
+    end
+  end
 end
 
 Liquid::Template.register_tag('fdroid_show_latest_packages', Jekyll::FDroidLatestPackagesTag)

data/lib/jekyll/FDroidPackageDetailGenerator.rb

@@ -16,53 +16,52 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Jekyll
+  class FDroidPackagesGenerator < Generator
+    attr_accessor :alreadyBuilt
 
-	class FDroidPackagesGenerator < Generator
-		attr_accessor :alreadyBuilt
+    safe true
+    priority :highest
 
-		safe true
-		priority :highest
+    def generate(site)
+      # generator will only run on first build, not because of auto-regeneration
+      if @alreadyBuilt != true
+        @alreadyBuilt = true
 
-		def generate(site)
-			# generator will only run on first build, not because of auto-regeneration
-			if @alreadyBuilt != true
-				@alreadyBuilt = true
+        # Add plugin's SASS directory so site's list of SASS directories
+        if site.config["sass"].nil? || site.config["sass"].empty?
+          site.config["sass"] = Hash.new
+        end
+        if site.config["sass"]["load_paths"].nil? || site.config["sass"]["load_paths"].empty?
+          site.config["sass"]["load_paths"] = ["_sass", (File.expand_path "../../_sass", File.dirname(__FILE__))]
+        else
+          site.config["sass"]["load_paths"] << (File.expand_path "../../_sass", File.dirname(__FILE__))
+        end
 
-				# Add plugin's SASS directory so site's list of SASS directories
-				if site.config["sass"].nil? || site.config["sass"].empty?
-					site.config["sass"] = Hash.new
-				end
-				if site.config["sass"]["load_paths"].nil? || site.config["sass"]["load_paths"].empty?
-					site.config["sass"]["load_paths"] = ["_sass", (File.expand_path "../../_sass", File.dirname(__FILE__))]
-				else
-					site.config["sass"]["load_paths"] << (File.expand_path "../../_sass", File.dirname(__FILE__))
-				end
+        # Enable pagination
+        if site.config["pagination"].nil? || site.config["pagination"].empty?
+          site.config["pagination"] = Hash.new
+        end
+        site.config["pagination"]["enabled"] = true
 
-				# Enable pagination
-				if site.config["pagination"].nil? || site.config["pagination"].empty?
-					site.config["pagination"] = Hash.new
-				end
-				site.config["pagination"]["enabled"] = true
+        index = FDroid::IndexV1.download(site.config["fdroid-repo"], site.active_lang || 'en_US')
 
-				index = FDroid::IndexV1.download(site.config["fdroid-repo"], site.active_lang || 'en_US')
+        Jekyll::LunrJsSearch::Indexer.new.generate(site, index.apps)
 
-				Jekyll::LunrJsSearch::Indexer.new.generate(site, index.apps)
-
-				# Generate detail page for every package
-				site.collections["packages"] = Collection.new(site, "packages")
-				index.apps.each do |package|
-					# This page needs to be created twice, once for site.pages, and once for site.collections.
-					# If not, then the i18n code in jekyll-polyglot will end up processing the page twice, as
-					# it iterates over all pages and all packages. The end result is a double prefix for "/en/en"
-					# for any links in the page.
-					# https://gitlab.com/fdroid/jekyll-fdroid/issues/38
-					site.pages << FDroidPackageDetailPage.new(site, site.source, package)
-					site.collections["packages"].docs << FDroidPackageDetailPage.new(site, site.source, package)
-				end
-				# Generate browsing pages
-				site.includes_load_paths << (File.expand_path "../../_includes", File.dirname(__FILE__))
-				site.pages << FDroidBrowsingPage.new(site, site.source)
-			end
-		end
-	end
+        # Generate detail page for every package
+        site.collections["packages"] = Collection.new(site, "packages")
+        index.apps.each do |package|
+          # This page needs to be created twice, once for site.pages, and once for site.collections.
+          # If not, then the i18n code in jekyll-polyglot will end up processing the page twice, as
+          # it iterates over all pages and all packages. The end result is a double prefix for "/en/en"
+          # for any links in the page.
+          # https://gitlab.com/fdroid/jekyll-fdroid/issues/38
+          site.pages << FDroidPackageDetailPage.new(site, site.source, package)
+          site.collections["packages"].docs << FDroidPackageDetailPage.new(site, site.source, package)
+        end
+        # Generate browsing pages
+        site.includes_load_paths << (File.expand_path "../../_includes", File.dirname(__FILE__))
+        site.pages << FDroidBrowsingPage.new(site, site.source)
+      end
+    end
+  end
 end

data/lib/jekyll/FDroidPackageDetailPage.rb

@@ -16,12 +16,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Jekyll
-
   class FDroidPackageDetailPage < ReadYamlPage
-
     # @param [Jekyll::Site]  site
     # @param [string]  base
-    # @param [FDfroid::App]  package
+    # @param [FDroid::App]  package
     def initialize(site, base, package)
       @site = site
       @base = base

data/lib/jekyll/FDroidRepoInfoTag.rb

@@ -18,22 +18,24 @@
 require_relative '../fdroid/IndexV1'
 
 module Jekyll
+  # Used to output the repo name/timestamp used to generate this F-Droid site.
+  class FDroidRepoInfoTag < Liquid::Tag
+    @@repotag = ''
 
-	# Used to output the repo name/timestamp used to generate this F-Droid site.
-	class FDroidRepoInfoTag < Liquid::Tag
+    def initialize(tag_name, text, tokens)
+      super
+    end
 
-		def initialize(tag_name, text, tokens)
-			super
-		end
-
-		def render(context)
-			site = context.registers[:site]
-			url = site.config['fdroid-repo']
-			index = FDroid::IndexV1.download(url, 'en')
-
-			"#{index.repo.name} #{index.repo.date}"
-		end
-	end
+    def render(context)
+      if @@repotag == ''
+        site = context.registers[:site]
+        url = site.config['fdroid-repo']
+        index = FDroid::IndexV1.download(url, 'en')
+        @@repotag = "#{index.repo.name} #{index.repo.date}"
+      end
+      return @@repotag
+    end
+  end
 end
 
 Liquid::Template.register_tag('fdroid_repo_info', Jekyll::FDroidRepoInfoTag)

data/lib/jekyll/FDroidSearchAutocompleteTag.rb

@@ -16,71 +16,81 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Jekyll
+  class SearchForm
+    def self.render_form(context, search_form_template_path, result_item_template_contents)
+      site = context.registers[:site]
+      repo_timestamp = FDroid::IndexV1.download(site.config['fdroid-repo'], 'en').repo.timestamp
 
-	class SearchForm
-		def self.render_form(context, search_form_template_path, result_item_template_contents)
-			context['result_item_template'] = result_item_template_contents
-			context['search_id'] = rand(1000000)
-
-			template = Liquid::Template.parse(IO.read((File.expand_path( search_form_template_path, File.dirname(__FILE__)))))
-			template.render(context)
-		end
-	end
-
-	# As the user types, a list of results is shown below the text input (floating above other content).
-	# When an item is selected, it will navigate to that packages page.
-	# Designed to be used in a sidebar widget.
-
-	class DropDownWithTemplate < Liquid::Block
-		def render(context)
-			search_form_template_path = "../../_layouts/search-autocomplete.html"
-			SearchForm.render_form(context, search_form_template_path, super.to_s)
-		end
+      context['result_item_template'] = result_item_template_contents
+
+      # If an app developer is able to guess this at the time that they write their app descriptions, then they could
+      # potentially try and inject a new template which hijacks the search results template. This is due to the way in
+      # which JS is used to find the relevant `<script type="x-tmpl-mustache" id="...-{{ search_id }}">` template.
+      # Thus, make it random, and include the repo timestamp. They'd need to guess a random number correctly, and it
+      # will change every day that the repo is republished.
+      context['search_id'] = "#{rand(1000000)}.#{repo_timestamp}"
+
+      context['repo_timestamp'] = repo_timestamp
+
+      template = Liquid::Template.parse(IO.read((File.expand_path(search_form_template_path, File.dirname(__FILE__)))))
+      template.render(context)
+    end
+  end
+
+  # As the user types, a list of results is shown below the text input (floating above other content).
+  # When an item is selected, it will navigate to that packages page.
+  # Designed to be used in a sidebar widget.
+
+  class DropDownWithTemplate < Liquid::Block
+    def render(context)
+      search_form_template_path = "../../_layouts/search-autocomplete.html"
+      SearchForm.render_form(context, search_form_template_path, super.to_s)
     end
+  end
+
+  class DefaultDropDown < Liquid::Tag
+    def render(context)
+      search_form_template_path = "../../_layouts/search-autocomplete.html"
+
+      result_item_template_path = "../../_includes/search-autocomplete-default-result-template.html"
+      result_item_template = IO.read((File.expand_path(result_item_template_path, File.dirname(__FILE__))))
 
-	class DefaultDropDown < Liquid::Tag
-		def render(context)
-			search_form_template_path = "../../_layouts/search-autocomplete.html"
-
-			result_item_template_path = "../../_includes/search-autocomplete-default-result-template.html"
-			result_item_template = IO.read((File.expand_path(result_item_template_path, File.dirname(__FILE__))))
-
-			SearchForm.render_form(context, search_form_template_path, result_item_template)
-		end
-	end
-
-	# As the user types, a div is populated with search results.
-	# Differs from DropDownAutocomplete in that once you move focus away from the text input, the results
-	# are still displayed.
-	# Designed for a fully fledged search form on its own page.
-
-	# For each result result, this will render the template found between
-	# the {% fdroid_search_full_with_template %}{% endfdroid_search_full_with_template %} tags.
-	class FullSearchWithTemplate < Liquid::Block
-		def render(context)
-			search_form_template_path = "../../_layouts/search-full.html"
-			SearchForm.render_form(context, search_form_template_path, super.to_s)
-		end
-	end
-
-	# For each search result, this will render the contents of
-	# "_includes/search-full-default-result-template.html" from this plugin.
-	class DefaultFullSearch < Liquid::Tag
-		def initialize(tag_name, argument, tokens)
-			super
-			@empty_search_id = argument.strip
-		end
-
-		def render(context)
-			search_form_template_path = "../../_layouts/search-full.html"
-
-			result_item_template_path = "../../_includes/search-full-default-result-template.html"
-			result_item_template = IO.read((File.expand_path(result_item_template_path, File.dirname(__FILE__))))
-
-			context['empty_search_id'] = @empty_search_id
-			SearchForm.render_form(context, search_form_template_path, result_item_template)
-		end
-	end
+      SearchForm.render_form(context, search_form_template_path, result_item_template)
+    end
+  end
+
+  # As the user types, a div is populated with search results.
+  # Differs from DropDownAutocomplete in that once you move focus away from the text input, the results
+  # are still displayed.
+  # Designed for a fully fledged search form on its own page.
+
+  # For each result result, this will render the template found between
+  # the {% fdroid_search_full_with_template %}{% endfdroid_search_full_with_template %} tags.
+  class FullSearchWithTemplate < Liquid::Block
+    def render(context)
+      search_form_template_path = "../../_layouts/search-full.html"
+      SearchForm.render_form(context, search_form_template_path, super.to_s)
+    end
+  end
+
+  # For each search result, this will render the contents of
+  # "_includes/search-full-default-result-template.html" from this plugin.
+  class DefaultFullSearch < Liquid::Tag
+    def initialize(tag_name, argument, tokens)
+      super
+      @empty_search_id = argument.strip
+    end
+
+    def render(context)
+      search_form_template_path = "../../_layouts/search-full.html"
+
+      result_item_template_path = "../../_includes/search-full-default-result-template.html"
+      result_item_template = IO.read((File.expand_path(result_item_template_path, File.dirname(__FILE__))))
+
+      context['empty_search_id'] = @empty_search_id
+      SearchForm.render_form(context, search_form_template_path, result_item_template)
+    end
+  end
 end
 
 Liquid::Template.register_tag('fdroid_search_autocomplete', Jekyll::DefaultDropDown)

data/lib/jekyll/ReadYamlPage.rb

@@ -18,23 +18,22 @@
 # Found at https://github.com/ggreer/jekyll-gallery-generator/blob/master/lib/jekyll-gallery-generator.rb#L69
 
 module Jekyll
+  class ReadYamlPage < Page
+    # We need do define it ourself because the templates are in the plugin's directory
+    def read_yaml(base, name, opts = {})
+      begin
+        self.content = File.read(File.join(base.to_s, name.to_s), (site ? site.file_read_opts : {}).merge(opts))
+        if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+          self.content = $POSTMATCH
+          self.data = SafeYAML.load($1)
+        end
+      rescue SyntaxError => e
+        Jekyll.logger.warn "YAML Exception reading #{File.join(base.to_s, name.to_s)}: #{e.message}"
+      rescue Exception => e
+        Jekyll.logger.warn "Error reading file #{File.join(base.to_s, name.to_s)}: #{e.message}"
+      end
 
-	class ReadYamlPage < Page
-		# We need do define it ourself because the templates are in the plugin's directory
-		def read_yaml(base, name, opts = {})
-			begin
-				self.content = File.read(File.join(base.to_s, name.to_s), (site ? site.file_read_opts : {}).merge(opts))
-				if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
-					self.content = $POSTMATCH
-					self.data = SafeYAML.load($1)
-				end
-				rescue SyntaxError => e
-					Jekyll.logger.warn "YAML Exception reading #{File.join(base.to_s, name.to_s)}: #{e.message}"
-				rescue Exception => e
-					Jekyll.logger.warn "Error reading file #{File.join(base.to_s, name.to_s)}: #{e.message}"
-			end
-
-			self.data ||= {}
-		end
-	end
+      self.data ||= {}
+    end
+  end
 end

data/lib/lunr/Javascript.rb

@@ -8,11 +8,11 @@ require "v8"
 require "json"
 
 class V8::Object
-	def to_json
-		@context['JSON']['stringify'].call(self)
-	end
+  def to_json
+    @context['JSON']['stringify'].call(self)
+  end
 
-	def to_hash
-		JSON.parse(to_json, :max_nesting => false)
-	end
-end
+  def to_hash
+    JSON.parse(to_json, :max_nesting => false)
+  end
+end

data/lib/lunr/LunrIndexer.rb

@@ -15,7 +15,6 @@ require 'v8'
 module Jekyll
   module LunrJsSearch
     class Indexer
-
       # @param [Jekyll::Site]  site
       # @param [Array<App>]  packages
       # @return [Object]
@@ -44,11 +43,11 @@ module Jekyll
 
         packages.each_with_index do |package, i|
           doc = {
-              'id' => i,
-              'packageName' => package.package_name,
-              'icon' => package.icon,
-              'name' => package.name,
-              'summary' => package.summary
+            'id' => i,
+            'packageName' => package.package_name,
+            'icon' => package.icon,
+            'name' => package.name,
+            'summary' => package.summary
           }
 
           ctx['builder'].add(doc)
@@ -63,22 +62,23 @@ module Jekyll
         filename = File.join(@js_dir, 'index.json')
 
         total = {
-            "docs" => @docs,
-            "index" => @index.to_hash
+          "docs" => @docs,
+          "index" => @index.to_hash
         }
 
         filepath = File.join(site.dest, filename)
-        File.open(filepath, "w") {|f| f.write(JSON.dump(total))}
+        File.open(filepath, "w") { |f| f.write(JSON.dump(total)) }
         Jekyll.logger.info "Lunr:", "Index ready (lunr.js v#{@lunr_version})"
         added_files = [filename]
 
         site_js = File.join(site.dest, @js_dir)
         extras = [
-            'assets/fdroid-search-autocomplete.js',
-            'bower_components/lunr.js/lunr.js',
-            'bower_components/mustache.js/mustache.min.js',
-            'bower_components/awesomplete/awesomplete.min.js',
-            'bower_components/awesomplete/awesomplete.css'
+          'assets/fdroid-search-autocomplete.js',
+          'assets/fdroid-search-autocomplete-init.js',
+          'bower_components/lunr.js/lunr.js',
+          'bower_components/mustache.js/mustache.min.js',
+          'bower_components/awesomplete/awesomplete.min.js',
+          'bower_components/awesomplete/awesomplete.css'
         ]
         Jekyll.logger.info "Lunr:", "Added required assets to #{@js_dir}"
         extras.each do |path|

data/lib/lunr/SearchIndexFile.rb

@@ -5,12 +5,12 @@
 #
 
 module Jekyll
-	module LunrJsSearch
-		class SearchIndexFile < Jekyll::StaticFile
-			# Override write as the index.json index file has already been created
-			def write(dest)
-				true
-			end
-		end
-	end
-end
+  module LunrJsSearch
+    class SearchIndexFile < Jekyll::StaticFile
+      # Override write as the index.json index file has already been created
+      def write(dest)
+        true
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-fdroid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: '1.1'
 platform: ruby
 authors:
 - Nico Alt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-include-cache
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.50.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.50.0
 description: Browse packages of a F-Droid repository.
 email: nicoalt@posteo.org
 executables: []
@@ -138,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: F-Droid - Free and Open Source Android App Repository