wor 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c6c0153991d04b7e5455702cbe0791b867d7e70
-  data.tar.gz: cb25136401a2339342fbda30215edca734143fdf
+  metadata.gz: a3a97cac4c47daa5b8066be8e72cfecb6b120179
+  data.tar.gz: f8bf53bc4c0798c05e8ad543cf1922d994000321
 SHA512:
-  metadata.gz: c2257badb3676c73687323a5f1221f4aafff0caa9f25532dffe4ee06ad983a807cf696163c2def7b362af92c58ec55f20eba17c24dbc41a8dfa9aac59c937395
-  data.tar.gz: 163588ab97a54f854507af0a7042792b313238206c02d708f419fd77d5ec7759b3f7acc228242ac44fc70040bcb1b1f804d2cb38b79b5d853d82913aee82e9c7
+  metadata.gz: 32ca962788a29ccb71eebe3afa297d82cce48e5962361172a657dc4fd4ddc52f4d0e87d3f9cb1edecd7c6c3cecc82b58cd3c702fbeb6e418eebe2950c5dbf79c
+  data.tar.gz: 7a335f27b49f245fa256cf6198bfc3cf370c04c3a7212713e111f5d87ec431bd7f34f8a1885a6db0c86a77241e14d1e203bb1ae0bafc0319e3eb819a0a8204f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wor (0.0.3)
+    wor (0.0.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/wor/collection.rb

@@ -2,6 +2,54 @@ module WOR
   class Collection
     attr_accessor :name
 
+    # Class Methods (Static)
+    class << self
+      def get_folder_name params
+        if (!WOR::Configuration::USE_LOCALIZATION)
+          return params[:collection_name]
+        end
+
+        locale_info = WOR::Localization.read_locale_file(params[:locale])
+
+        if (locale_info.nil?)
+          return params[:collection_name]
+        end
+
+        locale_info['paths'].each do | key, value |
+          if (value == params[:collection_name].to_s)
+            return key
+          end
+        end
+
+        return params[:collection_name]
+      end
+
+      def get_folder_name_by_path(params)
+        original_collection_name = WOR::Helpers.get_parent_directory_name params[:path]
+        return get_folder_name(locale: params[:locale], collection_name: original_collection_name)
+      end
+
+      def get_folder_url(params)
+        if (!WOR::Configuration::USE_LOCALIZATION)
+          return params[:collection_name]
+        end
+
+        locale_info = WOR::Localization.read_locale_file(params[:locale])
+
+        if (locale_info.nil?)
+          return params[:collection_name]
+        end
+
+        locale_info['paths'].each do | key, value |
+          if (key == params[:collection_name].to_s)
+            return value
+          end
+        end
+
+        return params[:collection_name]
+      end
+    end
+
     def initialize collection_name
       @name = collection_name
     end

data/lib/wor/collection_item.rb

@@ -1,9 +1,8 @@
 module WOR
   class CollectionItem
-  attr_accessor :path, :body, :layout, :name
+  attr_accessor :body, :layout, :locale, :collection_name, :name
 
   def initialize path
-    self.path = path
     self.body = Hash.new
     self.layout = "application"
     self.name = "Null"
@@ -13,15 +12,26 @@ module WOR
       return
     end
 
+    if (WOR::Configuration::USE_LOCALIZATION)
+      self.locale = WOR::Localization.get_locale
+      self.collection_name = WOR::Collection.get_folder_name_by_path(path: path, locale: self.locale)
+    else
+      self.collection_name = WOR::Collection.get_folder_name_by_path(path: path)
+    end
+
     if (File.file?(path))
-      extn = File.extname path 
-      self.name = File.basename path, extn
-      create_custom_properties(self.path, true)
+      file_initialize path
     else
-      directory_initialize self.path
+      directory_initialize path
     end
   end
 
+  def file_initialize path
+    extn = File.extname path 
+    self.name = File.basename path, extn
+    create_custom_properties(path, true)
+  end
+
   def directory_initialize path
     files = Dir.glob(path + "/*")
 
@@ -75,6 +85,24 @@ module WOR
     self.body[language] = file_data
   end
 
+  def url
+    if (self.collection_name == "pages")
+      translated_collection = ""
+    else
+      translated_collection = "/" + WOR::Localization.translate_path_to_language(path: self.collection_name, locale: self.locale)
+    end
+
+    if (self.name == "index")
+      translated_name = ""
+    else
+      translated_name = "/" + WOR::Localization.translate_path_to_language(path: self.name, locale: self.locale)
+    end    
+
+    url = "/#{self.locale}#{translated_collection}#{translated_name}"
+
+    return url
+  end
+
   private 
     def create_custom_properties file, get_body
       results = File.read(file).match(/(---.+---)(.*)/m)

data/lib/wor/configuration.rb

@@ -0,0 +1,6 @@
+module WOR
+  class Configuration
+    USE_LOCALIZATION = true
+    DEFAULT_LOCALE = "en"
+  end
+end

data/lib/wor/helpers.rb

@@ -0,0 +1,10 @@
+module WOR
+  class Helpers
+    class << self
+      def get_parent_directory_name path
+        parent_path = File.expand_path("..", path)
+        return File.basename parent_path
+      end
+    end
+  end
+end

data/lib/wor/localization.rb

@@ -0,0 +1,73 @@
+module WOR
+  class Localization
+
+    # Class Methods (Statics)
+    class << self
+      def translate_path_to_original params
+        if (!WOR::Configuration::USE_LOCALIZATION)
+          return params[:path]
+        end
+
+        locale_info = WOR::Localization.read_locale_file(params[:locale])
+
+        if (locale_info.nil?)
+          return params[:path]
+        end
+
+        locale_info['paths'].each do | key, value |
+          if (value == params[:path].to_s)
+            return key
+          end
+        end
+
+        return params[:path]
+      end
+
+      def translate_path_to_language params
+        if (!WOR::Configuration::USE_LOCALIZATION)
+          return params[:path]
+        end
+
+        locale_info = WOR::Localization.read_locale_file(params[:locale])
+
+        if (locale_info.nil?)
+          return params[:path]
+        end
+
+        locale_info['paths'].each do | key, value |
+          if (key == params[:path].to_s)
+            return value
+          end
+        end
+
+        return params[:path]
+      end
+
+      def get_locale
+        locale = I18n.locale
+
+        if (locale.nil?)
+          locale = Wor::Configuration::DEFAULT_LOCALE
+        end
+
+        return locale
+      end
+
+      def read_locale_file locale
+        require 'yaml'
+
+        path = "#{Rails.root}/config/locales/wor.#{locale}.yml"
+
+        locale_info = nil
+
+        begin
+          locale_info = YAML.load_file(path)
+        rescue
+          locale_info = nil
+        end
+
+        return locale_info
+      end
+    end
+  end
+end

data/lib/wor.rb

@@ -3,61 +3,39 @@ require 'rails'
 module WOR
   autoload :Collection,           'wor/collection'
   autoload :CollectionItem,       'wor/collection_item'
+  autoload :Configuration,        'wor/configuration'
+  autoload :Helpers,              'wor/helpers'
+  autoload :Localization,         'wor/localization'
 
   class Core
-    def self.find params
-      collection = self.get_collection(locale: params[:locale], collection: params[:collection])
-
-      target_item = nil
-
-      I18n.locale = params[:locale]
-
-      collection.items.each do | item |
-        if (item.name == params[:page_name] ||
-          item.get_permalink(params[:locale].to_s) == params[:page_name].to_s)
-          target_item = item
+    # Class Methods (Static)
+    class << self
+      def find params
+        # Build path
+        path = "#{Rails.root}/content"
+
+        if (params[:locale].present?)
+          if (WOR::Configuration::DEFAULT_LOCALE == params[:locale].to_s)
+            path += "/#{params[:collection]}"
+          else
+            collection_name = params[:collection]
+            translated_collection_name = WOR::Collection.get_folder_name(locale: params[:locale], collection_name: collection_name)
+            path += "/#{params[:collection]}"
+          end
+
+          path += "/#{WOR::Localization.translate_path_to_original(path: params[:page_name], locale: params[:locale])}.md"
+        else
+          path += "/#{params[:page_name]}.md"  
         end
-      end
-
-      return target_item
-    end
-
-    def self.get_collection params
-      folder_name = self.get_collection_folder_name(params[:locale], params[:collection])
-
-      return WOR::Collection.new folder_name
-    end
 
-    def self.get_collection_folder_name(locale, collection_name)
-      locale_info = self.read_locale_file(locale)
+        I18n.locale = params[:locale]
 
-      if (locale_info.nil?)
-        return collection_name
+        return CollectionItem.new path
       end
 
-      locale_info['paths'].each do | key, value |
-        if (value == collection_name)
-          return key
-        end
-      end
-
-      return collection_name
-    end
+      def build_path
 
-    def self.read_locale_file locale
-      require 'yaml'
-
-      path = "#{Rails.root}/config/locales/wor.#{locale}.yml"
-
-      locale_info = nil
-
-      begin
-        locale_info = YAML.load_file(path)
-      rescue
-        locale_info = nil
       end
-
-      return locale_info
     end
   end
 end

data/spec/rails_app/config/locales/wor.pt.yml

@@ -1,2 +1,3 @@
 paths:
-  courses: 'cursos'
+  courses: 'cursos'
+  test: 'teste'

data/spec/rails_app/content/courses/{curso-teste.md → test.md}

@@ -1,5 +1,4 @@
 ---
-  name: Curso Teste
   permalink: test
   permalink_pt: teste
 ---

data/spec/rails_app/content/pages/courses.md

@@ -0,0 +1,8 @@
+---
+  layout: page
+  permalink: courses
+  permalink_pt: courses
+---
+<div>
+  Content of courses.md
+</div>

data/spec/wor_spec.rb

@@ -2,55 +2,110 @@ require 'wor'
 require 'test_helper'
 
 describe WOR::Core do
-  it 'get permalink' do
-    item = WOR::CollectionItem.new "#{Rails.root}/content/courses/curso-teste.md"
-    
-    expect(item.get_permalink("en")).to eql("test")
+  it 'find' do
+    params = { collection: "pages", locale: "en", page_name: "index"}
+    target = WOR::Core.find(params)
+
+    expect(target.permalink).not_to be(nil)
   end
 
-  it 'get permalink index in pt' do
-    item_index = WOR::CollectionItem.new "#{Rails.root}/content/pages/index.md"
-    expect(item_index.get_permalink("pt")).to eql("/")
+  it 'find with basename' do
+    params = { collection: "cursos", locale: "pt", page_name: "teste"}
+    target = WOR::Core.find(params)
+
+    expect(target).not_to be(nil)
+  end
+
+  it 'find with basename without item have permalink on language' do
+    params = { collection: "courses", locale: "en", page_name: "test" }
+    target = WOR::Core.find(params)
+
+    expect(target.permalink).not_to be(nil)
+  end
+
+  it 'get url of root in default language' do
+    params = { collection: "pages", locale: "en", page_name: "index" }
+    target = WOR::Core.find(params)
+
+    expect(target.url).to eq("/en")
+  end
+
+  it 'get url of root in pt language' do
+    params = { collection: "pages", locale: "pt", page_name: "index" }
+    target = WOR::Core.find(params)
+
+    expect(target.url).to eq("/pt")
+  end
+
+  it 'get url of page in default language' do
+    params = { collection: "pages", locale: "en", page_name: "courses" }
+    target = WOR::Core.find(params)
+
+    expect(target.url).to eq("/en/courses")
+  end
+
+  it 'get url of page in pt language' do
+    params = { collection: "pages", locale: "pt", page_name: "cursos" }
+    target = WOR::Core.find(params)
+
+    expect(target.url).to eq("/pt/cursos")
   end
+end
 
-  it 'get collection folder name in default language' do
-    collection_folder_name = WOR::Core.get_collection_folder_name('en', 'courses')
-    expect(collection_folder_name).to eql("courses")
+describe WOR::Helpers do
+  it 'return parent directory of file' do
+    parent = WOR::Helpers.get_parent_directory_name "#{Rails.root}/content/courses/curso-teste.md"
+    expect(parent).to eq("courses")
   end
+end
 
-  it 'get collection folder name in pt language' do
-    collection_folder_name = WOR::Core.get_collection_folder_name('pt', 'cursos')
-    expect(collection_folder_name).to eql("courses")
+describe WOR::Collection do
+  it 'return original collection name' do
+    locale = 'pt'
+    original_collection_name = WOR::Collection.get_folder_name(locale: locale, collection_name: 'cursos')
+    expect(original_collection_name).to eq("courses")
   end
+end
 
+describe WOR::Localization do
   it 'read locale file that exists' do
-    locale_file = WOR::Core.read_locale_file('en')
+    locale_file = WOR::Localization.read_locale_file('en')
     expect(locale_file).not_to be(nil)
   end
 
   it 'read locale file that not exists' do
-    locale_file = WOR::Core.read_locale_file('fr')
+    locale_file = WOR::Localization.read_locale_file('fr')
     expect(locale_file).to be(nil)
   end
 
-  it 'find' do
-    params = { collection: "pages", locale: "en", page_name: "index"}
-    target = WOR::Core.find(params)
+   it 'get translated url in default language' do
+    url = WOR::Localization.translate_path_to_language(path: "courses", locale: "en")
 
-    expect(target.permalink).not_to be(nil)
+    expect(url).to eq("courses")
   end
 
-  it 'find with basename' do
-    params = { collection: "cursos", locale: "pt", page_name: "teste"}
-    target = WOR::Core.find(params)
+  it 'get translated url in pt language' do
+    url = WOR::Localization.translate_path_to_language(path: "courses", locale: "pt")
 
-    expect(target).not_to be(nil)
+    expect(url).to eq("cursos")
   end
+end
 
-  it 'find with basename without item have permalink on language' do
-    params = { collection: "courses", locale: "en", page_name: "test" }
-    target = WOR::Core.find(params)
+describe WOR::CollectionItem do
+  it 'get url in default language' do
+    I18n.locale = 'en'
+    item = WOR::CollectionItem.new "#{Rails.root}/content/courses/test.md"
+    expect(item.url).to eql("/en/courses/test")
+  end
 
-    expect(target.permalink).not_to be(nil)
+  it 'get url in pt language' do
+    I18n.locale = 'pt'
+    item = WOR::CollectionItem.new "#{Rails.root}/content/courses/test.md"
+    expect(item.url).to eql("/pt/cursos/teste")
+  end
+
+  it 'get permalink index in pt' do
+    item_index = WOR::CollectionItem.new "#{Rails.root}/content/pages/index.md"
+    expect(item_index.get_permalink("pt")).to eql("/")
   end
 end

data/wor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wor'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.date        = '2017-05-07'
   s.summary     = "To do summary!"
   s.description = "To do description"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rodrigo Vargas
@@ -49,6 +49,9 @@ files:
 - lib/wor.rb
 - lib/wor/collection.rb
 - lib/wor/collection_item.rb
+- lib/wor/configuration.rb
+- lib/wor/helpers.rb
+- lib/wor/localization.rb
 - log/test.log
 - spec/rails_app/Rakefile
 - spec/rails_app/config.ru
@@ -60,7 +63,8 @@ files:
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/locales/wor.en.yml
 - spec/rails_app/config/locales/wor.pt.yml
-- spec/rails_app/content/courses/curso-teste.md
+- spec/rails_app/content/courses/test.md
+- spec/rails_app/content/pages/courses.md
 - spec/rails_app/content/pages/index.md
 - spec/rails_app/log/test.log
 - spec/test_helper.rb