ui_bibz 1.1.7 → 1.2.0

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Mon Sep 14 10:07:34 2015 by
+  Generated on Mon Sep 21 15:46:14 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-1.9.3).
 </div>

data/lib/ui_bibz.rb

@@ -26,6 +26,7 @@ module UiBibz
       autoload :Jumbotron,               "ui_bibz/ui/core/jumbotron"
       autoload :Label,                   "ui_bibz/ui/core/label"
       autoload :ListGroup,               "ui_bibz/ui/core/list/list_group"
+      autoload :Modal,                   "ui_bibz/ui/core/modal/modal"
       autoload :Nav,                     "ui_bibz/ui/core/nav/nav"
       autoload :Navbar,                  "ui_bibz/ui/core/nav/navbar"
       autoload :Panel,                   "ui_bibz/ui/core/panel"

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -22,6 +22,7 @@ module UiBibz::Concerns::Models::Searchable
         search:                @params[:search],
         sort:                  @params[:sort],
         action:                @params[:action],
+        column_id:             @params[:column_id],
         id:                    @arguments[:store_id],
         records:               search_sort_paginate,
         searchable_attributes: @searchable_attributes,
@@ -105,7 +106,7 @@ module UiBibz::Concerns::Models::Searchable
           sql_query << "lower(#{ attribute.keys.first.to_s.pluralize }.#{ attribute.values.first }) LIKE :#{ attribute.values.first }"
           sql_attributes = sql_attributes.merge(Hash[attribute.values.first, "%#{ @params[:search].downcase }%"])
         else
-          sql_query << "lower(#{ self.to_s.downcase.pluralize }.#{ attribute }) LIKE :#{ attribute }"
+          sql_query << "lower(#{ self.to_s.underscore.pluralize }.#{ attribute }) LIKE :#{ attribute }"
           sql_attributes = sql_attributes.merge(Hash[attribute, "%#{ @params[:search].downcase }%"])
         end
       end

data/lib/ui_bibz/helpers/ui_core_helper.rb

@@ -8,6 +8,10 @@ module UiBibz::Helpers::UiCoreHelper
     end
   end
 
+  def modal content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Modal.new(content, options, html_options).tap(&block).render
+  end
+
   # Use "notify" instead of "alert" : due to "actionview (4.2.0) lib/action_view/helpers/form_helper.rb" conflict
   def notify content = nil, options = nil, html_options = nil, &block
     UiBibz::Ui::Core::Alert.new(content, options, html_options, &block).render

data/lib/ui_bibz/ui/core/modal/components/modal_body.rb

@@ -0,0 +1,45 @@
+module UiBibz::Ui::Core
+
+  # Create a modal body
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::ModalBody.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::ModalBody.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::ModalBody.new.render
+  #
+  #   UiBibz::Ui::Core::ModalBody.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class ModalBody < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      content_tag :div, @content, class_and_html_options("modal-body")
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/modal/components/modal_footer.rb

@@ -0,0 +1,45 @@
+module UiBibz::Ui::Core
+
+  # Create a modal footer
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::ModalFooter.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::ModalFooter.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::ModalFooter.new.render
+  #
+  #   UiBibz::Ui::Core::ModalFooter.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class ModalFooter < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      content_tag :div, @content, class_and_html_options("modal-footer")
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/modal/components/modal_header.rb

@@ -0,0 +1,58 @@
+# encoding: UTF-8
+module UiBibz::Ui::Core
+
+  # Create a modal header
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::ModalHeader.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::CarHeader.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::ModalHeader.new.render
+  #
+  #   UiBibz::Ui::Core::ModalHeader.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class ModalHeader < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      content_tag :div, class_and_html_options("modal-header") do
+        concat close_button_html
+        concat content_tag :h4, glyph_and_content_html, class: 'modal-title'
+      end
+    end
+
+    private
+
+    def close_button_html
+      content_tag :button, class: 'close', "data-dismiss" => 'modal', "aria-label" => "Close" do
+        concat content_tag :span, "×", "aria-hidden" => true
+        concat content_tag :span, "Close", class: 'sr-only'
+      end
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/modal/modal.rb

@@ -0,0 +1,92 @@
+require 'ui_bibz/ui/core/modal/components/modal_header'
+require 'ui_bibz/ui/core/modal/components/modal_body'
+require 'ui_bibz/ui/core/modal/components/modal_footer'
+module UiBibz::Ui::Core
+
+  # Create an modal
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Modal.new(options = nil, html_options = nil) do  |m|
+  #     m.header content, options, html_options, &block
+  #     m.body content, options, html_options, &block
+  #     m.footer content, options, html_options, &block
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Modal.new({glyph: { name: 'eye', size: 3}, { class: 'test' }) do |m|
+  #     m.header 'Title'
+  #     m.body 'Content'
+  #     m.footer do
+  #       button_link 'Ok', '#', class: :success
+  #     end
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   modal(options = {}, html_options = {}) do |m|
+  #     m.header do
+  #       'Title'
+  #     end
+  #     m.body do
+  #       'Content'
+  #     end
+  #     m.footer do
+  #       'Footer'
+  #     end
+  #   end
+  #
+  class Modal < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      content_tag :div, class_and_html_options(['modal', effect]) do
+        content_tag :div, class: 'modal-dialog', role: 'document' do
+          content_tag :div, class: 'modal-content' do
+            concat @header
+            concat @body
+            concat @footer
+          end
+        end
+      end
+    end
+
+    def header content = nil, options = nil, html_options = nil, &block
+      @header = ModalHeader.new(content, options, html_options, &block).render
+    end
+
+    def footer content = nil, options = nil, html_options = nil, &block
+      @footer = ModalFooter.new(content, options, html_options, &block).render
+    end
+
+    def body content = nil, options = nil, html_options = nil, &block
+      @body = ModalBody.new(content, options, html_options, &block).render
+    end
+
+    private
+
+    def effect
+      @options[:effect] unless @options[:effect].nil?
+    end
+
+  end
+end

data/lib/ui_bibz/ui/ux/table/components/column.rb

@@ -1,11 +1,12 @@
 module UiBibz::Ui::Ux
   class Column < UiBibz::Ui::Core::Component
 
-    attr_accessor :hidden, :link, :name, :data_index, :date_format, :sort, :format, :date_format, :count, :custom_sort, :parent
+    attr_accessor :hidden, :link, :name, :data_index, :date_format, :sort, :format, :date_format, :count, :custom_sort, :parent, :id
 
     def initialize content = nil, options = nil, html_options = nil, &block
       super
       @data_index  = @content
+      @id          = @options[:column_id] || @data_index
       @name        = @options[:name]
       @link        = @options[:link] # for show or edit action
       @order       = @options[:order]

data/lib/ui_bibz/ui/ux/table/components/store.rb

@@ -32,6 +32,10 @@ module UiBibz::Ui::Ux
       @store.sort
     end
 
+    def column_id
+      @store.column_id
+    end
+
     def direction
       @store.direction
     end

data/lib/ui_bibz/ui/ux/table/extensions/sortable.rb

@@ -43,12 +43,13 @@ module UiBibz::Ui::Ux
 
     def url_options
       args =  {
-        controller: @store.controller,
-        id:         @store.param_id,
-        action:     @store.action,
-        search:     @store.search,
-        sort:       sort_name,
-        direction:  direction
+        controller:  @store.controller,
+        id:          @store.param_id,
+        action:      @store.action,
+        search:      @store.search,
+        sort:        sort_name,
+        column_id:   @column.id,
+        direction:   direction
       }
       args = args.merge({ custom_sort: true, column_name: @column.data_index }) if @column.custom_sort
       args = args.merge({ parent: true }) if @column.parent
@@ -65,7 +66,7 @@ module UiBibz::Ui::Ux
     end
 
     def name_with_caret
-      sort_name == sort_column ? @name + caret : @name
+      sort_name == sort_column && @column.id.to_s == @store.column_id.to_s ? @name + caret : @name
     end
 
     def caret
@@ -80,8 +81,12 @@ module UiBibz::Ui::Ux
       sort_name == sort_column && sort_direction == "asc" ? "desc" : "asc"
     end
 
+    def column_name
+      @column.data_index || @column
+    end
+
     def sort_column_name
-      @column.sort.nil? ? "#{ @store.model.to_s.downcase.pluralize }.#{ @column.data_index}" : @column.sort
+      @column.sort.nil? ? "#{ @store.model.to_s.underscore.pluralize }.#{ @column.data_index}" : @column.sort
     end
 
     def sort_name

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "1.1.7"
+  VERSION = "1.2.0"
 end

data/test/test_helper.rb

@@ -2,11 +2,6 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
-#require 'color_pound_spec_reporter'
-
-#Minitest::Reporters.use! [ColorPoundSpecReporter.new]
-require 'minitest/line/describe_track'
-
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 

data/test/ui/table_test.rb

@@ -47,7 +47,7 @@ class TableTest < ActionView::TestCase
   test 'table sortable' do
     options  = { sortable: true }
     actual   = UiBibz::Ui::Ux::Sortable.new(@store, options).header(@store.columns.list.first)
-    expected = "<a class=\"dropup\" href=\"/users?direction=asc&amp;search=Name+fr&amp;sort=users.id\">Id</a>"
+    expected = "<a class=\"dropup\" href=\"/users?column_id=id&amp;direction=asc&amp;search=Name+fr&amp;sort=users.id\">Id</a>"
 
     assert_equal expected, actual
   end

data/test/ui_helper_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'test_helper'
 
 include UiBibz::Helpers::UiCoreHelper
@@ -75,4 +76,18 @@ class UiHelperTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
+  test 'modal' do
+    actual = modal do |m|
+      m.header 'My title'
+      m.body 'My body'
+      m.footer do
+        concat button_link 'Close', url: '#', state: :link
+        concat button_link 'Save', url: '#', state: :primary
+      end
+    end
+    expected = "<div class=\"modal\"><div class=\"modal-dialog\" role=\"document\"><div class=\"modal-content\"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><span aria-hidden=\"true\">×</span><span class=\"sr-only\">Close</span></button><h4 class=\"modal-title\">My title</h4></div><div class=\"modal-body\">My body</div><div class=\"modal-footer\"><a class=\"btn- btn\" href=\"#\">Close</a><a class=\"btn-primary btn\" href=\"#\">Save</a></div></div></div></div>"
+
+    assert_equal expected, actual
+  end
+
 end

data/ui_bibz.gemspec

@@ -20,20 +20,17 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib", "vendor"]
 
   # rails
-  s.add_dependency 'rails', '~> 4.2.4'
+  s.add_dependency 'rails', '>= 4.2.0'
   s.add_dependency 'will_paginate', '~> 3.0.6'
   s.add_dependency 'will_paginate-bootstrap'
   s.add_dependency 'will-paginate-i18n'
   s.add_dependency 'haml'
   s.add_dependency 'haml-rails'
-  s.add_dependency 'sass-rails', '~> 5.0.4'
+  s.add_dependency 'sass-rails', '>= 5.0.0'
   s.add_dependency 'font-awesome-sass'
   s.add_dependency 'bootstrap-sass', '~> 3.3.5'
 
   s.add_development_dependency "minitest"
-  s.add_development_dependency "minitest-line"
-  s.add_development_dependency "minitest-reporters"
-  s.add_development_dependency "color_pound_spec_reporter"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "factory_girl_rails", "~> 4.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Thooams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
@@ -150,48 +150,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-line
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: color_pound_spec_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +264,10 @@ files:
 - doc/UiBibz/Ui/Core/Label.html
 - doc/UiBibz/Ui/Core/List.html
 - doc/UiBibz/Ui/Core/ListGroup.html
+- doc/UiBibz/Ui/Core/Modal.html
+- doc/UiBibz/Ui/Core/ModalBody.html
+- doc/UiBibz/Ui/Core/ModalFooter.html
+- doc/UiBibz/Ui/Core/ModalHeader.html
 - doc/UiBibz/Ui/Core/Nav.html
 - doc/UiBibz/Ui/Core/NavDropdown.html
 - doc/UiBibz/Ui/Core/NavLink.html
@@ -353,6 +315,7 @@ files:
 - doc/images/etiquette.png
 - doc/images/glyph.png
 - doc/images/list.png
+- doc/images/modal.png
 - doc/images/nav.png
 - doc/images/navbar.png
 - doc/images/panel.png
@@ -398,6 +361,10 @@ files:
 - lib/ui_bibz/ui/core/label.rb
 - lib/ui_bibz/ui/core/list/components/list.rb
 - lib/ui_bibz/ui/core/list/list_group.rb
+- lib/ui_bibz/ui/core/modal/components/modal_body.rb
+- lib/ui_bibz/ui/core/modal/components/modal_footer.rb
+- lib/ui_bibz/ui/core/modal/components/modal_header.rb
+- lib/ui_bibz/ui/core/modal/modal.rb
 - lib/ui_bibz/ui/core/nav/components/nav_dropdown.rb
 - lib/ui_bibz/ui/core/nav/components/nav_link.rb
 - lib/ui_bibz/ui/core/nav/components/navbar_form.rb