unidom-geo 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b07c69b43b6c4003e4188e19cc8761aaa3fc37c4
-  data.tar.gz: a99da5d86e8d086ea2ff4236ffa106547e2d2753
+  metadata.gz: '04091f3b47716f81dabccd033d78edfb71c9e2ea'
+  data.tar.gz: 30d6f758f78fbcddc14fb9bd0e656d6e58fcd27f
 SHA512:
-  metadata.gz: 91769c5cfae2ed16f1166c1e3eb67da2d037938bc2e82234a9d004637e0cc6e4c2f06e9d3f40fc419eb24e2ebd4c85aa12bf2da219eccea59c12c2b844c049d3
-  data.tar.gz: 99586e668b69e43456adba80618b34fbb8b8777e69ef051f2dd0f66c81eaf59992f88e7109609095002be52def426be693115417a55e8a373d07ca9f01d57044
+  metadata.gz: 61f026168f11f4f82cdb65c5e1c2a3c9312773ccab006ed2dd26499bc5c798fedd439dcb027f4725b47bfa88a6ceb406bf33870d7e79a938ee93586af139801f
+  data.tar.gz: 63ce8db98d6fdfcec255eeeacfb8e533f0a511f95cb349eb5b545eec6cf248d42d1a8e27c8789a1231467cf85dc3c5d23a4af73a3762dfb5d973a785d57d373c

data/README.md

@@ -147,7 +147,20 @@ describe Unidom::Party::Shop, type: :model do
       name: 'Some Shop'
     }
 
-    it_behaves_like 'Unidom::Geo::Concerns::AsLocated', model_attributes
+    location_attributes = {
+      postal_address: '#1 Some Street',
+      postal_code:    '610000',
+      region_id:      SecureRandom.uuid,
+      region_type:    'Unidom::Geo::Region::Mock'
+    }
+    location = Unidom::Geo::Location.create! location_attributes
+
+    locator_attributes = {
+      name: 'Tim'
+    }
+    locator = Unidom::Party::Person.create! locator_attributes
+
+    it_behaves_like 'Unidom::Geo::Concerns::AsLocated', model_attributes, location, locator
 
   end
 

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

@@ -3,7 +3,8 @@
 
 module Unidom::Geo::Concerns::AsLocated
 
-  extend ActiveSupport::Concern
+  extend  ActiveSupport::Concern
+  include Unidom::Common::Concerns::ArgumentValidation
 
   included do |includer|
 
@@ -15,7 +16,13 @@ module Unidom::Geo::Concerns::AsLocated
     # location = Unidom::Geo::Location.first
     # shop.is_located! to: location, by: current_person
     def is_located!(to: nil, by: nil, at: Time.now)
+
+      assert_present! :to, to
+      assert_present! :by, by
+      assert_present! :at, at
+
       locatings.location_is(to).valid_at(now: at).alive.first_or_create! locator: by, opened_at: at
+
     end
 
     ##
@@ -23,7 +30,12 @@ module Unidom::Geo::Concerns::AsLocated
     # location = Unidom::Geo::Location.first
     # 如： shop.is_located? to: location, at: Time.now
     def is_located?(to: nil, at: Time.now)
+
+      assert_present! :to, to
+      assert_present! :at, at
+
       locatings.location_is(to).valid_at(now: at).alive.exists?
+
     end
 
   end

data/lib/rspec/models/unidom/geo/concerns/as_located_shared_examples.rb

@@ -1,17 +1,26 @@
-shared_examples 'Unidom::Geo::Concerns::AsLocated' do |model_attributes|
+shared_examples 'Unidom::Geo::Concerns::AsLocated' do |model_attributes, location, locator|
 
-  locating_1_attribtues = {
-      location_id:  SecureRandom.uuid,
-      locator_id:   SecureRandom.uuid,
-      locator_type: 'Unidom::Geo::Locator::Mock'
-    }
+  context do
 
-  locating_2_attribtues = {
-      location_id:  SecureRandom.uuid,
-      locator_id:   SecureRandom.uuid,
-      locator_type: 'Unidom::Geo::Locator::Mock'
-    }
+    locating_1_attribtues = {
+        location_id:  SecureRandom.uuid,
+        locator_id:   SecureRandom.uuid,
+        locator_type: 'Unidom::Geo::Locator::Mock'
+      }
 
-  it_behaves_like 'has_many', model_attributes, :locatings, Unidom::Geo::Locating, [ locating_1_attribtues, locating_2_attribtues ]
+    locating_2_attribtues = {
+        location_id:  SecureRandom.uuid,
+        locator_id:   SecureRandom.uuid,
+        locator_type: 'Unidom::Geo::Locator::Mock'
+      }
+
+    it_behaves_like 'has_many', model_attributes, :locatings, Unidom::Geo::Locating, [ locating_1_attribtues, locating_2_attribtues ]
+
+    located = described_class.create! model_attributes
+
+    it_behaves_like 'assert_present!', located, :is_located!, [ { to: location, by: locator, at: Time.now } ], [ :to, :by, :at ]
+    it_behaves_like 'assert_present!', located, :is_located?, [ { to: location,              at: Time.now } ], [ :to,      :at ]
+
+  end
 
 end

data/lib/unidom/geo/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Geo
-    VERSION = '1.5.6'.freeze
+    VERSION = '1.5.7'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-geo
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common