houston-core 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f11c47960bbc475231f9b6561811960bd8a58e3
-  data.tar.gz: 39aafe18371c39efcd82cd03a405f56ce91b3548
+  metadata.gz: bb13d5eecf56a92b97bf57602f08952d35e5c939
+  data.tar.gz: 657f17128b2853f46c5dc1133bd2ee2afd61d42a
 SHA512:
-  metadata.gz: b35f5368c098de2509a399b2e42e4d69090118e3af08defbce752ce0d3636a69f9ed07de850397b1a3fa27e538c83c4a12f355ab9cca1cc7bac05436a260dfac
-  data.tar.gz: ca852de3146dbc304fec753f44e46b5a7f4237fb9d5d3c032cef4f590a9fcb9b81d9c1690e08b5c915a7162f27feb85a0e218a02853bd4489efa5fcd3286e1ab
+  metadata.gz: fcecec80ae7c7a153d232d4db2f01a7ee31b95dc4918091df07dd34755b62b6a4d45dab3bae64c5a02833b5606285f1dc6a71aee7a95268c3b9db1fbe46fd42b
+  data.tar.gz: 6e2e4e806e8eaef10afd1eeffa3df4a4a007c8091c3c046cb5b10721d00b4f8b8d261f6b2e322c958727fa442216ae5789bba26027ed21d03e563209fc9618e2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houston-core (0.8.3)
+    houston-core (0.8.4)
       activerecord-import
       activerecord-pluck_in_batches (~> 0.2.0)
       addressable (~> 2.3.8)
@@ -21,7 +21,7 @@ PATH
       houston-vestal_versions
       neat-rails
       nested_editor_for
-      nokogiri
+      nokogiri (~> 1.7)
       oauth2
       oj (~> 2.18)
       openxml-xlsx (>= 0.2.0)
@@ -177,7 +177,7 @@ GEM
     nested_editor_for (0.1.1)
     net-ldap (0.12.1)
     nio4r (1.2.1)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     oauth2 (1.3.0)
       faraday (>= 0.8, < 0.11)
@@ -186,10 +186,10 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     oj (2.18.1)
-    openxml-package (0.2.6)
+    openxml-package (0.2.7)
       nokogiri
       ox
-      rubyzip (~> 1.1.0)
+      rubyzip (~> 1.2.1)
     openxml-xlsx (0.2.3)
       nokogiri
       openxml-package (>= 0.2.0)
@@ -242,7 +242,7 @@ GEM
       railties (>= 4.2.0, < 5.1)
     rr (1.2.0)
     ruby-progressbar (1.8.1)
-    rubyzip (1.1.7)
+    rubyzip (1.2.1)
     rufus-scheduler (3.2.2)
     safe_yaml (1.0.4)
     sass (3.4.23)

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

@@ -136,4 +136,27 @@ window.App =
           $form.find('.alert').remove()
           Errors.fromResponse(response).renderToAlert().prependTo $form
 
+  confirmDelete: (options)->
+    html = """
+    <div class="modal hide">
+      <form class="form-horizontal" action="#{options.url}" method="POST">
+        <input type="hidden" name="_method" value="delete">
+        <input type="hidden" name="#{App.meta('csrf-param')}" value="#{App.meta('csrf-token')}">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h3>Delete #{options.resource}</h3>
+        </div>
+        <div class="modal-body">
+          #{options.message}
+        </div>
+        <div class="modal-footer">
+          <button data-dismiss="modal" class="btn btn-default">Cancel</button>
+          <button type="submit" class="btn btn-danger">Delete #{options.resource}</button>
+        </div>
+      </form>
+    </div>
+    """
+    $modal = $(html).modal()
+    $modal.on 'hidden', -> $(@).remove()
+
 window.Houston = window.App

data/app/controllers/projects_controller.rb

@@ -6,7 +6,7 @@ class ProjectsController < ApplicationController
 
   def index
     @title = "Projects"
-    @projects = Project.unretired
+    @projects = Project.preload(:team).unretired
   end
 
 

data/app/helpers/avatar_helper.rb

@@ -5,7 +5,7 @@ module AvatarHelper
   def avatar_for(user, options={})
     size = options.fetch(:size, 24)
 
-    return "<div class=\"avatar avatar-empty\" style=\"width:#{size}px; height:#{size}px\" />".html_safe unless user
+    return "<div class=\"avatar avatar-empty\" style=\"width:#{size}px; height:#{size}px\"></div>".html_safe unless user
 
     "<img class=\"avatar user-#{user.id}\" src=\"#{gravatar_url(user.email, size: size * 2)}\" width=\"#{size}\" height=\"#{size}\" alt=\"#{user.name}\" />".html_safe
   end

data/app/models/project.rb

@@ -46,7 +46,7 @@ class Project < ActiveRecord::Base
 
 
 
-  # Teammates
+  # Features
   # ------------------------------------------------------------------------- #
 
   def self.with_feature(feature)

data/houston-core.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gemoji", "~> 2.1.0"
   spec.add_dependency "handlebars_assets", "~> 0.23.0"
   spec.add_dependency "neat-rails"
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "~> 1.7"
   spec.add_dependency "oauth2"
   spec.add_dependency "oj", "~> 2.18"
   spec.add_dependency "openxml-xlsx", ">= 0.2.0"

data/lib/houston/boot/active_record_serializer.rb

@@ -7,13 +7,9 @@ module Houston
 
     def pack(record)
       model = record.class
+      type_caster = model.type_caster
       normal_attributes = record.attributes.each_with_object({}) do |(attribute, value), attributes|
-        column = model.column_for_attribute(attribute)
-
-        # Don't serialize the attribute if the column was deleted
-        next if column.is_a?(ActiveRecord::ConnectionAdapters::NullColumn)
-
-        attributes[attribute] = model.connection.type_cast_from_column(column, value)
+        attributes[attribute] = type_caster.type_cast_for_database(attribute, value)
       end
       { "class" => model.name, "attributes" => normal_attributes }
     end

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/test/unit/models/serializer_test.rb

@@ -38,6 +38,20 @@ class SerializerTest < ActiveSupport::TestCase
       like: /"class":"Project","attributes":{.*},"\^S":"Houston::ActiveRecordSerializer"/)
   end
 
+  should "not explode when trying to serialize an object with an attribute that isn't a column" do
+    serialized_project = '{"class":"Project","attributes":{"id":18,"name":"Example","missing_column":true},"^S":"Houston::ActiveRecordSerializer"}'
+    project_with_bad_attribute = load(serialized_project)
+    refute_raises do
+      dump(project_with_bad_attribute)
+    end
+  end
+
+  should "serialize serialized attributes correctly" do
+    action = Action.new(params: {key: "value"})
+    assert_serializes(action,
+      like: /"params":"{\\\":key\\\":\\\"value\\\"}"/)
+  end
+
   should "work even when you set a value" do
     project = Project.create!(name: "Test", slug: "test")
     project.updated_at = 1.week.after(project.updated_at) # ActiveSupport::TimeWithZone
@@ -58,7 +72,11 @@ private
       assert_match expectation, serialized, "The object wasn't serialized as expected"
     end
 
-    assert_equal object, load(serialized), "The object wasn't deserialized as expected"
+    if object.is_a?(ActiveRecord::Base)
+      assert_equal object.attributes, load(serialized)&.attributes, "The object wasn't deserialized as expected"
+    else
+      assert_equal object, load(serialized), "The object wasn't deserialized as expected"
+    end
   end
 
   def load(string)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston-core
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -266,16 +266,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement