eitil 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85f10151e9a975cf8b377f3997c976224fab4f0be988fd948ccfd0346bb68bc
-  data.tar.gz: a18ab619c76964154d49875277eeb51b1020871a091161372793721715b95473
+  metadata.gz: aefe6597672c5fcabffbce60d0caffb14540331dfe9133d1c4ff01b5ef30c229
+  data.tar.gz: 3dd8b83eb7dceaa7a1ad605a1adfc07963532c563a5df7d62f39183ae8a89c61
 SHA512:
-  metadata.gz: 6c95090129ee5c2f0eef08138cc656bdfcd6d81e612163c25ffcfcd2b10823441141a0687d9e3952d4a3a17ca002d02476de6c36d83acbdb90c946f13ae7a766
-  data.tar.gz: 3fd66d39a64878e49e3be363a1198247a9b64c6cc23bd5825b0340ae44feba308b23f0930d7a05d9b7b73dae19db0a26b134cf91f6fcdb38e959186d1765698b
+  metadata.gz: 025eb7fe3fe248483babaf55d49c7da4311edc9e4443681cc74b9c41ed39e444ed6f4d0453ed71a5e9191f84fd8bd16ed61f89c328e779d85e2d6cf41eab246a
+  data.tar.gz: d83660005e68ebf2c4a5144679078070ef076f9f7f8f55f6df9e2bfd8e97ffa9928114c1607cfc5abf779b6a21eeea3ead5d4179c1447278d01d668a7d0db7be

data/eitil_integrate/lib/eitil_integrate/application_exporter/auto_sum/drop_data.rb

@@ -25,7 +25,9 @@ module EitilIntegrate::RubyXL
       end
 
       def drop_empty_values
-        @hash.transform_values! { |array| array.reject { |item| item.safe_send :empty? } }
+        @hash.transform_values! do |array| 
+          array.reject { |item| item.respond_to?(:empty?) && item.empty? }
+        end
       end
 
       def drop_non_accepted_values

data/eitil_integrate/lib/eitil_integrate/application_exporter/initialize.rb

@@ -3,6 +3,8 @@
 
 require "eitil_core/setters/set_ivars"
 require "eitil_core/argument_helpers/all_kwargs_to_ivars"
+require "action_view"
+require "rubyXL"
 
 module EitilIntegrate
   module RubyXL

data/eitil_wrapper/lib/eitil_wrapper/decorators/application_decorator.rb

@@ -1,3 +1,6 @@
+
+require "active_model/railtie"
+
 module EitilWrapper
   class ApplicationDecorator
 

data/eitil_wrapper/lib/eitil_wrapper/decorators/controller_decorator.rb

@@ -50,17 +50,22 @@ module EitilWrapper
     end
 
     def set_decorator
-      @dec_class.new ivars
+      @dec_class.new **ivars
     end
 
+    # Converts the controller_ivars, given in your main application's configuration,
+    # into an hash. If no controller_ivars, continue with converting, in order to avoid
+    # issues due to differing data types.
     def controller_ivars
+      return {} unless Eitil.controller_ivars.any?
+
       Eitil.controller_ivars.map do |ivar|
         { ivar => instance_variable_get("@#{ivar.to_s}") }
       end.inject &:merge
     end
 
     def ivars
-       @dec_kwargs ? controller_ivars.merge(@dec_kwargs) : controller_ivars
+       @dec_kwargs.any? ? controller_ivars.merge(@dec_kwargs) : controller_ivars
     end
 
   end

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
   
 end

data/spec/dummy_app/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/spec/dummy_app/app/assets/config/manifest.js

@@ -0,0 +1,4 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link dummy_app_manifest.js

data/spec/dummy_app/app/assets/javascripts/application.js

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require rails-ujs
+//= require activestorage
+//= require_tree .

data/spec/dummy_app/app/assets/javascripts/cable.js

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the `rails generate channel` command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/spec/dummy_app/app/assets/stylesheets/addresses.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/spec/dummy_app/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/spec/dummy_app/app/assets/stylesheets/scaffold.css

@@ -0,0 +1,80 @@
+body {
+  background-color: #fff;
+  color: #333;
+  margin: 33px;
+}
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+}
+
+a:visited {
+  color: #666;
+}
+
+a:hover {
+  color: #fff;
+  background-color: #000;
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding: 0 5px 7px;
+}
+
+div.field,
+div.actions {
+  margin-bottom: 10px;
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px 7px 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#error_explanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px -7px 0;
+  background-color: #c00;
+  color: #fff;
+}
+
+#error_explanation ul li {
+  font-size: 12px;
+  list-style: square;
+}
+
+label {
+  display: block;
+}

data/spec/dummy_app/app/assets/stylesheets/users.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/spec/dummy_app/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/spec/dummy_app/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/spec/dummy_app/app/controllers/addresses_controller.rb

@@ -0,0 +1,58 @@
+class AddressesController < ApplicationController
+  before_action :set_address, only: [:show, :edit, :update, :destroy]
+
+  # GET /addresses
+  def index
+    @addresses = Address.all
+  end
+
+  # GET /addresses/1
+  def show
+  end
+
+  # GET /addresses/new
+  def new
+    @address = Address.new
+  end
+
+  # GET /addresses/1/edit
+  def edit
+  end
+
+  # POST /addresses
+  def create
+    @address = Address.new(address_params)
+
+    if @address.save
+      redirect_to @address, notice: 'Address was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /addresses/1
+  def update
+    if @address.update(address_params)
+      redirect_to @address, notice: 'Address was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /addresses/1
+  def destroy
+    @address.destroy
+    redirect_to addresses_url, notice: 'Address was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_address
+      @address = Address.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    def address_params
+      params.fetch(:address, {})
+    end
+end

data/spec/dummy_app/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+
+  include EitilWrapper::ControllerDecorator
+
+end

data/spec/dummy_app/app/controllers/users_controller.rb

@@ -0,0 +1,93 @@
+class UsersController < ApplicationController
+  
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+
+  # ---
+  # Tests for EitilWrapper::Decorator
+
+  before_action :set_user, only: [:decorator_a, :decorator_b, :decorator_c, :decorator_d]
+
+  # default
+  def decorator_a
+    hash = decorate(@user)
+    render json: hash
+  end
+
+  # specific dec_method
+  def decorator_b
+    hash = decorate(@user, dec_method: :first_and_last_name)
+    render json: hash
+  end
+
+  # post request, with 'isWeb' and 'isMobile' params
+  def decorator_c
+    hash = decorate(@user)
+    render json: hash
+  end
+
+  # specific dec_class
+  def decorator_d
+    hash = decorate(@user, dec_class: :Application, dec_method: :timestamps)
+    render json: hash
+  end
+
+  # ---
+
+
+
+  # GET /users
+  def index
+    @users = User.all
+  end
+
+  # GET /users/1
+  def show
+  end
+
+  # GET /users/new
+  def new
+    @user = User.new
+  end
+
+  # GET /users/1/edit
+  def edit
+  end
+
+  # POST /users
+  def create
+    @user = User.new(user_params)
+
+    if @user.save
+      redirect_to @user, notice: 'User was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /users/1
+  def update
+    if @user.update(user_params)
+      redirect_to @user, notice: 'User was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /users/1
+  def destroy
+    @user.destroy
+    redirect_to users_url, notice: 'User was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_user
+      @user = User.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    def user_params
+      params.fetch(:user, {})
+    end
+end

data/spec/dummy_app/app/decorators/address_decorator.rb

@@ -0,0 +1,3 @@
+class AddressDecorator < ApplicationDecorator
+
+end

data/spec/dummy_app/app/decorators/application_decorator.rb

@@ -0,0 +1,12 @@
+class ApplicationDecorator < EitilWrapper::ApplicationDecorator
+
+  # ---
+  # Tests for EitilWrapper::Decorator
+
+  def timestamps(record)
+    record.slice(:created_at, :updated_at)
+  end
+
+  # ---
+
+end

data/spec/dummy_app/app/decorators/user_decorator.rb

@@ -0,0 +1,19 @@
+class UserDecorator < ApplicationDecorator
+
+  def first_and_last_name(user)
+    user.slice(:first_name, :last_name)
+  end
+
+  def app(user)
+    user.slice(:phone, :email)
+  end
+
+  def web(user)
+    user.slice(:age, :wage)
+  end
+
+  def base(user)
+    user.as_json
+  end
+
+end