unidom-geo 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99edf34802dae03b1030d2f753953e5e18ddb968
-  data.tar.gz: 4459523b9f18b844f3a3779ba76b5249f8c934c5
+  metadata.gz: 12d31ea61eb003e61fccae0699f67ee7eb690ed5
+  data.tar.gz: 53df0070bdaff458ac4409f126241400f5547456
 SHA512:
-  metadata.gz: 6be77f01de86483d6ced96685375d5f46ef2e27cb5c0d25a648ea1bf050c0a3d9389410c13d2e057675c299fdafdfb7eb61ce996d960985b4a6365517086efaa
-  data.tar.gz: e45571e16c68a5040dacf4eccdaf76db4275f1243c511c6c3607aa908fe9107404fc8109e942e85303661f1fe9a1482021402a85c5066c231a1f3ec727c80f07
+  metadata.gz: fb82d867053175160ac9634ff864b2b1ff297cfb947eb69e69c9f45c2892382546960b9a6f487196e10a1fa65e270645bae05dbf05d47be2b2ccd2ccc1423915
+  data.tar.gz: 6497cce2c3bb2300fb2b2cfab07eb5986b44212b512cfbf4741f7743d1b48f9e2641a4c0504add999456c2d3654f9717f5fb2b91a09d9727bebf4491e50db2dd

data/README.md

@@ -6,6 +6,10 @@
 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'
@@ -15,8 +19,12 @@ gem 'unidom-geo'
 ```shell
 rake db:migrate
 ```
+The migration versions start with 200104.
 
 ## Call the Model:
 ```ruby
 Unidom::Geo::Location.valid_at.alive.first.region
+
+active_locatings = location.locatings.valid_at.alive
+Unidom::Geo::Locating.locate! location, shop
 ```

data/app/assets/javascripts/unidom/geo/application.js

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require_self

data/app/assets/stylesheets/unidom/geo/application.css

@@ -10,6 +10,5 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_tree .
  *= require_self
  */

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

@@ -1,9 +1,11 @@
 # Locating 是地理定位，表示地理位置和被定位物体之间的关联。
 
-class Unidom::Geo::Location < ActiveRecord::Base
+class Unidom::Geo::Locating < ActiveRecord::Base
 
   self.table_name = 'unidom_locatings'
 
+  include Unidom::Common::Concerns::ModelExtension
+
   belongs_to :location, class_name: 'Unidom::Geo::Location'
   belongs_to :located,  polymorphic: true
   belongs_to :locator,  polymorphic: true
@@ -12,6 +14,15 @@ class Unidom::Geo::Location < ActiveRecord::Base
   scope :located_is,  ->(located)  { where located:  located  }
   scope :located_by,  ->(locator)  { where locator:  locator  }
 
-  include Unidom::Common::Concerns::ModelExtension
+  def self.locate!(location, located, locator = nil, opened_at = Time.now)
+    attributes = { opened_at: opened_at }
+    if locator.present?
+      attributes[:locator] = locator
+    else
+      attributes[:locator_id]   = Unidom::Common::NULL_UUID
+      attributes[:locator_type] = ''
+    end
+    self.located_is(located).location_is(location).valid_at.alive.first_or_create! attributes
+  end
 
 end

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

@@ -4,6 +4,8 @@ class Unidom::Geo::Location < ActiveRecord::Base
 
   self.table_name = 'unidom_locations'
 
+  include Unidom::Common::Concerns::ModelExtension
+
   validates :latitude,  presence: true, numericality: { greater_than_or_equal_to: -90,  less_than_or_equal_to: 90  }
   validates :longitude, presence: true, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180 }
 
@@ -17,9 +19,9 @@ class Unidom::Geo::Location < ActiveRecord::Base
 
   belongs_to :region, polymorphic: true
 
+  has_many :locatings, class_name: 'Unidom::Geo::Locating'
+
   scope :region_is,         ->(region)         { where region:         region         }
   scope :postal_address_is, ->(postal_address) { where postal_address: postal_address }
 
-  include Unidom::Common::Concerns::ModelExtension
-
 end

data/app/views/layouts/unidom/geo/application.html.erb

@@ -2,13 +2,14 @@
 <html>
 <head>
   <title>Unidom Geo</title>
-  <%= stylesheet_link_tag    'unidom/geo/application', media: 'all' %>
-  <%= javascript_include_tag 'unidom/geo/application' %>
+  <%= stylesheet_link_tag 'unidom/geo/application', media: 'all' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
 
 <%= yield %>
 
+<%= javascript_include_tag 'unidom/geo/application' %>
+
 </body>
 </html>

data/db/migrate/20010401000000_create_unidom_locations.rb

@@ -20,7 +20,6 @@ class CreateUnidomLocations < ActiveRecord::Migration
 
       t.column :accuarcy_code, 'char(1)', null: false, default: 'N'
 
-      t.string   :slug,             null: false, default: nil, limit: 200
       t.column   :state, 'char(1)', null: false, default: 'C'
       t.datetime :opened_at,        null: false, default: ::Time.utc(1970)
       t.datetime :closed_at,        null: false, default: ::Time.utc(3000)
@@ -38,8 +37,7 @@ class CreateUnidomLocations < ActiveRecord::Migration
     add_index :unidom_locations, :minimum_longitude
     add_index :unidom_locations, :maximum_latitude
     add_index :unidom_locations, :maximum_longitude
-    add_index :unidom_locations, :slug, unique: true
-    # add_index :unidom_locations, [ :postal_address, :region_id, :region_type ], unique: true
+    add_index :unidom_locations, [ :postal_address, :region_id, :region_type ], unique: true, name: 'index_unidom_locations_on_postal_address_and_region'
 
   end
 

data/lib/unidom/geo/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Geo
-    VERSION = '0.2'.freeze
+    VERSION = '0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-geo
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
 description: Unidom (UNIfied Domain Object Model) is a series of domain model engines.
   The Geo domain model engine includes Region, Town, and Location models. Unidom (统一领域对象模型)是一系列的领域模型引擎。地理领域模型引擎包括行政区划、乡镇和街道地址的模型。
 email:
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Unidom Geo Domain Model Engine 地理领域模型引擎