ditty 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e117d869f435ccaf97c5e0ed465a2464695d0e1
-  data.tar.gz: 0eaa19a3ed0647b95abf5593ca4a89a98f043e5e
+  metadata.gz: 671a4f94844586df6b6f93e6b52555b4676c5571
+  data.tar.gz: ae067afab7015874c78e682a1ca1cd354860473d
 SHA512:
-  metadata.gz: dfe1b8c443b4ae745c8e45c9e660c6819f49d9af0062f486f3c5d24d4f9f2383a52cde548c3dfc6c6f4a2406d21b680af6abba5d85e35120ff9675c8eb087215
-  data.tar.gz: 076b68ddde52ccdede169bdf493aa63adb1ea28ffcec0f764791e460e4e3e744e382af61d950b0d6b624ef55e9b425a13d9817af3b5b292472dd98f8bc9afd6b
+  metadata.gz: 2c55cc8ad699496e26a57ed594da2e5779da9208e172119e8dd9df142ff8ed963ea9f06969846990e10ab3303264bc7038c1586d3a09b232723c6d47d0a9e7e1
+  data.tar.gz: 4d7b7e184449f4bac9287ac6588c5b30162617a68e76bf54524a7ad12671c996296fc2bd26c2c3a0ca8f2ca06e9ab7a222ed06f2c60e37c719a550af77b1dd15

data/Contributors.md

@@ -0,0 +1,5 @@
+# Ditty Contributors
+
+* [Jurgens du Toit](https://github.com/jrgns)
+* [Sergey Shkarupa](https://github.com/sshkarupa)
+* [Leonardo Tegon](https://github.com/tegon)

data/Rakefile

@@ -2,12 +2,14 @@
 
 require 'rake'
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
 require 'ditty/rake_tasks'
 
 require 'ditty'
 require 'ditty/components/app'
 
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+rescue LoadError
+end

data/lib/ditty.rb

@@ -79,7 +79,7 @@ module Ditty
       components.inject([]) do |memo, comp|
         memo.concat comp[1].navigation if comp[1].respond_to?(:navigation)
         memo
-      end
+      end.sort_by { |v| v[:order] }
     end
 
     def self.migrations
@@ -88,6 +88,12 @@ module Ditty
       end.compact
     end
 
+    def self.public_folder
+      components.map do |_name, comp|
+        comp.public_folder if comp.respond_to?(:public_folder)
+      end.compact
+    end
+
     def self.seeders
       components.map do |_name, comp|
         comp.seeder if comp.respond_to?(:seeder)
@@ -96,7 +102,7 @@ module Ditty
 
     def self.workers
       components.inject([]) do |memo, comp|
-        memo.concat comp.workers if comp.respond_to?(:workers)
+        memo.concat comp[1].workers if comp[1].respond_to?(:workers)
         memo
       end
     end

data/lib/ditty/components/app.rb

@@ -45,6 +45,7 @@ module Ditty
           group: 'User Management',
           order: 10,
           icon: 'lock',
+          target: ::Ditty::User,
           items: [
             { order: 10, link: '/users/', text: 'Users', target: ::Ditty::User, icon: 'user' },
             { order: 20, link: '/roles/', text: 'Roles', target: ::Ditty::Role, icon: 'check-square' },

data/lib/ditty/helpers/component.rb

@@ -9,7 +9,7 @@ module Ditty
       include ActiveSupport::Inflector
 
       def dataset
-        filtered(policy_scope(settings.model_class))
+        search(filtered(policy_scope(settings.model_class)))
       end
 
       def list
@@ -43,6 +43,10 @@ module Ditty
         self.class.const_defined?('FILTERS') ? self.class::FILTERS : []
       end
 
+      def searchable_fields
+        self.class.const_defined?('SEARCHABLE') ? self.class::SEARCHABLE : []
+      end
+
       def filtered(dataset)
         filters.each do |filter|
           next unless params[filter[:name].to_s]
@@ -58,6 +62,14 @@ module Ditty
         value = value.send(filter[:modifier]) if filter[:modifier]
         dataset.where(filter[:field].to_sym => value)
       end
+
+      def search(dataset)
+        return dataset if params['q'] == '' || params['q'].nil?
+        return dataset if searchable_fields == []
+
+        filters = searchable_fields.map { |f| Sequel.ilike(f.to_sym, "%#{params[:q]}%") }
+        dataset.where Sequel.|(*filters)
+      end
     end
   end
 end

data/lib/ditty/helpers/views.rb

@@ -22,6 +22,16 @@ module Ditty
         }
       end
 
+      def filter_control(filter, opts = {})
+        meth = "#{filter[:name]}_options".to_sym
+        return unless respond_to? meth
+        haml :'partials/filter_control', locals: {
+          name: filter[:name],
+          label: opts[:label] || filter[:name].titlecase,
+          options: send(meth)
+        }
+      end
+
       def flash_messages(key = :flash)
         return '' if flash(key).empty?
         id = (key == :flash ? 'flash' : "flash_#{key}")

data/lib/ditty/rake_tasks.rb

@@ -23,16 +23,24 @@ module Ditty
           require 'ditty/seed'
         end
 
-        desc 'Prepare Ditty migrations'
+        desc 'Prepare Ditty'
         task :prep do
           puts 'Prepare the Ditty folders'
           Dir.mkdir 'pids' unless File.exist?('pids')
 
+          puts 'Preparing the Ditty public folder'
+          Dir.mkdir 'public' unless File.exist?('public')
+          ::Ditty::Components.public_folder.each do |path|
+            FileUtils.cp_r "#{path}/.", 'public'
+          end
+
           puts 'Preparing the Ditty migrations folder'
           Dir.mkdir 'migrations' unless File.exist?('migrations')
           ::Ditty::Components.migrations.each do |path|
             FileUtils.cp_r "#{path}/.", 'migrations'
           end
+          puts 'Migrations added:'
+          Dir.foreach('migrations').sort.each { |x| puts x if File.file?("migrations/#{x}") }
         end
 
         desc 'Migrate Ditty database to latest version'

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/views/partials/filter_control.haml

@@ -0,0 +1,6 @@
+.form-group
+  %label{ for: "filter_#{name}" }= label
+  %select.form-control{ name: name, id: "filter_#{name}" }
+    %option{ value: '' } -- Select One --
+    - options.each do |k,v| k ||= v;  v ||= k;
+      %option{ value: k, selected: (params[name].eql? k)}= v

data/views/partials/search.haml

@@ -0,0 +1,21 @@
+- if self.class.const_defined?(:SEARCHABLE) || self.class.const_defined?(:FILTERS)
+  %form{ method: 'get', action: base_path }
+    - if self.class.const_defined?(:SEARCHABLE)
+      .form-group
+        .input-group
+          %input.form-control{ name: 'q', type: 'text', placeholder: 'Search...', value: params['q'] }
+          .input-group-btn
+            %button.btn.btn-primary{ type: 'submit' }
+              %span.fa.fa-search
+          - if self.class.const_defined? :FILTERS
+            .input-group-btn
+              %button.btn.btn-default{ type: 'button', :'data-toggle' => 'collapse', :'data-target' => '#filter-form', :'aria-expanded' => 'false', :'aria-controls' => '#filter-form'}
+                %span.fa.fa-arrow-down
+
+    - if self.class.const_defined?(:FILTERS)
+      #filter-form{ class: self.class.const_defined?(:SEARCHABLE) ? 'collapse' : '' }
+        .form-inline
+          - FILTERS.each do |filter|
+            = filter_control(filter)
+          - unless self.class.const_defined?(:SEARCHABLE)
+            %button.btn.btn-default{ type: 'submit'} Go

data/views/partials/sidebar.haml

@@ -15,10 +15,11 @@
                 %span.fa.arrow
               %ul.nav.nav-second-level
                 - item[:items].each do |sub_item|
-                  %li
-                    %a{ href: "#{settings.map_path}#{sub_item[:link]}" }
-                      %i.fa.fa-fw{ class: "fa-#{sub_item[:icon]}" }
-                      = sub_item[:text]
+                  - if sub_item[:target].nil? || policy(sub_item[:target]).list?
+                    %li
+                      %a{ href: "#{settings.map_path}#{sub_item[:link]}" }
+                        %i.fa.fa-fw{ class: "fa-#{sub_item[:icon]}" }
+                        = sub_item[:text]
           - else
             %li
               %a{ href: "#{settings.map_path}#{item[:link]}" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -330,6 +330,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Contributors.md
 - Gemfile.ci
 - License.txt
 - Rakefile
@@ -386,11 +387,13 @@ files:
 - views/index.haml
 - views/layout.haml
 - views/partials/delete_form.haml
+- views/partials/filter_control.haml
 - views/partials/footer.haml
 - views/partials/form_control.haml
 - views/partials/navbar.haml
 - views/partials/notifications.haml
 - views/partials/pager.haml
+- views/partials/search.haml
 - views/partials/sidebar.haml
 - views/roles/display.haml
 - views/roles/edit.haml