contracto 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4465406c89d2015abf010adcff9b249a3037dbaa
-  data.tar.gz: ae6b062c639841a4ac51b6a171acab7cb679ed9f
+  metadata.gz: 539e08faf6ec2176f82085c557bf154af64ef392
+  data.tar.gz: e229d835ff7227b6a154261f33bd9f8a5e108dea
 SHA512:
-  metadata.gz: 003e9b8e2671be644d878e4aa463978863bab5249db1559b7317a5237de803a73ce496e59b4c264b98bb92116c64db5e26efa081a8fe183e00b413f197eb82d4
-  data.tar.gz: 60d73c833de3fdc617911684bca8ab308d894a42fc5535c2a84be133c8e69d101f9164d4701247bc85eae465742e4e7d4b129227cad07f8bac66d7a36931dd46
+  metadata.gz: 42861847062ba686ec7bf2f1119d53bbb054b8292cc5fd79c51e203c922c4762a04c8354cebf7ba275c7dcad174a67cfd2c81870c8cd2acf7d405d1b4ac7aff8
+  data.tar.gz: 73a5d1e7bc398c71e55862cb67222872a9a158c9a43a379c2d934990abf48fda3c81be107d5a2874b836570bf66bb3057bbd17c589c190acfd083025d4136f8f

data/lib/contracto/command/start/remote.rb

@@ -13,7 +13,7 @@ class Contracto::Command::Start::Remote
   def actions
     [
       :clone_repo_to_tmp_contracto_dir,
-      :move_repo_files_to_root_dir,
+      :move_tmp_dir_files_to_root_dir,
       :remove_tmp_contracto_dir,
       :start_server
     ]

data/lib/contracto/constants.rb

@@ -7,6 +7,7 @@ module Contracto::Constants
   CONTRACTO_TMP_DIR     = '.tmp.contracto'
   RUBY_SERVER_DIR       = "#{GEM_DIR}/lib/contracto/server/ruby"
   CONTRACT_FILENAME     = 'contract.con.json'
+  SAMPLE_CONTRACT_DIR   = "#{GEM_DIR}/spec/fixtures"
   CONTRACT_PID_FILEPATH = "#{ROOT_DIR}/server.pid"
   PORT                  = 54321
 
@@ -30,6 +31,10 @@ module Contracto::Constants
     RUBY_SERVER_DIR
   end
 
+  def sample_contract_dir
+    SAMPLE_CONTRACT_DIR
+  end
+
   def contract_filename
     CONTRACT_FILENAME
   end

data/lib/contracto/server/ruby/server.rb

@@ -5,10 +5,11 @@ get '/contracto' do
   "*** Contracto server is working! [#{Gem::Specification.find_by_name('contracto').version}] ***"
 end
 
-json_string = File.read Contracto::Constants::CONTRACT_FILENAME
-json_strings = [json_string]
+jsons_with_contracts = Dir["#{Contracto::Constants::ROOT_DIR}/**/*.con.json"].map do |file_with_contract|
+  File.read file_with_contract
+end
 
-Contracto::Parser.new(json_strings).contracts.each do |contract|
+Contracto::Parser.new(jsons_with_contracts).contracts.each do |contract|
   send(contract.http_method, contract.url_pattern) do
     contract.response_body(params)
   end

data/lib/contracto/system_action.rb

@@ -4,10 +4,6 @@ class Contracto::SystemAction
   class << self
     include Contracto::Constants
 
-    def remove_contracto_dir
-      FileUtils.rm_rf contracto_dir
-    end
-
     def remove_tmp_contracto_dir
       FileUtils.rm_rf contracto_tmp_dir
     end
@@ -16,7 +12,8 @@ class Contracto::SystemAction
       if contract_already_exists?
         puts 'contract already exists, creating sample contract skipped'
       else
-        FileUtils.cp sample_contract_path, FileUtils.pwd
+        FileUtils.cp_r sample_contract_dir, contracto_tmp_dir
+        move_tmp_dir_files_to_root_dir
         puts "created: #{contract_filename}"
       end
     end
@@ -52,18 +49,18 @@ class Contracto::SystemAction
       remove_tmp_contracto_dir
     end
 
-    def move_repo_files_to_root_dir
-      system "mv #{contracto_tmp_dir}/* #{contracto_tmp_dir}/.[^.]* . 2> /dev/null"  # Could not use FileUtils for some reason
+    def move_tmp_dir_files_to_root_dir
+      move_dir_files_to_root_dir(contracto_tmp_dir)
     end
     
     private
 
-    def contract_already_exists?
-      File.exist?("#{root_dir}/#{contract_filename}")
+    def move_dir_files_to_root_dir(dir)
+      system "mv #{dir}/* #{dir}/.[^.]* . 2> /dev/null"  # Could not use FileUtils for some reason
     end
 
-    def sample_contract_path
-      "#{ruby_server_dir}/#{contract_filename}"
+    def contract_already_exists?
+      File.exist?("#{root_dir}/#{contract_filename}")
     end
 
     def server_already_running?

data/lib/contracto/version.rb

@@ -1,3 +1,3 @@
 module Contracto
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/script/send_test_requests.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+for path in users users/1 users/2 users/1/posts users/2/posts; do curl 0.0.0.0:54321/$path; done

data/script/start_from_remote.sh

@@ -3,9 +3,9 @@ rm -rf tmp
 mkdir tmp
 cd tmp
 contracto start git@github.com:kv109/contracto_sample-contract.git
-curl 0.0.0.0:54321/users
-curl 0.0.0.0:54321/users/1
-curl 0.0.0.0:54321/users/2
+../send_test_requests.sh
+contracto stop
+contracto start
 contracto stop
 cd ..
 rm -rf tmp

data/script/start_locally.sh

@@ -4,6 +4,9 @@ mkdir tmp
 cd tmp
 contracto init
 contracto start
+../send_test_requests.sh
+contracto stop
+contracto start
 contracto stop
 cd ..
 rm -rf tmp

data/{lib/contracto/server/ruby/contract.con.json → spec/fixtures/posts.con.json}

@@ -2,25 +2,7 @@
   {
     "request": {
       "http_method": "get",
-      "path": "/users"
-    },
-    "responses": [
-      {
-        "request": {
-          "headers": {
-            "Content-Type": "application/json"
-          }
-        },
-        "response": {
-          "body_path": "/users.json"
-        }
-      }
-    ]
-  },
-  {
-    "request": {
-      "http_method": "get",
-      "path": "/users/:id"
+      "path": "/users/:id/posts"
     },
     "responses": [
       {
@@ -33,7 +15,7 @@
           }
         },
         "response": {
-          "body_path": "/users/1.json"
+          "body_path": "/users/1/posts.json"
         }
       },
       {
@@ -46,7 +28,7 @@
           }
         },
         "response": {
-          "body_path": "/users/2.json"
+          "body_path": "/users/2/posts.json"
         }
       }
     ]

data/spec/fixtures/users/1/posts.json

@@ -0,0 +1,7 @@
+[
+  {
+    "id": 1,
+    "title": "When I got home",
+    "content": "I killed my wife"
+  }
+]

data/spec/fixtures/users/1.json

@@ -1,4 +1,5 @@
 {
+  "id": :id,
   "first_name": "Albert",
   "last_name": "Einstein",
   "age": 30

data/spec/fixtures/users/2/posts.json

@@ -0,0 +1,7 @@
+[
+  {
+    "id": 5,
+    "title": "I had fun once",
+    "content": "It was awful"
+  }
+]

data/spec/fixtures/users/2.json

@@ -1,4 +1,5 @@
 {
+  "id": :id,
   "first_name": "Kurt",
   "last_name": "Godel",
   "age": 35

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contracto
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Kacper Walanus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -95,17 +95,20 @@ files:
 - lib/contracto/errors.rb
 - lib/contracto/parser.rb
 - lib/contracto/server/ruby/config.ru
-- lib/contracto/server/ruby/contract.con.json
 - lib/contracto/server/ruby/server.rb
 - lib/contracto/system_action.rb
 - lib/contracto/system_action_chain.rb
 - lib/contracto/version.rb
+- script/send_test_requests.sh
 - script/start_from_remote.sh
 - script/start_locally.sh
 - spec/fixtures/contract.con.json
+- spec/fixtures/posts.con.json
 - spec/fixtures/users.json
 - spec/fixtures/users/1.json
+- spec/fixtures/users/1/posts.json
 - spec/fixtures/users/2.json
+- spec/fixtures/users/2/posts.json
 - spec/spec_helper.rb
 - spec/unit/contract_spec.rb
 - spec/unit/parser_spec.rb
@@ -135,9 +138,12 @@ specification_version: 4
 summary: XXX
 test_files:
 - spec/fixtures/contract.con.json
+- spec/fixtures/posts.con.json
 - spec/fixtures/users.json
 - spec/fixtures/users/1.json
+- spec/fixtures/users/1/posts.json
 - spec/fixtures/users/2.json
+- spec/fixtures/users/2/posts.json
 - spec/spec_helper.rb
 - spec/unit/contract_spec.rb
 - spec/unit/parser_spec.rb