RubyGems - houston-core - Versions diffs - 0.6.3 → 0.7.0.beta - Mend

houston-core 0.6.3 → 0.7.0.beta

Files changed (232) hide show

data/app/views/layouts/naked.html.erb ADDED Viewed

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= title %></title>
+    <%= csrf_meta_tags %>
+    <meta name="relative_url_root" content="<%= main_app.root_url %>" />
+    <meta name="revision" content="<%= revision %>" />
+    <meta name="env" content="<%= Rails.env %>" />
+    <%= yield :meta %>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+    <![endif]-->
+    <!-- Le styles -->
+    <%= stylesheet_link_tag "houston/vendor", media: "all" %>
+    <%= stylesheet_link_tag "houston/application", media: "all" %>
+    <%= stylesheet_link_tag "houston/print", media: "print" %>
+    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
+    <%= stylesheet_link_tag "houston/reports/application", :media => "all" %>
+    <%= yield :stylesheets %><%# so that Engines can hook in and add styles %>
+    <!-- Le fav and touch icons -->
+    <% unless unfurling? %>
+      <link rel="icon" type="image/x-icon" href="<%= ENV['RAILS_RELATIVE_URL_ROOT'] %>/favicon.png" />
+    <% end %>
+  </head>
+  <body>
+    <div class="container">
+      <%= yield -%>
+      <%= render partial: "layouts/tester_bar" if Rails.env.development? -%>
+    </div> <!-- /container -->
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" %>
+    <%# javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js" %>
+    <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.1/underscore-min.js" %>
+    <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.0.0/backbone-min.js" %>
+    <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.2/handlebars.min.js" %>
+    <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/d3/3.4.1/d3.min.js" %>
+    <%# javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/dropzone/4.0.1/min/dropzone.min.js" %>
+    <%= javascript_include_tag "houston/vendor" %>
+    <%= javascript_include_tag "houston/application" %>
+    <%= yield :javascripts %><%# so that Engines can hook in and add scripts %>
+  </body>
+</html>

data/app/views/layouts/naked_dashboard.html.erb CHANGED Viewed

@@ -15,32 +15,31 @@
     <!-- Le styles -->
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
-    <%= stylesheet_link_tag :vendor, media: "all" %>
-    <%= stylesheet_link_tag :dashboard, media: "all" %>
+    <%= stylesheet_link_tag "houston/vendor", media: "all" %>
+    <%= stylesheet_link_tag "houston/dashboard", media: "all" %>
     <%= yield :stylesheets %><%# so that Engines can hook in and add styles %>
     <!-- Le fav and touch icons -->
-    <link rel="icon" type="image/x-icon" href="<%= ENV['RAILS_RELATIVE_URL_ROOT'] %>/favicon.png" />
-    <link href="images/apple-touch-icon.png" rel="apple-touch-icon">
-    <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
-    <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
+    <% unless unfurling? %>
+      <link rel="icon" type="image/x-icon" href="<%= ENV['RAILS_RELATIVE_URL_ROOT'] %>/favicon.png" />
+    <% end %>
   </head>
   <body class="dashboard">
     <div id="container" <% if params[:zoom].to_f > 0 %> style="transform: scale(<%= params[:zoom].to_f %>); transform-origin: 50% 0; -webkit-transform: scale(<%= params[:zoom].to_f %>); -webkit-transform-origin: 50% 0; -moz-transform: scale(<%= params[:zoom].to_f %>); -moz-transform-origin: 50% 0;" <% end %>>
       <%= yield -%>
     </div>
     <!-- Le javascript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <%= javascript_include_tag "https://code.jquery.com/jquery-1.9.1.min.js" %>
+    <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" %>
     <%# javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js" %>
     <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.1/underscore-min.js" %>
     <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.0.0/backbone-min.js" %>
     <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.2/handlebars.min.js" %>
     <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/d3/3.4.1/d3.min.js" %>
     <%# javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/dropzone/4.0.1/min/dropzone.min.js" %>
-    <%= javascript_include_tag :dashboard %>
-    <%= yield :javascripts %>
+    <%= javascript_include_tag "houston/dashboard" %>
+    <%= yield :javascripts %><%# so that Engines can hook in and add scripts %>
   </body>
 </html>

data/app/views/oauth/providers/_form.html.erb ADDED Viewed

@@ -0,0 +1,54 @@
+<%= form_for @provider, html: {class: "form-horizontal"} do |f| %>
+  <fieldset>
+    <div class="control-group">
+      <%= f.label :name, class: "control-label" %>
+      <div class="controls">
+        <%= f.text_field :name, class: "text_field" %>
+      </div>
+    </div>
+    <div class="control-group">
+      <%= f.label :site, class: "control-label" %>
+      <div class="controls">
+        <%= f.text_field :site, class: "text_field" %>
+      </div>
+    </div>
+    <div class="control-group">
+      <%= f.label :authorize_path, class: "control-label" %>
+      <div class="controls">
+        <%= f.text_field :authorize_path, class: "text_field" %>
+      </div>
+    </div>
+    <div class="control-group">
+      <%= f.label :token_path, class: "control-label" %>
+      <div class="controls">
+        <%= f.text_field :token_path, class: "text_field" %>
+      </div>
+    </div>
+  </fieldset>
+<hr />
+  <fieldset>
+    <div class="control-group">
+      <%= f.label :client_id, class: "control-label" %>
+      <div class="controls">
+        <%= f.text_field :client_id, class: "text_field" %>
+      </div>
+    </div>
+    <div class="control-group">
+      <%= f.label :client_secret, class: "control-label" %>
+      <div class="controls">
+        <%= f.text_field :client_secret, class: "text_field" %>
+      </div>
+    </div>
+  </fieldset>
+  <div class="form-actions">
+    <%= f.submit nil, class: "btn btn-primary" %>
+    <%= link_to "Cancel", oauth_providers_path, class: "btn" %>
+  </div>
+<% end %>

data/app/views/oauth/providers/edit.html.erb ADDED Viewed

@@ -0,0 +1,7 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  Edit Provider
+</h1>
+<% end %>
+<%= render "form" %>

data/app/views/oauth/providers/index.html.erb ADDED Viewed

@@ -0,0 +1,41 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  Providers
+  <%= link_to "New Provider", new_oauth_provider_path, class: "btn btn-primary" if can?(:create, Oauth::Provider) %>
+</h1>
+<% end %>
+<div class="nomargin">
+  <table id="providers" class="table table-sortable table-striped">
+    <thead>
+      <tr>
+        <td class="table-margin"></td>
+        <th class="provider-name">Name</th>
+        <th class="provider-site">Site</th>
+        <th class="provider-client-id">Client ID</th>
+        <td class="table-margin"></td>
+      </tr>
+    </thead>
+    <tbody>
+      <% @providers.each do |provider| %>
+        <tr class="provider">
+          <td class="table-margin"></td>
+          <td class="provider-name"><%= link_to provider.name, edit_oauth_provider_path(provider) %></td>
+          <td class="provider-site"><%= provider.site %></td>
+          <td class="provider-client-id"><%= provider.client_id %></td>
+          <td class="table-margin"></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+<% content_for :javascripts do %>
+  <script type="text/javascript">
+    $(function() {
+      $('#providers').tablesorter();
+    });
+  </script>
+<% end %>

data/app/views/oauth/providers/new.html.erb ADDED Viewed

@@ -0,0 +1,7 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  New Provider
+</h1>
+<% end %>
+<%= render "form" %>

data/app/views/projects/_form.html.erb CHANGED Viewed

@@ -13,7 +13,7 @@
         <%= f.text_field :slug, :class => "text_field" %>
       </div>
     </div>
     <div class="control-group">
       <%= f.label :color, :class => "control-label" %>
       <div class="controls">
@@ -23,11 +23,11 @@
         <% end %>
       </div>
     </div>
     <% Project.adapters.each do |_, adapter| %>
       <hr />
       <div class="control-group project-adapter" id="<%= adapter.attribute_name %>">
         <label class="control-label"><%= adapter.title %></label>
         <div class="controls">
@@ -42,8 +42,8 @@
             <div class="project-adapter-fields" data-adapter="<%= name %>">
               <% adapter.namespace.adapter(name).parameters.each do |parameter| %>
                 <% errors = @project.errors[parameter].flatten %>
-                <%= label_tag "project[extended_attributes][#{parameter}]", parameter.to_s.gsub("_", " ").gsub(/\b('?[a-z])/) { $1.capitalize } %>
-                <%= text_field_tag "project[extended_attributes][#{parameter}]", @project.extended_attributes[parameter.to_s], :class => "text_field #{"error" if errors.any?}" %>
+                <%= label_tag "project[props][#{parameter}]", parameter.to_s.gsub("_", " ").gsub(/\b('?[a-z])/) { $1.capitalize } %>
+                <%= text_field_tag "project[props][#{parameter}]", @project.props[parameter.to_s], :class => "text_field #{"error" if errors.any?}" %>
                 <% if errors.any? %>
                   <span class="help-inline">&nbsp;<%= errors.to_sentence %></span>
                 <% end %>
@@ -52,7 +52,7 @@
           <% end %>
         </div>
       </div>
     <% end %>
     <hr />
@@ -78,8 +78,7 @@
           <% if feature.fields.any? %>
             <div class="project-feature-fields" data-feature="<%= feature_slug %>">
-              <%= f.fields_for :extended_attributes, nil do |f| %>
-                <% f.object = OpenStruct.new(@project.extended_attributes) # WTF %>
+              <%= f.fields_for :props do |f| %>
                 <% feature.fields.each do |form| %>
                   <div class="project-feature-field">
                     <%= form.render(self, f) %>

data/app/views/projects/index.html.erb CHANGED Viewed

@@ -77,7 +77,7 @@
           <% KeyDependency.all.each do |dependency| %>
             <td class="project-dependency">
-              <%= project.extended_attributes["key_dependency.#{dependency.slug}"] %>
+              <%= project.props["keyDependency.#{dependency.slug}"] %>
             </td>
           <% end %>

data/app/views/users/_form.html.erb CHANGED Viewed

@@ -28,14 +28,14 @@
         <%= f.text_field :email, :class => "text_field" %>
       </div>
     </div>
     <div class="control-group">
       <%= f.label :alias_emails, "Other Email Addresses", :class => "control-label" %>
       <div class="controls">
         <%= f.text_area :alias_emails, :class => "text_field", rows: 3, value: @user.alias_emails.join("\n") %>
       </div>
     </div>
     <% if can?(:manage, @user) %>
       <div class="control-group">
         <%= f.label :role, :class => "control-label" %>
@@ -44,7 +44,7 @@
         </div>
       </div>
     <% end %>
     <% if can?(:manage, @user) %>
       <div class="control-group">
         <%= f.label :administrator, :class => "control-label" %>
@@ -53,14 +53,13 @@
         </div>
       </div>
     <% end %>
-    <%= f.fields_for :view_options, nil do |f| %>
-      <% f.object = OpenStruct.new(@user.view_options) # WTF %>
+    <%= f.fields_for :props do |f| %>
       <% Houston.config.user_options.each do |form| %>
         <hr />
         <div class="control-group">
           <label class="control-label"><%= form.name %></label>
           <div class="controls">
@@ -69,18 +68,18 @@
         </div>
       <% end %>
     <% end %>
     <% if @user.credentials.any? %>
       <hr />
       <div class="control-group">
         <label class="control-label">Credentials</label>
         <div class="controls">
           <p>Houston has remembered your credentials for:</p>
           <ul class="user-credentials">
             <%= content_tag_for :li, @user.credentials do |user_credentials| %>
               <span class="user-credentials-service"><%= user_credentials.service %></span>
@@ -92,8 +91,8 @@
         </div>
       </div>
     <% end %>
     <% if @user.new_record? %>
       <div class="control-group">
         <div class="controls">
@@ -103,7 +102,7 @@
         </div>
       </div>
     <% end %>
     <div class="form-actions">
       <%= f.submit nil, :class => "btn btn-primary" %>
       <%= link_to "Invite", invite_user_path(@user), :method => "post", :class => "btn btn-primary" if @user.persisted? && @user.encrypted_password.blank? && !@user.invited? && can?(:create, User) %>
@@ -113,19 +112,21 @@
         <button class="btn btn-delete btn-danger" id="retire_user_button">Retire</button>
       <% end %>
     </div>
   </fieldset>
 <% end %>
 <% content_for :javascripts do %>
 <script type="text/javascript">
   $(function() {
+    <% if @user.persisted? && can?(:destroy, @user) %>
     $('#retire_user_button').click(function(e) {
       e.preventDefault();
       $.destroy('<%= user_path(@user) %>')
         .success(function() { window.location = '/users'; })
         .error(function() { console.log(arguments); });
     });
+    <% end %>
   });
 </script>
 <% end %>

data/bin/rails CHANGED Viewed

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/config/application.rb CHANGED Viewed

@@ -27,7 +27,7 @@ require "hpricot"
 require "nested_editor_for"
 require "neat-rails"
 require "nokogiri"
-require "oauth-plugin"
+require "oauth2"
 require "octokit"
 require "oj"
 require "openxml/xlsx"
@@ -49,10 +49,16 @@ Bundler.require(*Rails.groups)
 require "coffee_script"
 require "uglifier"
-# Apply patches
-require "patches/sprockets_output_path_for_assets"
 module Houston
+  def self.host=(value)
+    @host = value
+  end
+  def self.host
+    return @host if defined?(@host)
+    Houston.config.host
+  end
   class Application < Rails::Application
     # This Rails application gets initialized different ways: many times it is
     # intialized from within a Houston instance project. This line ensures that
@@ -90,12 +96,7 @@ module Houston
     # http://stackoverflow.com/a/24727310/731300
     config.middleware.insert 0, Rack::UTF8Sanitizer
-    # DEPRECATION WARNING: Currently, Active Record suppresses errors raised within
-    # `after_rollback`/`after_commit` callbacks and only print them to the logs.
-    # In the next version, these errors will no longer be suppressed. Instead, the
-    # errors will propagate normally just like in other Active Record callbacks.
-    #
-    # You can opt into the new behavior and remove this warning by setting:
+    # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
   end
 end

data/config/boot.rb CHANGED Viewed

@@ -1,4 +1,3 @@
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/config/environments/development.rb CHANGED Viewed

@@ -1,3 +1,6 @@
+port = Rack::Server::Options.new.parse!(ARGV.dup).fetch(:Port, "3000")
+Houston.host = "localhost:#{port}"
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -31,12 +34,11 @@ Rails.application.configure do
   config.assets.prefix = "/dev-assets"
   # So Devise mailers can make links
-  server_options = Rack::Server::Options.new.parse!(ARGV.dup)
-  config.action_mailer.default_url_options = {
-    :host => "localhost",
-    :port => server_options.fetch(:Port, "3000")
-  }
-  puts "[config] default host: localhost:#{config.action_mailer.default_url_options[:port]}"
+  config.action_mailer.default_url_options = {host: "localhost", port: port}
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.