unidom-geo 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c45e31e1ee141061b5ce9d4a8555cad2e972352
-  data.tar.gz: 10a83320f101878f1c165e5658567967a1eca23d
+  metadata.gz: 4d804f7b473b75141cb773b78046619750b7d4c6
+  data.tar.gz: ea65c588897d92dea09f9832a6d3bad8abbd653c
 SHA512:
-  metadata.gz: 1c4d28720aa4e64f3b6c79a18f8a440fe853dc07d01088fe1d719257e3d3e9b9bfa2628e2f4041dee132d7dc0ecec3d3acc3a62be43805a1eb589f10892161b3
-  data.tar.gz: 79cda3a5bc8a42c34251dd6fc4599998eee8c7a9bf0bd397e09de2a6b5bc668557e128d94f91ee2cd62adb4b1c3576a9849707fa49cc9f8c2bd249681c0c1a19
+  metadata.gz: df39c01b430a9c26d7e5da6d7d9a3d8e8ceb856088b889a3ed1e1a978d7ea320bbf7d76ef34214f5055156b33c84e25246200dc143cab98d7a191be32bf8b895
+  data.tar.gz: 7844ceb083e5ce0194983aa0d3746a573732e91f0d750fa283985f192b1c2dd46f9cc6f2dd309a97b6ed4e8cff50741b549a942e06d56b7dcf5d93f893ce2e46

data/README.md

@@ -31,6 +31,9 @@ active_locatings = location.locatings.valid_at.alive
 location.locate! shop, by: person
 # or
 Unidom::Geo::Locating.locate! location: location, located: shop
+
+# Determine whether a shop was located to a given location at a given time.
+location.locate? shop, at: Time.now
 ```
 
 ## Include the Concerns:
@@ -43,6 +46,7 @@ include Unidom::Geo::Concerns::AsRegion
 The As Located concern do the following tasks for the includer automatically:  
 1. Define the has_many :locatings macro as: ``has_many :locatings, class_name: 'Unidom::Geo::Locating', as: :located``
 2. Define the has_many :locations macro as: ``has_many :locations, through: :locatings, source: :location``
+3. Define the #is_located! method as: ``is_located!(to: nil, by: nil, at: Time.now)``
 
 ### As Region concern
 The As Region concern do the following tasks for the includer automatically:  

data/app/models/unidom/geo/concerns/as_located.rb

@@ -7,6 +7,10 @@ module Unidom::Geo::Concerns::AsLocated
     has_many :locatings, class_name: 'Unidom::Geo::Locating', as:     :located
     has_many :locations, through:    :locatings,              source: :location
 
+    def is_located!(to: nil, by: nil, at: Time.now)
+      locatings.location_is(to).valid_at(now: at).alive.first_or_create! locator: by, opened_at: at
+    end
+
   end
 
   module ClassMethods

data/app/models/unidom/geo/location.rb

@@ -25,7 +25,11 @@ class Unidom::Geo::Location < ActiveRecord::Base
   scope :postal_address_is, ->(postal_address) { where postal_address: postal_address }
 
   def locate!(located, by: nil, at: Time.now)
-    locatings.create! located: located, locator: by, opened_at: at
+    locatings.located_is(located).valid_at(now: at).alive.first_or_create! locator: by, opened_at: at
+  end
+
+  def locate?(located, at: Time.now)
+    locatings.located_is(located).valid_at(now: at).alive.exists?
   end
 
 end

data/lib/unidom/geo/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Geo
-    VERSION = '1.1'.freeze
+    VERSION = '1.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-geo
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common