unidom-geo 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d804f7b473b75141cb773b78046619750b7d4c6
-  data.tar.gz: ea65c588897d92dea09f9832a6d3bad8abbd653c
+  metadata.gz: 45957405107d6cfc8b05b70870e5ab3ca60cb698
+  data.tar.gz: 02198793be1f7c86e96a8a528421c1075e566dd6
 SHA512:
-  metadata.gz: df39c01b430a9c26d7e5da6d7d9a3d8e8ceb856088b889a3ed1e1a978d7ea320bbf7d76ef34214f5055156b33c84e25246200dc143cab98d7a191be32bf8b895
-  data.tar.gz: 7844ceb083e5ce0194983aa0d3746a573732e91f0d750fa283985f192b1c2dd46f9cc6f2dd309a97b6ed4e8cff50741b549a942e06d56b7dcf5d93f893ce2e46
+  metadata.gz: bc95936a4854c65376e68551a9cd9d01e5fc7fe59a784a321b50bf48fe933bee86af029b53f3bff5b7ba42aa82f1689960f6541231749eb8338fc5a2acc8e19c
+  data.tar.gz: ba8a25a4e547244f893d9ef18b7ced35ed192dee371c5b81c5808ce082fbbd7243455cab215abd1926689efb9e556bfa51f244fd3964e38747e435f532ba722b

data/README.md

@@ -6,22 +6,34 @@
 Unidom (UNIfied Domain Object Model) is a series of domain model engines. The Geo domain model engine includes Town and Location models.
 Unidom (统一领域对象模型)是一系列的领域模型引擎。地理领域模型引擎包括乡镇和街道地址的模型。
 
+
+
 ## Recent Update
+
 Check out the [Road Map](ROADMAP.md) to find out what's the next.
 Check out the [Change Log](CHANGELOG.md) to find out what's new.
 
+
+
 ## Usage in Gemfile:
+
 ```ruby
 gem 'unidom-geo'
 ```
 
+
+
 ## Run the Database Migration:
+
 ```shell
 rake db:migrate
 ```
 The migration versions start with 200104.
 
+
+
 ## Call the Model:
+
 ```ruby
 Unidom::Geo::Location.valid_at.alive.first.region
 
@@ -36,19 +48,29 @@ Unidom::Geo::Locating.locate! location: location, located: shop
 location.locate? shop, at: Time.now
 ```
 
+
+
 ## Include the Concerns:
+
 ```ruby
 include Unidom::Geo::Concerns::AsLocated
+include Unidom::Geo::Concerns::AsLocator
 include Unidom::Geo::Concerns::AsRegion
 ```
 
 ### As Located concern
 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)``
+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)``  
+4. Define the #is_located? method as: ``is_located?(to: nil, at: Time.now)``
+
+### As Locator concern
+The As Locator 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: :locator``  
+2. Define the has_many :locations macro as: ``has_many :locations, through: :locatings, source: :location``  
 
 ### As Region concern
 The As Region concern do the following tasks for the includer automatically:  
-1. Define the has_many :locations macro as: ``has_many :locations, class_name: 'Unidom::Geo::Location'``
+1. Define the has_many :locations macro as: ``has_many :locations, class_name: 'Unidom::Geo::Location'``  
 2. Define the has_many :locatings macro as: ``has_many :locatings, through: :locations, source: :locatings``

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

@@ -11,6 +11,10 @@ module Unidom::Geo::Concerns::AsLocated
       locatings.location_is(to).valid_at(now: at).alive.first_or_create! locator: by, opened_at: at
     end
 
+    def is_located?(to: nil, at: Time.now)
+      locatings.location_is(to).valid_at(now: at).alive.exists?
+    end
+
   end
 
   module ClassMethods

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

@@ -0,0 +1,25 @@
+module Unidom::Geo::Concerns::AsLocator
+
+  extend ActiveSupport::Concern
+
+  included do |includer|
+
+    has_many :locatings, class_name: 'Unidom::Geo::Locating', as:     :locator
+    has_many :locations, through:    :locatings,              source: :location
+
+=begin
+    def locate!(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
+
+    def locate?(to: nil, at: Time.now)
+      locatings.location_is(to).valid_at(now: at).alive.exists?
+    end
+=end
+
+  end
+
+  module ClassMethods
+  end
+
+end

data/lib/unidom/geo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-geo
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -40,6 +40,7 @@ files:
 - app/controllers/unidom/geo/application_controller.rb
 - app/helpers/unidom/geo/application_helper.rb
 - app/models/unidom/geo/concerns/as_located.rb
+- app/models/unidom/geo/concerns/as_locator.rb
 - app/models/unidom/geo/concerns/as_region.rb
 - app/models/unidom/geo/locating.rb
 - app/models/unidom/geo/location.rb