weeler 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65141fa7b10f285e8e70ec0488fa845fead1ec10
-  data.tar.gz: 12c5b73383d1af0ed440a66d0ee17f4250ac11d8
+  metadata.gz: f125a52f99e3be0ecbc7bd79dcbcfd1d7a66e0d5
+  data.tar.gz: e853a94bc834beb1c75aee9384c04d98e92c4262
 SHA512:
-  metadata.gz: ddde632811f7a6886189e7a005e6ce0b5efddc61ea51e58cef810c5f66c8675a8832f69d921951c551f9268b30a7514c6d31f92e28170765533776fc3a8a6346
-  data.tar.gz: 265f18ff090c4ef3dc6c497f7480aba342c79cbc9967a63e04ceea2d550c5b809e8d43dc046683fa7e3420e945f8c4cc959fea526d345a323e73f97c1e9f2a85
+  metadata.gz: 6b50067fa6a4cc485e90284a7ec420650e4fa9352c97dd623693fc95495f43c71afe227a90b3acd4a89ce0de9c8ef968d04fb59a058a1287e8f4881d92a7bd88
+  data.tar.gz: 95f657a3eb4d93311230b93da56a51b1fb98380bf36551060e0cc297d7533b67e8811d87ecefb7531403bf4c39db6702a6299a77655431341b67332074f17a2f

data/CHANGELOG.md

@@ -0,0 +1,68 @@
+## 0.0.4
+
+### Features & Enhancements
+
+* Refacture translations import and export. Moved logic to lib/i18n/backend/weeler .
+* Append routes and controller example generators.
+* Increase test covorage.
+
+### Bug Fixes
+
+* Fixed export multiply export bug.
+* Change file browser button to fix dependency error.
+
+### Contributors
+
+* Arturs Braucs
+
+## 0.0.3
+
+### Bug Fixes
+
+* Remove routes isolation. That crashed all backend. :(
+
+### Contributors
+
+* Arturs Braucs
+
+## 0.0.2
+
+### Features & Enhancements
+
+* Implement I18n Active Record backend
+* Add GUI for frontend - bootstrap
+* List, add, edit application I18n translations
+* Import and export translation excel (xlsx) files
+* Implement weeler routes
+
+### Test Suite
+
+* I18n backend tests
+* Weeler routes tests
+
+Translations not tested yet
+
+### Bug Fixes
+
+### Contributors
+
+* Arturs Braucs
+
+## 0.0.1
+
+* Initial release
+
+### Features & Enhancements
+
+* Gem structure
+* Rails dependencies
+
+### Bug Fixes
+
+### Test Suite
+
+* RSpec
+
+### Contributors
+
+* Arturs Braucs

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/weeler.png)](http://badge.fury.io/rb/weeler)
 [![Build Status](https://travis-ci.org/weby-lv/weeler.png?branch=master)](https://travis-ci.org/weby-lv/weeler)
 [![Coverage Status](https://coveralls.io/repos/weby-lv/weeler/badge.png)](https://coveralls.io/r/weby-lv/weeler)
+[![Code Climate](https://codeclimate.com/github/weby-lv/weeler.png)](https://codeclimate.com/github/weby-lv/weeler)
 
 CMS for weby.lv projects.
 

data/app/assets/javascripts/weeler/init.js.coffee

@@ -0,0 +1,8 @@
+#= require jquery
+#= require jquery_ujs
+#= require_tree "./vendor"
+#= require weeler/app
+#= require_self
+
+$(document).ready () ->
+  $('.weeler-file-inputs').bootstrapFileInput()

data/app/assets/javascripts/weeler/vendor/bootstrap.file-input.js

@@ -0,0 +1,122 @@
+/*
+  Bootstrap - File Input
+  ======================
+
+  This is meant to convert all file input tags into a set of elements that displays consistently in all browsers.
+
+  Converts all
+  <input type="file">
+  into Bootstrap buttons
+  <a class="btn">Browse</a>
+
+*/
+$(function() {
+
+$.fn.bootstrapFileInput = function() {
+
+  this.each(function(i,elem){
+
+    var $elem = $(elem);
+
+    // Maybe some fields don't need to be standardized.
+    if (typeof $elem.attr('data-bfi-disabled') != 'undefined') {
+      return;
+    }
+
+    // Set the word to be displayed on the button
+    var buttonWord = 'Browse';
+
+    if (typeof $elem.attr('title') != 'undefined') {
+      buttonWord = $elem.attr('title');
+    }
+
+    // Start by getting the HTML of the input element.
+    // Thanks for the tip http://stackoverflow.com/a/1299069
+    var input = $('<div>').append( $elem.eq(0).clone() ).html();
+    var className = '';
+
+    if (!!$elem.attr('class')) {
+      className = ' ' + $elem.attr('class');
+    }
+
+    // Now we're going to replace that input field with a Bootstrap button.
+    // The input will actually still be there, it will just be float above and transparent (done with the CSS).
+    $elem.replaceWith('<a class="file-input-wrapper btn' + className + '">'+buttonWord+input+'</a>');
+  })
+
+  // After we have found all of the file inputs let's apply a listener for tracking the mouse movement.
+  // This is important because the in order to give the illusion that this is a button in FF we actually need to move the button from the file input under the cursor. Ugh.
+  .promise().done( function(){
+
+    // As the cursor moves over our new Bootstrap button we need to adjust the position of the invisible file input Browse button to be under the cursor.
+    // This gives us the pointer cursor that FF denies us
+    $('.file-input-wrapper').mousemove(function(cursor) {
+
+      var input, wrapper,
+        wrapperX, wrapperY,
+        inputWidth, inputHeight,
+        cursorX, cursorY;
+
+      // This wrapper element (the button surround this file input)
+      wrapper = $(this);
+      // The invisible file input element
+      input = wrapper.find("input");
+      // The left-most position of the wrapper
+      wrapperX = wrapper.offset().left;
+      // The top-most position of the wrapper
+      wrapperY = wrapper.offset().top;
+      // The with of the browsers input field
+      inputWidth= input.width();
+      // The height of the browsers input field
+      inputHeight= input.height();
+      //The position of the cursor in the wrapper
+      cursorX = cursor.pageX;
+      cursorY = cursor.pageY;
+
+      //The positions we are to move the invisible file input
+      // The 20 at the end is an arbitrary number of pixels that we can shift the input such that cursor is not pointing at the end of the Browse button but somewhere nearer the middle
+      moveInputX = cursorX - wrapperX - inputWidth + 20;
+      // Slides the invisible input Browse button to be positioned middle under the cursor
+      moveInputY = cursorY- wrapperY - (inputHeight/2);
+
+      // Apply the positioning styles to actually move the invisible file input
+      input.css({
+        left:moveInputX,
+        top:moveInputY
+      });
+    });
+
+    $('.file-input-wrapper input[type=file]').change(function(){
+
+      var fileName;
+      fileName = $(this).val();
+
+      // Remove any previous file names
+      $(this).parent().next('.file-input-name').remove();
+      if (!!$(this).prop('files') && $(this).prop('files').length > 1) {
+        fileName = $(this)[0].files.length+' files';
+        //$(this).parent().after('<span class="file-input-name">'+$(this)[0].files.length+' files</span>');
+      }
+      else {
+        // var fakepath = 'C:\\fakepath\\';
+        // fileName = $(this).val().replace('C:\\fakepath\\','');
+        fileName = fileName.substring(fileName.lastIndexOf('\\')+1,fileName.length);
+      }
+
+      $(this).parent().after('<span class="file-input-name">'+fileName+'</span>');
+    });
+
+  });
+
+};
+
+// Add the styles before the first stylesheet
+// This ensures they can be easily overridden with developer styles
+var cssHtml = '<style>'+
+  '.file-input-wrapper { overflow: hidden; position: relative; cursor: pointer; z-index: 1; }'+
+  '.file-input-wrapper input[type=file], .file-input-wrapper input[type=file]:focus, .file-input-wrapper input[type=file]:hover { position: absolute; top: 0; left: 0; cursor: pointer; opacity: 0; filter: alpha(opacity=0); z-index: 99; outline: 0; }'+
+  '.file-input-name { margin-left: 8px; }'+
+  '</style>';
+$('link[rel=stylesheet]').eq(0).before(cssHtml);
+
+});

data/app/assets/stylesheets/weeler/init.css.erb

@@ -0,0 +1,5 @@
+/*
+*= require_tree ./vendor
+*= require ./style
+*= require weeler/app
+*/

data/app/assets/stylesheets/weeler/{style.css.scss.erb → style.css.scss}

@@ -10,6 +10,17 @@ footer {
   padding-right: 15px;
 }
 
+/*
+ * Fix bootrsap top bug
+ *
+ */
+ body.modal-open,
+.modal-open .navbar-fixed-top,
+.modal-open .navbar-fixed-bottom {
+  margin-right: 0;
+}
+
+
 /*
  * Off Canvas
  * --------------------------------------------------

data/app/controllers/weeler/translations_controller.rb

@@ -17,6 +17,9 @@ module Weeler
 
     def create
       @translation = I18n::Backend::Weeler::Translation.new(translation_params)
+
+      
+
       if @translation.save
         redirect_to edit_weeler_translation_path(@translation), flash: {success: "Translation saved."}
       else
@@ -42,93 +45,17 @@ module Weeler
     end
 
     def export
-      require( 'axlsx' )
-
-      # construct xlsx file
-      p = Axlsx::Package.new
-      # Numbers requires this
-      p.use_shared_strings = true
-      
-      sheet = p.workbook.add_worksheet(name: "translations")
-
-      # All used locales and translations by params
-      locales = I18n::Backend::Weeler::Translation.available_locales
-      locales = locales.select{ |l| l.present? }
-      @translations = translations_by_params
-
-      # title row
-      row = [ 'Key' ]
-      locales.each do |locale|
-        row.push(locale.capitalize)
-      end
-
-      sheet.add_row(row)
-
-      @translations.each do |translation|
-        row = [ translation.key ]
-        locales.each do |locale|
-          result = I18n::Backend::Weeler::Translation.locale(locale).lookup(translation.key).load
-          if result.first.present?
-            row.push(result.first.value)
-          else
-            row.push("")
-          end
-        end
-
-        sheet.add_row(row)
-      end
-
       respond_to do |format|
         format.xlsx do
           outstrio = StringIO.new
-          outstrio.write(p.to_stream.read)
+          outstrio.write(translations_by_params.as_xlsx_package.to_stream.read)
           send_data(outstrio.string, filename: "translations" + '.xlsx')
         end
       end
-
     end
 
     def import
-      require "roo"
-      xls = Roo::Excelx.new(params[:file].tempfile.path, file_warning: :ignore)
-
-      xls.each_with_pagename do |name, sheet|
-        
-        # Lookup locales
-        locales = []
-        sheet.row(1).each_with_index do |cell, i|
-          if i > 0
-            locales.push(cell.downcase)
-          end
-        end
-
-        # Lookup values
-        (2..sheet.last_row).each do |row_no|
-          locale = nil
-          key = nil
-          value = nil
-          sheet.row(row_no).each_with_index do |cell, i|
-            if i == 0
-              key = cell
-            else
-              locale = locales[ i - 1 ]
-              value = cell.nil? ? '' : cell
-
-              p "> Readed: #{locale}.#{key} = #{value} "
-              if locale.present? && key.present?
-                translation = I18n::Backend::Weeler::Translation.find_or_initialize_by locale: locale, key: key
-                if translation.value != value
-                  translation.value = value
-                  translation.save
-                end
-              end
-
-            end
-          end # cells
-
-        end # rows
-
-      end # sheets
+      I18n::Backend::Weeler::Translation.import params[:file].tempfile.path
       redirect_to weeler_translations_path, flash: {success: "Translations succesfully imported."}
     end
 

data/app/views/layouts/weeler/base.html.erb

@@ -1,86 +1,40 @@
 <!DOCTYPE html>
 <html lang="en">
+    <head>
+      <title>Weeler</title>
+      
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+      
+      <%= stylesheet_link_tag "weeler/init", :media => "all" %>
+      <%= javascript_include_tag "weeler/init" %>
+      
+      <%= csrf_meta_tags %>
+      
+      <%= render "weeler/shared/flash" %>
 
-        <head>
-                <title>Weeler</title>
-                
-                <meta charset="utf-8">
-                <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-                
-                <%= stylesheet_link_tag "weeler", :media => "all" %>
-                <%= javascript_include_tag "weeler" %>
-                
-                <%= csrf_meta_tags %>
-                
-                <% flash.each do |name, message| %>
-                        <script type="text/javascript">
-                                $(function(){
-                                        $.pnotify({
-                                                type: '<%= name %>', // 'notice', 'info', 'success', 'error'
-                                                title: '<%= name %>',
-                                                text: '<%= message %>',
-                                                styling: 'bootstrap',
-                                                shadow: false,
-                                                animation: 'fade',
-                                                closer: true,
-                                                history: false,
-                                                auto_display: true
-                                        });
-                                });
-                        </script>
-                <% end %>
-        </head>
+      <%= yield :weeler_header %>
+    </head>
 
-        <body>
-            <div class="navbar navbar-fixed-top navbar-inverse" role="navigation">
-                  <div class="container">
-                    <div class="navbar-header">
-                      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                      </button>
-                      <a class="navbar-brand" href="<%= weeler_root_path %>">Weeler</a>
-                    </div>
-                    <div class="collapse navbar-collapse">
-                      <ul class="nav navbar-nav">
-                        <li class="<%= 'active' if @current_menu_item == 'home' %>"><a href="<%= weeler_root_path %>">Home</a></li>
-                        <li class="<%= 'active' if @current_menu_item == 'about' %>"><a href="<%= weeler_about_path %>">About</a></li>
-                      </ul>
-                    </div><!-- /.nav-collapse -->
-                  </div><!-- /.container -->
-                </div><!-- /.navbar -->
+    <body <%= yield :weeler_body_tag %> >
+      <%= render "weeler/shared/header_navbar" %>
 
-                <div class="container">
+      <div class="container">
+        <div class="row row-offcanvas row-offcanvas-right">
 
-                  <div class="row row-offcanvas row-offcanvas-right">
-                    <div class="col-xs-6 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
-                      <div class="well sidebar-nav">
-                        <ul class="nav">
-                          <li>Configuration</li>
-                          <li class="<%= "active" %> "><a href="<%= weeler_translations_path %>">Translations</a></li>
-                          <li>Content</li>
-                          
-                          <% Weeler.menu_items.each do |item| %>
-                            <li><%= link_to item.to_s.capitalize, eval("weeler_#{item.to_s}_path") %></li>
-                          <% end %>
+          <%= render "weeler/shared/side_navbar" %>
 
-                        </ul>
-                      </div><!--/.well -->
-                    </div><!--/span-->
-                    <div class="col-xs-12 col-sm-9">
-                      <%= yield %>
-                    </div><!--/span-->
-                  </div><!--/row-->
+          <div class="col-xs-12 col-sm-9">
+            <%= yield %>
+          </div><!--/span-->
+        </div><!--/row-->
 
-                  <hr>
+        <hr>
 
-                  <footer>
-                    <p>&copy; Weby 2013</p>
-                  </footer>
+        <%= render "weeler/shared/footer" %>
 
-                </div><!--/.container-->
+      </div><!--/.container-->
 
-        </body>
+    </body>
 
 </html>

data/app/views/weeler/shared/_flash.html.erb

@@ -0,0 +1,17 @@
+<% flash.each do |name, message| %>
+        <script type="text/javascript">
+                $(function(){
+                        $.pnotify({
+                                type: '<%= name %>', // 'notice', 'info', 'success', 'error'
+                                title: '<%= name %>',
+                                text: '<%= message %>',
+                                styling: 'bootstrap',
+                                shadow: false,
+                                animation: 'fade',
+                                closer: true,
+                                history: false,
+                                auto_display: true
+                        });
+                });
+        </script>
+<% end %>

data/app/views/weeler/shared/_footer.html.erb

@@ -0,0 +1,3 @@
+<footer>
+  <p>&copy; Weby 2013</p>
+</footer>

data/app/views/weeler/shared/_header_navbar.html.erb

@@ -0,0 +1,18 @@
+<div class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="<%= weeler_root_path %>">Weeler</a>
+    </div>
+    <div class="collapse navbar-collapse">
+      <ul class="nav navbar-nav">
+        <li class="<%= 'active' if @current_menu_item == 'home' %>"><a href="<%= weeler_root_path %>">Home</a></li>
+        <li class="<%= 'active' if @current_menu_item == 'about' %>"><a href="<%= weeler_home_about_path %>">About</a></li>
+      </ul>
+    </div><!-- /.nav-collapse -->
+  </div><!-- /.container -->
+</div><!-- /.navbar -->

data/app/views/weeler/shared/_side_navbar.html.erb

@@ -0,0 +1,14 @@
+<div class="col-xs-6 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
+  <div class="well sidebar-nav">
+    <ul class="nav">
+      <li>Configuration</li>
+      <li class="<%= "active" %> "><a href="<%= weeler_translations_path %>">Translations</a></li>
+      <li>Content</li>
+      
+      <% Weeler.menu_items.each do |item| %>
+        <li><%= link_to item.to_s.capitalize, "#{weeler_root_url}/#{item}" %></li>
+      <% end %>
+
+    </ul>
+  </div><!--/.well -->
+</div><!--/span-->

data/app/views/weeler/translations/index.html.erb

@@ -47,12 +47,9 @@
       </ul>
 
       <!-- Import and export data -->
-      <form class="navbar-form navbar-left" role="import" method="post" action="<%= import_weeler_translations_path %>" enctype="multipart/form-data">
       <%= form_tag import_weeler_translations_path, {:multipart => true, class: "navbar-form navbar-left"} do %>
-          <div class="form-group fileupload fileupload-new" data-provides="fileupload">
-            <span class="btn btn-file"><span class="fileupload-new">Select file</span><span class="fileupload-exists">Change</span><input type="file" name="file" /></span>
-            <span class="fileupload-preview"></span>
-            <a href="#" class="close fileupload-exists" data-dismiss="fileupload" style="float: none">×</a>
+          <div class="form-group">
+            <input type="file" name="file" class="weeler-file-inputs" /></span>
           </div>
         <div class="btn-group">
           <button type="submit" class="btn btn-default">Import</button>

data/lib/generators/weeler/install_generator.rb

@@ -33,13 +33,22 @@ module Weeler
       #  copy_files 'models', 'app/models'
       #end
 
-      #def install_views
-      #  copy_files 'views', 'app/views'
-      #end
+      def install_views
+        copy_files 'views', 'app/views'
+      end
+
+      def install_controllers
+        copy_files 'controllers', 'app/controllers'
+      end
+
+      class_option :routes, :desc => "Generate routes", :type => :boolean, :default => true
+      def add_weeler_routes
+        weeler_routes  = "mount_weeler_at \"weeler\" do \n"
+        weeler_routes << "    # weeler_resources :example, include_in_weeler_menu: true \n"
+        weeler_routes << "  end"
+        route weeler_routes
+      end
 
-      #def install_controllers
-      #  copy_files 'controllers', 'app/controllers'
-      #end
 
       private
 

data/lib/generators/weeler/templates/controllers/weeler/example_controller.rb.example

@@ -0,0 +1,7 @@
+# class Weeler::ExampleController < Weeler::BaseController
+  
+  # def index
+  # # index action is required for menu items
+  # end
+
+# end