infopark_dashboard 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTg3YTYwZmNjNTFkMzlkNTdhNzVjNzEzZWRhYWI4YzQxOTJmZGMxOA==
+    OGRiYjUyMDMxMzg3ZjFlMzczMjBhMzM4MmM4MTgzMzgxYTM1Njk5Yw==
   data.tar.gz: !binary |-
-    ZGFhMmYyY2UwNzQ1YjYxMjAwYThjMDA1OTZiNGRiNjQ1ZTc2ZGM1NA==
+    NGI2NzJmZDhhZjUyNTcxOTFmZTU4MjBlNjAyYmM5Yjg3ZTA0MjljOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDAyYzg3YTNiMjdiODcyNmIyNjUyNjBjZGJmOWIzOTM2ZjA4ZGE2MGNiYTUz
-    NDVlY2EwOWU0NjNhYjljZTQwZDk2MTJkYTNjMjcxNWM1YjQxNzgwODA4NjQ3
-    NDFiY2U5YTlmZGI1N2FjYTdjMWMwMDZiOGIxMThmYzc5ZWRhYTk=
+    YzdmN2I5NmFjOTMzNzZiZTZkZGExMjI2OThkYzhjNGUyYjUwMzRiYmY4ZTZm
+    ZWZhMGUxZjNhZjhiYWM3NTkxZmIxNGRmYzVkMjM2Yzg0MGFjZDVkNzczYmM3
+    NDcxMzVkNjJhNDc5YjkwMzg0NzZkMDgxMGMxMzY5MDA2NGEzM2I=
   data.tar.gz: !binary |-
-    NjFkMzUxY2QzYWIxYWIzNDE5MTk4ZWVlODM4ODdiMTgyNThjNTE1YzM1YTUx
-    YTdhZDQ2NDE5MDAzMTBjMzViMDhmZmJkMGU0MzRjNTIxYTlhZjRkMThkNzk5
-    ZjZjMDY4OGMyMjM2ZTM2NjBkODZmOGQ3NmU3ZGNjMDI3NDBjOTY=
+    YmIwNjc1ZmY1MmVmMWQ3ZTlhOTBmNGUzOTEyMDEzYWQ2NWJkZmMzMDQ1OGQ1
+    Y2UxZTViMmE4ZjMyOGU0MDRmNTYwYzhiZTNlM2RjYmY2OGEzMWQ0N2RmNWQz
+    ODZlYWE4YWY0MjNmNjM4ODA4OTZkMTk4OWIwZjhiNjQ1MDNlYjc=

data/CHANGELOG.md

@@ -1 +1,6 @@
-# Changelog
+# v0.0.3
+  * Removed widgets from CMS stats, because we do not support a suffix search yet and widgets will
+    no longer be a separate CMS object in the future.
+  * Updated to Twitter Bootstrap 3.
+  * Removed support for global attributes.
+  * Updated gem dependencies to better prevent future incompatibilities.

data/app/assets/stylesheets/infopark_dashboard/dashboard.css

@@ -10,10 +10,9 @@
  *
  *= require_self
  *= require twitter/bootstrap
- *= require twitter/bootstrap-responsive
  *= require_tree .
  */
 
 body {
   padding: 60px 0 0 0;
-}
+}

data/app/controllers/infopark_dashboard/dashboard_controller.rb

@@ -1,18 +1,9 @@
 module InfoparkDashboard
   class DashboardController < ApplicationController
     before_filter :require_local!
+    before_filter :set_workspaces, only: [:objects, :content]
 
     def objects
-      @workspaces = RailsConnector::CmsRestApi.get('workspaces')['results']
-
-      @current_workspace = @workspaces.detect do |workspace|
-        workspace['id'] == RailsConnector::Workspace.current.id
-      end
-
-      @workspaces.each do |workspace|
-        workspace['title'] ||= 'Published'
-      end
-
       @meta_stats = MetaStats.new
     end
 
@@ -43,5 +34,17 @@ module InfoparkDashboard
     def local_request?
       Rails.configuration.consider_all_requests_local || request.local?
     end
+
+    def set_workspaces
+      @workspaces = RailsConnector::CmsRestApi.get('workspaces')['results']
+
+      @current_workspace = @workspaces.detect do |workspace|
+        workspace['id'] == RailsConnector::Workspace.current.id
+      end
+
+      @workspaces.each do |workspace|
+        workspace['title'] ||= 'Published'
+      end
+    end
   end
-end
+end

data/app/models/infopark_dashboard/cms_stats.rb

@@ -1,31 +1,35 @@
 module InfoparkDashboard
   class CmsStats
-    attr_reader :published_objects
-    attr_reader :websites
-    attr_reader :homepages
-    attr_reader :resources
-    attr_reader :widgets
-    attr_reader :recently_published
+    def published_objects
+      @published_objects ||= Obj.all.size
+    end
 
-    def initialize
-      published_workspace.as_current do
-        @published_objects = Obj.all.size
-        @websites = Obj.where(:_obj_class, :equals, 'Website').size
-        @homepages = Obj.where(:_obj_class, :equals, 'Homepage').size
-        @resources = Obj.where(:_path, :starts_with, '/resources').and_not(:_obj_class, :equals, 'Container').size
-        @widgets = Obj.where(:_obj_class, :contains_prefix, 'Widget').size
-        @recently_published = Obj.all.order(:_last_changed).reverse_order.take(20)
-      end
+    def websites
+      @websites ||= Obj.where(:_obj_class, :equals, 'Website').size
+    end
+
+    def homepages
+      @homepages ||= Obj.where(:_obj_class, :equals, 'Homepage').size
     end
 
     def workspaces
       @workspaces ||= RailsConnector::CmsRestApi.get('workspaces')['results'].size
     end
 
-    private
+    def recently_changed
+      @recently_changed ||= Obj.all.order(:_last_changed).reverse_order.take(20)
+    end
+
+    def resources
+      @resources ||= begin
+        container = Obj.where(:_obj_class, :equals, 'ResourceContainer').to_a
 
-    def published_workspace
-      RailsConnector::Workspace.find('published')
+        query = container.inject(RailsConnector::ObjSearchEnumerator.new(nil)) do |query, parent|
+          query.and(:_path, :starts_with, parent.path)
+        end
+
+        query.size
+      end
     end
   end
-end
+end

data/app/models/infopark_dashboard/meta_stats.rb

@@ -16,14 +16,6 @@ module InfoparkDashboard
       @obj_classes ||= ObjClass.all
     end
 
-    def global_attributes_count
-      global_attributes.size
-    end
-
-    def global_attributes
-      @attributes ||= Attribute.all
-    end
-
     private
 
     def max_group_size(hash)
@@ -32,4 +24,4 @@ module InfoparkDashboard
       end
     end
   end
-end
+end

data/app/views/infopark_dashboard/dashboard/content/_cms_stats.html.haml

@@ -42,11 +42,3 @@
   %dd
     %span.badge
       = stats.resources
-
-%dl.dl-horizontal
-  %dt
-    Widgets:
-
-  %dd
-    %span.badge
-      = stats.widgets

data/app/views/infopark_dashboard/dashboard/content/{_recently_published.html.haml → _recently_changed.html.haml}

@@ -1,5 +1,5 @@
 %h2
-  Recently Published CMS Objects
+  Recently Changed CMS Objects
 
 %table.table.table-bordered.table-hover
   %thead
@@ -17,7 +17,7 @@
         Last Changed
 
   %tbody
-    - recently_published.each do |obj|
+    - recently_changed.each do |obj|
       %tr
         %td
           = obj.name
@@ -30,4 +30,4 @@
           = obj.obj_class
 
         %td
-          = time_ago_in_words(obj.last_changed)
+          = time_ago_in_words(obj.last_changed)

data/app/views/infopark_dashboard/dashboard/content.html.haml

@@ -1,17 +1,22 @@
-.row-fluid
+.row
   %h1
     Project Content
 
   %p
     Gives you an overview of what currently is going on in your project.
 
-.row-fluid
-  .span6.well.well-small
+.row
+  = render('layouts/infopark_dashboard/dashboard/workspace_toggle', current: @current_workspace, workspaces: @workspaces)
+
+.row
+  .col-md-6.well.well-sm
     = render('infopark_dashboard/dashboard/content/cms_stats', stats: @cms_stats)
 
-  .span6.well.well-small
+  .col-md-1
+
+  .col-md-5.well.well-sm
     = render('infopark_dashboard/dashboard/content/crm_stats', stats: @crm_stats)
 
-.row-fluid
-  .span12
-    = render('infopark_dashboard/dashboard/content/recently_published', recently_published: @cms_stats.recently_published)
+.row
+  .col-md-12
+    = render('infopark_dashboard/dashboard/content/recently_changed', recently_changed: @cms_stats.recently_changed)

data/app/views/infopark_dashboard/dashboard/help/_gem.html.haml

@@ -3,14 +3,14 @@
     = link_to(gem.rubygems_url, target: 'blank') do
       = gem.name
 
-  - class_name = gem.latest? ? 'badge-success' : 'badge-warning'
+  - class_name = gem.latest? ? 'label-success' : 'label-warning'
 
   %td
     = gem.version
 
   %td
-    %span.badge{class: class_name, title: "Latest Version: #{gem.latest_version}"}
+    %span.label{class: class_name, title: "Latest Version: #{gem.latest_version}"}
       - if gem.latest?
-         
+        %span.glyphicon.glyphicon-ok
       - else
-        = gem.latest_version
+        = gem.latest_version

data/app/views/infopark_dashboard/dashboard/help/_updates.html.haml

@@ -9,7 +9,7 @@
   <a href="#{Rails.configuration.infopark_dashboard.blog_url}" target="_blank">Infopark Blog</a>
   to see what has changed.
 
-%table.table
+%table.table.table-hover
   %thead
     %tr
       %th
@@ -22,4 +22,4 @@
         Status
 
   %tbody
-    = render(partial: 'infopark_dashboard/dashboard/help/gem', collection: gems)
+    = render(partial: 'infopark_dashboard/dashboard/help/gem', collection: gems)

data/app/views/infopark_dashboard/dashboard/help.html.haml

@@ -1,4 +1,4 @@
-.row-fluid
+.row
   %h1
     Help, Links & Updates
 
@@ -6,8 +6,8 @@
     If you are looking for help or want to jump directly to Infopark GUI applications, then check
     out the links below. Don't forget the feedback button, if you miss anything.
 
-.row-fluid
+.row
   = render('infopark_dashboard/dashboard/help/links')
 
-.row-fluid
-  = render('infopark_dashboard/dashboard/help/updates', gems: @gems)
+.row
+  = render('infopark_dashboard/dashboard/help/updates', gems: @gems)

data/app/views/infopark_dashboard/dashboard/objects/_attribute.html.haml

@@ -1,5 +1,5 @@
 %h5
-  %i.icon-list.pull-left
+  %span.glyphicon.glyphicon-list.pull-left
 
    
 
@@ -9,7 +9,7 @@
     %small
       (#{attribute.title})
 
-%ul.unstyled
+%ul.list-unstyled
   %li
     %strong
       Type:
@@ -35,4 +35,4 @@
       %strong
         Max Size:
 
-      = attribute.max_size
+      = attribute.max_size

data/app/views/infopark_dashboard/dashboard/objects/_obj_class.html.haml

@@ -1,5 +1,5 @@
 %h4
-  %i.icon-folder-open.pull-left
+  %span.glyphicon.glyphicon-folder-open.pull-left
 
    
 
@@ -9,10 +9,10 @@
     (#{obj_class.title})
 
   - if @current_workspace['title'] == 'published'
-    %span.badge{class: obj_class.count == 0 ? 'badge-important' : nil}
+    %span.label{class: obj_class.count == 0 ? 'label-important' : nil}
       ⅀ #{obj_class.count}
 
-%ul.unstyled
+%ul.list-unstyled
   %li
     %strong
       Type:
@@ -26,4 +26,4 @@
   = render('infopark_dashboard/dashboard/objects/preset_attributes', attributes: obj_class.preset_attributes)
 
 - if obj_class.attributes?
-  = render('infopark_dashboard/dashboard/objects/attributes', attributes: obj_class.attributes)
+  = render('infopark_dashboard/dashboard/objects/attributes', attributes: obj_class.attributes)

data/app/views/infopark_dashboard/dashboard/objects/_obj_class_details.html.haml

@@ -5,9 +5,11 @@
     = stats.obj_classes_count
 
 - stats.obj_classes.in_groups_of(2).each do |group|
-  .row-fluid
+  .row
     - group.each do |item|
       - next unless item
 
-      .span6.well.well-small
-        = render('infopark_dashboard/dashboard/objects/obj_class', obj_class: item)
+      .col-md-5.well.well-sm
+        = render('infopark_dashboard/dashboard/objects/obj_class', obj_class: item)
+
+      .col-md-1

data/app/views/infopark_dashboard/dashboard/objects/_preset_attributes.html.haml

@@ -1,4 +1,4 @@
-%ul.unstyled
+%ul.list-unstyled
   %li
     %strong
       Preset-Attributes:
@@ -9,4 +9,4 @@
           = attribute
 
           %small
-            \= #{preset}
+            \= #{preset}

data/app/views/infopark_dashboard/dashboard/objects.html.haml

@@ -1,4 +1,4 @@
-.row-fluid
+.row
   %h1
     Object Classes and Attributes
 
@@ -8,9 +8,7 @@
     <strong>rails generate cms:migration NAME</strong>, or use the more specific migration
     generators, like <strong>rails generate cms:model</strong>.
 
-.row-fluid
-  = render('layouts/infopark_dashboard/dashboard/workspace_toggle')
+.row
+  = render('layouts/infopark_dashboard/dashboard/workspace_toggle', current: @current_workspace, workspaces: @workspaces)
 
   = render('infopark_dashboard/dashboard/objects/obj_class_details', stats: @meta_stats)
-
-  = render('infopark_dashboard/dashboard/objects/global_attribute_details', stats: @meta_stats)

data/app/views/infopark_dashboard/dashboard/people.html.haml

@@ -1,18 +1,18 @@
-.row-fluid
+.row
   %h1
     Editors
 
     %span.badge
       ⅀ #{@editors.size}
 
-.row-fluid
-  .span12
+.row
+  .col-md-12
     %p
       People listed have access to your Infopark GUI applications. They are able to influence the
       content of the webpage. You can add new editors in the CRM by creating a new Contact and give them
       the <strong>cmsadmin</strong> role.
 
-    %table.table.table-bordered
+    %table.table.table-hover
       %thead
         %tr
           %th

data/app/views/layouts/infopark_dashboard/dashboard/_navigation.html.haml

@@ -1,18 +1,21 @@
-.navbar.navbar-fixed-top
-  .navbar-inner
-    .container-fluid
-      %button.btn.btn-navbar{type: 'button', data: { toggle: 'collapse', target: '.nav-collapse' }}
+.navbar.navbar-default.navbar-fixed-top
+  .container
+    .navbar-header
+      %button.navbar-toggle{type: 'button', data: { toggle: 'collapse', target: '.navbar-collapse' }}
+        %span.sr-only
+          Toggle navigation
+
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
 
-      = link_to(root_path, class: 'brand') do
+      = link_to(root_path, class: 'navbar-brand') do
         Infopark Developer Dashboard
 
-      .nav-collapse.collapse
-        %ul.nav.pull-right
-          %li
-            = link_to(Rails.configuration.infopark_dashboard.support_url, target: :_blank) do
-              %i.icon-envelope
+    .navbar-collapse.collapse
+      %ul.nav.navbar-nav.navbar-right
+        %li
+          = link_to(Rails.configuration.infopark_dashboard.support_url, target: :_blank) do
+            %span.glyphicon.glyphicon-envelope
 
-              Need help?
+            Need help?

data/app/views/layouts/infopark_dashboard/dashboard/_workspace_toggle.html.haml

@@ -1,16 +1,15 @@
 .btn-group
-  %a.btn
+  %button.btn.btn-default.dropdown-toggle{type: 'button', data: { toggle: 'dropdown' }}
     Workspace:
-    = @current_workspace['title']
+    = current['title']
 
-  %a.btn.dropdown-toggle{data: { toggle: 'dropdown' }}
     %span.caret
 
-  %ul.dropdown-menu
-    - if @workspaces.size > 1
-      - @workspaces.each do |workspace|
-        - next if workspace['id'] == @current_workspace['id']
+  %ul.dropdown-menu{role: 'menu'}
+    - if workspaces.size > 1
+      - workspaces.each do |workspace|
+        - next if workspace['id'] == current['id']
 
         %li
           = link_to("#{request.path}?_rc-ws=#{workspace['id']}") do
-            = workspace['title']
+            = workspace['title']

data/app/views/layouts/infopark_dashboard/dashboard.haml

@@ -20,15 +20,12 @@
   %body
     = render('layouts/infopark_dashboard/dashboard/navigation')
 
-    .container-fluid
+    .container
       = render('layouts/infopark_dashboard/dashboard/flash_messages')
 
-      .row-fluid
-        .span2
-          %ul.nav.nav-list
-            %li.nav-header
-              Navigation
-
+      .row
+        .col-md-2
+          %ul.nav.nav-pills.nav-stacked
             = render('layouts/infopark_dashboard/dashboard/nav_link', title: 'Classes & Attributes', path: root_path)
 
             = render('layouts/infopark_dashboard/dashboard/nav_link', title: 'Editors', path: people_path)
@@ -39,7 +36,7 @@
 
             = render('layouts/infopark_dashboard/dashboard/nav_link', title: 'Help, Links & Updates', path: help_path)
 
-        .span10
+        .col-md-10
           = yield
 
-    = javascript_include_tag('infopark_dashboard/dashboard')
+    = javascript_include_tag('infopark_dashboard/dashboard')

data/lib/infopark_dashboard/version.rb

@@ -1,3 +1,3 @@
 module InfoparkDashboard
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_dashboard
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
@@ -58,18 +58,21 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: infopark_cloud_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '6.9'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 6.9.5
@@ -77,6 +80,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '6.9'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 6.9.5
@@ -84,16 +90,16 @@ dependencies:
   name: infopark_crm_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +163,7 @@ files:
 - app/models/infopark_dashboard/resource.rb
 - app/views/infopark_dashboard/dashboard/content/_cms_stats.html.haml
 - app/views/infopark_dashboard/dashboard/content/_crm_stats.html.haml
-- app/views/infopark_dashboard/dashboard/content/_recently_published.html.haml
+- app/views/infopark_dashboard/dashboard/content/_recently_changed.html.haml
 - app/views/infopark_dashboard/dashboard/content.html.haml
 - app/views/infopark_dashboard/dashboard/help/_gem.html.haml
 - app/views/infopark_dashboard/dashboard/help/_links.html.haml
@@ -165,7 +171,6 @@ files:
 - app/views/infopark_dashboard/dashboard/help.html.haml
 - app/views/infopark_dashboard/dashboard/objects/_attribute.html.haml
 - app/views/infopark_dashboard/dashboard/objects/_attributes.html.haml
-- app/views/infopark_dashboard/dashboard/objects/_global_attribute_details.html.haml
 - app/views/infopark_dashboard/dashboard/objects/_mandatory_attributes.html.haml
 - app/views/infopark_dashboard/dashboard/objects/_obj_class.html.haml
 - app/views/infopark_dashboard/dashboard/objects/_obj_class_details.html.haml

data/app/views/infopark_dashboard/dashboard/objects/_global_attribute_details.html.haml

@@ -1,13 +0,0 @@
-%h2
-  Global Attribute Details
-
-  %span.badge
-    = stats.global_attributes_count
-
-- stats.global_attributes.in_groups_of(2).each do |group|
-  .row-fluid
-    - group.each do |attribute|
-      - next unless attribute
-
-      .span6.well.well-small
-        = render('infopark_dashboard/dashboard/objects/attribute', attribute: attribute)