aureus 2.1.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6bc83e94e616d6d1c0d6794c6d5f1908137e63
-  data.tar.gz: 72bf1e9b1984f099e04d53fa605cec70536c8293
+  metadata.gz: da714510bbeed3441c14f68e61c96a5d8bd12a9a
+  data.tar.gz: f688df1e2ff0f3bde65eb69da161f43b1ade6666
 SHA512:
-  metadata.gz: b59200ec049d253dff0a460fdeceb54a6df97197143c66b7aecdba31d89a02afa1e8cca5a00debac3df5363ca97fc1d04f2f9ab6cffbe551b8505c7153bb6290
-  data.tar.gz: 647b195205a1a1a3f18787b85c040e2786503ae86698a80d5926c5100dc7b85efaf9d6a17e7e83d9eab5162022afc00a5b628c1fe74f0786b06ec75abb407674
+  metadata.gz: 63c0589fec2132e80681de09684e2f4161a75d1e391a2ad358f642676867bb37fef90089e345cacd0a5e684ccad77c0cff049b1c1a05032167c3357973417cf0
+  data.tar.gz: dd50c6309dced03e90e89e87d950330cf5b97d55c1a23cd1ecf64750ac12673d1a33c188bbd5c022b43e1f11055f43b4e575e0280445f6a364d76a084b487783

data/Gemfile

@@ -2,7 +2,8 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rspec-rails'
+  gem 'rake'
+  gem 'rspec-rails', '~> 2.14'
   gem 'combustion'
   gem 'actionpack'
   gem 'activerecord'

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    aureus (2.1.4)
+    aureus (3.0.0)
       formtastic (= 2.3.0.rc3)
       haml-rails (~> 0.5)
-      jquery-datatables-rails (~> 1.12)
       jquery-rails (~> 3.0)
       jquery-ui-rails (~> 4.0)
       leaflet-rails (~> 0.7)
@@ -15,30 +14,30 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.1)
-    atomic (1.1.14)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
     combustion (0.5.1)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
@@ -59,32 +58,31 @@ GEM
       railties (>= 4.0.1)
     hike (1.2.3)
     i18n (0.6.9)
-    jquery-datatables-rails (1.12.2)
-      jquery-rails
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    leaflet-rails (0.7.2)
+    json (1.8.1)
+    leaflet-rails (0.7.3)
     mapbox-rails (1.6.1.1)
-    minitest (4.7.5)
-    multi_json (1.8.2)
+    minitest (5.3.4)
+    multi_json (1.10.1)
     normalize-rails (3.0.1)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.3.2)
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    rspec-rails (2.14.1)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
@@ -98,7 +96,7 @@ GEM
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0)
-    sprockets (2.10.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -107,12 +105,12 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    tzinfo (0.3.38)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -123,6 +121,7 @@ DEPENDENCIES
   aureus!
   combustion
   generator_spec
-  rspec-rails
+  rake
+  rspec-rails (~> 2.14)
   sprockets
   sqlite3

data/README.md

@@ -5,76 +5,68 @@
 Aureus is a tool to quickly generate admin interfaces for a rails app.
 It's between scaffolding and tools like ActiveAdmin.
 
-## General Concept
-
-The idea behind aureus is to abstract as much as possible of GUI rendering by still giving enough freedom for customization.
-A typical aureus driven view would look like this:
-
-```haml
-= aureus_row do |r|
-  = aureus_box 'Datatable' do
-    = aureus_datatable Resource.all do |t|
-      - t.head do |h|
-        - h.text 'Title'
-        - h.text 'Text'
-      - t.row do |r,res|
-        - r.identifier res.id
-        - r.cell res.title
-        - r.cell res.text
-        - r.button :show, 'url'
-        - r.button :edit, 'url'
-        - r.button :destroy, 'url', confirm: 'Delete user?'
-```
-
-## Installation
+## Sample Controller
 
-To use **aureus** simply require the gem:
+The following Controller will render a finished interface:
 
 ```ruby
-gem 'aureus'
-```
-
-### Asset Pipeline
-
-Aureus uses the rails asset pipeline to load and override the style and behavior.
-
-Change your `application.scss` to match the following:
-
-```scss
-//= require aureus
-//= require_self
-
-@import 'aureus/skin/default';
-@import 'aureus/theme';
+class ResourcesController < Aureus::ResourcesController
+  before_filter :prepare_aureus
+
+  def index
+    @resources = Resource.all
+  end
+
+  def new
+    @resource = Resource.new
+  end
+
+  def create
+    Resource.create!(permitted_params[:resource])
+    redirect_to resources_url
+  end
+
+  def show
+    @resource = Resource.find(params[:id])
+  end
+
+  def edit
+    @resource = Resource.find(params[:id])
+  end
+
+  def update
+    resource = Resource.find(params[:id])
+    resource.update!(permitted_params[:resource])
+    redirect_to resource_url(resource)
+  end
+
+  def destroy
+    resource = Resource.find(params[:id])
+    resource.destroy!
+    redirect_to resources_url
+  end
+
+  protected
+
+  def prepare_aureus
+    aureus({
+      actions: [:index, :new, :create, :show, :edit, :update, :destroy],
+      table_fields: [:id, :title, :text],
+      form_fields: [:title, :text],
+      item_fields: [:title, :text]
+    })
+  end
+
+  def permitted_params
+    params.permit(resource: [:title, :text])
+  end
+end
 ```
 
-Change your `application.js` to match the following:
-
-```javascript
-//= require aureus
-//= require_self
-
-$(function(){
-  aureus({
-    remove_messages_after: 2
-  });
-});
-```
-
-You can now use the aureus framework to rapidly build awesome interfaces!
-
 ## Generators
 
-Aureus has a bunch of generators built-in to easily generate a complete interface.
-
-### Layout & Views
-
-* Run `rails g aureus:layout application` to generate a typical aureus layout.
-* Run `rails g aureus:views Resource ResourcesController` to generate aureus views for a model and controller.
+The following generators are available:
 
-### Devise
+* Run `rails g aureus:setup` to create the initializer.
+* Run `rails g aureus:copy` to copy the views and layout.
 
-* Run `rails g aureus:devise_views devise` to generate views using aureus helpers.
-* Run `rails g aureus:devise_i18n devise` to generate the i18n file used by the views.
-* Run `rails g aureus:devise_invitable_views devise` to generate views using aureus helpers.
-* Run `rails g aureus:devise_invitable_i18n devise` to generate the i18n file used by the views.

data/app/assets/javascripts/aureus/index.js

@@ -2,7 +2,6 @@
 //= require jquery_ujs
 //= require leaflet
 //= require mapbox
-//= require dataTables/jquery.dataTables
 
 var aureus_default_options = {
   mapbox_id: 'the_id'
@@ -11,56 +10,16 @@ var aureus_default_options = {
 function aureus(options) {
   window.__aureus = { options: jQuery.extend({}, aureus_default_options, options || {}) };
   _aureus_remove_messages_after(window.__aureus.options.remove_messages_after);
-  _aureus_datatables_decorate();
   _aureus_simple_map();
   _aureus_dropdown();
 }
 
-function aureus_trigger_form(selector) {
-  $(selector).submit();
-}
-
 function _aureus_remove_messages_after(seconds) {
   setTimeout(function() {
     $('.aureus-messages p').fadeOut();
   }, seconds*1000);
 }
 
-function _aureus_datatables_decorate() {
-  $.fn.dataTableExt.oStdClasses.sWrapper = 'datatable-wrapper';
-  $('.datatable').each(function(){
-    $(this).dataTable({
-      sDom: 't',
-      oLanguage: _aureus_datatable_translation($(this)),
-      bPaginate: false,
-      aoColumns: _aureus_datatables_column_configurator($(this))
-    });
-  });
-}
-
-function _aureus_datatable_translation(table) {
-  return {
-    sSearch : table.data('i18n_sSearch'),
-    sLengthMenu: table.data('i18n_sLengthMenu'),
-    sZeroRecords: table.data('i18n_sZeroRecords'),
-    sInfo: table.data('i18n_sInfo'),
-    sInfoEmpty: table.data('i18n_sInfoEmpty'),
-    sInfoFiltered: table.data('i18n_sInfoFiltere')
-  };
-}
-
-function _aureus_datatables_column_configurator(table) {
-  var ret = [];
-  table.find('thead tr th').each(function(){
-    if($(this).hasClass('no-sorting')) {
-      ret.push({ bSortable: false });
-    } else {
-      ret.push(null);
-    }
-  });
-  return ret;
-}
-
 function _aureus_simple_map() {
   $('.aureus-simple-map').each(function(){
     var el = $(this);

data/app/assets/javascripts/aureus/layout.js.erb

@@ -0,0 +1,9 @@
+//= require aureus
+//= require_self
+
+$(function(){
+  aureus({
+    remove_messages_after: <%= Aureus.messages_timeout || 3600 %>,
+    mapbox_id: '<%= Aureus.mapbox_id %>'
+  });
+});

data/{spec/internal/app/assets/stylesheets/application.scss → app/assets/stylesheets/aureus/layout.scss.erb}

@@ -1,5 +1,5 @@
 //= require aureus
 //= require_self
 
-@import 'aureus/skin/default';
+@import 'aureus/skin/<%= Aureus.skin || 'default' %>';
 @import 'aureus/theme';

data/app/assets/stylesheets/aureus/skin/default.scss

@@ -41,10 +41,6 @@ $color-toolbar-info: #59483c;
 $color-toolbar-link: #fff;
 $color-toolbar-link-hover: #c6b78d;
 
-$icon-sort: image-path("aureus/icon-sort.png");
-$icon-sort_abc_asc: image-path("aureus/icon-sort-abc-asc.png");
-$icon-sort_abc_desc: image-path("aureus/icon-sort-abc-desc.png");
-
 $icon-pencil: image-path("aureus/icon-pencil.png");
 $icon-cross: image-path("aureus/icon-cross.png");
 $icon-eye: image-path("aureus/icon-eye.png");

data/app/assets/stylesheets/aureus/theme/content.scss

@@ -36,10 +36,6 @@
         border-color: $color-box-button-hover;
       }
     }
-    .datatable-wrapper {
-      overflow: auto;
-      overflow-x: scoll;
-    }
     .content {
       margin: 0;
       padding: 12px;

data/app/assets/stylesheets/aureus/theme/table.scss

@@ -1,4 +1,4 @@
-.datatable, .simple-table {
+.aureus-datatable, .aureus-simple-table {
   width: 100%;
   border-spacing: 0;
   thead {
@@ -22,21 +22,6 @@
       th:first-child {
         border-left: 0;
       }
-      th.sorting {
-        background-image: url($icon-sort);
-        background-repeat: no-repeat;
-        background-position: center right;
-      }
-      th.sorting_asc {
-        background-image: url($icon-sort_abc_asc);
-        background-repeat: no-repeat;
-        background-position: center right;
-      }
-      th.sorting_desc {
-        background-image: url($icon-sort_abc_desc);
-        background-repeat: no-repeat;
-        background-position: center right;
-      }
       th.center {
         text-align: center;
       }

data/app/assets/stylesheets/aureus/theme.scss

@@ -1,3 +1,11 @@
+//= depend_on aureus/theme/base
+//= depend_on aureus/theme/messages
+//= depend_on aureus/theme/toolbar
+//= depend_on aureus/theme/navigation
+//= depend_on aureus/theme/content
+//= depend_on aureus/theme/table
+//= depend_on aureus/theme/form
+
 @import 'aureus/theme/base';
 @import 'aureus/theme/messages';
 @import 'aureus/theme/toolbar';

data/app/controllers/aureus/resources_controller.rb

@@ -0,0 +1,52 @@
+module Aureus
+  class ResourcesController < AureusController
+    protected
+
+    def aureus(options)
+      @aureus ||= {}
+      @aureus[:box_title] = 'Attributes'
+      @aureus[:form_inputs] = (options[:form_fields] || []).map{|f| [f] }
+
+      model_name = params[:controller].split('/').last.singularize
+
+      @aureus[:resource] = lambda{ instance_variable_get(:"@#{model_name}") }
+      @aureus[:resources] = lambda{ instance_variable_get(:"@#{model_name.pluralize}") }
+
+      case params[:action]
+        when 'index'
+          @aureus[:title] = "All #{model_name.pluralize.titleize}"
+          @aureus[:box_title] = 'List'
+          if options[:actions].include?(:new)
+            @aureus[:navigation_buttons] = [["New #{model_name.titleize}", path_for(:new)]]
+          end
+          @aureus[:table_cells] = (options[:table_fields] || []).map{|f| [f.to_s.titleize, lambda{|r| r.send(f) }] }
+          @aureus[:row_actions] = []
+          if options[:actions].include?(:show)
+            @aureus[:row_actions] << lambda{|r| [:show, path_for(:show, r.id)] }
+          end
+          if options[:actions].include?(:edit)
+            @aureus[:row_actions] << lambda{|r| [:edit, path_for(:edit, r.id)] }
+          end
+          if options[:actions].include?(:destroy)
+            @aureus[:row_actions] << lambda{|r| [:destroy, path_for(:destroy, r.id), confirm: 'Really?'] }
+          end
+        when 'new'
+          @aureus[:title] = "New #{model_name.titleize}"
+            @aureus[:navigation_buttons] = [['Cancel', path_for(:index)]]
+        when 'show'
+          @aureus[:title] = "View #{model_name.titleize}"
+          @aureus[:navigation_buttons] = [['Back', path_for(:index)]]
+          @aureus[:item_entries] = (options[:item_fields] || []).map{|f| [f.to_s.titleize, lambda{|r| r.send(f) }] }
+        when 'edit'
+          @aureus[:title] = "Edit #{model_name.titleize}"
+          @aureus[:navigation_buttons] = [['Cancel', path_for(:index)]]
+      end
+    end
+
+    private
+
+    def path_for(action, id=nil)
+      url_for(action: action, id: id, only_path: true)
+    end
+  end
+end

data/app/controllers/aureus_controller.rb

@@ -0,0 +1,2 @@
+class AureusController < Aureus.parent_controller.constantize
+end

data/app/views/aureus/resources/_form.html.haml

@@ -0,0 +1,8 @@
+= aureus_form @aureus[:resource].call do |f|
+  = aureus_row do |r|
+    - r.column 25 do
+      = aureus_box @aureus[:box_title], for: :form do
+        - (@aureus[:form_inputs] || []).each do |input|
+          = f.input *input
+        = f.action :submit
+    - r.space 75

data/app/views/aureus/resources/_item.html.haml

@@ -0,0 +1,7 @@
+= aureus_row do |r|
+  - r.column 25 do
+    = aureus_box @aureus[:box_title] do
+      = aureus_listing do |l|
+        - (@aureus[:item_entries] || []).each do |entry|
+          - l.entry entry[0], entry[1].call(@aureus[:resource].call)
+  - r.space 75

data/app/views/aureus/resources/_navigation.html.haml

@@ -0,0 +1,5 @@
+- content_for :navigation do
+  = aureus_navigation do |n|
+    - n.title @aureus[:title]
+    - (@aureus[:navigation_buttons] || []).each do |button|
+      - n.button link_to(*button)

data/app/views/aureus/resources/_table.html.haml

@@ -0,0 +1,11 @@
+= aureus_row do
+  = aureus_box @aureus[:box_title] do
+    = aureus_datatable @aureus[:resources].call do |t|
+      - t.head do |h|
+        - (@aureus[:table_cells] || []).each do |cell|
+          - h.text cell[0]
+      - t.row do |r, resource|
+        - (@aureus[:table_cells] || []).each do |cell|
+          - r.cell cell[1].call(resource)
+        - (@aureus[:row_actions] || []).each do |action|
+          - r.button *action.call(resource)

data/app/views/aureus/resources/edit.html.haml

@@ -0,0 +1,2 @@
+= render 'navigation'
+= render 'form'

data/app/views/aureus/resources/index.html.haml

@@ -0,0 +1,2 @@
+= render 'navigation'
+= render 'table'

data/app/views/aureus/resources/new.html.haml

@@ -0,0 +1,2 @@
+= render 'navigation'
+= render 'form'

data/app/views/aureus/resources/show.html.haml

@@ -0,0 +1,2 @@
+= render 'navigation'
+= render 'item'

data/app/views/layouts/aureus.html.haml

@@ -0,0 +1,14 @@
+!!! 5
+%html
+  %head
+    %meta{ charset: 'utf-8' }
+    %title= Aureus.site_title
+    = stylesheet_link_tag 'aureus/layout', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'aureus/layout', 'data-turbolinks-track' => true
+    = csrf_meta_tag
+  %body
+    = aureus_toolbar (Aureus.toolbar_title || 'Aureus') do |t|
+      - instance_exec(t, &Aureus.toolbar_builder)
+    = yield(:navigation)
+    = aureus_messages flash
+    .aureus-content= yield

data/aureus.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'formtastic', '2.3.0.rc3'
   s.add_runtime_dependency 'normalize-rails', '~> 3.0'
   s.add_runtime_dependency 'mapbox-rails', '~> 1.6'
-  s.add_runtime_dependency 'jquery-datatables-rails', '~> 1.12'
 end

data/config.ru

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 require 'combustion'
 
 Combustion.initialize! :active_record, :action_controller, :action_view, :sprockets do

data/lib/aureus/components/box.rb

@@ -1,31 +1,28 @@
 module Aureus
-
   module Components
-
     class Box < Renderable
-
-      def initialize title, options, &block
+      def initialize(title, options, &block)
         init options, for: :text, centered: false
         init_haml_helpers
         @title = title
         @buttons = Array.new
-        @content = capture_haml self, &block
+        @content = capture_haml(self, &block)
       end
 
-      def content &block
-        @new_content = capture_haml &block
+      def content(&block)
+        @new_content = capture_haml(&block)
       end
 
-      def foot &block
+      def foot(&block)
         @foot = capture_haml &block
       end
 
-      def button content
-        @buttons << BoxButton.new(content)
+      def button(content)
+        @buttons << content
       end
 
       def render
-        title = content_tag('h3',compact(content_tag('span', @title),compact_render(*@buttons)))
+        title = content_tag('h3', compact(content_tag('span', @title), @buttons.join))
         classes = ['box']
         classes << 'centered' if @options[:centered]
         @content = @new_content if !@new_content.nil?
@@ -38,21 +35,6 @@ module Aureus
           compact title, content_tag('div', @content), footer
         end
       end
-
-    end
-
-    class BoxButton < Renderable
-
-      def initialize content
-        @content = content
-      end
-
-      def render
-        @content
-      end
-
     end
-
   end
-
 end