tdl-client-ruby 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f26c749800235135540aa9dbd89683d51c7acc2
-  data.tar.gz: 50a2516af1455cfca7428985e3f187ec281d33c4
+  metadata.gz: 0e206393d58ca00c7f4560f88677b76e9d165985
+  data.tar.gz: d2b95e230be6006c59a106ef0493e298780e3d9a
 SHA512:
-  metadata.gz: c65df7f640fcb09cd9aa9ff8e5dc79febc92d1d8a706c73b5ecf58b487aa7f22eb163a7cc35cb73bd85a11deb4b093cd600516a3e15ea5a0538212225303822f
-  data.tar.gz: ff0f24af5b8a58132d6e142f4c3b11c7033fbbd5b6560cd3b2a69566262f0aa7cbca9a227259f8a1bec53a2766d80aec00d53558529813c4781fad82b301d291
+  metadata.gz: 8e4b1cfbf040a3507b7783c641dd0b53a1969f8a55d791213e8345a887771e5fbe232fbc4e79d2d618a43907008872851ff371ab585e5202ff4a67a3b5b3d489
+  data.tar.gz: 1635f6f159525ecac124a8d95e612120e9e76a4945f01dab084b07a5d84cecb9dfe88aceea4f30693e6b62fadac0f06220acba9f27bcedc82a191f69369fcdd9

data/Rakefile

@@ -37,12 +37,12 @@ end
 
 #~~~~~~~~ Deploy
 
-require 'tdl/version'
+require 'tdl/previous_version'
 
 task :build do
   system 'gem build tdl-client-ruby.gemspec'
 end
 
 task :release => :build do
-  system "gem push tdl-client-ruby-*.gem"
+  system 'gem push tdl-client-ruby-*.gem'
 end

data/lib/tdl.rb

@@ -1,6 +1,5 @@
 
 require 'tdl/client'
-require 'tdl/version'
 
 module TDL
 end

data/lib/tdl/abstractions/response/fatal_error_response.rb

@@ -0,0 +1,18 @@
+require 'tdl/actions/stop_action'
+
+module TDL
+  class FatalErrorResponse
+
+    def initialize(message)
+      @message = message
+    end
+
+    def client_action
+      StopAction.new
+    end
+
+    def audit_text
+      "error = #{@message}"
+    end
+  end
+end

data/lib/tdl/abstractions/{response.rb → response/valid_response.rb}

@@ -1,10 +1,11 @@
 module TDL
-  class Response
-    attr_reader :result, :id
+  class ValidResponse
+    attr_reader :result, :id, :client_action
 
-    def initialize(id, result)
+    def initialize(id, result, client_action)
       @id = id
       @result = result
+      @client_action = client_action
     end
 
     def to_h

data/lib/tdl/client.rb

@@ -2,7 +2,7 @@ require 'stomp'
 require 'logging'
 
 require 'tdl/transport/remote_broker'
-require 'tdl/abstractions/processing_rules'
+require 'tdl/processing_rules'
 require 'tdl/actions/stop_action'
 
 require 'tdl/serialization/json_rpc_serialization_provider'
@@ -29,8 +29,8 @@ module TDL
         @logger.info 'Stopping client.'
         remote_broker.close
       rescue Exception => e
-        @logger.error "Problem communicating with the broker. #{e.message}"
-        raise $! if ENV['RUBY_ENV'] == 'test'
+        @logger.error "There was a problem processing messages. #{e.message}"
+        @logger.error e.backtrace.join("\n")
       end
     end
 
@@ -50,12 +50,11 @@ module TDL
         @audit.log(request)
 
         # Obtain response from user
-        processing_rule = @processing_rules.get_rule_for(request)
-        response = get_response_for(processing_rule, request)
-        @audit.log(response ? response : Response.new('','empty'))
+        response = @processing_rules.get_response_for(request)
+        @audit.log(response)
 
         # Obtain action
-        client_action = response ? processing_rule.client_action : StopAction.new
+        client_action = response.client_action
 
         # Act
         client_action.after_response(remote_broker, request, response)
@@ -64,19 +63,6 @@ module TDL
         client_action.prepare_for_next_request(remote_broker)
       end
 
-      def get_response_for(processing_rule, request)
-        begin
-          user_implementation = processing_rule.user_implementation
-          result = user_implementation.call(*request.params)
-
-          response = Response.new(request.id, result)
-        rescue Exception => e
-          response = nil
-          @logger.info "The user implementation has thrown exception. #{e.message}"
-        end
-        response
-      end
-
     end
   end
 

data/lib/tdl/previous_version.rb

@@ -0,0 +1,3 @@
+module TDL
+  PREVIOUS_VERSION = '0.5.7'
+end

data/lib/tdl/{abstractions/processing_rules.rb → processing_rules.rb}

@@ -1,4 +1,6 @@
 require 'tdl/abstractions/processing_rule'
+require 'tdl/abstractions/response/fatal_error_response'
+require 'tdl/abstractions/response/valid_response'
 require 'tdl/actions/client_actions'
 
 module TDL
@@ -6,6 +8,7 @@ module TDL
 
     def initialize
       @rules = Hash.new
+      @logger = Logging.logger[self]
     end
 
     # ~~~~ Builders
@@ -18,7 +21,6 @@ module TDL
       ProcessingRuleBuilder.new(self, method_name)
     end
 
-
     class ProcessingRuleBuilder
 
       def initialize(instance, method_name)
@@ -37,14 +39,27 @@ module TDL
     end
 
 
-
     # ~~~~ Accessors
 
-    def get_rule_for(request)
+    def get_response_for(request)
       if @rules.has_key?(request.method)
-        @rules[request.method]
+        processing_rule = @rules[request.method]
       else
-        raise NameError.new("Method #{request.method} did not match any processing rule.")
+        message = "method \"#{request.method}\" did not match any processing rule"
+        @logger.warn(message)
+        return FatalErrorResponse.new(message)
+      end
+
+      begin
+        user_implementation = processing_rule.user_implementation
+        result = user_implementation.call(*request.params)
+
+        return ValidResponse.new(request.id, result, processing_rule.client_action)
+      rescue Exception => e
+        message = 'user implementation raised exception'
+        @logger.warn("#{message}, #{e.message}")
+        @logger.warn e.backtrace.join("\n")
+        return FatalErrorResponse.new(message)
       end
     end
 

data/lib/tdl/serialization/deserialization_exception.rb

@@ -0,0 +1,3 @@
+
+class DeserializationException < StandardError
+end

data/lib/tdl/serialization/json_rpc_serialization_provider.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'tdl/abstractions/request'
-require 'tdl/abstractions/response'
+require 'tdl/serialization/deserialization_exception'
 
 module TDL
   class JSONRPCSerializationProvider
@@ -9,8 +9,12 @@ module TDL
     end
 
     def deserialize(msg)
-      request_data = JSON.parse(msg.body)
-      Request.new(msg, request_data)
+      begin
+        request_data = JSON.parse(msg.body)
+        Request.new(msg, request_data)
+      rescue Exception => e
+        raise DeserializationException,'Invalid message format', e.backtrace
+      end
     end
 
     def serialize(response)

data/lib/tdl/transport/remote_broker.rb

@@ -19,10 +19,6 @@ module TDL
       @stomp_client.acknowledge(request.original_message)
     end
 
-    def publish(response)
-      @stomp_client.publish("/queue/#{@username}.resp", response)
-    end
-
     def join(limit = nil)
       @stomp_client.join(limit)
     end

data/release.sh

@@ -2,27 +2,26 @@
 
 SCRIPT_FOLDER="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 VERSION_FILE="${SCRIPT_FOLDER}/lib/tdl/version.rb"
-SPEC_FOLDER="${SCRIPT_FOLDER}/features/spec/"
+TMP_VERSION_FILE="${SCRIPT_FOLDER}/out/versions.txt"
 
-function get_version_from_tag() {
-    local target_folder=$1
-    git --git-dir ${target_folder}/.git describe --all | cut -d "/" -f 2 | tr -d "v"
-}
 
-function get_property() {
+function gemspec_property() {
     local property=$1
-    cat ${VERSION_FILE} | grep "${property}" | cut -d "=" -f2 | tr -d " '"
+    cat ${TMP_VERSION_FILE} | grep ${property} | cut -d "=" -f2 | tr -d " "
 }
 
-# Current
-CURRENT_MAJOR_MINOR_VERSION=`get_version_from_tag ${SPEC_FOLDER}`
-CURRENT_PATCH_VERSION=`get_property "CURRENT_PATCH_VERSION"`
-CURRENT_VERSION="${CURRENT_MAJOR_MINOR_VERSION}.${CURRENT_PATCH_VERSION}"
+echo "Reading gemspec properties. This might take some time."
 
 # Previous
-PREVIOUS_MAJOR_MINOR_VERSION=`get_property "PREVIOUS_VERSION" | cut -d "." -f 1,2`
-PREVIOUS_PATCH_VERSION=`get_property "PREVIOUS_VERSION" | cut -d "." -f 2`
-PREVIOUS_VERSION=`get_property "PREVIOUS_VERSION"`
+ruby <<-EOS | tee ${TMP_VERSION_FILE}
+require "rubygems"
+spec = Gem::Specification::load("tdl-client-ruby.gemspec")
+puts "PREVIOUS_VERSION = #{spec.metadata['previous_version']}"
+puts "CURRENT_VERSION = #{spec.version}"
+EOS
+PREVIOUS_VERSION=`gemspec_property PREVIOUS_VERSION`
+CURRENT_VERSION=`gemspec_property CURRENT_VERSION`
+
 
 # Prompt for version confirmation
 read -p "Going to release version ${CURRENT_VERSION} (previous ${PREVIOUS_VERSION}). Proceed ? [y/n] "
@@ -37,24 +36,9 @@ git tag -a "v${CURRENT_VERSION}" -m "Release ${CURRENT_VERSION}"
 git push origin "v${CURRENT_VERSION}"
 echo "Pushed tag to Git origin. It will now trigger the deployment pipeline."
 
-# Increment version
-next_patch_version() {
-    if [ "$CURRENT_MAJOR_MINOR_VERSION" == "$PREVIOUS_MAJOR_MINOR_VERSION" ]; then
-        patch=$((CURRENT_PATCH_VERSION+1))
-    else
-        patch="0"
-    fi
-    echo ${patch}
-}
-
-# Switch to next version
-NEXT_PATCH_VERSION=`next_patch_version`
-echo "Next patch version is: $NEXT_PATCH_VERSION"
-
 cat > "${VERSION_FILE}" <<-EOF
 module TDL
   PREVIOUS_VERSION = '$CURRENT_VERSION'
   # the current MAJOR.MINOR version is dynamically computed from the version of the Spec
-  CURRENT_PATCH_VERSION = '$NEXT_PATCH_VERSION'
 end
 EOF

data/tdl-client-ruby.gemspec

@@ -1,18 +1,44 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'tdl/version'
+require 'tdl/previous_version'
 
-# DEBT: The patch version is not resetting correctly
+#~~~~~~ Compute version
 
-SPEC_FOLDER = File.expand_path('../features/spec',__FILE__).to_s
-puts "Spec folder is: #{SPEC_FOLDER}"
-MAJOR_MINOR_VERSION = `git --git-dir #{SPEC_FOLDER}/.git describe --all | cut -d '/' -f 2 | tr -d 'v'`.strip
-VERSION = "#{MAJOR_MINOR_VERSION}.#{TDL::CURRENT_PATCH_VERSION}"
+# Add increment to Version class
+class ComparableVersion < Gem::Version
+  def increment
+    segments = self.segments.dup
+    segments[-1] = segments[-1].succ
+
+    self.class.new segments.join('.')
+  end
+end
+
+# Get Spec version from Git
+spec_folder = File.expand_path('../features/spec',__FILE__).to_s
+major_minor_version = `git --git-dir #{spec_folder}/.git describe --all | cut -d '/' -f 2 | tr -d 'v'`.strip
+
+# Compute next version
+previous_version = ComparableVersion.new(TDL::PREVIOUS_VERSION)
+new_spec_version = ComparableVersion.new(major_minor_version+'.0')
+if new_spec_version > previous_version
+  current_version = new_spec_version
+else
+  current_version = previous_version.increment
+end
+# puts "previous_version = #{previous_version}"
+# puts "current_version = #{current_version}"
+
+VERSION = "#{current_version}"
+
+
+#~~~~~ Create gemspec
 
 Gem::Specification.new do |spec|
   spec.name          = 'tdl-client-ruby'
   spec.version       = VERSION
+  spec.metadata      = { 'previous_version' => TDL::PREVIOUS_VERSION }
   spec.authors       = ['Julian Ghionoiu']
   spec.email         = ['iulian.ghionoiu@gmail.com']
 

data/tdl-client-ruby.iml

@@ -40,6 +40,7 @@
     <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.11.2, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_test (v0.1.2, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="netrc (v0.10.3, rbenv: 2.2.2) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.4.2, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rest-client (v1.8.0, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.7.5, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.10.0, rbenv: 2.2.2) [gem]" level="application" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdl-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Julian Ghionoiu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stomp
@@ -199,24 +199,27 @@ files:
 - examples/add_numbers.rb
 - lib/tdl.rb
 - lib/tdl/abstractions/processing_rule.rb
-- lib/tdl/abstractions/processing_rules.rb
 - lib/tdl/abstractions/request.rb
-- lib/tdl/abstractions/response.rb
+- lib/tdl/abstractions/response/fatal_error_response.rb
+- lib/tdl/abstractions/response/valid_response.rb
 - lib/tdl/actions/client_actions.rb
 - lib/tdl/actions/publish_action.rb
 - lib/tdl/actions/publish_and_stop_action.rb
 - lib/tdl/actions/stop_action.rb
 - lib/tdl/client.rb
+- lib/tdl/previous_version.rb
+- lib/tdl/processing_rules.rb
+- lib/tdl/serialization/deserialization_exception.rb
 - lib/tdl/serialization/json_rpc_serialization_provider.rb
 - lib/tdl/transport/remote_broker.rb
-- lib/tdl/version.rb
 - release.sh
 - tdl-client-ruby.gemspec
 - tdl-client-ruby.iml
 homepage: https://github.com/julianghionoiu/tdl-client-ruby
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  previous_version: 0.5.7
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/tdl/version.rb

@@ -1,5 +0,0 @@
-module TDL
-  PREVIOUS_VERSION = '0.3.6'
-  # the current MAJOR.MINOR version is dynamically computed from the version of the Spec
-  CURRENT_PATCH_VERSION = '7'
-end