Pay heed to rubocop

diff --git a/lib/osm_community_index/local_chapter.rb b/lib/osm_community_index/local_chapter.rb
index 6b203afe8b24af7038d580b5637d6aa4cb79a699..fc87f64d2a8972cae7ae366dfd97acf09a82b8ee 100644 (file)
--- a/lib/osm_community_index/local_chapter.rb
+++ b/lib/osm_community_index/local_chapter.rb
@@ -1,6 +1,5 @@
 module OsmCommunityIndex
   class LocalChapter
 module OsmCommunityIndex
   class LocalChapter

-

     attr_reader :id, :name, :url
 
     @localised_chapters = {}
     attr_reader :id, :name, :url
 
     @localised_chapters = {}


@@ -15,8 +14,6 @@ module OsmCommunityIndex
       @localised_chapters[locale] ||= load_local_chapters(locale)
     end
 
       @localised_chapters[locale] ||= load_local_chapters(locale)
     end
 

-    protected
-

     def self.load_local_chapters(locale)
       community_index = OsmCommunityIndex.community_index
       localised_strings = OsmCommunityIndex.localised_strings(locale)
     def self.load_local_chapters(locale)
       community_index = OsmCommunityIndex.community_index
       localised_strings = OsmCommunityIndex.localised_strings(locale)


@@ -33,7 +30,5 @@ module OsmCommunityIndex
       end
       local_chapters
     end
       end
       local_chapters
     end

-

   end
   end

-
-end
\ No newline at end of file
+end

diff --git a/lib/osm_community_index/osm_community_index.rb b/lib/osm_community_index/osm_community_index.rb
index 987f94614ef3f49b01f7b628f8387a0d6e2b43d3..caa47304c1181272c13b705ffae0a87768987f05 100644 (file)
--- a/lib/osm_community_index/osm_community_index.rb
+++ b/lib/osm_community_index/osm_community_index.rb
@@ -12,8 +12,6 @@ module OsmCommunityIndex
       @localised_strings[locale] ||= locale_hash_from_json(locale)
     end
 
       @localised_strings[locale] ||= locale_hash_from_json(locale)
     end
 

-    protected
-

     def self.community_index_from_json
       json_file = Rails.root.join("node_modules/osm-community-index/dist/resources.json")
       JSON.parse(File.read(json_file))
     def self.community_index_from_json
       json_file = Rails.root.join("node_modules/osm-community-index/dist/resources.json")
       JSON.parse(File.read(json_file))


@@ -23,17 +21,13 @@ module OsmCommunityIndex
       locale = locale_in.to_s.tr("-", "_")
       # try the passed in locale
       json = load_locale_json(locale)
       locale = locale_in.to_s.tr("-", "_")
       # try the passed in locale
       json = load_locale_json(locale)

-      unless json.nil?
-        return json
-      end
+      return json unless json.nil?

 
       # now try it without it's country part (eg 'en' instead of 'en_GB')
       shortened_locale = locale.split("_").first
 
       # now try it without it's country part (eg 'en' instead of 'en_GB')
       shortened_locale = locale.split("_").first

-      unless shortened_locale === locale
+      unless shortened_locale == locale

         json = load_locale_json(shortened_locale)
         json = load_locale_json(shortened_locale)

-        unless json.nil?
-          return json
-        end
+        return json unless json.nil?

       end
 
       # if nothing else works, then return "en"
       end
 
       # if nothing else works, then return "en"


@@ -42,11 +36,9 @@ module OsmCommunityIndex
 
     def self.load_locale_json(locale)
       json_path = Rails.root.join("node_modules/osm-community-index/i18n/#{locale}.yaml")
 
     def self.load_locale_json(locale)
       json_path = Rails.root.join("node_modules/osm-community-index/i18n/#{locale}.yaml")

-      if File.exist?(json_path)
-        return YAML.safe_load(File.read(json_path))[locale]
-      end
+      return YAML.safe_load(File.read(json_path))[locale] if File.exist?(json_path)
+

       nil
     end
       nil
     end

-

   end
   end

-end
\ No newline at end of file
+end