From 63f73a8f2405fe3122e4f1cea114ed0a3db21bca Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Thu, 26 Mar 2015 12:32:00 +0200 Subject: [PATCH] Update gems, mount depp engine --- Gemfile | 9 ++-- Gemfile.lock | 109 ++++++++++++++++++++++++++++------------------- config/routes.rb | 2 + 3 files changed, 72 insertions(+), 48 deletions(-) diff --git a/Gemfile b/Gemfile index 98a6bed4c..0b11eab88 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # core -gem 'rails', '4.2.0' +gem 'rails', '4.2.1' gem 'iso8601', '~> 0.8.2' # for dates and times gem 'hashie_rails', '~> 0.0.1' @@ -19,8 +19,8 @@ gem 'rails-settings-cached', '~> 0.4.1' # for settings gem 'delayed_job_active_record', '~> 4.0.3' # delayed job # html-xml -gem 'haml-rails', '~> 0.6.0' # haml for views -gem 'nokogiri', '~> 1.6.2.1' # For XML parsing +gem 'haml-rails', '~> 0.9.0' # haml for views +gem 'nokogiri', '>= 1.6.2.2' # For XML parsing # style gem 'sass-rails', '~> 5.0.1' # sass style @@ -66,6 +66,9 @@ gem 'deep_cloneable', '~> 2.1.1' # id + mid login gem 'digidoc_client', '~> 0.2.1' +# epp + repp client +gem 'depp', github: 'domify/depp' + group :development do # dev tools gem 'spring', '~> 1.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 045f05d6e..86dcdf282 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,6 +8,24 @@ GIT activesupport (>= 3.0, < 6.0) request_store (~> 1.1.0) +GIT + remote: git://github.com/domify/depp.git + revision: c4dfe022c5b74a681246ea6f9f183a35e09b7d5a + specs: + depp (0.0.1) + coderay (>= 1.1.0) + coffee-rails (>= 4.1.0) + countries (>= 0.9.3) + epp-xml (>= 0.10.4) + figaro (>= 1.1.0) + haml-rails (>= 0.9.0) + jquery-rails (>= 4.0.3) + nokogiri (>= 1.6.6.2) + rails (>= 4.2.1) + sass-rails (>= 5.0.0) + uglifier (>= 2.6.1) + uuidtools (>= 2.1.4) + GIT remote: git://github.com/haml/html2haml.git revision: 6984f50bdbbd6291535027726a5697f28778ee8d @@ -22,38 +40,38 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actionmailer (4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0) - actionview (= 4.2.0) - activesupport (= 4.2.0) - rack (~> 1.6.0) + actionpack (4.2.1) + actionview (= 4.2.1) + activesupport (= 4.2.1) + rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0) - activesupport (= 4.2.0) + actionview (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0) - activesupport (= 4.2.0) + activejob (4.2.1) + activesupport (= 4.2.1) globalid (>= 0.3.0) - activemodel (4.2.0) - activesupport (= 4.2.0) + activemodel (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) + activerecord (4.2.1) + activemodel (= 4.2.1) + activesupport (= 4.2.1) arel (~> 6.0) activerecord-import (0.6.0) activerecord (>= 3.0) - activesupport (4.2.0) + activesupport (4.2.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -178,7 +196,7 @@ GEM ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.4) formatador (0.2.5) - globalid (0.3.0) + globalid (0.3.3) activesupport (>= 4.1.0) grape (0.10.1) activesupport @@ -208,10 +226,10 @@ GEM builder (>= 2.1.2) haml (4.0.6) tilt - haml-rails (0.6.0) + haml-rails (0.9.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 3.1, < 5.0) + haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) hashie (3.3.2) @@ -261,13 +279,13 @@ GEM mina (0.3.1) open4 (~> 1.3.4) rake - mini_portile (0.6.0) + mini_portile (0.6.2) minitest (5.5.1) - multi_json (1.10.1) + multi_json (1.11.0) multi_xml (0.5.5) newrelic_rpm (3.9.9.275) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) nori (2.4.0) nprogress-rails (0.1.6.5) open4 (1.3.4) @@ -298,30 +316,30 @@ GEM rack-test (0.6.3) rack (>= 1.0) railroady (1.3.0) - rails (4.2.0) - actionmailer (= 4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) - activemodel (= 4.2.0) - activerecord (= 4.2.0) - activesupport (= 4.2.0) + rails (4.2.1) + actionmailer (= 4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) + activemodel (= 4.2.1) + activerecord (= 4.2.1) + activesupport (= 4.2.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) + railties (= 4.2.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) + rails-dom-testing (1.0.6) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.1) + rails-html-sanitizer (1.0.2) loofah (~> 2.0) rails-settings-cached (0.4.1) rails (>= 4.0.0) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + railties (4.2.1) + actionpack (= 4.2.1) + activesupport (= 4.2.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) @@ -406,7 +424,7 @@ GEM json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) selectize-rails (0.11.2) - sexp_processor (4.4.5) + sexp_processor (4.5.0) shoulda-matchers (2.6.2) activesupport (>= 3.0.0) simplecov (0.9.1) @@ -427,7 +445,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.3) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -440,7 +458,7 @@ GEM libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) timers (4.0.1) hitimes @@ -499,6 +517,7 @@ DEPENDENCIES database_cleaner (~> 1.3.0) deep_cloneable (~> 2.1.1) delayed_job_active_record (~> 4.0.3) + depp! devise (~> 3.4.1) digidoc_client (~> 0.2.1) epp (~> 1.4.0) @@ -511,7 +530,7 @@ DEPENDENCIES guard-rails (~> 0.7.0) guard-rspec (~> 4.3.1) guard-rubocop (~> 1.1.0) - haml-rails (~> 0.6.0) + haml-rails (~> 0.9.0) hashie_rails (~> 0.0.1) html2haml! isikukood @@ -522,7 +541,7 @@ DEPENDENCIES launchy (~> 2.4.3) mina (~> 0.3.1) newrelic_rpm (~> 3.9.9.275) - nokogiri (~> 1.6.2.1) + nokogiri (>= 1.6.2.2) nprogress-rails (~> 0.1.6.5) paper_trail! pg (~> 0.18.0) @@ -531,7 +550,7 @@ DEPENDENCIES poltergeist (~> 1.5.1) pry (~> 0.10.1) railroady (~> 1.3.0) - rails (= 4.2.0) + rails (= 4.2.1) rails-settings-cached (~> 0.4.1) rake ransack (~> 1.5.1) diff --git a/config/routes.rb b/config/routes.rb index 01d24b182..334730e57 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -79,6 +79,8 @@ Rails.application.routes.draw do end namespace(:registrar) do + mount Depp::Engine, at: '/depp' + resources :invoices devise_scope :user do