helena_administration 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f978075a80540cad53ad0d956138185dfdbd9b
-  data.tar.gz: 1535a6e907aca1c901a96213365d357bd7d4f103
+  metadata.gz: 2b74145c74375cd00829d623d68697dbf6c0ebab
+  data.tar.gz: 8ec05a7f09803ea81518bf0af6731a59b3a04d9f
 SHA512:
-  metadata.gz: a04f634738439df548e8a7c6b4614dd138af5117df81b11ea73cd1cfad52bf54a0931626c73a6b4d13607613ec0dcc07718c6194c7d8513016eb25802de932b3
-  data.tar.gz: e7e249d0f518faa423853052ae0ff07885aa167fb1ecc1619e6a57300dfef9bcbffb678748f11340496c211147679f2e5eef2c622d12039b364de85dc10ded29
+  metadata.gz: bba953cb0957798a1fcf47bfbb4cac242e3b6765857ae495244d2a20af8f40c5608526065d926f4bbc0b833ab3bf70eb0574ec72d406abb27943dbaf3d204760
+  data.tar.gz: 14ce62e4a94287109c52edac8c0d47eecf0a938d68ad6883c2e6cedce396c2e6b07d124fa7e5f70fee435b775ccf7be621e8a8d8297a6651339b0130b8934130

data/.travis.yml

@@ -5,3 +5,6 @@ rvm:
 
 services:
   - mongodb
+
+cache: bundler
+sudo: false

data/Gemfile

@@ -13,8 +13,8 @@ gemspec
 # To use debugger
 # gem 'debugger'
 
-gem 'helena', '~> 1.0.0.rc2',
-  git: 'https://github.com/gurix/helena.git'
+gem 'helena', '~> 1.0.0.rc3'
+  # git: 'https://github.com/gurix/helena.git'
   # path: '../helena/'
 
 gem 'compass-h5bp', group: :assets

data/Gemfile.lock

@@ -1,27 +1,7 @@
-GIT
-  remote: https://github.com/gurix/helena.git
-  revision: b62701e9e9ed81a0e927525edcbbca98916595fe
-  specs:
-    helena (1.0.0.rc2)
-      bootstrap-sass (~> 3.2)
-      breadcrumbs_on_rails (~> 2.3)
-      browser (~> 0.8)
-      haml-rails (~> 0.9)
-      jquery-rails (~> 4.0)
-      mongoid (~> 4.0)
-      mongoid-simple-tags (~> 0.1)
-      mongoid_orderable (~> 4.1)
-      rails (~> 4.2)
-      rails-i18n (~> 4.0)
-      responders (~> 2.0)
-      sass-rails (~> 5.0)
-      simple_form (~> 3.1.0.rc2)
-      slim (~> 3.0)
-
 PATH
   remote: .
   specs:
-    helena_administration (0.0.5)
+    helena_administration (0.0.6)
       bootstrap-sass (~> 3.2)
       breadcrumbs_on_rails (~> 2.3)
       codemirror-rails (~> 5)
@@ -45,44 +25,44 @@ GEM
   remote: https://rubygems.org/
   specs:
     ZenTest (4.11.0)
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
       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.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       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.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.2)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    arel (6.0.0)
-    autoprefixer-rails (5.2.1)
+    arel (6.0.2)
+    autoprefixer-rails (5.2.1.1)
       execjs
       json
     autotest (4.4.6)
@@ -97,14 +77,14 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.5)
+    bootstrap-sass (3.3.5.1)
       autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.2.19)
+      sass (>= 3.3.0)
     breadcrumbs_on_rails (2.3.0)
     browser (0.8.0)
-    bson (3.1.0)
+    bson (3.1.2)
     builder (3.2.2)
-    byebug (4.0.5)
+    byebug (5.0.0)
       columnize (= 0.9.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
@@ -169,6 +149,22 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
+    helena (1.0.0.rc3)
+      bootstrap-sass (~> 3.2)
+      breadcrumbs_on_rails (~> 2.3)
+      browser (~> 0.8)
+      haml-rails (~> 0.9)
+      jquery-rails (~> 4.0)
+      mongoid (~> 4.0)
+      mongoid-simple-tags (~> 0.1)
+      mongoid-tree (~> 2.0)
+      mongoid_orderable (~> 4.1)
+      rails (~> 4.2)
+      rails-i18n (~> 4.0)
+      responders (~> 2.0)
+      sass-rails (~> 5.0)
+      simple_form (~> 3.1.0.rc2)
+      slim (~> 3.0)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
@@ -209,6 +205,8 @@ GEM
     mongoid-simple-tags (0.1.3)
       json (~> 1.8)
       mongoid (>= 3.0.3)
+    mongoid-tree (2.0.0)
+      mongoid (>= 4.0, <= 5.0)
     mongoid_orderable (4.1.1)
       mongoid
     moped (2.0.6)
@@ -224,24 +222,24 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
+    pry-byebug (3.2.0)
+      byebug (~> 5.0)
       pry (~> 0.10)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.2)
-      actionmailer (= 4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      activemodel (= 4.2.2)
-      activerecord (= 4.2.2)
-      activesupport (= 4.2.2)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -254,9 +252,9 @@ GEM
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.2.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -271,15 +269,15 @@ GEM
       rspec-mocks (~> 3.3.0)
     rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-rails (3.3.2)
+    rspec-rails (3.3.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -290,7 +288,7 @@ GEM
     rspec-support (3.3.0)
     ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
-    sass (3.4.14)
+    sass (3.4.16)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -319,7 +317,7 @@ GEM
     spork (0.9.2)
     sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -350,7 +348,7 @@ DEPENDENCIES
   dotenv-rails
   factory_girl_rails
   faker
-  helena (~> 1.0.0.rc2)!
+  helena (~> 1.0.0.rc3)
   helena_administration!
   launchy
   mongoid-rspec

data/app/controllers/helena_administration/versions_controller.rb

@@ -10,14 +10,18 @@ module HelenaAdministration
     end
 
     def new
+      source_version = @survey.newest_version
       @version = @survey.versions.any? ? @survey.versions.build(source_version.attributes) : @survey.versions.build
+      @version.parent = source_version
       @version.survey_detail = (@version.try(:survey_detail) || Helena::SurveyDetail.new)
       @version.notes = ''
       add_breadcrumb t('.new'), new_survey_version_path(@survey)
     end
 
     def create
-      build_version && @version.update_attributes(version_params)
+      @version = build_version
+      @version.update_attributes(version_params)
+
       if @version.save
         flash[:success] = t 'shared.actions.created'
       else
@@ -64,19 +68,16 @@ module HelenaAdministration
     end
 
     def version_params
-      params.require(:version).permit(:notes, :session_report, :active, settings: [:display_progressbar], survey_detail_attributes: [:title, :description])
+      params.require(:version).permit(:parent, :notes, :session_report, :active,
+                                      settings: [:display_progressbar], survey_detail_attributes: [:title, :description])
     end
 
     def build_version
-      if source_version
-        @version = Helena::VersionPublisher.publish(source_version)
-      else
-        @version = @survey.versions.build
-      end
-    end
-
-    def source_version
-      @survey.newest_version
+      @version = if version_params[:parent].present?
+                   Helena::VersionPublisher.publish(@survey.versions.find(version_params[:parent]))
+                 else
+                   @survey.versions.build version: (@survey.newest_version.version + 1)
+                 end
     end
   end
 end

data/app/views/helena_administration/versions/_form.html.slim

@@ -6,7 +6,8 @@
   = f.input :session_report, as: :text, hint: t('.slim_lang_hint_html'), input_html: { cols: 60, rows: 10, class: 'slim_lang' }
   - if f.object.persisted?
     = f.input :active, as: :boolean
-
+  - else
+    = f.input :parent, collection: f.object.ancestors_and_self, label_method: ->(v){ "#{v.survey.name} #{v.version} #{v.notes}" if v.present?}, include_blank: true, selected: -> (v) { v.parent }
   = f.simple_fields_for :settings do |setting|
     = setting.input :display_progressbar, as:         :boolean,
                                           label:      t('.display_progressbar'),

data/lib/helena_administration/version.rb

@@ -1,3 +1,3 @@
 module HelenaAdministration
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helena_administration
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Markus Graf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari