lolcation_client 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fca6dfbcc45730ced54f283c15c7f96fce7e47aa
-  data.tar.gz: 5d0c0f2e0ad8e3fc6fc8675c62b964dd3173a0fd
+  metadata.gz: db6234d327df630f577bd8197571cc9d82bbf68f
+  data.tar.gz: 1cb4d0b5bea591cccf8a46d1130882f53bda1293
 SHA512:
-  metadata.gz: 8cf99f41462384bfbb01da1304af23cb3ef6e4e1d686d2d0a6e74d52a6651a38de60ca83048652f79a13e15fec75d7a37761a4d25f2f0ced2e52770c914ac042
-  data.tar.gz: 1c5890719812651813ba61a5f22a24a6191a17114ca1b4fec137e97c0cedeafcfcdd100e844d48a06cb490edb968b35bd4ab39cd55dd4e39602c050ae0fd4306
+  metadata.gz: 2ffbf03b2f04f554a9b5636f78f39317afe258e3bb736c643e2eea058a6414008f7c863e9bbdee02eca3777ba752c5ed7a1a932ace45eb3301fa217125e2527b
+  data.tar.gz: 25428aae5bdd403434efd1b653c18abeed5c8c686a7acaaf05cb1d0619bb4ccf6e6a5226e43eb5f9ee3699204aae22e82af7e982bf57ef414d9a51ce75e6bac9

data/lib/generators/lolcation_client/templates/migration.rb

@@ -10,6 +10,7 @@ class AddLolcationTo<%= table_name.camelize %> < ActiveRecord::Migration
       t.string :lolcation_address_city
       t.string :lolcation_address_state
       t.string :lolcation_address_number
+      t.string :lolcation_address_zipcode
     end
   end
 end

data/lib/lolcation_client/interceptor.rb

@@ -7,22 +7,23 @@ module LolcationClient
 
     def self.included(model)
       model.send(:after_validation) do
-        if self.lolcation_id.present?
-          response = patch_on_lolcation_server
+        if self.persisted?
+          response = update_on_lolcation_server
         else
-          response = post_on_lolcation_server
+          response = create_on_lolcation_server
         end
 
-        parsed_response = JSON.parse(response.body)
-        if parsed_response["error"]
-          self.errors.add(:base, parsed_response["error"])
+        json = JSON.parse(response.body, object_class: OpenStruct)
+
+        if json.error.present?
+          self.errors.add(:base, json.error)
           false
-        elsif parsed_response['localization']
-          self.lolcation_id = parsed_response["localization"]["objectId"]
-          self.lolcation_latitude = parsed_response["localization"]["latitude"]
-          self.lolcation_longitude = parsed_response["localization"]["longitude"]
+        elsif json.localization.present?
+          self.lolcation_id = json.localization.id
+          self.lolcation_latitude = json.localization.latitude
+          self.lolcation_longitude = json.localization.longitude
         else
-          parsed_response.map {|error, message| self.errors.add("lolcation_#{error}", message[0])}
+          json.map {|error, message| self.errors.add("lolcation_#{error}", message[0])}
           false
         end
       end
@@ -34,9 +35,10 @@ module LolcationClient
       self.class.try(:lolcation_custom_fields) || []
     end
 
-    def set_custom_fields
+    def build_custom_fields
       attributes = custom_fields.map {|attribute| {attribute => self.try(attribute)}}
-      hash = {}
+      hash       = {}
+
       attributes.each do |attribute|
         attribute.each do |key, value|
           hash[key] = value
@@ -46,40 +48,41 @@ module LolcationClient
       hash
     end
 
-    def prepare_object_to_post
+    def build_params
       {
         localization: {
-          latitude: self.try(:lolcation_latitude),
-          longitude: self.try(:lolcation_longitude),
-          name: self.try(:lolcation_name),
-          address_street: self.try(:lolcation_address_street),
+          latitude:             self.try(:lolcation_latitude),
+          longitude:            self.try(:lolcation_longitude),
+          name:                 self.try(:lolcation_name),
+          address_street:       self.try(:lolcation_address_street),
           address_neighborhood: self.try(:lolcation_address_neighborhood),
-          address_city: self.try(:lolcation_address_city),
-          address_state: self.try(:lolcation_address_state),
-          address_number: self.try(:lolcation_address_number),
-          custom_fields: set_custom_fields
+          address_city:         self.try(:lolcation_address_city),
+          address_state:        self.try(:lolcation_address_state),
+          address_number:       self.try(:lolcation_address_number),
+          address_zipcode:      self.try(:lolcation_address_zipcode),
+          #custom_fields:        build_custom_fields
         },
         sandbox: sandbox?
-      }
+      }.to_json
     end
 
-    def post_on_lolcation_server
+    def create_on_lolcation_server
       url = LolcationClient::Configurations::URL
       conn = Faraday.new(url: url)
       conn.post do |r|
         r.headers["X-Token"] = token
         r.headers["Content-Type"] = "application/json"
-        r.body = prepare_object_to_post.to_json
+        r.body = build_params
       end
     end
 
-    def patch_on_lolcation_server
+    def update_on_lolcation_server
       url = LolcationClient::Configurations::URL
       conn = Faraday.new(url: "#{url}/#{self.lolcation_id}")
       conn.put do |r|
         r.headers["X-Token"] = token
         r.headers["Content-Type"] = "application/json"
-        r.body = prepare_object_to_post.to_json
+        r.body = build_params
       end
     end
   end

data/lib/lolcation_client/lolcation_fields.rb

@@ -3,8 +3,16 @@ module LolcationClient
     def lolcation_fields(options = {})
       self.class_eval do
         before_validation do
-          fields = [:latitude, :longitude, :name, :address_street, :address_neighborhood,
-            :address_city, :address_state, :address_number]
+          fields = [
+            :latitude,
+            :longitude,
+            :name,
+            :address_street,
+            :address_neighborhood,:address_city,
+            :address_state,
+            :address_number,
+            :address_zipcode,
+          ]
 
           fields.each do |field|
             self.send("lolcation_#{field}=", self.send(options[field] || "lolcation_#{field}"))

data/lib/lolcation_client/near_in.rb

@@ -6,12 +6,12 @@ module LolcationClient
     include LolcationClient::Configurations
 
     def near_in(options = {})
-      raise ArgumentError, 'You must pass latitude and longitude as params' unless options[:latitude] || options[:longitude]
+      raise ArgumentError, 'Latitude and Longitude is required' unless options[:latitude].present? || options[:longitude].present?
 
-      parse_response(grab_objects(options), options)
+      process(do_post(options), options)
     end
 
-    def parse_response(response, options)
+    def process(response, options)
       json = JSON.parse(response.body, object_class: OpenStruct)
 
       list = json['localizations']
@@ -23,7 +23,7 @@ module LolcationClient
 
     private
 
-    def grab_objects(options = {})
+    def do_post(options = {})
       url = LolcationClient::Configurations::URL
       conn = Faraday.new(url: "#{url}/near-me")
       conn.post do |r|

data/lib/lolcation_client/version.rb

@@ -1,3 +1,3 @@
 module LolcationClient
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcation_client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Eduardo Zaghi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler