trailguide 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1168244069ee4cc060d0e55a08c80bbccff498fa545105604902acc15a750386
-  data.tar.gz: b84fd9db3485005545dae5c0a8d52d5b30b85eb6bd09da83c690db85adb179d7
+  metadata.gz: f039c1544c6c7838e9cbfcbed1c055695c9858410c4691e4610c0d01a3f4641a
+  data.tar.gz: 0352f018c0b28e12ab7ad1240601d30efbc3128060ddff71a0bb71ab62f0bcbb
 SHA512:
-  metadata.gz: 203c6d29fe77bc8e5ef5f4ffbe11f93bbc14c9d8923228285c4fe03c03f59b16c2a1aebcf617443fcc21b420cd51d8dbfe77ac8b983a430a3a1f6b0ec0f386a8
-  data.tar.gz: 9508e5301cc1b3dc9aef23e2fe0199b50f2ea29bdc704662de63f002bec1adade251111afbf2e374410f0dd33a69f5bc8509a1a2d334095c2d67ca25a049885d
+  metadata.gz: f98583d74689f359af53deaacc3ec9423724353207c18051a3502b7b247acda71f74c44020b7cf99995cd64bdfa0063b6f4737d2c38f0aa96eec50bed62a7e8d
+  data.tar.gz: 0e3905af90fee8378ced8c729da4a5d2f127208b4fb6e26cdfc1a07b6376486373ec36ca825fb9fad52056b72e0d4f0b40b30c185681280b060ff14553f11b74

data/app/controllers/trail_guide/admin/experiments_controller.rb

@@ -1,6 +1,6 @@
 module TrailGuide
   module Admin
-    class ExperimentsController < TrailGuide::Admin::ApplicationController
+    class ExperimentsController < ApplicationController
       before_action except: [:index] do
         (redirect_to :back rescue redirect_to trail_guide_admin.experiments_path) and return unless experiment.present?
       end
@@ -29,7 +29,7 @@ module TrailGuide
       end
 
       def winner
-        experiment.declare_winner!(params[:winner])
+        experiment.declare_winner!(params[:variant])
         redirect_to :back rescue redirect_to trail_guide_admin.experiments_path
       end
 

data/app/controllers/trail_guide/{application_controller.rb → experiments_controller.rb}

@@ -1,5 +1,5 @@
 module TrailGuide
-  class ApplicationController < ::ApplicationController
+  class ExperimentsController < ::ApplicationController
     before_action do
       render json: { error: "Experiment does not exist" }, status: 404 and return unless experiment.present?
     end

data/config/routes.rb

@@ -1,10 +1,24 @@
 TrailGuide::Engine.routes.draw do
-  get   '/:experiment_name' => 'application#choose',
+  get   '/:experiment_name' => 'experiments#choose',
         defaults: { format: :json }
-  match '/:experiment_name' => 'application#convert',
+  match '/:experiment_name' => 'experiments#convert',
         defaults: { format: :json },
         via: [:put, :post]
-  match '/:experiment_name/:checkpoint' => 'application#convert',
+  match '/:experiment_name/:checkpoint' => 'experiments#convert',
         defaults: { format: :json },
         via: [:put, :post]
 end
+
+if defined?(TrailGuide::Admin::Engine)
+  TrailGuide::Admin::Engine.routes.draw do
+    resources :experiments, path: '/', only: [:index] do
+      member do
+        match :start,   via: [:put, :post, :get]
+        match :stop,    via: [:put, :post, :get]
+        match :reset,   via: [:put, :post, :get]
+        match :restart, via: [:put, :post, :get]
+        match :winner,  via: [:put, :post, :get], path: 'winner/:variant'
+      end
+    end
+  end
+end

data/lib/trail_guide/admin/engine.rb

@@ -9,5 +9,3 @@ module TrailGuide
     end
   end
 end
-
-load TrailGuide::Admin::Engine.root.join("config/admin/routes.rb")

data/lib/trail_guide/version.rb

@@ -2,7 +2,7 @@ module TrailGuide
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 4
+    PATCH = 5
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailguide
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mark Rebec
@@ -108,11 +108,10 @@ files:
 - app/assets/stylesheets/trail_guide/admin/application.css
 - app/controllers/trail_guide/admin/application_controller.rb
 - app/controllers/trail_guide/admin/experiments_controller.rb
-- app/controllers/trail_guide/application_controller.rb
+- app/controllers/trail_guide/experiments_controller.rb
 - app/views/layouts/trail_guide/admin/application.html.erb
 - app/views/trail_guide/admin/experiments/_experiment.html.erb
 - app/views/trail_guide/admin/experiments/index.html.erb
-- config/admin/routes.rb
 - config/routes.rb
 - lib/trail_guide/adapters.rb
 - lib/trail_guide/adapters/participants.rb

data/config/admin/routes.rb

@@ -1,11 +0,0 @@
-TrailGuide::Admin::Engine.routes.draw do
-  resources :experiments, path: '/', only: [:index] do
-    member do
-      match :start,   via: [:put, :post, :get]
-      match :stop,    via: [:put, :post, :get]
-      match :reset,   via: [:put, :post, :get]
-      match :restart, via: [:put, :post, :get]
-      match 'winner/:winner', action: :winner, as: :winner, via: [:put, :post, :get]
-    end
-  end
-end