diff --git a/.ruby-version b/.ruby-version index 951d42f..b503b50 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.4.2 +ruby-2.4.3 diff --git a/Gemfile b/Gemfile index 5a9eeb0..8cffaeb 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'httparty' gem 'humane-rails' gem 'pg' gem 'puma' -gem 'rails', '~> 5.2.0.beta2' +gem 'rails', '~> 5.2.0.rc2' gem 'sass-rails' gem 'shrine' gem 'uglifier', '>= 1.3.0' @@ -50,4 +50,4 @@ group :test do gem 'shrine-memory' end -ruby "2.4.2" \ No newline at end of file +ruby "2.4.3" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 1f8d7fc..3f5fdbb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,45 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.0.beta2) - actionpack (= 5.2.0.beta2) + actioncable (5.2.0.rc2) + actionpack (= 5.2.0.rc2) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.2.0.beta2) - actionpack (= 5.2.0.beta2) - actionview (= 5.2.0.beta2) - activejob (= 5.2.0.beta2) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0.rc2) + actionpack (= 5.2.0.rc2) + actionview (= 5.2.0.rc2) + activejob (= 5.2.0.rc2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.0.beta2) - actionview (= 5.2.0.beta2) - activesupport (= 5.2.0.beta2) + actionpack (5.2.0.rc2) + actionview (= 5.2.0.rc2) + activesupport (= 5.2.0.rc2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.0.beta2) - activesupport (= 5.2.0.beta2) + actionview (5.2.0.rc2) + activesupport (= 5.2.0.rc2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.0.beta2) - activesupport (= 5.2.0.beta2) + activejob (5.2.0.rc2) + activesupport (= 5.2.0.rc2) globalid (>= 0.3.6) - activemodel (5.2.0.beta2) - activesupport (= 5.2.0.beta2) - activerecord (5.2.0.beta2) - activemodel (= 5.2.0.beta2) - activesupport (= 5.2.0.beta2) + activemodel (5.2.0.rc2) + activesupport (= 5.2.0.rc2) + activerecord (5.2.0.rc2) + activemodel (= 5.2.0.rc2) + activesupport (= 5.2.0.rc2) arel (>= 9.0) - activestorage (5.2.0.beta2) - actionpack (= 5.2.0.beta2) - activerecord (= 5.2.0.beta2) - activesupport (5.2.0.beta2) + activestorage (5.2.0.rc2) + actionpack (= 5.2.0.rc2) + activerecord (= 5.2.0.rc2) + marcel (~> 0.3.1) + activesupport (5.2.0.rc2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) acts-as-taggable-on (5.0.0) @@ -46,43 +47,46 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (9.0.0) - aws-partitions (1.52.0) + aws-partitions (1.73.0) aws-sdk (3.0.1) aws-sdk-resources (~> 3) - aws-sdk-acm (1.2.0) + aws-sdk-acm (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-alexaforbusiness (1.0.0) + aws-sdk-alexaforbusiness (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-apigateway (1.9.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-applicationautoscaling (1.6.0) + aws-sdk-applicationautoscaling (1.8.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-applicationdiscoveryservice (1.0.0) + aws-sdk-applicationdiscoveryservice (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-appstream (1.4.0) + aws-sdk-appstream (1.7.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-appsync (1.0.0) + aws-sdk-appsync (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-athena (1.0.0) + aws-sdk-athena (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-autoscaling (1.4.0) + aws-sdk-autoscaling (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-autoscalingplans (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-batch (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-budgets (1.3.0) + aws-sdk-budgets (1.5.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cloud9 (1.0.0) + aws-sdk-cloud9 (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-clouddirectory (1.1.0) @@ -100,31 +104,31 @@ GEM aws-sdk-cloudhsmv2 (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cloudsearch (1.0.0) + aws-sdk-cloudsearch (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cloudsearchdomain (1.0.0) + aws-sdk-cloudsearchdomain (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cloudtrail (1.0.0) + aws-sdk-cloudtrail (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-cloudwatch (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cloudwatchevents (1.1.0) + aws-sdk-cloudwatchevents (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-cloudwatchlogs (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-codebuild (1.5.0) + aws-sdk-codebuild (1.7.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-codecommit (1.2.0) + aws-sdk-codecommit (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-codedeploy (1.2.0) + aws-sdk-codedeploy (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-codepipeline (1.1.0) @@ -133,83 +137,83 @@ GEM aws-sdk-codestar (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cognitoidentity (1.0.0) + aws-sdk-cognitoidentity (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cognitoidentityprovider (1.2.0) + aws-sdk-cognitoidentityprovider (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-cognitosync (1.0.0) + aws-sdk-cognitosync (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-comprehend (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-configservice (1.5.0) + aws-sdk-configservice (1.7.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-core (3.13.0) + aws-sdk-core (3.17.1) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.0.0) + aws-sdk-costandusagereportservice (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-costexplorer (1.0.0) + aws-sdk-costexplorer (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-databasemigrationservice (1.3.0) + aws-sdk-databasemigrationservice (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-datapipeline (1.0.0) + aws-sdk-datapipeline (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-dax (1.0.0) + aws-sdk-dax (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-devicefarm (1.2.0) + aws-sdk-devicefarm (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-directconnect (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-directoryservice (1.0.0) + aws-sdk-directoryservice (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-dynamodb (1.3.0) + aws-sdk-dynamodb (1.5.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-dynamodbstreams (1.0.0) + aws-sdk-dynamodbstreams (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-ec2 (1.23.0) + aws-sdk-ec2 (1.29.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-ecr (1.2.0) + aws-sdk-ecr (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-ecs (1.7.0) + aws-sdk-ecs (1.12.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-efs (1.0.0) + aws-sdk-efs (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-elasticache (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-elasticbeanstalk (1.3.0) + aws-sdk-elasticbeanstalk (1.5.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-elasticloadbalancing (1.1.0) + aws-sdk-elasticloadbalancing (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-elasticloadbalancingv2 (1.6.0) + aws-sdk-elasticloadbalancingv2 (1.8.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-elasticsearchservice (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-elastictranscoder (1.0.0) + aws-sdk-elastictranscoder (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-emr (1.1.0) @@ -218,43 +222,43 @@ GEM aws-sdk-firehose (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-gamelift (1.1.0) + aws-sdk-gamelift (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-glacier (1.5.0) + aws-sdk-glacier (1.6.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-glue (1.2.0) + aws-sdk-glue (1.6.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-greengrass (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-guardduty (1.0.0) + aws-sdk-guardduty (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-health (1.0.0) + aws-sdk-health (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-iam (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-importexport (1.0.0) + aws-sdk-importexport (1.0.1) aws-sdk-core (~> 3) aws-sigv2 (~> 1.0) - aws-sdk-inspector (1.1.0) + aws-sdk-inspector (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-iot (1.3.0) + aws-sdk-iot (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-iotdataplane (1.0.0) + aws-sdk-iotdataplane (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-iotjobsdataplane (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-kinesis (1.1.0) + aws-sdk-kinesis (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-kinesisanalytics (1.2.0) @@ -269,52 +273,52 @@ GEM aws-sdk-kinesisvideomedia (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-kms (1.3.0) + aws-sdk-kms (1.5.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-lambda (1.2.0) + aws-sdk-lambda (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-lambdapreview (1.0.0) + aws-sdk-lambdapreview (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-lex (1.2.0) + aws-sdk-lex (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-lexmodelbuildingservice (1.3.0) + aws-sdk-lexmodelbuildingservice (1.5.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-lightsail (1.3.0) + aws-sdk-lightsail (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-machinelearning (1.0.0) + aws-sdk-machinelearning (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-marketplacecommerceanalytics (1.0.0) + aws-sdk-marketplacecommerceanalytics (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-marketplaceentitlementservice (1.0.0) + aws-sdk-marketplaceentitlementservice (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-marketplacemetering (1.0.0) + aws-sdk-marketplacemetering (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-mediaconvert (1.0.0) + aws-sdk-mediaconvert (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-medialive (1.0.0) + aws-sdk-medialive (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-mediapackage (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-mediastore (1.0.0) + aws-sdk-mediastore (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-mediastoredata (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-migrationhub (1.0.0) + aws-sdk-migrationhub (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-mobile (1.0.0) @@ -323,19 +327,19 @@ GEM aws-sdk-mq (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-mturk (1.1.0) + aws-sdk-mturk (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-opsworks (1.1.0) + aws-sdk-opsworks (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-opsworkscm (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-organizations (1.7.0) + aws-sdk-organizations (1.8.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-pinpoint (1.2.0) + aws-sdk-pinpoint (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-polly (1.4.0) @@ -344,10 +348,10 @@ GEM aws-sdk-pricing (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.8.0) + aws-sdk-rds (1.15.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-redshift (1.1.0) + aws-sdk-redshift (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-rekognition (1.2.0) @@ -356,10 +360,10 @@ GEM aws-sdk-resourcegroups (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-resourcegroupstaggingapi (1.0.0) + aws-sdk-resourcegroupstaggingapi (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-resources (3.10.0) + aws-sdk-resources (3.12.0) aws-sdk-acm (~> 1) aws-sdk-alexaforbusiness (~> 1) aws-sdk-apigateway (~> 1) @@ -369,6 +373,7 @@ GEM aws-sdk-appsync (~> 1) aws-sdk-athena (~> 1) aws-sdk-autoscaling (~> 1) + aws-sdk-autoscalingplans (~> 1) aws-sdk-batch (~> 1) aws-sdk-budgets (~> 1) aws-sdk-cloud9 (~> 1) @@ -482,6 +487,7 @@ GEM aws-sdk-storagegateway (~> 1) aws-sdk-support (~> 1) aws-sdk-swf (~> 1) + aws-sdk-transcribeservice (~> 1) aws-sdk-translate (~> 1) aws-sdk-waf (~> 1) aws-sdk-wafregional (~> 1) @@ -489,29 +495,29 @@ GEM aws-sdk-workmail (~> 1) aws-sdk-workspaces (~> 1) aws-sdk-xray (~> 1) - aws-sdk-route53 (1.6.0) + aws-sdk-route53 (1.9.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-route53domains (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.8.0) + aws-sdk-s3 (1.8.2) aws-sdk-core (~> 3) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sdk-sagemaker (1.3.0) + aws-sdk-sagemaker (1.6.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-sagemakerruntime (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-serverlessapplicationrepository (1.0.0) + aws-sdk-serverlessapplicationrepository (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-servicecatalog (1.2.0) + aws-sdk-servicecatalog (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-servicediscovery (1.0.0) + aws-sdk-servicediscovery (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-ses (1.6.0) @@ -520,13 +526,13 @@ GEM aws-sdk-shield (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-simpledb (1.0.0) + aws-sdk-simpledb (1.0.1) aws-sdk-core (~> 3) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.0.0) + aws-sdk-sms (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-snowball (1.1.0) + aws-sdk-snowball (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-sns (1.1.0) @@ -535,28 +541,31 @@ GEM aws-sdk-sqs (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-ssm (1.5.0) + aws-sdk-ssm (1.8.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-states (1.2.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-storagegateway (1.2.0) + aws-sdk-storagegateway (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-support (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-support (1.0.0) + aws-sdk-swf (1.0.1) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-swf (1.0.0) + aws-sdk-transcribeservice (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-translate (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-waf (1.3.0) + aws-sdk-waf (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-wafregional (1.3.0) + aws-sdk-wafregional (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-workdocs (1.1.0) @@ -565,7 +574,7 @@ GEM aws-sdk-workmail (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-workspaces (1.0.0) + aws-sdk-workspaces (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-xray (1.1.0) @@ -579,15 +588,15 @@ GEM bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.1.0) - capybara (2.16.1) + byebug (10.0.1) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) - childprocess (0.8.0) + xpath (>= 2.0, < 4.0) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -598,10 +607,10 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.0.5) crass (1.0.3) - devise (4.3.0) + devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) + railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) diff-lcs (1.3) @@ -609,8 +618,8 @@ GEM dotenv-rails (2.2.1) dotenv (= 2.2.1) railties (>= 3.2, < 5.2) - down (4.2.0) - erubi (1.7.0) + down (4.3.0) + erubi (1.7.1) erubis (2.7.0) execjs (2.7.0) factory_girl (4.9.0) @@ -618,7 +627,7 @@ GEM factory_girl_rails (4.9.0) factory_girl (~> 4.9.0) railties (>= 3.0.0) - ffi (1.9.18) + ffi (1.9.23) friendly_id (5.2.3) activerecord (>= 4.0.0) globalid (0.4.1) @@ -638,49 +647,52 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - httparty (0.15.6) + httparty (0.16.1) multi_xml (>= 0.5.2) humane-rails (5.1.0) rails (>= 3.2.0) - i18n (0.9.1) + i18n (1.0.0) concurrent-ruby (~> 1.0) jmespath (1.3.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.1.1) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) method_source (0.9.0) + mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) + minitest (5.11.3) multi_xml (0.6.0) - nio4r (2.1.0) - nokogiri (1.8.1) + nio4r (2.3.0) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) - pg (0.21.0) - public_suffix (3.0.1) - puma (3.11.0) - rack (2.0.3) - rack-test (0.8.2) + pg (1.0.0) + public_suffix (3.0.2) + puma (3.11.3) + rack (2.0.4) + rack-test (1.0.0) rack (>= 1.0, < 3) - rails (5.2.0.beta2) - actioncable (= 5.2.0.beta2) - actionmailer (= 5.2.0.beta2) - actionpack (= 5.2.0.beta2) - actionview (= 5.2.0.beta2) - activejob (= 5.2.0.beta2) - activemodel (= 5.2.0.beta2) - activerecord (= 5.2.0.beta2) - activestorage (= 5.2.0.beta2) - activesupport (= 5.2.0.beta2) + rails (5.2.0.rc2) + actioncable (= 5.2.0.rc2) + actionmailer (= 5.2.0.rc2) + actionpack (= 5.2.0.rc2) + actionview (= 5.2.0.rc2) + activejob (= 5.2.0.rc2) + activemodel (= 5.2.0.rc2) + activerecord (= 5.2.0.rc2) + activestorage (= 5.2.0.rc2) + activesupport (= 5.2.0.rc2) bundler (>= 1.3.0) - railties (= 5.2.0.beta2) + railties (= 5.2.0.rc2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -689,22 +701,22 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.2.0.beta2) - actionpack (= 5.2.0.beta2) - activesupport (= 5.2.0.beta2) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.0.rc2) + actionpack (= 5.2.0.rc2) + activesupport (= 5.2.0.rc2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.0) - rb-fsevent (0.10.2) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rspec-core (3.7.0) + rspec-core (3.7.1) rspec-support (~> 3.7.0) rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) @@ -720,12 +732,12 @@ GEM rspec-expectations (~> 3.7.0) rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) - rspec-support (3.7.0) + rspec-support (3.7.1) ruby_dep (1.5.0) - ruby_parser (3.10.1) + ruby_parser (3.11.0) sexp_processor (~> 4.9) rubyzip (1.2.1) - sass (3.5.4) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -739,13 +751,13 @@ GEM seed_dump (3.2.4) activerecord (>= 4) activesupport (>= 4) - selenium-webdriver (3.8.0) + selenium-webdriver (3.11.0) childprocess (~> 0.5) - rubyzip (~> 1.0) - sexp_processor (4.10.0) + rubyzip (~> 1.2) + sexp_processor (4.10.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - shrine (2.8.0) + shrine (2.9.0) down (~> 4.1) shrine-memory (0.3.0) shrine (~> 2.2) @@ -765,14 +777,14 @@ GEM thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) - tzinfo (1.2.4) + turbolinks (5.1.0) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2017.3) + tzinfo-data (1.2018.4) tzinfo (>= 1.0.0) - uglifier (4.0.2) + uglifier (4.1.8) execjs (>= 0.3.0, < 3) warden (1.2.7) rack (>= 1.0) @@ -781,11 +793,11 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -808,7 +820,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) pg puma - rails (~> 5.2.0.beta2) + rails (~> 5.2.0.rc2) rails-controller-testing rspec-rails sass-rails @@ -825,7 +837,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 2.4.2p198 + ruby 2.4.3p205 BUNDLED WITH - 1.16.0 + 1.16.1 diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 5a1e87e..2cc08d0 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -13,10 +13,12 @@ Roof Sets %dl - - @roof_sets.each do |roof_set| + - if @roof_sets + - @roof_sets.each do |roof_set| + %dt + = link_to roof_set.name, roof_set + %dd + = roof_set.description + - else %dt - = link_to roof_set.name, roof_set - %dd - = roof_set.description - - \ No newline at end of file + None! \ No newline at end of file diff --git a/data/sfusd2.csv b/data/sfusd2.csv new file mode 100644 index 0000000..ed2c1b4 --- /dev/null +++ b/data/sfusd2.csv @@ -0,0 +1,6 @@ +NAME,ADDRESS,CITY,STATE,ZIPCODE,GNIS_ID +Life Learning Academy Charter School,651 8th Street,San Francisco,CA,94130,2506865 +Alliant International University,One Beach Street Suite 100,San Francisco,CA,94133-1221,2370744 +Montessori Children's Center,755 Font Boulevard,San Francisco,CA,94132,2506903 +Pacific Primary School,1500 Grove Street,San Francisco,CA,94117,2506899 +Abraham Lincoln High School,2162 24th Avenue,San Francisco,CA,94116-1723,227118 \ No newline at end of file