houston-core 0.8.4 → 0.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb13d5eecf56a92b97bf57602f08952d35e5c939
-  data.tar.gz: 657f17128b2853f46c5dc1133bd2ee2afd61d42a
+  metadata.gz: e4e1d6c3985ae5161a50c0466746cae431ad3714
+  data.tar.gz: 26c7ef3631e87aff62d30fc043bb01f85112f35e
 SHA512:
-  metadata.gz: fcecec80ae7c7a153d232d4db2f01a7ee31b95dc4918091df07dd34755b62b6a4d45dab3bae64c5a02833b5606285f1dc6a71aee7a95268c3b9db1fbe46fd42b
-  data.tar.gz: 6e2e4e806e8eaef10afd1eeffa3df4a4a007c8091c3c046cb5b10721d00b4f8b8d261f6b2e322c958727fa442216ae5789bba26027ed21d03e563209fc9618e2
+  metadata.gz: f72089a72bfec7d3941bc2c603b12860db583c1979e2f49b07d44faf6f4cf56d94d209e0d0952feff7f05d966b623a60d959b6e86515e97be17607d3bec74aaa
+  data.tar.gz: 895c8c494072732ecfc593e5422628dc712c612d5811b0b189d26d3f9d37c683361bee6fd243ecb74f46d245a9d595ff58da63da86e99691375a4f3eb2d673a5

data/Gemfile

@@ -15,6 +15,7 @@ group :test do
   gem "rr"
   gem "webmock", require: "webmock/minitest"
   gem "factory_girl_rails"
+  gem "launchy"
 
   # For Jenkins
   gem "simplecov-json", require: false

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    houston-core (0.8.4)
+    houston-core (0.9.0.rc1)
       activerecord-import
       activerecord-pluck_in_batches (~> 0.2.0)
       addressable (~> 2.3.8)
-      attentive (>= 0.3.6)
+      attentive (>= 0.3.9)
       browser (~> 2.3.0)
-      cancan (~> 1.6.10)
+      cancancan (~> 1.16.0)
       coffee-rails (~> 4.1.0)
       concurrent-ruby (~> 1.0.2)
       devise
@@ -17,67 +17,64 @@ PATH
       faraday-raise-errors (~> 0.2.0)
       gemoji (~> 2.1.0)
       handlebars_assets (~> 0.23.0)
-      houston-devise_ldap_authenticatable
-      houston-vestal_versions
-      neat-rails
-      nested_editor_for
+      kramdown
+      neat-rails (~> 0.5.1)
       nokogiri (~> 1.7)
       oauth2
       oj (~> 2.18)
       openxml-xlsx (>= 0.2.0)
       pg (~> 0.19.0)
       pg_search (~> 1.0.5)
-      premailer (~> 1.8.6)
+      premailer (~> 1.10.0)
       progressbar (~> 0.21.0)
       rack-utf8_sanitizer (~> 1.3.1)
       rails (~> 5.0.0)
-      redcarpet (~> 3.3.2)
-      rufus-scheduler (~> 3.2.0)
+      rufus-scheduler (~> 3.3.4)
       sass-rails (~> 5.0)
-      strongbox (~> 0.7.2)
+      slackdown (>= 0.2.1)
       thor
       uglifier (>= 2.7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activerecord-import (0.17.1)
+    activerecord-import (0.17.2)
       activerecord (>= 3.2)
     activerecord-pluck_in_batches (0.2.0)
       activerecord (>= 4.2.7, < 5.1.0)
-    activesupport (5.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -85,13 +82,13 @@ GEM
     addressable (2.3.8)
     ansi (1.5.0)
     arel (7.1.4)
-    attentive (0.3.8)
-      thread_safe
+    attentive (0.3.9)
+      concurrent-ruby
     bcrypt (3.1.11)
     browser (2.3.0)
     builder (3.2.3)
-    cancan (1.6.10)
-    capybara (2.12.1)
+    cancancan (1.16.0)
+    capybara (2.13.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -106,18 +103,18 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    css_parser (1.4.8)
+    css_parser (1.4.10)
       addressable
-    devise (4.2.0)
+    devise (4.2.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 5.1)
       responders
       warden (~> 1.2.3)
-    devise_invitable (1.7.1)
+    devise_invitable (1.7.2)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
     docile (1.1.5)
@@ -143,16 +140,13 @@ GEM
       sprockets (>= 2.0.0)
       tilt (>= 1.2)
     hashdiff (0.3.2)
-    houston-devise_ldap_authenticatable (0.7.1)
-      devise (>= 3.0.0)
-      net-ldap (~> 0.12.1)
-    houston-vestal_versions (2.0.1)
-      activerecord (>= 3, < 6)
-      activesupport (>= 3, < 6)
     htmlentities (4.3.4)
-    i18n (0.8.0)
+    i18n (0.8.1)
     json (2.0.3)
     jwt (1.5.6)
+    kramdown (1.13.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -173,19 +167,17 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    neat-rails (0.5.0)
-    nested_editor_for (0.1.1)
-    net-ldap (0.12.1)
-    nio4r (1.2.1)
+    neat-rails (0.5.1)
+    nio4r (2.0.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-    oauth2 (1.3.0)
-      faraday (>= 0.8, < 0.11)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (2.18.1)
+    oj (2.18.5)
     openxml-package (0.2.7)
       nokogiri
       ox
@@ -194,14 +186,15 @@ GEM
       nokogiri
       openxml-package (>= 0.2.0)
     orm_adapter (0.5.0)
-    ox (2.4.9)
+    ox (2.4.11)
     pg (0.19.0)
     pg_search (1.0.6)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
       arel
-    premailer (1.8.7)
-      css_parser (>= 1.4.5)
+    premailer (1.10.2)
+      addressable
+      css_parser (>= 1.4.10)
       htmlentities (>= 4.0.0)
     progressbar (0.21.0)
     pry (0.10.4)
@@ -213,37 +206,37 @@ GEM
       rack (>= 1.0)
     rack-utf8_sanitizer (1.3.2)
       rack (>= 1.0, < 3.0)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
+      railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    redcarpet (3.3.4)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rr (1.2.0)
     ruby-progressbar (1.8.1)
     rubyzip (1.2.1)
-    rufus-scheduler (3.2.2)
+    rufus-scheduler (3.3.4)
+      tzinfo
     safe_yaml (1.0.4)
     sass (3.4.23)
     sass-rails (5.0.6)
@@ -261,6 +254,8 @@ GEM
     simplecov-json (0.2)
       json
       simplecov
+    slackdown (0.2.2)
+      kramdown (~> 1.13.2)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -269,15 +264,13 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    strongbox (0.7.2)
-      activerecord
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.6)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.4)
+    uglifier (3.1.11)
       execjs (>= 0.3.0, < 3)
     warden (1.2.7)
       rack (>= 1.0)
@@ -298,6 +291,7 @@ DEPENDENCIES
   capybara
   factory_girl_rails
   houston-core!
+  launchy
   minitest
   minitest-reporters
   minitest-reporters-turn_reporter

data/app/assets/javascripts/houston/app/models/role.coffee

@@ -0,0 +1,4 @@
+class @Houston.Role extends Backbone.Model
+
+class @Houston.Roles extends Backbone.Collection
+  model: Houston.Role

data/app/assets/javascripts/houston/app/views/nested_resources.coffee

@@ -0,0 +1,44 @@
+class @Houston.NestedRow extends Neat.ModelEditor
+  tagName: 'li'
+  className: 'nested-row'
+
+  context: ->
+    context = super
+    context.index = @index
+    context
+
+  destroy: (e)->
+    e?.preventDefault()
+    @$el.addClass('hidden')
+    @model.set('destroyed', true)
+
+
+
+class @Houston.NestedResources extends Neat.CollectionEditor
+  modelView: Houston.NestedRow
+  pageSize: Infinity
+  index: 0
+
+  initialize: (options)->
+    super
+    @collection.bind 'reset add change', @showOrHideAdd, @
+    $(@el).delegate 'a.add-nested-link', 'click', _.bind(@addResource, @)
+
+  afterRender: ->
+    super
+    @showOrHideAdd()
+
+  addResource: (e)->
+    e?.preventDefault()
+    @collection.add new @collection.model()
+
+  constructModelView: (options)->
+    view = super(options)
+    view.index = (@index += 1)
+    view
+
+  showOrHideAdd: ->
+    visibleLinks = @$el.find('.nested-row:visible .add-nested').toArray()
+    lastLink = visibleLinks.pop()
+    $(visibleLinks).hide()
+    $(lastLink).show()

data/app/assets/javascripts/houston/app/views/team_roles_view.coffee

@@ -0,0 +1,10 @@
+class @Houston.TeamRolesView extends Houston.NestedResources
+  resource: 'roles'
+  viewPath: 'houston/teams/roles'
+
+  initialize: (options)->
+    @collection = new Houston.Roles(options.values, parse: true)
+    super
+    @options = options
+    @templateOptions.roles = @options.roles
+    @templateOptions.users = [{}].concat @options.users

data/app/assets/javascripts/houston/application.js

@@ -14,8 +14,10 @@
 //= require_tree ./core
 //= require md5
 //= require_tree ../../templates
-//= require_tree ./app
 //= require_self
+//= require_tree ./app
+
+window.Neat.template = HandlebarsTemplates
 
 $.tablesorter.defaults.cssAsc = 'sort-asc';
 $.tablesorter.defaults.cssDesc = 'sort-desc';

data/app/assets/javascripts/houston/core/ajax_helpers.coffee

@@ -0,0 +1,26 @@
+$.extend
+
+  # Extend jQuery with functions for PUT and DELETE requests.
+  put: (url, data, callback, type)->
+    if jQuery.isFunction(data)
+      callback = data
+      data = {}
+
+    data = data || {}
+    data['_method'] = 'put'
+    jQuery.post(url, data, callback, type)
+
+  destroy: (url, data, callback, type)->
+    if jQuery.isFunction(data)
+      callback = data
+      data = {}
+
+    data = data || {}
+    data._method = 'delete'
+    jQuery.post(url, data, callback, type)
+
+
+
+$(document).ajaxSend (e, jqxhr, settings)->
+  return if settings.type is 'GET'
+  jqxhr.setRequestHeader 'X-CSRF-Token', App.meta('csrf-token')

data/app/assets/javascripts/houston/core/app.coffee

@@ -91,51 +91,6 @@ window.App =
     date = new Date(date.getTime())
     App.truncateDate(date)
 
-  promptForCredentialsTo: (service)->
-    html = """
-    <div class="modal hide fade">
-      <form class="form-horizontal" id="user_credentials_form">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h3>Log in to #{service}</h3>
-        </div>
-        <div class="modal-body">
-          <div class="control-group">
-            <label class="control-label" for="user_credentials_login">Login</label>
-            <div class="controls">
-              <input type="text" id="user_credentials_login">
-            </div>
-          </div>
-          <div class="control-group">
-            <label class="control-label" for="user_credentials_password">Password</label>
-            <div class="controls">
-              <input type="password" id="user_credentials_password">
-            </div>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button type="submit" class="btn btn-primary">Sign in</button>
-        </div>
-      </form>
-    </div>
-    """
-    $modal = $(html).modal()
-    $modal.on 'hidden', -> $(@).remove()
-    $modal.on 'shown', (e)=>
-      $input = $modal.find('input[type="text"]:first').select()
-      $modal.find('button[type="submit"]').click (e)=>
-        e.preventDefault()
-        xhr = $.put '/credentials',
-          service: service
-          login: $modal.find('#user_credentials_login').val()
-          password: $modal.find('#user_credentials_password').val()
-        xhr.success ->
-          $modal.modal('hide')
-        xhr.error (response)->
-          $form = $('#user_credentials_form')
-          $form.find('.alert').remove()
-          Errors.fromResponse(response).renderToAlert().prependTo $form
-
   confirmDelete: (options)->
     html = """
     <div class="modal hide">