rrrspec-web 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e6d8a19033575e5a1996c713a7e188e7e503322
-  data.tar.gz: f8228f601047f98f4acffbacdb3eee14290a5f10
+  metadata.gz: 74ee5aa013465a0f3fccc8043aeb8f43370bc354
+  data.tar.gz: 3a0fbc05bf9244d8033a6ad2430bf75c61f6276c
 SHA512:
-  metadata.gz: 4f211ee0bce9f400bec637b5b11365863c8041183e7a16a560cebd10fb3da5f6eaa04fdd1a16678e4fdee0136f2bcb2880148d0b80cdbc0c56e140c6ce3a866f
-  data.tar.gz: 9c1a9ea865e71ce6bdac88a41dbcc8107cc2e4ee5cdf798f0acfc56af0ef076ad4ef76997978cfba4b1cb67289c42a4d4b849adccc83635b4ea5ddaa307c8ce9
+  metadata.gz: 645daaa283bcbcdbe3bebdaeb7e3d910f67419c2d12c32dcc736480dc53f7abdf8716bf75bedfaf4319b48b1f6186444d3e41f1d61648136e2edb0cfea2bbcbb
+  data.tar.gz: 40fb536e6e66ea5ca127015add099471f4b25128e86551e736bd3d2868fa13be4dc3eaa5e4d84c767124384488fffa2843179f15b03e0ab11d34dc477f48c3a1

data/lib/rrrspec/web.rb

@@ -9,6 +9,7 @@ require 'rrrspec/web/app'
 require 'rrrspec/web/configuration'
 
 RRRSpec.configuration = RRRSpec::Web::WebConfiguration.new
+ActiveSupport::JSON::Encoding.time_precision = 0
 
 module RRRSpec
   module Web

data/lib/rrrspec/web/api.rb

@@ -6,56 +6,6 @@ module RRRSpec
   module Web
     DEFAULT_PER_PAGE = 10
 
-    class API < Grape::API
-      version 'v1', using: :path
-      format :json
-      set :per_page, DEFAULT_PER_PAGE
-
-      resource :tasksets do
-        desc "Return active tasksets"
-        get :actives do
-          ActiveTaskset.list
-        end
-
-        desc "Return recently finished tasksets"
-        get :recents do
-          paginate(RRRSpec::Server::Persistence::Taskset.recent).map(&:as_json_with_no_relation)
-        end
-
-        desc "Return tasksets that contains failure_exit slave"
-        get :failure_slaves do
-          paginate(RRRSpec::Server::Persistence::Taskset.has_failed_slaves.recent).map(&:as_json_with_no_relation)
-        end
-
-        desc "Return a taskset."
-        params { requires :key, type: String, desc: "Taskset key." }
-        route_param :key do
-          get do
-            p_obj = RRRSpec::Server::Persistence::Taskset.where(key: params[:key]).full.first
-            if p_obj
-              p_obj.as_full_json.update('is_full' => true)
-            else
-              error!('Not Found', 404)
-            end
-          end
-        end
-      end
-
-      namespace :batch do
-        resource :tasks do
-          desc "Return all tasks in the taskset"
-          params { requires :key, type: String, desc: "Taskset key." }
-          route_param :key do
-            get do
-              r_taskset = Taskset.new(params[:key])
-              error!('Not Found', 404) unless r_taskset.exist?
-              r_taskset.tasks.map(&:to_h)
-            end
-          end
-        end
-      end
-    end
-
     module OjFormatter
       def self.call(object, env)
         Oj.dump(object, mode: :compat, time_format: :ruby)

data/lib/rrrspec/web/version.rb

@@ -1,5 +1,5 @@
 module RRRSpec
   module Web
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/spec/rrrspec/web/api_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module RRRSpec
-  describe "Web" do
+  RSpec.describe Web do
     before do
       RRRSpec.configuration = Web::WebConfiguration.new
       RRRSpec.configuration.redis = @redis
@@ -73,69 +73,6 @@ module RRRSpec
       worker_log.set_finished_time
     end
 
-    describe Web::API do
-      include Rack::Test::Methods
-
-      def app
-        Web::API
-      end
-
-      describe "GET /v1/tasksets/actives" do
-        before { ActiveTaskset.add(taskset) }
-
-        it 'returns the active tasksets' do
-          get "/v1/tasksets/actives"
-          expect(last_response.status).to eq(200)
-          expect(JSON.parse(last_response.body)).to eq(JSON.parse(ActiveTaskset.list.to_json))
-        end
-      end
-
-      describe "GET /v1/tasksets/recents" do
-        context 'there are 11 tasksets' do
-          before do
-            11.times { Server::Persistence::Taskset.create() }
-          end
-
-          it 'returns the recent 10 tasksets' do
-            get "/v1/tasksets/recents"
-            expect(last_response.status).to eq(200)
-            expect(JSON.parse(last_response.body).size).to eq(10)
-          end
-        end
-      end
-
-      describe "GET /v1/tasksets/:key" do
-        context 'with the taskset persisted' do
-          before do
-            Server::Persister.persist(taskset)
-          end
-
-          it 'returns the taskset' do
-            get "/v1/tasksets/#{taskset.key}"
-            expect(last_response.status).to eq(200)
-            expect(JSON.parse(last_response.body)).to eq(
-              JSON.parse(JSON.generate(Server::Persistence::Taskset.first.as_full_json)).update("is_full" => true)
-            )
-          end
-        end
-
-        context 'with the taskset not persisted' do
-          it 'returns 404' do
-            get "/v1/tasksets/#{taskset.key}"
-            expect(last_response.status).to eq(404)
-          end
-        end
-      end
-
-      describe "GET /v1/batch/tasks/:key" do
-        it 'returns all tasks in the taskset' do
-          get "/v1/batch/tasks/#{taskset.key}"
-          expect(last_response.status).to eq(200)
-          expect(JSON.parse(last_response.body)).to eq([JSON.parse(task.to_json)])
-        end
-      end
-    end
-
     describe Web::APIv2 do
       include Rack::Test::Methods
 
@@ -150,7 +87,7 @@ module RRRSpec
           get "/v2/tasksets/actives"
           expect(last_response.status).to eq(200)
           expect(JSON.parse(last_response.body)).to eq([
-            { 'key' => taskset.key },
+            { 'key' => taskset.key, 'status' => taskset.status, 'rsync_name' => taskset.rsync_name, 'created_at' => taskset.created_at.iso8601 },
           ])
         end
       end

data/spec/spec_helper.rb

@@ -9,7 +9,8 @@ require 'rack/test'
 require 'database_cleaner'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.raise_errors_for_deprecations!
+  config.disable_monkey_patching!
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrrspec-web
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Masaya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler