lines-engine 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70da46d6dccf55d0fd98813e9c8adedd08a00365
-  data.tar.gz: 4479a07a64ede18c1e4c7f7ce7c88abcc91ff01b
+  metadata.gz: 2a9dfd417c327209ac7ba0b305cc9aecdc997067
+  data.tar.gz: 02d1a7d0170c3cce61dcf8520a6db6ecc71c76e2
 SHA512:
-  metadata.gz: 9ab9ba5d97ebd8fe06c35df649644a9ac42f65fdb9fef49633f691b4a4194ca68811d0b0db51d6fadd20ad3f4b820bdbc3d996dd1fc976b5d90f8b87f326e6c4
-  data.tar.gz: 1eb2ec79f3b797ce7641f1d748ae2c5a6625591e836ed77804004821d134a91572e2fd1c2dd2f3ec7782f05dbbc24efb19c34361e929e1a6cbea430b17c8f325
+  metadata.gz: 48b216ce1faf8f94c5a8d5e60fbfc41266f3cf574be601f98d56630f445699bdef670896b232bce2ad3a93de3a3e41742e93de0d4eef5d827d798d1395d73558
+  data.tar.gz: 8ebc8ccdbd91cd80f998baff80458a011e7e2c4e652400881d704d673288d475bcfd11bf8e319f6224bf7137d4c6ce8160a810e46a0eeb00ca3c5ff04d2f46c2

data/.gitignore

@@ -9,4 +9,6 @@ spec/dummy/public/assets
 /lines-engine-*.gem
 node_modules/
 .DS_Store
-
+tmp/
+/doc/
+.yardoc

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.0
+
+- 118n support now available. Locale files can be found at */config/locales/*
+
 ## 1.0.0
 
 - Proud to announce the first stable release with the new backend!

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    lines-engine (1.0.0)
+    lines-engine (1.1.0)
       acts-as-taggable-on (~> 3.5, >= 3.5)
       bcrypt (~> 3.1.0, >= 3.1.0)
       bcrypt-ruby (>= 3.0.0, <= 4)
       carrierwave (~> 0.10.0, >= 0.10.0)
       coffee-rails (>= 4.0.0, < 5)
       friendly_id (~> 5.1.0, >= 5.1.0)
+      i18n (~> 0.7.0)
       jquery-fileupload-rails (~> 0.4.1, >= 0.4.1)
       jquery-rails (>= 3.1.0, < 5)
       jquery-ui-rails (~> 5, >= 5.0.0)
@@ -22,7 +23,6 @@ PATH
       rmagick (~> 2.13.4, >= 2.13.4)
       sanitize (~> 3.0.0, >= 3.0.0)
       sass-rails (>= 4.0.0)
-      simple_form (~> 3, >= 3.0.0, < 4)
       sitemap_generator (~> 5.0.0, >= 5.0.5)
       thor (~> 0.1, >= 0.19)
       thread_safe (~> 0.1, >= 0.3)
@@ -31,36 +31,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -70,7 +70,7 @@ GEM
       activerecord (>= 3.2, < 5)
     addressable (2.3.8)
     arel (6.0.3)
-    autoprefixer-rails (5.2.1.1)
+    autoprefixer-rails (6.0.3)
       execjs
       json
     bcrypt (3.1.10)
@@ -81,7 +81,7 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -104,13 +104,13 @@ GEM
     crass (0.2.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.5.2)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faker (1.4.3)
+    faker (1.5.0)
       i18n (~> 0.5)
     ffi (1.9.10)
     formatador (0.2.5)
@@ -135,7 +135,7 @@ GEM
       actionpack (>= 3.1)
       railties (>= 3.1)
       sass (>= 3.2)
-    jquery-rails (4.0.4)
+    jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -150,7 +150,7 @@ GEM
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
     mail (2.6.3)
@@ -158,10 +158,10 @@ GEM
     meta-tags (2.0.0)
       actionpack (>= 3.0.0)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
     minitest (5.8.0)
-    mysql2 (0.3.19)
+    mysql2 (0.3.20)
     nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -170,7 +170,7 @@ GEM
       mini_portile (~> 0.6.0)
     nokogumbo (1.1.12)
       nokogiri
-    notiffany (0.0.7)
+    notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
     orm_adapter (0.5.0)
@@ -186,20 +186,20 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     railroady (1.3.1)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.4)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
@@ -207,13 +207,13 @@ GEM
       loofah (~> 2.0)
     rails3-jquery-autocomplete (1.0.15)
       rails (>= 3.2)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.2.3)
@@ -238,23 +238,20 @@ GEM
       crass (~> 0.2.0)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.1.12)
-    sass (3.4.16)
-    sass-rails (5.0.3)
+    sass (3.4.18)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     shellany (0.0.1)
-    simple_form (3.1.0)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
     sitemap_generator (5.0.5)
       builder
     slop (3.6.0)
-    sprockets (3.2.0)
+    sprockets (3.3.4)
       rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -264,10 +261,10 @@ GEM
       net-ssh (>= 2.8.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     xpath (2.0.0)

data/app/controllers/lines/admin/articles_controller.rb

@@ -164,9 +164,9 @@ module Lines
 
         # Allowed attribute with strong_params
         def article_params
-          params.require(:article).permit(:content, :teaser, :hero_image, :short_hero_image, :published, :published_at, 
-            :sub_title, :title, :pictures, :author_ids, :hero_image_cache, :tag_list, :gplus_url, :featured, 
-            :document, :document_cache, :hero_image_file, :remove_document, :remove_hero_image, :pictures, :authors,
+          params.require(:article).permit(:content, :teaser, :hero_image, :short_hero_image, :published, 
+            :published_at, :sub_title, :title, :hero_image_cache, :tag_list, :gplus_url, :featured, 
+            :document, :document_cache, :hero_image_file, :remove_document, :remove_hero_image, :pictures,
             pictures_attributes: [:id, :image, :name, :article_id], author_ids: [] )
         end
 

data/app/controllers/lines/application_controller.rb

@@ -11,7 +11,7 @@ module Lines
 
       # checks if current user is authorized. Redirects to login_url if not
       def authorize
-        redirect_to login_url, notice: "Please log in to access the administration area." if current_lines_user.nil?
+        redirect_to login_url, notice: t('lines.please_login') if current_lines_user.nil?
       end
 
   end

data/app/controllers/lines/sessions_controller.rb

@@ -19,7 +19,7 @@ module Lines
         session[:user_id] = user.id
         redirect_to admin_root_url
       else
-        flash.now[:error] = "Email or password is invalid"
+        flash.now[:error] = t('lines.login_error')
         render "new"
       end
     end

data/app/helpers/lines/application_helper.rb

@@ -72,21 +72,20 @@ module Lines
       html = content_tag(:div, id: 'navbar') do
         content_tag(:div, class: 'navbar-inner') do
           if current_lines_user
-            #content_tag(:span, link_to('', admin_articles_path), class: 'backlink', title: 'Dashboard') + content_tag(:span, action_link, class: 'actionlink') + content_tag(:span, class: 'buttons', &block) + content_tag(:span, link_to('Logout', logout_path), class: 'logout') + content_tag(:span, "Logged in as #{current_lines_user.email}", class: 'logged-in-as')
             content_tag(:span, class: 'buttons', &block) + "<div class='btn-menu'><dic class='stripes'></div></div>".html_safe + 
             "<div class='submenu'>
               <div class='submenu-inner'>
                 <ul>
                   <li>#{link_to("Dashboard", admin_articles_path)}</li>
-                  <li>#{link_to("Authors", admin_authors_path)}</li>
+                  <li>#{link_to(t('activerecord.models.lines/author', count: 2).html_safe, admin_authors_path)}</li>
                 </ul>
                 <ul>
-                  <li class='small'>Logged in as #{current_lines_user.email}</li>
-                  <li>#{link_to("Logout", logout_path)}</li>
+                  <li class='small'>#{t('lines.logged_in_as').html_safe} #{current_lines_user.email}</li>
+                  <li>#{link_to(t('lines.buttons.logout').html_safe, logout_path)}</li>
                 </ul>
                 <ul>
-                  <li>#{link_to("Formatting Help", "#", class: "btn-cheatsheet")}</li>
-                  <li>#{link_to("About Lines", "http://lines.opoloo.com")}</li>
+                  <li>#{link_to(t('lines.buttons.formating_help').html_safe, "#", class: "btn-cheatsheet")}</li>
+                  <li>#{link_to(t('lines.buttons.about').html_safe, "http://lines.opoloo.com")}</li>
                 </ul>
               </div>
             </div>".html_safe
@@ -102,17 +101,17 @@ module Lines
     def get_action_link
       if controller_path == 'admin/articles'
         case action_name
-          when 'index' then 'All articles'
-          when 'new' then 'New article'
-          when 'edit' then 'Edit article'
-          when 'show' then "Preview"
+          when 'index' then t('lines/buttons/all_articles').html_safe
+          when 'new' then t('lines/buttons/new_article').html_safe
+          when 'edit' then t('lines/buttons/edit_article').html_safe
+          when 'show' then t('lines/buttons/preview').html_safe
         end
       elsif controller_path == 'admin/authors'
         case action_name
-          when 'index' then 'All authors'
-          when 'new' then 'New author'
-          when 'edit' then 'Edit author'
-          when 'show' then "Author"
+          when 'index' then t('lines/buttons/all_authors').html_safe
+          when 'new' then t('lines/buttons/new_author').html_safe
+          when 'edit' then t('lines/buttons/edit_author').html_safe
+          when 'show' then t('lines/buttons/author').html_safe
         end
       end
     end

data/app/views/kaminari/lines/_next_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="next">
-  <%= link_to_unless current_page.last?, raw('Older &rsaquo;'), url, :rel => 'next', :remote => remote %>
+  <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %>
 </span>

data/app/views/kaminari/lines/_prev_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="prev">
-  <%= link_to_unless current_page.first?, raw('&lsaquo; Newer'), url, :rel => 'prev', :remote => remote %>
+  <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %>
 </span>

data/app/views/layouts/lines/application.html.erb

@@ -20,8 +20,8 @@
 <body>
 <% if current_lines_user %>
   <%= render_navbar do %>
-    <%= link_to 'New Article', new_admin_article_path, class: "btn btn-new-article highlight" %>  
-    <%= link_to 'Dashboard', admin_articles_path, class: "btn btn-view-blog" %>
+    <%= link_to t('lines.buttons.new_article').html_safe, new_admin_article_path, class: "btn btn-new-article highlight" %>  
+    <%= link_to t('lines.buttons.dashboard').html_safe, admin_articles_path, class: "btn btn-view-blog" %>
   <% end %>
   <div class="spacer"></div>
 <% end %>

data/app/views/lines/admin/articles/_form.html.erb

@@ -1,9 +1,21 @@
-<%= simple_form_for([:admin, @article], id: 'article_form') do |f| %>
+<% if @article.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= pluralize(@article.errors.count, "error") %> prohibited this article from being saved:</h2>
+    <ul>
+    <% @article.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+    <a href="#" class="close">x</a>
+  </div>
+<% end %>
+
+<%= form_for([:admin, @article], id: 'article_form') do |f| %>
   <div class="new-article">
     <div class="hero-upload">
       <%= f.file_field :hero_image %>
       <%= f.hidden_field :remove_hero_image %>
-      <div class="btn-change-hero">Change</div>
+      <div class="btn-change-hero"><%= t('lines.buttons.change') %></div>
       <% if @article.short_hero_image.present? %>
         <img src="<%= @article.short_hero_image %>" alt="" />
       <% elsif @article.hero_image? %>
@@ -13,9 +25,9 @@
       <div class="upload-overlay">
         <div class="upload-overlay-close icon-close"></div>
         <div class="upload-overlay-inner">
-          <h2>Select Hero Image</h2>
-          <div class="btn-remove-hero<%= " show" if @article.hero_image? || @article.short_hero_image %>">Remove hero image</div>
-          <%= f.label :hero_image, "Upload an image" %>
+          <h2><%= t('lines.buttons.select_hero_image') %></h2>
+          <div class="btn-remove-hero<%= " show" if @article.hero_image? || @article.short_hero_image %>"><%= t('lines.buttons.remove_hero_image') %></div>
+          <%= f.label :hero_image, t('lines.buttons.upload_image') %>
           <div class="hero-images">
             <% Lines::Article::HERO_IMAGES.each_with_index do |h, i| %>
               <img src="<%= "/heroes/#{h}" %>" alt="" class="<%= 'selected-hero-image' if ('/heroes/' + h) == @article.short_hero_image %>" />
@@ -28,26 +40,26 @@
     </div>
 
     <div class="input-field required">
-      <%= f.text_field :title, placeholder: "Title", class: 'title' %>
+      <%= f.text_field :title, placeholder: true, class: 'title' %>
     </div>
 
     <div class="input-field">
-      <%= f.text_field :sub_title, placeholder: "Subtitle" %>
+      <%= f.text_field :sub_title, placeholder: true %>
     </div>
 
     <div class="input-field">
-      <%= f.text_area :teaser, placeholder: "Teaser", rows: 1 %>
+      <%= f.text_area :teaser, placeholder: true, rows: 1 %>
     </div>
 
     <div class="input-field editor required">
-      <%= f.text_area :content, placeholder: "Body copy", rows: 1, data: {editor: "codemirror"} %>
+      <%= f.text_area :content, placeholder: true, rows: 1, data: {editor: "codemirror"} %>
     </div>
 
     <div class="input-field">
       <div class="documents">
-        <%= f.label :document, "#{@article.document? ? @article.document.file.filename + ' <span>(' + number_to_human_size(File.size(@article.document.file.file)) + ')</span>' : 'Attach Document' }".html_safe, class: "attachment-label", title: "Change Attachment" -%>
+        <%= f.label :document, "#{@article.document? ? @article.document.file.filename + ' <span>(' + number_to_human_size(File.size(@article.document.file.file)) + ')</span>' : t('lines.buttons.attach_document').html_safe }".html_safe, class: "attachment-label", title: t('lines.buttons.change_attachment').html_safe -%>
         <% if @article.document? %>
-          <span class="icon-delete btn-delete-attachment" title="Remove Attachment"></span>
+          <span class="icon-delete btn-delete-attachment" title="<%= t('lines.buttons.remove_attachment').html_safe %>"></span>
         <% end %>
         <%= f.file_field :document, class: "article-document-value" %>
         <div class="hidden">
@@ -58,20 +70,20 @@
 
     </div>
 
-    <h2>Authors <span style="color: #c10020;">*</span></h2>
+    <h2><%= t('activerecord.models.lines/author', count: 2) %> <span style="color: #c10020;">*</span></h2>
 
-    <div class="input-field">
+    <div class="input-field checkbox">
       <%= f.collection_check_boxes(:author_ids, Lines::Author.all, :id, :name) %>
     </div>
 
-    <h2>Additional Info</h2>
+    <h2><%= t('lines.additional_info').html_safe %></h2>
 
     <div class="input-field">
       <%= f.autocomplete_field :tag_list, autocomplete_tag_name_admin_articles_path, :"data-delimiter" => ', ', placeholder: "Tags" %>
     </div>
 
     <div class="input-field">
-      <%= f.text_field :gplus_url, placeholder: "Google+ link" %>
+      <%= f.text_field :gplus_url, placeholder: true %>
     </div>
 
     <div class="input-field required">
@@ -79,8 +91,8 @@
     </div>
 
     <%= render_navbar do %>
-      <%= f.submit "Save Article", class: "btn btn-save-publish highlight" %>
-      <%= link_to "Cancel", admin_articles_path, class: "btn btn-cancel" %>
+      <%= f.submit t('lines.buttons.save_article').html_safe, class: "btn btn-save-publish highlight" %>
+      <%= link_to t('lines.buttons.cancel').html_safe, admin_articles_path, class: "btn btn-cancel" %>
     <% end %>        
 
   </div>