jabysoft-base 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f17919c27f0cc74b82f52ba6b387009d3ae59a7
-  data.tar.gz: 725159bc10e219a37759cd92fdb8142e26d17a8c
+  metadata.gz: fee81c055ec53725205d25a9fafed8c617f6189d
+  data.tar.gz: 83e6acb7d7a26a643744164f094a11e3fe5d0faa
 SHA512:
-  metadata.gz: b7e30299e7bcc7c911508dbba0402f86f18ca7ea80fbc8ab39a40377f7382fd6818546e5eb71ecf4684cbbccbe3b0d826b1bbdca167e6a86251501a984e328d7
-  data.tar.gz: 4f6e6ad160decbb0a6c34465d57ce09409c24c8bab481fd5d566e25f915894cb4e99af969d4ec867afba1e41a0c37150d6d69f06052f0bf6f8490e61716bd52a
+  metadata.gz: a45cb6c985ac2cfc2722478d094ed85373177058bf3b916e44ff2818938bf61fcbed311dd42ab61c5edfce1efc14ff4c8e408972e66cd2c936136e1cba3b0d6a
+  data.tar.gz: 08ead797e3baf418c40cfd5660938a49d239b040e7fadfaa47837f5913666f2dd47c9913ea4faadb5cb5e3ee95346c863597e0be330a763b7d9e9ddaa57474b0

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    jabysoft-base (0.1.1)
+    jabysoft-base (0.1.5)
+      codacy-coverage (~> 1.1)
       devise (~> 4.2)
       factory_girl_rails (~> 4.7)
+      haml-rails (~> 0.9)
       pry-byebug (~> 3.4)
       rails (~> 5.0)
       rake (~> 11.0)
@@ -49,10 +51,12 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (7.1.1)
+    arel (7.1.4)
     bcrypt (3.1.11)
     builder (3.2.2)
-    byebug (9.0.5)
+    byebug (9.0.6)
+    codacy-coverage (1.1.0)
+      simplecov (>= 0.10.0)
     coderay (1.1.1)
     concurrent-ruby (1.0.2)
     devise (4.2.0)
@@ -71,6 +75,19 @@ GEM
       railties (>= 3.0.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
+    haml (4.0.7)
+      tilt
+    haml-rails (0.9.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
     i18n (0.7.0)
     json (2.0.2)
     loofah (2.0.3)
@@ -82,13 +99,11 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     nio4r (1.2.1)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
-    pkg-config (1.1.7)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -122,10 +137,10 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    responders (2.2.0)
+    rake (11.3.0)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rspec-core (3.5.2)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -133,7 +148,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -142,6 +157,9 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    ruby_parser (3.8.2)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.7.0)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -151,12 +169,13 @@ GEM
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
+    tilt (2.0.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     warden (1.2.6)
@@ -169,7 +188,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
   jabysoft-base!
   simplecov (~> 0.12.0)
 
@@ -177,4 +195,4 @@ RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.1
+   1.13.2

data/README.md

@@ -1,4 +1,7 @@
 # Jabysoft-base
+[ ![Codeship Status for Jabysoft/jabysoft-base](https://codeship.com/projects/e6e2f750-4dc3-0134-2149-266445f4b7e3/status?branch=master)](https://codeship.com/projects/170622)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9d41f1dbe5934ae0826fbb7ecf3a548b)](https://www.codacy.com/app/CQ-JABYSOFT/jabysoft-base?utm_source=github.com&utm_medium=referral&utm_content=Jabysoft/jabysoft-base&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/9d41f1dbe5934ae0826fbb7ecf3a548b)](https://www.codacy.com/app/CQ-JABYSOFT/jabysoft-base?utm_source=github.com&utm_medium=referral&utm_content=Jabysoft/jabysoft-base&utm_campaign=Badge_Coverage)
 [![Gem Version](https://badge.fury.io/rb/jabysoft-base.svg)](https://badge.fury.io/rb/jabysoft-base)
 
 Set of utilities to build rails applications with style.
@@ -26,6 +29,21 @@ Execute jabysoft:setup to initialize your Rails project.
     $ rails generate jabysoft:setup
 
 
+After that, your Rails scaffold generator should have been overriden by Jabysoft generator.
+
+## Configuration
+
+We started some improvemnts to allow your rails app to configure our gem by using a initializer to set options.
+
+### Allowed options
+	* skip_authorize - The gem uses Cancancan to authorize action buttons. This option enables Cancancan to authorize.[default: true]
+
+```ruby
+Jabysoft.configure do |config|
+	config.skip_authorize = false
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/app/controllers/base_controller.rb

@@ -6,8 +6,8 @@ class BaseController < ApplicationController
   before_action :set_resource, only: [:show, :edit, :update, :destroy]
   before_action :disable_edition, only: [:show]
   before_action :load, except: [:index, :destroy]
-
-  PER_PAGE = 5
+  
+  PER_PAGE = 6
 
   def index
     if included_attributes
@@ -93,16 +93,23 @@ class BaseController < ApplicationController
     nil
   end
 
+  # to be used by subclasses
   def load
   end
 
   protected
   def model
-    params[:controller].camelize.singularize.constantize if params[:controller]
+    get_model_name.singularize.constantize
   end
 
   def index_path
-    Rails.application.routes.url_helpers.send("#{params[:controller].camelize.underscore}_path")
+    Rails.application.routes.url_helpers.send("#{get_model_name.underscore}_path")
+  end
+
+  def get_model_name
+    model_name = self.class.name
+    model_name.slice! 'Controller'
+    model_name
   end
 
   def disable_edition

data/app/helpers/base_helper.rb

@@ -1,15 +1,11 @@
 module BaseHelper
-
-  def translate_attribute(model, attribute = nil, options = {})
+  
+  def translate_attribute(model, attribute = nil)
     return model.human_attribute_name(attribute) if attribute
-    if options.any?
-      return model.model_name.human.pluralize if options[:pluralize]
-    else
-      model.model_name.human
-    end
+    model.model_name.human
   end
 
-  alias_method :ta, :translate_attribute
+  alias ta translate_attribute
 
   def edit_url_for(model)
     if model.id
@@ -55,6 +51,10 @@ module BaseHelper
     number_to_currency(value)
   end
 
+  def decorate(object, decorator)
+    yield decorator.new(object)
+  end
+
   private
   def collect_request_params(params)
     params.collect { |param| "#{param[0]}: #{param[1]}" }.join(", ")

data/app/helpers/links_helper.rb

@@ -57,6 +57,10 @@ module LinksHelper
     link_to t('back'), url, html_options
   end
 
+  def link_to_menu(model, url)
+    link_to model.model_name.human.pluralize, url
+  end
+
   def submit_or_edit_button(form, edit_path, is_edition)
     if is_edition && params[:action] != 'new'
       link_to_edit form.object, edit_path, class: "btn btn-primary btn-lg"
@@ -75,7 +79,7 @@ module LinksHelper
 
   private
   def authorize_button(action, model, options, button_class)
-    return true #FIXME - to be removed
+    return true if Jabysoft.configuration.skip_authorize
     unless can? action, model
       options.merge!(class: button_class+" disabled ") and return false
     end

data/app/models/concerns/extension_model_behaviour.rb

@@ -6,11 +6,9 @@ module ExtensionModelBehaviour
     scope :active, -> { where(active: true) }
     scope :scoped, -> { select(:id, scoped_attribute) }
 
-    private
     def self.scoped_attribute
       return :code if column_names.include? 'code'
       :name
     end
-
   end
 end

data/app/models/concerns/searchable_behaviour.rb

@@ -1,5 +1,6 @@
 module SearchableBehaviour
   extend ActiveSupport::Concern
+  # It gives models search behaviour
 
   included do
     def self.search(params)
@@ -20,7 +21,6 @@ module SearchableBehaviour
       each_attr.join("OR ")
     end
 
-    private
     def self.has_joins?
       select_hash_attributes.any?
     end
@@ -43,5 +43,4 @@ module SearchableBehaviour
     end
 
   end
-
 end

data/config/locales/en.yml

@@ -24,7 +24,6 @@ en:
   selection: Select
   search: Search
   not_authorized: Not Authorized
-  admin_area: Administration
   toggle_sidebar: Sidebar
   send: Send
   contact: Contact

data/config/locales/pt-BR.yml

@@ -24,7 +24,6 @@ pt-BR:
   selection: Selecione
   search: Pesquisar
   not_authorized: Sem permissão
-  admin_area: Administração
   toggle_sidebar: Menu Lateral
   send: Enviar
   contact: Contato

data/jabysoft-base.gemspec

@@ -26,12 +26,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'simplecov', '~> 0.12.0'
   spec.add_dependency 'rails', '~> 5.0'
+  spec.add_dependency 'haml-rails', '~> 0.9'
   spec.add_dependency 'rspec-rails', '~> 3.5'
   spec.add_dependency 'factory_girl_rails', '~> 4.7'
   spec.add_dependency 'rake', '~> 11.0'
   spec.add_dependency 'pry-byebug', '~> 3.4'
   spec.add_dependency 'devise', '~> 4.2'
+  spec.add_runtime_dependency 'codacy-coverage', '~> 1.1'
 end

data/lib/generators/haml/scaffold/scaffold_generator.rb

@@ -21,8 +21,7 @@ module Haml
         end
       end
 
-    protected
-
+      protected
       def available_views
         %w(index edit show new _index)
       end

data/lib/generators/jabysoft/setup/templates/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '2.3.1'
 
-# JabySoft
+# JabySoft gem
 gem 'jabysoft-base', '~> 0.1'
 
 # RAILS DEPENDENCIES
@@ -17,13 +17,14 @@ gem 'turbolinks', '~> 5.0'
 gem 'jbuilder', '~> 2.6'
 
 # INCLUDED
-gem 'haml-rails', '~> 0.9.0'
-gem 'choices', '~> 0.4.0'
+gem 'haml', '~> 4.0'
+gem 'choices', '~> 0.4'
 gem 'will_paginate-bootstrap', '~> 1.0', '>= 1.0.1'
 gem 'rack-mini-profiler', '~> 0.10.1', require: false
 gem 'whenever', '~> 0.9.7', require: false
 gem 'after_party', '~> 1.10'
-gem 'rails-controller-testing', '~> 0.1.1'
+gem 'rails-controller-testing', '~> 0.1'
+gem 'codacy-coverage', '~> 1.1'
 
 group :development, :test do
   gem 'pry-byebug', '~> 3.4'

data/lib/generators/jabysoft/setup/templates/layouts/admin.html.haml

@@ -9,7 +9,7 @@
   %body
     %nav.navbar.navbar-default.navbar-fixed-top
       .container
-        = link_to t('admin_area'), admin_root_path, class: 'navbar-brand'
+        = link_to t('title.administration'), admin_root_path, class: 'navbar-brand'
 
         %button{class: "navbar-toggle", "data-toggle" => "collapse", "data-target" => ".navHeaderCollapse"}
           %span.glyphicon.glyphicon-th

data/lib/generators/jabysoft/setup/templates/spec/rails_helper.rb

@@ -1,3 +1,7 @@
+# It sends test coverage info to codacy.com
+require 'codacy-coverage'
+Codacy::Reporter.start
+
 require 'simplecov'
 SimpleCov.start :rails do
   add_filter 'config/initializers'

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -29,16 +29,6 @@ module Rspec
         template 'controller_spec.rb', template_file
       end
 
-      # do not execute views
-      #def generate_view_specs
-      #  return unless options[:view_specs] && options[:template_engine]
-      #
-      #  copy_view :edit
-      #  copy_view :index unless options[:singleton]
-      #  copy_view :new
-      #  copy_view :show
-      #end
-
       def generate_routing_spec
         return unless options[:routing_specs]
 

data/lib/jabysoft/base.rb

@@ -1,12 +1,25 @@
 require 'devise'
 require 'jabysoft/base/version'
+require 'jabysoft/base/configuration'
 require 'rails/engine'
 
 module Jabysoft
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Jabysoft::Base::Configuration.new
+  end
+
+  def self.configure
+    yield configuration if block_given?
+  end
+
   module Base
     class Engine < ::Rails::Engine
       config.app_generators do |g|
-        g.templates.unshift File::expand_path('../../templates', __FILE__)
+        g.templates.unshift File.expand_path('../../templates', __FILE__)
         g.orm             :active_record
         g.template_engine :haml
         g.test_framework  :rspec, fixture: true

data/lib/jabysoft/base/configuration.rb

@@ -0,0 +1,10 @@
+module Jabysoft
+	module Base
+		class Configuration
+			attr_accessor :skip_authorize
+			def initialize
+				@skip_authorize = true
+			end
+		end
+	end
+end

data/lib/jabysoft/base/version.rb

@@ -1,5 +1,5 @@
 module Jabysoft
   module Base
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/lib/templates/rails/scaffold_controller/controller.rb

@@ -4,7 +4,18 @@ require_dependency "<%= namespaced_path %>/application_controller"
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < BaseController
   # This is a Jabysoft controller
+  
+  # This method allows you to add associations using Model.includes(:object) to the main query on index action.
+  # def included_attributes
+  #  :school
+  # end
 
+  # This method allows you to obtain dependencies and make them available in the controller.
+  # It is called 'before_action :load, except: [:index, :destroy]'
+  # def load
+  #  @list = Model.all
+  # end
+  
   # Only allow a trusted parameter "white list" through.
   def permit_params
     <%- if attributes_names.empty? -%>
@@ -13,17 +24,5 @@ class <%= controller_class_name %>Controller < BaseController
     params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
     <%- end -%>
   end
-
-  # This method allows you to add associations using Model.includes(:object) to the main query on index action.
-  #def included_attributes
-  #  :school
-  #end
-
-  # This method allows you to obtain dependencies and make them available in the controller.
-  # It is called 'before_action :load, except: [:index, :destroy]'
-  #def load
-  #  @list = Model.all
-  #end
-
 end
 <% end -%>

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jabysoft-base
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Emerson S. Xavier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: codacy-coverage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Simple Jabysoft Rails-based code and scaffold generators.
 email:
 - msxavii@gmail.com
@@ -173,6 +187,7 @@ files:
 - lib/generators/jabysoft/setup/templates/spec/spec_helper.rb
 - lib/generators/rspec/scaffold/scaffold_generator.rb
 - lib/jabysoft/base.rb
+- lib/jabysoft/base/configuration.rb
 - lib/jabysoft/base/version.rb
 - lib/templates/haml/scaffold/_form.html.haml
 - lib/templates/haml/scaffold/_index.html.haml