aureus 2.1.4 → 3.0.0

data/lib/aureus/components/data_table.rb

@@ -1,14 +1,13 @@
 module Aureus
-
   module Components
-
     class DataTable < Renderable
       include ActionView::Helpers::JavaScriptHelper
 
-      def initialize resource
+      def initialize(resource, &block)
         @resource = resource
         @head = DataTableHead.new
         @rows = Array.new
+        yield(self)
       end
 
       def head
@@ -23,67 +22,41 @@ module Aureus
         end
       end
 
-      def data
-        {
-          i18n_sSearch: I18n.t('aureus.datatables.search'),
-          i18n_sLengthMenu: I18n.t('aureus.datatables.length_menu'),
-          i18n_sZeroRecords: I18n.t('aureus.datatables.zero_records'),
-          i18n_sInfo: I18n.t('aureus.datatables.info'),
-          i18n_sInfoEmpty: I18n.t('aureus.datatables.info_empty'),
-          i18n_sInfoFiltered: I18n.t('aureus.datatables.info_filtered')
-        }
-      end
-
       def render
-        content_tag 'table', id: @resource.class.name.downcase, class: 'datatable', data: data do
+        content_tag 'table', id: @resource.class.name.downcase, class: 'aureus-datatable' do
           compact @head.render, content_tag('tbody',compact_render(*@rows))
         end
       end
-
     end
 
     class DataTableHead < Renderable
-
       def initialize
         @columns = Array.new
       end
 
-      def text name
-        @columns << DataTableHeadColumn.new(name,'text-sorting')
-      end
-
-      def date name
-        @columns << DataTableHeadColumn.new(name,'date-sorting')
-      end
-
-      def raw name
-        @columns << DataTableHeadColumn.new(name,'no-sorting')
+      def text(name)
+        @columns << DataTableHeadColumn.new(name)
       end
 
       def render
-        raw ''
+        text '' # actions
         content_tag 'thead' do
           content_tag 'tr', compact_render(*@columns)
         end
       end
-
     end
 
     class DataTableHeadColumn < Renderable
-
-      def initialize name, sorting
+      def initialize(name)
         @name = name
-        @sorting = sorting
       end
 
       def render
-        content_tag 'th', @name, class: @sorting
+        content_tag 'th', @name
       end
-
     end
 
     class DataTableRow < Renderable
-
       def initialize
         init_haml_helpers
         @cells = Array.new
@@ -91,19 +64,19 @@ module Aureus
         @identifier = ''
       end
 
-      def identifier value
+      def identifier(value)
         @identifier = value
       end
 
-      def cell data='', &block
-        if block_given?
+      def cell(data='', &block)
+        if block
           @cells << DataTableRowCell.new(capture_haml(&block))
         else
           @cells << DataTableRowCell.new(data)
         end
       end
 
-      def button type_or_title, url, *args
+      def button(type_or_title, url, *args)
         if type_or_title.is_a? Symbol
           @buttons << DataTableRowButton.new(type_or_title,type_or_title.to_s,url,args)
         else
@@ -111,31 +84,27 @@ module Aureus
         end
       end
 
-      def button_raw content
+      def button_raw(content)
         @buttons << Renderable.new(content)
       end
 
       def render
         content_tag 'tr', compact_render(*@cells)+content_tag('td',compact_render(*@buttons),class: 'buttons'), id: @identifier
       end
-
     end
 
     class DataTableRowCell < Renderable
-
-      def initialize data
+      def initialize(data)
         @data = data
       end
 
       def render
         content_tag 'td', @data
       end
-
     end
 
     class DataTableRowButton < Renderable
-
-      def initialize type, text, url, options
+      def initialize(type, text, url, options)
         init options, remote: true, confirm: 'Delete resource?'
         @type = type
         @text = text
@@ -161,9 +130,6 @@ module Aureus
           end
         end
       end
-
     end
-
   end
-
 end

data/lib/aureus/components/listing.rb

@@ -1,43 +1,36 @@
 module Aureus
-
   module Components
-
     class Listing < Renderable
-
       def initialize
         @entries = Array.new
+        yield(self)
       end
 
-      def entry head, body = nil, &block
+      def entry(head, body = nil, &block)
         init_haml_helpers
         if block_given?
-          @entries << ListingEntry.new(head,capture_haml(&block))
+          @entries << ListingEntry.new(head, capture_haml(&block))
         else
-          @entries << ListingEntry.new(head,body)
+          @entries << ListingEntry.new(head, body)
         end
       end
 
       def render
-        content_tag 'table', compact_render(*@entries), class: 'simple-table'
+        content_tag 'table', compact_render(*@entries), class: 'aureus-simple-table'
       end
-
     end
 
     class ListingEntry < Renderable
-
-      def initialize head, body
+      def initialize(head, body)
         @head = head
         @body = body
       end
 
       def render
         content_tag 'tr' do
-          compact content_tag('th',@head), content_tag('td',@body)
+          compact content_tag('th', @head), content_tag('td', @body)
         end
       end
-
     end
-
   end
-
 end

data/lib/aureus/components/messages.rb

@@ -1,17 +1,14 @@
 module Aureus
-
   module Components
-
     class Messages < Renderable
-
-      def initialize flash
+      def initialize(flash)
         @flash = flash
       end
 
       def render
         content_tag 'div', class: 'aureus-messages' do
           out = Array.new
-          [:notice,:error,:alert].each do |i|
+          [:notice, :error, :alert].each do |i|
             if @flash[i]
               out << content_tag('p', @flash[i], class: i.to_s)
             end
@@ -19,9 +16,6 @@ module Aureus
           compact *out
         end
       end
-
     end
-
   end
-
 end

data/lib/aureus/components/navigation.rb

@@ -1,48 +1,35 @@
 module Aureus
-
   module Components
-
     class Navigation < Renderable
-
       def initialize
         @title = ''
         @buttons = Array.new
+        yield(self)
       end
 
-      def title title
+      def title(title)
         @title = title
       end
 
-      def button content
+      def button(content)
         @buttons << NavigationButton.new(content)
       end
 
-      def submit_form_button resource, text
-        form_class = resource.is_a?(String) ? resource : resource.class.name.underscore
-        tag = content_tag 'a', text, onclick: "aureus_trigger_form('form.#{form_class}')", class: 'submit_form_button'
-        @buttons << NavigationButton.new(tag)
-      end
-
       def render
         content_tag 'div', class: 'aureus-navigation' do
-          compact content_tag('h2', content_tag('span',@title)), content_tag('ul', compact_render(*@buttons), id: 'quicklinks')
+          compact content_tag('h2', content_tag('span', @title)), content_tag('ul', compact_render(*@buttons), id: 'quicklinks')
         end
       end
-
     end
 
     class NavigationButton < Renderable
-
-      def initialize content
+      def initialize(content)
         @content = content
       end
 
       def render
         content_tag 'li', @content
       end
-
     end
-
   end
-
 end

data/lib/aureus/components/row.rb

@@ -1,17 +1,14 @@
 module Aureus
-
   module Components
-
     class Row < Renderable
-
-      def initialize &block
+      def initialize(&block)
         init_haml_helpers
         @columns = Array.new
         @content = capture_haml self, &block
       end
 
-      def column width, &block
-        @columns << RowColumn.new(width,capture_haml(&block))
+      def column(width, &block)
+        @columns << RowColumn.new(width, capture_haml(&block))
       end
 
       def space width
@@ -54,16 +51,12 @@ module Aureus
     end
 
     class RowColumn < Renderable
-
       attr_reader :width, :content
 
-      def initialize  width, content
+      def initialize(width, content)
         @width = width
         @content = content
       end
-
     end
-
   end
-
 end

data/lib/aureus/components/simple_map.rb

@@ -1,21 +1,15 @@
 module Aureus
-
   module Components
-
     class SimpleMap < Renderable
-
-      def initialize args
+      def initialize(args)
         init args, { height: 300, zoom: 13 }
       end
 
       def render
         if @options[:longitude] and @options[:latitude]
-          content_tag('div',nil, class: 'aureus-simple-map', data: @options )
+          content_tag('div', nil, class: 'aureus-simple-map', data: @options )
         end
       end
-
     end
-
   end
-
 end

data/lib/aureus/components/toolbar.rb

@@ -1,13 +1,11 @@
 module Aureus
-
   module Components
-
     class Toolbar < Renderable
-
-      def initialize title
+      def initialize(title)
         @title = title
         @left = ToolbarSection.new 'left'
         @right = ToolbarSection.new 'right'
+        yield(self)
       end
 
       def left
@@ -20,42 +18,38 @@ module Aureus
 
       def render
         content_tag 'div', { class: 'aureus-toolbar' } do
-          compact content_tag('h1',@title), @left.render, @right.render
+          compact content_tag('h1', @title), @left.render, @right.render
         end
       end
-
     end
 
     class ToolbarSection < Renderable
-
-      def initialize position
+      def initialize(position)
         @items = Array.new
         @position = position
       end
 
-      def link_to text, url, *args
-        @items << ToolbarButton.new(text,0,url,args)
+      def link_to(text, url, *args)
+        @items << ToolbarButton.new(text, 0, url, args)
       end
 
-      def dropdown title
+      def dropdown(title)
         toolbar = ToolbarDropdown.new(title)
         yield toolbar
         @items << toolbar
       end
 
-      def info text
+      def info(text)
         @items << ToolbarInfo.new(text,0)
       end
 
       def render
         content_tag 'ul', compact_render(*@items), class: @position
       end
-
     end
 
     class ToolbarButton < Renderable
-
-      def initialize text, level, url, args
+      def initialize(text, level, url, args)
         @text = text
         @level = level
         @url = url
@@ -63,14 +57,12 @@ module Aureus
       end
 
       def render
-        content_tag 'li', link_to(@text,@url,*@args), class: "level-#{@level}"
+        content_tag 'li', link_to(@text, @url, *@args), class: "level-#{@level}"
       end
-
     end
 
     class ToolbarInfo < Renderable
-
-      def initialize text, level
+      def initialize(text, level)
         @text = text
         @level = level
       end
@@ -78,32 +70,28 @@ module Aureus
       def render
         content_tag 'li', content_tag('span', @text, class: :info), class: "level-#{@level}"
       end
-
     end
 
     class ToolbarDivider < Renderable
-
       def initialize
       end
 
       def render
         content_tag 'div', '', class: :line
       end
-
     end
 
     class ToolbarDropdown < Renderable
-
-      def initialize title
+      def initialize(title)
         @title = title
         @items = Array.new
       end
 
-      def link_to text, url, *args
+      def link_to(text, url, *args)
         @items << ToolbarButton.new(text,1,url,args)
       end
 
-      def info text
+      def info(text)
         @items << ToolbarInfo.new(text,1)
       end
 
@@ -116,9 +104,6 @@ module Aureus
         list = content_tag 'ul', compact_render(*@items), class: 'dropdown-inner'
         content_tag 'li', title+list, class: 'dropdown-outer'
       end
-
     end
-
   end
-
 end

data/lib/aureus/engine.rb

@@ -1,5 +1,4 @@
 module Aureus
-
   class Engine < Rails::Engine
     config.autoload_paths << File.expand_path('../../', __FILE__)
     initializer 'aureus.configure_rails_initialization' do |app|
@@ -7,7 +6,5 @@ module Aureus
         include Aureus::Helper
       end
     end
-    
   end
-
 end

data/lib/aureus/helper.rb

@@ -1,62 +1,39 @@
 module Aureus
-
   module Helper
+    include Formtastic::Helpers::FormHelper
 
-    def aureus_toolbar title
-      toolbar = Components::Toolbar.new title
-      yield toolbar
-      toolbar.render
-    end
-
-    def aureus_navigation
-      navigation = Components::Navigation.new
-      yield navigation
-      navigation.render
+    def aureus_toolbar(title, &block)
+      Components::Toolbar.new(title, &block).render
     end
 
-    def aureus_messages flash
-      messages = Components::Messages.new flash
-      messages.render
+    def aureus_navigation(&block)
+      Components::Navigation.new(&block).render
     end
 
-    def aureus_content html
-      content = Components::Content.new html
-      content.render
+    def aureus_messages(flash)
+      Components::Messages.new(flash).render
     end
 
-    def aureus_row &block
-      row = Components::Row.new &block
-      row.render
+    def aureus_row(&block)
+      Components::Row.new(&block).render
     end
 
-    def aureus_box title, *args, &block
-      box = Components::Box.new title, args, &block
-      box.render
+    def aureus_box(title, *args, &block)
+      Components::Box.new(title, args, &block).render
     end
 
-    def aureus_datatable resource
-      table = Components::DataTable.new resource
-      yield table
-      table.render
+    def aureus_datatable(resource, &block)
+      Components::DataTable.new(resource, &block).render
     end
 
-    def aureus_form args, &block
-      semantic_form_for args do |f|
-        capture_haml f, &block
-      end
-    end
+    alias_method :aureus_form, :semantic_form_for
 
-    def aureus_listing
-      listing = Components::Listing.new
-      yield listing
-      listing.render
+    def aureus_listing(&block)
+      Components::Listing.new(&block).render
     end
 
-    def aureus_simple_map *args
-      map = Components::SimpleMap.new args
-      map.render
+    def aureus_simple_map(*args)
+      Components::SimpleMap.new(args).render
     end
-
   end
-
 end

data/lib/aureus/renderable.rb

@@ -1,5 +1,4 @@
 module Aureus
-
   class Renderable
     include ActionView::Context
     include ActionView::Helpers::TagHelper
@@ -7,30 +6,28 @@ module Aureus
     include ActionView::Helpers::UrlHelper
     include Haml::Helpers
 
-    def initialize content
+    def initialize(content)
       @content = content
     end
 
-    def init args, *defaults
+    def init(args, *defaults)
       @options = defaults.extract_options!.merge(args.extract_options!)
     end
 
-    def content_tag name, content_or_options_with_block = nil, options = nil, escape = false, &block
-      super name, content_or_options_with_block, options, escape, &block
+    def content_tag(name, content_or_options_with_block=nil, options=nil, escape=false, &block)
+      super(name, content_or_options_with_block, options, escape, &block)
     end
 
-    def compact *args
+    def compact(*args)
       args.join.html_safe
     end
 
-    def compact_render *args
+    def compact_render(*args)
       args.map{ |e| e.render }.join.html_safe
     end
 
     def render
       @content
     end
-
   end
-
 end

data/lib/aureus/version.rb

@@ -1,3 +1,3 @@
 module Aureus
-  VERSION = '2.1.4'
+  VERSION = '3.0.0'
 end

data/lib/aureus.rb

@@ -6,12 +6,20 @@ require 'jquery-rails'
 require 'leaflet-rails'
 require 'normalize-rails'
 require 'mapbox-rails'
-require 'jquery-datatables-rails'
 
 module Aureus
+  mattr_accessor :site_title
+  mattr_accessor :parent_controller
+  mattr_accessor :skin
+  mattr_accessor :mapbox_id
+  mattr_accessor :messages_timeout
+  mattr_accessor :toolbar_title
+  mattr_accessor :toolbar_builder
+
+  self.toolbar_builder = lambda{ |t| }
+
   module Components
     autoload :Box, 'aureus/components/box'
-    autoload :Content, 'aureus/components/content'
     autoload :DataTable, 'aureus/components/data_table'
     autoload :Listing, 'aureus/components/listing'
     autoload :Messages, 'aureus/components/messages'

data/lib/generators/aureus/copy/copy_generator.rb

@@ -0,0 +1,13 @@
+module Aureus
+  module Generators
+    class CopyGenerator < Rails::Generators::Base
+      desc 'copy aureus views and layout'
+      source_root File.expand_path('../../../../../app/views', __FILE__)
+
+      def generate
+        directory 'aureus', 'app/views/aureus'
+        copy_file 'layouts/aureus.html.haml', 'app/layouts/aureus.html.haml'
+      end
+    end
+  end
+end

data/lib/generators/aureus/setup/setup_generator.rb

@@ -0,0 +1,12 @@
+module Aureus
+  module Generators
+    class SetupGenerator < Rails::Generators::Base
+      desc 'generate an aureus initializer file'
+      def generate
+        initializer 'aureus.rb' do
+          "Aureus.parent_controller = 'ApplicationController'"
+        end
+      end
+    end
+  end
+end

data/spec/internal/app/controllers/all_controller.rb

@@ -1,5 +1,4 @@
 class AllController < ActionController::Base
-
   def index
     flash[:notice] = 'Notice'
     flash[:error] = 'Error'
@@ -10,5 +9,4 @@ class AllController < ActionController::Base
   def centered
     render :centered, layout: 'naked'
   end
-
 end