contracto 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a01da4681838d0f188cd20228bd42200833142c4
-  data.tar.gz: dbaaf04e0c3527125b236508b471e00ea7341d14
+  metadata.gz: edf170bc3055b6d07143821280feb345d918dcd2
+  data.tar.gz: b12accb1f9fdafdce5f3ec05317fefe391f6d383
 SHA512:
-  metadata.gz: 2c1a3c2ec6b68d5263df13ec4e9ac598e72aedc63dccae7859576c5eb066a605bd92b1e9ec58575eb8ceaffe6d1847e03fe0b1b27665dee9efc888bfa2c7941b
-  data.tar.gz: 1d8e16d382bc4c92b09cebd3e2683538cb2ef42a2b2d8da44652b69ca6573a56e6c865541ca05f9da31e5ca3018b43ec78beb20f8c609c5cb7a6888ad1fbff22
+  metadata.gz: 07fb46243e80a4bc8995624451200d75a66081dbfe9ec2f4463a1984bab9ec2875dafb25367489dafeda1006eac18ea6166a42b132302f08e8a22dcd0eb1a357
+  data.tar.gz: 3d8c554626d42f8d279a12b8126d47602c3e9487b44386648482034ba8dbf6054856ecae3fe57db8dcb3d9d2c127d0a73614b02056ddbb0ba38512889e562519

data/README.md

@@ -1,26 +1,34 @@
+# IN DEVELOPMENT
+
 # Contracto
 
-TODO: Write a gem description
+Creates HTTP server based on your contract.
 
 ## Installation
+    
+    $ gem install contracto
+
+## Usage
 
-Add this line to your application's Gemfile:
+Start server:
 
-```ruby
-gem 'contracto'
-```
+    $ contracto start git@github.com:kv109/contracto_sample-contract.git
+    
+Test server (default port is __54321__):
 
-And then execute:
+    $ curl 0.0.0.0:54321/users; curl 0.0.0.0:54321/users/1; curl 0.0.0.0:54321/users/2
+    
+Stop server: 
 
-    $ bundle
+    $ contracto stop
 
-Or install it yourself as:
+## How to write contract
 
-    $ gem install contracto
+See [documentation](https://github.com/kv109/contracto_sample-contract).
 
-## Usage
+## About consumer-driven contracts pattern
 
-TODO: Write usage instructions here
+http://martinfowler.com/articles/consumerDrivenContracts.html
 
 ## Contributing
 

data/lib/contracto/command/init.rb

@@ -16,8 +16,6 @@ class Contracto::Command::Init
 
   def actions
     [
-      :remove_contracto_dir,
-      :copy_server_files,
       :create_sample_contract
     ]
   end

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

@@ -15,7 +15,6 @@ class Contracto::Command::Start::Remote
       :clone_repo_to_tmp_contracto_dir,
       :move_repo_files_to_root_dir,
       :remove_tmp_contracto_dir,
-      :copy_server_files,
       :start_server
     ]
   end

data/lib/contracto/constants.rb

@@ -7,7 +7,7 @@ module Contracto::Constants
   CONTRACTO_TMP_DIR     = '.tmp.contracto'
   RUBY_SERVER_DIR       = "#{GEM_DIR}/lib/contracto/server/ruby"
   CONTRACT_FILENAME     = 'contract.con.json'
-  CONTRACT_PID_FILEPATH = "#{CONTRACTO_DIR}/server.pid"
+  CONTRACT_PID_FILEPATH = "#{ROOT_DIR}/server.pid"
   PORT                  = 54321
 
   def gem_dir

data/lib/contracto/contract/response.rb

@@ -23,6 +23,21 @@ class Contracto::Contract::Response
   end
 
   def body
-    File.read(root_dir + body_path)
+    set_body
+    @body.tap do
+      replace_params_placeholders_with_params_value
+    end
+  end
+
+  private
+
+  def set_body
+    @body = File.read(root_dir + body_path)
+  end
+
+  def replace_params_placeholders_with_params_value
+    params.each do |key, value|
+      @body.gsub!(":#{key}", value.to_s) if value
+    end
   end
 end

data/lib/contracto/server/ruby/contract.con.json

@@ -4,19 +4,15 @@
       "http_method": "get",
       "path": "/users"
     },
-    "examples": [
+    "responses": [
       {
         "request": {
           "headers": {
             "Content-Type": "application/json"
-          },
-          "body": {
-            "firstName": "Max",
-            "lastName": "Lincoln"
           }
         },
         "response": {
-          "body": {}
+          "body_path": "/users.json"
         }
       }
     ]
@@ -26,19 +22,31 @@
       "http_method": "get",
       "path": "/users/:id"
     },
-    "examples": [
+    "responses": [
+      {
+        "request": {
+          "headers": {
+            "Content-Type": "application/json"
+          },
+          "params": {
+            "id": 1
+          }
+        },
+        "response": {
+          "body_path": "/users/1.json"
+        }
+      },
       {
         "request": {
           "headers": {
             "Content-Type": "application/json"
           },
-          "body": {
-            "firstName": "Max",
-            "lastName": "Lincoln"
+          "params": {
+            "id": 2
           }
         },
         "response": {
-          "body": {}
+          "body_path": "/users/2.json"
         }
       }
     ]

data/lib/contracto/system_action.rb

@@ -12,22 +12,11 @@ class Contracto::SystemAction
       FileUtils.rm_rf contracto_tmp_dir
     end
 
-    def copy_server_files
-      FileUtils.cp_r ruby_server_dir, contracto_tmp_dir
-      FileUtils.mv contracto_tmp_dir, contracto_dir
-    end
-
-    def revert_copy_server_files
-      remove_contracto_dir
-      remove_tmp_contracto_dir
-    end
-
     def create_sample_contract
       if contract_already_exists?
         puts 'contract already exists, creating sample contract skipped'
-        remove_sample_contract
       else
-        FileUtils.mv sample_contract_path, FileUtils.pwd
+        FileUtils.cp sample_contract_path, FileUtils.pwd
         puts "created: #{contract_filename}"
       end
     end
@@ -35,7 +24,7 @@ class Contracto::SystemAction
     def start_server
       raise Contracto::ServerAlreadyRunningError if server_already_running?
 
-      system "rackup #{contracto_dir}/config.ru -p #{port} -D -P #{contract_pid_filepath}"
+      system "rackup #{ruby_server_dir}/config.ru -p #{port} -D -P #{contract_pid_filepath}"
       # TODO: loop below should terminate after n tries
       system "while ! echo exit | nc localhost #{port} > /dev/null && echo \"waiting for contracto server...\"; do sleep 1; done"
       test_request
@@ -70,15 +59,11 @@ class Contracto::SystemAction
     private
 
     def contract_already_exists?
-      File.exist?(contract_filename)
-    end
-
-    def remove_sample_contract
-      FileUtils.rm sample_contract_path
+      File.exist?("#{root_dir}/#{contract_filename}")
     end
 
     def sample_contract_path
-      "#{contracto_dir}/#{contract_filename}"
+      "#{ruby_server_dir}/#{contract_filename}"
     end
 
     def server_already_running?

data/lib/contracto/version.rb

@@ -1,3 +1,3 @@
 module Contracto
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contracto
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kacper Walanus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra