marged Develop

.gitignore

@@ -15,3 +15,7 @@
 /log/*
 !/log/.keep
 /tmp
+
+/data/*
+
+dump.rdb

.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

.vagrant/machines/nox/virtualbox/action_provision

@@ -0,0 +1 @@
+1.5:78672f12-18ae-4cd7-8606-7073530c02a2

.vagrant/machines/nox/virtualbox/action_set_name

@@ -0,0 +1 @@
+1449329777

.vagrant/machines/nox/virtualbox/creator_uid

@@ -0,0 +1 @@
+501

.vagrant/machines/nox/virtualbox/id

@@ -0,0 +1 @@
+78672f12-18ae-4cd7-8606-7073530c02a2

.vagrant/machines/nox/virtualbox/index_uuid

@@ -0,0 +1 @@
+d1b79d4f7a9d4b558848ddcb5403877d

.vagrant/machines/nox/virtualbox/private_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA0biLLIvog+G2O6O/pLfYPBQQjSCWQbfowrUqfSEQb8RysEH7
+sIJs6xDFS8ovasOueiCgSdiB/6nbFjPP8VHpfVSvSSK0CcQk4XGnldPhhex35jlp
+QzHubCvLW3sophMHRDehf76971Wd1QwPWgJazuvwblyKm70GeEcwQR/QBnLBy4T0
+/YjhMXpBRDWmFUCTkb7p2kQeIfLZbbinsTj8ytY9YT6PYRX0cYnJmwYV1qPePIru
+jNhBoEDSkyanCXnwhteJK3uRyJTUEUIXmw429WUxrzloOTyQQAoHXAXvTvFwMZCL
+bh7GmhxrHJC5HSHWZ/4d///nHWH1++2sF2xhPQIDAQABAoIBAQDEgGN248iC+ZPk
+IbPJRLEI6cvwT945yXYAKfubrsVV0/2aBNktM6eWQOp77v+qy5rJt5Q4XPLBeIdd
+MELgW92onxZ2Mlv64puj2PgrPJINB9n4D0b/vOMm24n5N1aI9T9TvcRGi5QvkksG
+efxQW/B1/UAUSAVfkydiv2EJRCOIRX9htFx5rzHIP3hDw8AL7nl890DFL6tXiYBo
+vbvmSADnisChew+E01DSxLnoxHtERtq+9tEtLQJY6+aoOaRg1GSwjqTXe9mUxRPM
+0Y/ne1u1zxXt9VocOFSN9o1Palluh00U2tWuCry1mr+Qpq4/OyxI8TciGqFCr94H
+ZEujgkkJAoGBAPP2CsueBY23FbiMqTxEfiRzv47v2bI9SXybBPmQMWm7l68sprmI
+6xWBgxETL6/pqLPSijWf/CT6lzPMReeGnp4+Rua0OI854/Gp3TcALn64S078c1A4
+piH9H5ZaWRlNSRhSRU0Po5iSEM2mKRvgotYpJNF3afDUVY5Kg2DGk77vAoGBANwR
+8e97h6W51tp/ryZnjJLFx2Z4YlTZtdg/qV0M/nCAKqbvUHu8lyP72fF219cpA4qC
+ef0nmZGYcAPdmPsZuonioMVkm1zfF04sGwZwL8rYF4bo7GXji3JHcE1HUKottlYA
+/wp4U7rXXMNxwm1pA8sKY3d+VMMPUfUMoYmCZiKTAoGBAMMXmlB0wSowJG2eBuRM
+Pbf23FR5GFVCT5cW/OZ6Whmcy9NpWLb8eEqNdHveJP9/Usri7mWt19zWjL3+eFSL
+QiN32Ak8TBK1j8S9O0t1mLj7tjWnCqw3cRuzKWR6QdBLDs4lVIgonoIvJMLgQvWp
+MW8kHe5omU7e7sBIdEGa66H/AoGAEo5Yzg6mc2zmFuppRF261q1ikNtZvznUQXWs
+vDHaSnYkIotPR/+w5tHXoKqarIPCzq0NyDDMnCA0Yb8PpSyYNAQt9jbzerM87dR+
+Ot6+yOXLpg6B0F2NZodririWrqLIGxxeZO2cccazBa/T6xHNxhMMLAk08HWcPYNh
+I40hO40CgYEA7ggFL3LiDEZcDIss4U6vBhGQncRqfmyqAiLrqhby2vKRV+gnR+Fe
+UYIRF7IxO2BBKJw3lFQR3YsRhqeSM4q13X//UAippJQlNZX0dPQsrVNfp6tU+fNF
+SyGaWggqPDuY7JVHS+cMXWBW9nWBuBRY8AqaadTlCC/6irkUlr9UStY=
+-----END RSA PRIVATE KEY-----

.vagrant/machines/nox/virtualbox/synced_folders

@@ -0,0 +1 @@
+{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/gamerinshaft/rails_app/switch_api","disabled":false},"/tmp/vagrant-puppet/manifests-165a8fe60decd8583fc5c43cbcd1c9cf":{"owner":"root","nfs__quiet":true,"guestpath":"/tmp/vagrant-puppet/manifests-165a8fe60decd8583fc5c43cbcd1c9cf","hostpath":"/Users/gamerinshaft/rails_app/switch_api/puppetmanifests","disabled":false},"/tmp/vagrant-puppet/modules-5f5d0cebfa4e3f108c5e8c7b7edd953b":{"owner":"root","nfs__quiet":true,"guestpath":"/tmp/vagrant-puppet/modules-5f5d0cebfa4e3f108c5e8c7b7edd953b","hostpath":"/Users/gamerinshaft/rails_app/switch_api/modules","disabled":false}}}

Gemfile

@@ -11,7 +11,7 @@ gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 4.1.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
+gem 'therubyracer', platforms: :ruby
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
@@ -37,14 +37,19 @@ gem 'grape-jbuilder'
 gem 'grape-swagger'
 gem 'grape-swagger-ui'
 gem 'haml-rails'
+gem 'redis'
+gem 'resque'
+gem 'resque-scheduler'
+gem 'rubocop', group: :development
+gem 'kakurenbo-puti'
+gem 'gon'
 
 group :development, :test do
   gem 'byebug'
 
   gem 'web-console', '~> 2.0'
 
   gem 'spring'
-  gem 'rubocop'
   gem 'rails-erd'
   gem 'pry-rails'
   gem 'pry-doc'
@@ -55,5 +60,9 @@ group :development, :test do
   gem 'awesome_print'
   gem 'quiet_assets'
   gem 'annotate'
-  gem 'rspec-rails', '~> 3.0.0.beta2'
+  gem 'json_expressions'
+  gem 'rspec-rails', '~> 3.0.0'
+  gem 'factory_girl_rails'
+  gem 'faker'
+  gem 'database_cleaner'
 end

Gemfile.lock

@@ -52,7 +52,7 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    byebug (8.2.0)
+    byebug (8.2.1)
     choice (0.2.0)
     coderay (1.1.0)
     coercible (1.0.0)
@@ -64,15 +64,29 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.0)
+    database_cleaner (1.5.1)
     debug_inspector (0.0.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     equalizer (0.0.11)
     erubis (2.7.0)
     execjs (2.6.0)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    faker (1.6.1)
+      i18n (~> 0.5)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    gon (6.0.1)
+      actionpack (>= 3.0)
+      json
+      multi_json
+      request_store (>= 1.0)
     grape (0.13.0)
       activesupport
       builder
@@ -125,18 +139,23 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    json_expressions (0.8.3)
+    kakurenbo-puti (0.1.0)
+      activerecord (>= 4.1.0)
+    libv8 (3.16.14.13)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
     minitest (5.8.3)
+    mono_logger (1.1.0)
     multi_json (1.11.2)
     multi_xml (0.5.5)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
@@ -159,6 +178,8 @@ GEM
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
+    rack-protection (1.5.3)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.1)
@@ -193,13 +214,28 @@ GEM
     rainbow (2.0.0)
     rake (10.4.2)
     rdoc (4.2.0)
-      json (~> 1.4)
-    rspec-core (3.0.3)
+    redis (3.2.2)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    ref (2.0.0)
+    request_store (1.2.1)
+    resque (1.25.2)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque-scheduler (4.0.0)
+      mono_logger (~> 1.0)
+      redis (~> 3.0)
+      resque (~> 1.25)
+      rufus-scheduler (~> 3.0)
+    rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    rspec-expectations (3.0.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
+    rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
     rspec-rails (3.0.2)
       actionpack (>= 3.0)
@@ -209,7 +245,7 @@ GEM
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
+    rspec-support (3.0.4)
     rubocop (0.35.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.3.0, < 3.0)
@@ -219,8 +255,9 @@ GEM
       tins (<= 1.6.0)
     ruby-graphviz (1.2.2)
     ruby-progressbar (1.7.5)
-    ruby_parser (3.7.1)
+    ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
+    rufus-scheduler (3.1.10)
     sass (3.4.19)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -232,9 +269,14 @@ GEM
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
     sexp_processor (4.6.0)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
-    spring (1.4.4)
-    sprockets (3.4.0)
+    spring (1.5.0)
+    sprockets (3.5.0)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
@@ -243,6 +285,9 @@ GEM
     sqlite3 (1.3.11)
     tapp (1.5.0)
       thor
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
@@ -258,6 +303,8 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicode-display_width (0.1.1)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -279,6 +326,10 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   byebug
   coffee-rails (~> 4.1.0)
+  database_cleaner
+  factory_girl_rails
+  faker
+  gon
   grape
   grape-jbuilder
   grape-swagger
@@ -288,19 +339,25 @@ DEPENDENCIES
   hirb-unicode
   jbuilder (~> 2.0)
   jquery-rails
+  json_expressions
+  kakurenbo-puti
   pry-byebug
   pry-doc
   pry-rails
   quiet_assets
   rails (= 4.2.1)
   rails-erd
-  rspec-rails (~> 3.0.0.beta2)
+  redis
+  resque
+  resque-scheduler
+  rspec-rails (~> 3.0.0)
   rubocop
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   spring
   sqlite3
   tapp
+  therubyracer
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)