house_test 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30f86898a56ca3a25fdf51b7aa3f2b5a023792a0
-  data.tar.gz: 8a22d9dea25927a632cebbd40a522c320628b659
+SHA256:
+  metadata.gz: aa9b9426fa22a65adf0d6ef9ad20fa4f2bf2a1815453913a0637bba567cbfce8
+  data.tar.gz: f65867244ef38f52a91703c31a74637fe2663ee394772a65549884e53c2209a2
 SHA512:
-  metadata.gz: af33c1e1e9b9c003a25d76d0a0876b5f70e1a2df89898225bda1ff7a0aaa4a579a63e2c624604f0e27ccd11794b4728b1607086e6dc79344f4b87d4b69e31023
-  data.tar.gz: 792727d92470a5dad57181edf48c591a2edebc63102453f0744cb83f8fee90eaf267307ccba06a0cfce28f593aaa6fd9b9260a4b7cc2c407ccc672c2e448a675
+  metadata.gz: 5caa100daf29af148492381b98af6ac3aa8264318fe6d538614c5ed181b5c78fee11ab1dab7bc73e12b29f95bb0c4bc8ebc21bbe00c5d383e3fbd5b9c729d17f
+  data.tar.gz: ff207e3d24f1adfcaf9c4987c93cbdfdaf5daad056f31ed66e0473d113ca504bc694590f536720dbbf883ef85818872fff09486cc76b7e6dc4dc10e5f70c666c

data/.gitlab-ci.yml

@@ -0,0 +1,12 @@
+image: ruby:2.6
+
+before_script:
+  - ruby -v
+  - which ruby
+  - gem install bundler rake
+  - bundle install
+
+test:
+  stage: test
+  script:
+    - bundle exec rake

data/.rubocop.yml

@@ -1,2 +1,2 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'house_test'

data/house_test.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'house_test/version'
@@ -29,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rest-client'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-faker'
   spec.add_dependency 'faker'
   spec.add_dependency 'hashie'
   spec.add_dependency 'sinatra', '2.0.4'

data/lib/house_test.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 require 'faker'
 require 'house_test/version'
 require 'house_test/indifferent_hash'
+require 'active_support'
+ActiveSupport::Deprecation.silenced = true
 require 'soaspec'
 
 # The code loaded when simply requiring the gem will only load code for the client

data/lib/house_test/backend/house.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Backend
   # House in memory
   class House
@@ -8,7 +10,7 @@ module Backend
       params = IndifferentHash.new(house_params)
 
       self.name = params[:name] || Faker::Name.name
-      self.rooms = (params[:rooms] || Faker::Number.number(1)).to_i
+      self.rooms = (params[:rooms] || Faker::Number.number(digits: 1)).to_i
       self.garages = params[:garages] || 1
       self.bathrooms = params[:bathrooms] || rooms - 1
       self.id = SecureRandom.uuid

data/lib/house_test/house_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'house_test/backend/house'
 require 'house_test/server/house_server'
 # Representing House objects in 'backend' (memory)
@@ -17,20 +19,37 @@ module HouseTest
     end
 
     # Get an existing house
+    # @param [Integer] id Id of house to get
+    # @return [House] House found. Nil if nothing found
     def get(id)
       houses.find { |house| house.id == id }
     end
 
     # Update house at id's key to value
+    # @param [Integer] id Id of house to update
+    # @return [Integer] Id of house updated
     def update(id, key, value)
-      found_house = houses.find { |house| house.id == id }
+      found_house = get id
+      return nil unless found_house
+
       found_house.send("#{key}=", value)
       id
     end
 
+    # Delete house at id
+    # @param [Integer] id Id of house to delete
+    # @return [Integer] Id of house deleted. Nil if not found
+    def delete(id)
+      found_house = get id
+      return nil unless found_house
+
+      houses.delete(found_house)
+      id
+    end
+
     # @return [String] Description of all houses
     def descriptions
       houses.map(&:description)
     end
   end
-end
+end

data/lib/house_test/indifferent_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'hashie'
 
 # Hash that allows accessing hash with either string or Hash

data/lib/house_test/server/house_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sinatra'
 require 'docdsl'
 require 'json'
@@ -37,8 +39,8 @@ class HouseServer < Sinatra::Application
       query = JSON.parse(request.body.string)
       id = HouseTest.update(id, query.keys.first, query.values.first)
       JSON.generate(updated: id)
-    rescue StandardError => exception
-      exception.message
+    rescue StandardError => e
+      e.message
     end
   end
 
@@ -50,8 +52,8 @@ class HouseServer < Sinatra::Application
                  else
                    HouseTest.add(JSON.parse(request.body.string))
                  end
-    rescue StandardError => exception
-      [200, { 'Content-Type' => 'text/json' }, exception.message]
+    rescue StandardError => e
+      [200, { 'Content-Type' => 'text/json' }, e.message]
     else
       [200, { 'Content-Type' => 'text/json' }, house_id]
     end
@@ -64,4 +66,4 @@ class HouseServer < Sinatra::Application
   get '/' do
     redirect '/docs'
   end
-end
+end

data/lib/house_test/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HouseTest
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'
 end

data/rest_client_scripts.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 # Example of using RestClient to create/retrieve houses
 # Can open with 'restclient' on cmd line
 require 'rest_client'
+require 'json'
 
-id = RestClient.post('http://localhost:4567/houses', JSON.generate(name: 'test_house')).body
+id = RestClient.post('http://localhost:14000/houses', JSON.generate(name: 'test_house')).body
 puts id
 
-RestClient.get('localhost:4567/houses').body
+RestClient.get('localhost:14000/houses').body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: house_test
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +215,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
@@ -238,8 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Test system for demonstrating CRUD in API and UI testing.