emapic_consul 0.1.5.2 → 0.1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5586a8f4a5d00fb7900df64a663109e67d2a9dae
-  data.tar.gz: 4313624bbc557a07e79d11a0b287d7a2476f684b
+  metadata.gz: d2827f188d89f5cdb50de0d31be713639ed9b8a5
+  data.tar.gz: 04023f99306ec75c5320f9a5e688a633bf951382
 SHA512:
-  metadata.gz: 50e2e100b9a081139b90c87b702ecb37d0c4cc681d9da91f6fb290f7e46fc29bbeb838bf994609432144a122fb527e510e453789b15c6da44f1847fd0975bf23
-  data.tar.gz: 40d8aceec369b84ec447c67032e268526b385c618201f05bad3828933bcfb6570a52fa6369ecd039ad63f8b7bd0d2ae1198053890124328a3e1a6e8d666995f7
+  metadata.gz: 543eb69d9a1703d478668ae6cfdbd7f8a579a00257ce532f40218db99663551e5c83bbef9092ed4ab6b9db362f54b26c5bfce7f70906d288a57a2421e6ca048a
+  data.tar.gz: 47b55f6a5b0e59ac62b83e7a4ed848bd4ae1c04e64cda879a31b184059331573ab0c8bda6fe07bac4d01041e16155830ac78668580139ab2dc233fb8eef4d639

data/README.md

@@ -43,39 +43,33 @@ To register proposal creation in Emapic:
 
 ```ruby
 # /app/models/custom/proposal.rb
-class Proposal
+require_dependency Rails.root.join('app', 'models', 'proposal').to_s
+
+class Proposal < ActiveRecord::Base
   after_create :notify_emapic
 
   def notify_emapic
-    EmapicConsul::Api.notify_group_creation(self)
+    EmapicConsul::Api.create_location_group(self)
   end
 end
 ```
 
-To register debate creation in Emapic:
+To register proposal voting in Emapic you need to modify the original
+`Proposal.register_vote` method, adding the following line:
 
 ```ruby
-# /app/models/custom/debate.rb
-class Debate
-  after_create :notify_emapic
-
-  def notify_emapic
-    EmapicConsul::Api.notify_group_creation(self)
-  end
-end
+EmapicConsul::Api.vote_location_group(user, self)
 ```
 
-To register vote creation in Emapic:
+So it ends looking like this:
 
 ```ruby
-# /app/models/custom/vote.rb
-class Vote
-  after_create :notify_emapic
-  VOTABLE_GROUPS = ['proposal', 'debate']
-
-  def notify_emapic
-    if VOTABLE_GROUPS.include? votable.type
-      EmapicConsul::Api.notify_vote(self)
+# /app/models/proposal.rb
+class Proposal
+  def register_vote(user, vote_value)
+    if votable_by?(user) && !archived?
+      vote_by(voter: user, vote: vote_value)
+      EmapicConsul::Api.vote_location_group(user, self)
     end
   end
 end

data/lib/emapic_consul/api.rb

@@ -26,12 +26,12 @@ module EmapicConsul
       print_debug_end(response.code)
     end
 
-    # notify_vote(vote_instance)
-    def self.notify_vote(vote)
+    # vote_location_group(usre_instance, proposal_instance)
+    def self.vote_location_group(voter, group)
       print_debug_start("to notify vote creation")
 
-      request = build_generic_request("/api/locationgroup/#{emapic_login}/#{vote.votable_id}")
-      request.params = { user_id: vote.voter_id, address: get_random_address }
+      request = build_generic_request("/api/locationgroup/#{emapic_login}/#{group.id}")
+      request.params = { user_id: voter.id, address: get_random_address }
       response = request.send
 
       puts "Response body: #{response.body}"
@@ -41,8 +41,10 @@ module EmapicConsul
     def self.get_random_address
       print_debug_start("to get the address")
 
-      uri = build_uri('/api/randomMadrid')
-      http = build_http_object(uri)
+      uri = EmapicConsul::Request.build_uri(api_host, '/api/randomMadrid', api_port)
+      # The build_http_object is not meant to be called from this class. But when
+      # the get_random_address method disappears this call will be deleted
+      http = EmapicConsul::Request.build_http_object(uri)
       request = Net::HTTP::Get.new(uri)
 
       response = http.request(request)
@@ -98,14 +100,5 @@ module EmapicConsul
       def self.api_secret
         ENV['EMAPIC_SECRET']
       end
-
-      # TODO: this code is duplicated inside EmapicConsul::Request. Must delete
-      # this when the get_random_address method is deleted
-      def self.build_http_object(uri)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        http
-      end
   end
 end

data/lib/emapic_consul/request.rb

@@ -4,17 +4,13 @@ require 'openssl'
 module EmapicConsul
   class Request
     def initialize(options = {})
-      uri = URI::HTTP.build(
-        host: options[:host],
-        path: options[:path],
-        port: options[:port]
-      )
-      @http = build_http_object(uri)
+      uri = EmapicConsul::Request.build_uri(options[:host], options[:path], options[:port])
+      @http = EmapicConsul::Request.build_http_object(uri)
       @request = Net::HTTP::Post.new(uri)
       @request.basic_auth(options[:api_key], options[:api_secret])
     end
 
-    # usage:
+    # Usage:
     # request.params = { id: 1, title: 'My title', geoloc: 'xyz' }
     def params=(params)
       @request.set_form_data(params)
@@ -24,13 +20,15 @@ module EmapicConsul
       @http.request(@request)
     end
 
-    private
+    def self.build_uri(host, path, port)
+      URI::HTTP.build(host: host, path: path, port: port)
+    end
 
-      def self.build_http_object(uri)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        http
-      end
+    def self.build_http_object(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http
+    end
   end
 end

data/lib/emapic_consul/version.rb

@@ -1,3 +1,3 @@
 module EmapicConsul
-  VERSION = "0.1.5.2"
+  VERSION = "0.1.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emapic_consul
 version: !ruby/object:Gem::Version
-  version: 0.1.5.2
+  version: 0.1.5.3
 platform: ruby
 authors:
 - Alberto Miedes Garcés
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler