houston-core 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ebed2d9d99936c2a7af336bcda0410aacae58a
-  data.tar.gz: c96eab16bd2f7a4715b0fc5fef032240bc980bbd
+  metadata.gz: aea60d0e5a29fcaf7c05ccc0978f6f2ec93c5fab
+  data.tar.gz: 5e886c3a86565a55679dd3852c2f623b368faac9
 SHA512:
-  metadata.gz: 4df4808a53d7eee91148629fa711782d2ce688ca3cf32411d6f1f36e4dc32f4b4542fbeb3402a5ce456a7358c28d773b30cf2fa186e51989ca1573348cd8e940
-  data.tar.gz: a0c0219e18afaface0ecf9d56697db4101b667a82baaf804d57def8247ba38aafd442f1de293ae2a3dc9de66dfd294603b06578c62709e39560f949d021276b5
+  metadata.gz: 620021cdcfbb49903f623f64d73becdb0d65a16b5a9e140925b3492b7073c4cff8ee24c0baeb0073d21c632c7fcefa6dcdaf26c82c11e583b43f49bbfa67b938
+  data.tar.gz: 76c018cf2d8a4eed980008319f3e91ac67c82fd95afe75a3e55daddb0b6d13a144860c71c993d9249c28563eb834ee43c2cd73393a6137ff5ff2c0a4746be90a

data/.gitignore

@@ -6,6 +6,7 @@
 
 # Ignore bundler config.
 /.bundle
+Gemfile.lock
 
 # Ignore all logfiles and tempfiles.
 /log/*

data/Gemfile

@@ -14,7 +14,7 @@ group :test do
   gem "timecop"
   gem "rr"
   gem "webmock", require: "webmock/minitest"
-  gem "factory_girl_rails"
+  gem "factory_girl_rails", "4.9.0"
   gem "launchy"
 
   # For Jenkins

data/app/models/action.rb

@@ -15,6 +15,8 @@ class Action < ActiveRecord::Base
     Faraday::SSLError,
     Faraday::HTTP::ServerError,
     Faraday::HTTP::Unauthorized,
+    Faraday::HTTP::TooManyRequests,
+    Faraday::HTTP::RequestTimeout,
     Faraday::TimeoutError,
     Net::OpenTimeout,
     exceptions_wrapping(PG::ConnectionBad),

data/app/presenters/measurements_presenter.rb

@@ -8,13 +8,14 @@ class MeasurementsPresenter
   def to_json(*args)
     Houston.benchmark "[#{self.class.name.underscore}] Render JSON" do
       query = measurements.select(<<-SQL)
-        taken_at "timestamp",
+        id,
+        (taken_at AT TIME ZONE 'UTC') AT TIME ZONE '#{Time.zone.now.strftime("%Z")}' "timestamp",
         name,
         value,
         json_build_object('type', subject_type, 'id', subject_id) "subject"
       SQL
 
-      ActiveRecord::Base.connection.select_value("select array_to_json(array_agg(row_to_json(t))) from (#{query.to_sql}) t")
+      ActiveRecord::Base.connection.select_value("select array_to_json(array_agg(row_to_json(t))) from (#{query.to_sql}) t") || []
     end
   end
 

data/app/views/actions/index.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <% if $scheduler %>
-  <p><b>Status:</b> <%= $scheduler.up? ? "Up (Started #{format_time $scheduler.started_at.to_time})".html_safe : "Down" %></p>
+  <p><b>Status:</b> <%= $scheduler.up? ? "Up (Started #{format_time $scheduler.started_at.to_t})".html_safe : "Down" %></p>
 <% else %>
   <p><b>Status:</b> Unavailable</p>
 <% end %>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>

data/houston-core.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   # For Houston as a Web Application
   spec.add_dependency "rails", "~> 5.0.0"
-  spec.add_dependency "pg", "~> 0.19.0"
+  spec.add_dependency "pg", "~> 0.21.0"
   # --------------------------------
   spec.add_dependency "activerecord-import"
   spec.add_dependency "activerecord-pluck_in_batches", "~> 0.2.0"
@@ -37,13 +37,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "devise_invitable"
   spec.add_dependency "faraday", "~> 0.9.2"
   spec.add_dependency "faraday-http-cache", "~> 1.2.2"
-  spec.add_dependency "faraday-raise-errors", "~> 0.2.0"
+  spec.add_dependency "faraday-raise-errors", "~> 0.3.0"
   spec.add_dependency "gemoji", "~> 2.1.0"
   spec.add_dependency "handlebars_assets", "~> 0.23.0"
+  spec.add_dependency "mail", "~> 2.6.6"
   spec.add_dependency "neat-rails", "~> 0.5.1"
-  spec.add_dependency "nokogiri", "~> 1.7"
+  spec.add_dependency "nokogiri", "~> 1.8"
   spec.add_dependency "oauth2"
-  spec.add_dependency "oj", "~> 2.18"
+  spec.add_dependency "oj", "~> 3.0"
   spec.add_dependency "openxml-xlsx", ">= 0.2.0"
   spec.add_dependency "pg_search", "~> 1.0.5"
   spec.add_dependency "premailer", "~> 1.10.0"
@@ -61,6 +62,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "coffee-rails", "~> 4.1.0"
 
   # Houston's background jobs daemon
-  spec.add_dependency "rufus-scheduler", "~> 3.3.4"
+  spec.add_dependency "rufus-scheduler", "~> 3.4.0"
 
 end

data/lib/houston/boot/extensions/dsl.rb

@@ -24,13 +24,14 @@ module Houston
     module AbilityBlock
       def ability(&block)
         __getobj__.instance_variable_set :@ability_block, block
+        self
       end
     end
 
     module AcceptsName
-      def name(*args)
-        __getobj__.name = args.first if args.any?
-        __getobj__.name
+      def name(name)
+        __getobj__.name = name
+        self
       end
     end
 

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/test/unit/extensions/events_extension_test.rb

@@ -19,7 +19,7 @@ class EventsExtensionTest < ActiveSupport::TestCase
     end
 
     should "return nil for an unregistered event" do
-      assert_equal nil, Houston.events["anything"]
+      assert_nil Houston.events["anything"]
     end
   end
 

data/test/unit/models/serializer_test.rb

@@ -19,7 +19,7 @@ class SerializerTest < ActiveSupport::TestCase
   end
 
   should "let Oj serialize times" do
-    assert_equal '{"^t":1468587630.542999999e59}',
+    assert_equal '{"^t":1468587630.542999999}',
       dump(Time.new(2016, 7, 15, 13, 1, 30, 59.457))
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston-core
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: gemoji
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.0
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.6
 - !ruby/object:Gem::Dependency
   name: neat-rails
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: openxml-xlsx
   requirement: !ruby/object:Gem::Requirement
@@ -450,14 +464,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 3.4.0
 description: 
 email:
 - bob.lailfamily@gmail.com
@@ -472,7 +486,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - ROADMAP.md
 - Rakefile

data/Gemfile.lock

@@ -1,306 +0,0 @@
-PATH
-  remote: .
-  specs:
-    houston-core (0.9.0)
-      activerecord-import
-      activerecord-pluck_in_batches (~> 0.2.0)
-      addressable (~> 2.3.8)
-      attentive (>= 0.3.9)
-      browser (~> 2.3.0)
-      cancancan (~> 1.16.0)
-      coffee-rails (~> 4.1.0)
-      concurrent-ruby (~> 1.0.2)
-      devise
-      devise_invitable
-      faraday (~> 0.9.2)
-      faraday-http-cache (~> 1.2.2)
-      faraday-raise-errors (~> 0.2.0)
-      gemoji (~> 2.1.0)
-      handlebars_assets (~> 0.23.0)
-      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.10.0)
-      progressbar (~> 0.21.0)
-      rack-utf8_sanitizer (~> 1.3.1)
-      rails (~> 5.0.0)
-      rufus-scheduler (~> 3.3.4)
-      sass-rails (~> 5.0)
-      slackdown (>= 0.2.1)
-      thor
-      uglifier (>= 2.7.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.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.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.2)
-      activesupport (= 5.0.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
-      globalid (>= 0.3.6)
-    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.18.3)
-      activerecord (>= 3.2)
-    activerecord-pluck_in_batches (0.2.0)
-      activerecord (>= 4.2.7, < 5.1.0)
-    activesupport (5.0.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.8)
-    ansi (1.5.0)
-    arel (7.1.4)
-    attentive (0.3.9)
-      concurrent-ruby
-    bcrypt (3.1.11)
-    browser (2.3.0)
-    builder (3.2.3)
-    cancancan (1.16.0)
-    capybara (2.13.0)
-      addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    coderay (1.1.1)
-    coffee-rails (4.1.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.5)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    css_parser (1.5.0)
-      addressable
-    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.2)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
-    docile (1.1.5)
-    erubis (2.7.0)
-    execjs (2.7.0)
-    factory_girl (4.8.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
-      railties (>= 3.0.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.2.2)
-      faraday (~> 0.8)
-    faraday-raise-errors (0.2.0)
-      faraday
-    gemoji (2.1.0)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    handlebars_assets (0.23.2)
-      execjs (~> 2.0)
-      sprockets (>= 2.0.0)
-      tilt (>= 1.2)
-    hashdiff (0.3.2)
-    htmlentities (4.3.4)
-    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.5)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    minitest-reporters (1.1.14)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    minitest-reporters-turn_reporter (0.1.2)
-      minitest-reporters
-    multi_json (1.12.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    neat-rails (0.5.1)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    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.5)
-    openxml-package (0.2.8)
-      nokogiri
-      ox
-      rubyzip (~> 1.2.1)
-    openxml-xlsx (0.2.3)
-      nokogiri
-      openxml-package (>= 0.2.0)
-    orm_adapter (0.5.0)
-    ox (2.5.0)
-    pg (0.19.0)
-    pg_search (1.0.6)
-      activerecord (>= 3.1)
-      activesupport (>= 3.1)
-      arel
-    premailer (1.10.3)
-      addressable
-      css_parser (>= 1.4.10)
-      htmlentities (>= 4.0.0)
-    progressbar (0.21.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rack-utf8_sanitizer (1.3.2)
-      rack (>= 1.0, < 3.0)
-    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.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.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)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rr (1.2.0)
-    ruby-progressbar (1.8.1)
-    rubyzip (1.2.1)
-    rufus-scheduler (3.3.4)
-      tzinfo
-    safe_yaml (1.0.4)
-    sass (3.4.23)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    shoulda-context (1.2.2)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    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)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.7)
-    timecop (0.8.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (3.2.0)
-      execjs (>= 0.3.0, < 3)
-    warden (1.2.7)
-      rack (>= 1.0)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capybara
-  factory_girl_rails
-  houston-core!
-  launchy
-  minitest
-  minitest-reporters
-  minitest-reporters-turn_reporter
-  pry
-  rr
-  shoulda-context
-  simplecov-json
-  timecop
-  webmock
-
-BUNDLED WITH
-   1.14.6