geo-core 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -11,7 +11,9 @@ GEM
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     builder (3.0.4)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
+    geocoder (1.1.6)
     i18n (0.6.1)
     mongoid (3.0.17)
       activemodel (~> 3.1)
@@ -40,6 +42,8 @@ PLATFORMS
 
 DEPENDENCIES
   autotest
+  database_cleaner
+  geocoder
   mongoid
   rspec
   rspec-nc

data/geo-core.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.add_dependency  "mongoid"
+  gem.add_dependency  "geocoder"
 
   gem.files         = Dir['lib/**/*.rb'] + Dir['lib/*.yml'] + Dir['*.*']
   gem.require_paths = ["lib"]

data/lib/geo-core.rb

@@ -1,6 +1,7 @@
 require 'mongoid'
+require 'geo-core/domain/orcamento'
+require 'geo-core/domain/item_orcamento'
+require 'geo-core/service/orcamento_service'
+
 current_path = File.expand_path File.dirname(__FILE__) 
 Mongoid.load!(current_path << "/mongoid.yml", :development)
-Dir['./lib/domain/*.rb'].each {|file| require file }
-Dir['./lib/service/*.rb'].each {|file| require file }
-Dir['./lib/*.rb'].each {|file| require file }

data/lib/{domain → geo-core/domain}/item_orcamento.rb

@@ -1,15 +1,17 @@
-require_relative '../geo-core.rb'
-
+require_relative '../../geo-core.rb'
 module Geo
-	module Core
+	module Domain
 		class ItemOrcamento
 			include Mongoid::Document
 			store_in collection: "itens_orcamento"
 
-			belongs_to :orcamento, class_name: "Geo::Core::Orcamento"
+			belongs_to :orcamento, class_name: "Geo::Domain::Orcamento"
 
 			field :codigo_material
 			field :quantidade
+			field :endereco_instalacao
+			field :latitude, type: Float
+			field :longitude, type: Float
 
 			validates :codigo_material, :quantidade, presence: true
 			validates :quantidade, :numericality => true

data/lib/{domain → geo-core/domain}/orcamento.rb

@@ -1,7 +1,7 @@
-require_relative '../geo-core.rb'
+require_relative '../../geo-core.rb'
 
 module Geo
-	module Core
+	module Domain
 		class Orcamento
 			include Mongoid::Document
 			store_in collection: "orcamentos"
@@ -9,7 +9,7 @@ module Geo
 			field :cliente
 			field :descricao
 
-			has_many :itens, class_name: 'Geo::Core::ItemOrcamento'
+			has_many :itens, class_name: 'Geo::Domain::ItemOrcamento'
 
 			validates :cliente, :descricao, presence: true
 

data/lib/geo-core/service/orcamento_service.rb

@@ -0,0 +1,77 @@
+require_relative '../domain/orcamento.rb'
+require_relative '../domain/item_orcamento.rb'
+require 'geocoder'
+
+module Geo
+	module Service
+		class Orcamento
+			def self.novo
+				return Geo::Domain::Orcamento.new
+			end
+
+			#FIXME fazer tratamento de errors
+			def self.salvar(params)
+				begin
+					orcamento = Geo::Domain::Orcamento.new params
+					raise orcamento.errors unless orcamento.valid? 
+					orcamento.save
+					orcamento.itens= Array.new
+					orcamento.itens.push criar_itens params[:itens_attributes]
+					return orcamento
+				rescue Exception => e
+					raise e
+				end					
+			end
+
+			private
+				def self.criar_itens(param)
+					return if !param
+					itens = Array.new
+					param.each do |chave, valor|
+						item = Geo::Domain::ItemOrcamento.new valor
+						itens.push item if item.valid?
+					end
+					return itens
+				end
+
+
+			def self.todos
+				return Geo::Domain::Orcamento.all
+			end
+
+			def self.por_id id
+				return Geo::Domain::Orcamento.find id
+			end
+
+			def self.item_orcamento_por_id id
+				return Geo::Domain::ItemOrcamento.find id
+			end
+
+			def self.atualizar_localizacao(params)
+				item_orcamento= Geo::Domain::ItemOrcamento.find(params[:item_orcamento_id])
+				if item_orcamento and params[:latitude] and params[:longitude]
+					return atualizar_endereco(item_orcamento, params[:latitude], params[:longitude])
+				end
+				return nil
+			end
+
+			private
+				def self.atualizar_endereco(item_orcamento, latitude, longitude)
+					item_orcamento.latitude= latitude
+					item_orcamento.longitude= longitude
+					item_orcamento.endereco_instalacao = buscar_endereco(latitude, longitude)
+					if item_orcamento.save
+						return item_orcamento
+					end
+					return nil
+				end
+
+				def self.buscar_endereco(latitude, longitude)
+					return Geocoder.search("#{latitude},#{longitude}")[0].formatted_address
+				end
+		end
+	end
+end
+
+
+

data/lib/geo-core/version.rb

@@ -1,5 +1,5 @@
 module Geo
 	module Core
-	  VERSION = "0.0.4"
+	  VERSION = "0.0.5"
 	end
 end

data/lib/mongoid.yml

@@ -4,9 +4,11 @@ development:
       database: geo
       hosts:
         - localhost:27017
-production:
+test:
   sessions:
     default:
-      database: geo
+      database: geo_test
       hosts:
-        - localhost:27017        
+        - localhost:27017        
+  options:
+    raise_not_found_error: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo-core
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: geocoder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Apenas um teste
 email:
 - mrmarcondes@gmail.com
@@ -34,17 +50,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/domain/item_orcamento.rb
-- lib/domain/material.rb
-- lib/domain/orcamento.rb
-- lib/domain_helper.rb
+- lib/geo-core/domain/item_orcamento.rb
+- lib/geo-core/domain/material.rb
+- lib/geo-core/domain/orcamento.rb
+- lib/geo-core/service/orcamento_service.rb
 - lib/geo-core/version.rb
 - lib/geo-core.rb
-- lib/service/orcamento_service.rb
 - lib/mongoid.yml
 - Gemfile.lock
-- geo-core-0.0.2.gem
-- geo-core-0.0.3.gem
+- geo-core-0.0.4.gem
+- geo-core-0.0.5.gem
 - geo-core.gemspec
 - LICENSE.txt
 - README.md
@@ -68,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Apenas um teste

data/lib/domain_helper.rb

@@ -1,5 +0,0 @@
-require 'mongoid'
-Mongoid.load!("lib/mongoid.yml", :development)
-Dir['./lib/domain/*.rb'].each {|file| require file }
-Dir['./lib/service/*.rb'].each {|file| require file }
-Dir['./lib/*.rb'].each {|file| require file }

data/lib/service/orcamento_service.rb

@@ -1,38 +0,0 @@
-require_relative '../domain/orcamento.rb'
-require_relative '../domain/item_orcamento.rb'
-
-module Geo
-	module Service
-		class Orcamento
-			def self.novo
-				return Geo::Core::Orcamento.new
-			end
-
-			#FIXME fazer tratamento de errors
-			def self.salvar(params)
-				begin
-					orcamento = Geo::Core::Orcamento.new params
-					raise orcamento.errors unless orcamento.valid? 
-					orcamento.save
-					criar_itens_para orcamento, params[:itens_attributes]
-					return orcamento
-				rescue
-					raise ""
-				end
-			end
-
-			private
-				def self.criar_itens_para(orcamento, param)
-					itens = Array.new
-					param.each do |chave, valor|
-						item = Geo::Core::ItemOrcamento.new valor
-						itens.push item if item.valid?
-					end
-					orcamento.itens.push itens
-				end
-		end
-	end
-end
-
-
-