unidom-contact 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1352769a30dacb2e61ede38eb018a7fb88e9511
-  data.tar.gz: 0ac784280303119e027fa6c95f45ba0f434e60c7
+  metadata.gz: 1bb8c1c4bdc3a86388a814536a16e4f9b8ba82f9
+  data.tar.gz: 1f4d011717a2e97db9fcdfe03bed37ea657055bf
 SHA512:
-  metadata.gz: 73d7215db5354e4e43658c0c269e5ef18ac04fbb1aa4a87e8717e7290429d47d94b450719e4247b7c5cbe57f4df6207e190522b422f6f28dce8575076ef2a5bb
-  data.tar.gz: 79d399cbd561687621903b1d341ae4f504039e05e0b5f2790bc5c44d8ca7df45e8e22204a84c730a39892ddcd041e2e856c6113ff87a79c9ec075ae7ffe50524
+  metadata.gz: b7df296b4b00638a8c727b5a425fdf6039e914bc984bd4199baabc48902b304474642b195b457386cfc11a3fb3e32f30bc2d53fc5a1a3a826c59a655a46312a6
+  data.tar.gz: 713ecf0b3d6b4578781c6bda6fba35fc70f3ef65686ba7a78d48b57b2e3c46dd2fba925da826e14b94185552ece1111209ba0a9b8f2e9b721851eb887cc9d3f9

data/README.md

@@ -51,12 +51,14 @@ include Unidom::Contact::Concerns::AsEmailAddressSubscriber
 ### As Contact concern
 The As Contact concern do the following tasks for the includer automatically:  
 1. Define the has_many :contact_subscriptions macro as: ``has_many :contact_subscriptions, class_name: 'Unidom::Contact::ContactSubscription', as: :contact``
-2. Define the #subscribe_contact! method as: ``def subscribe_contact!(contact, at: Time.now)``
+2. Define the #is_subscribed_as_contact! method as: ``is_subscribed_as_contact!(by: nil, at: Time.now, name: by.try(:name), primary: true)``
+3. Define the #is_subscribed_as_contact? method as: ``is_subscribed_as_contact?(by: nil, at: Time.now, primary: true)``
 
 ### As Subscriber concern
 The As Subscriber concern do the following tasks for the includer automatically:  
 1. Define the has_many :contact_subscriptions macro as: ``has_many :contact_subscriptions, class_name: 'Unidom::Contact::ContactSubscription', as: :subscriber``
-2. Define the #is_subscribed_as_contact! method as: ``def is_subscribed_as_contact!(by: nil, at: Time.now)``
+2. Define the #subscribe_contact! method as: ``subscribe_contact!(contact, at: Time.now, name: nil, primary: true)``
+3. Define the #subscribe_contact? method as: ``subscribe_contact?(contact, at: Time.now, primary: true)``
 
 ### As Email Address Subscriber concern
 The As Email Address Subscriber concern do the following tasks for the includer automatically:  

data/app/models/unidom/contact/concerns/as_contact.rb

@@ -6,12 +6,21 @@ module Unidom::Contact::Concerns::AsContact
 
     has_many :contact_subscriptions, class_name: 'Unidom::Contact::ContactSubscription', as: :contact
 
-    def is_subscribed_as_contact!(by: nil, at: Time.now, name: by.try(:name))
+    def is_subscribed_as_contact!(by: nil, at: Time.now, name: by.try(:name), primary: true)
 
       raise ArgumentError.new('The by argument is required.') if by.blank?
       raise ArgumentError.new('The at argument is required.') if at.blank?
 
-      contact_subscriptions.create! subscriber: by, opened_at: at, name: name
+      contact_subscriptions.subscribed_by(by).valid_at(now: at).alive.first_or_create! name: name, elemental: primary, opened_at: at
+
+    end
+
+    def is_subscribed_as_contact?(by: nil, at: Time.now, primary: true)
+
+      raise ArgumentError.new('The by argument is required.') if by.blank?
+      raise ArgumentError.new('The at argument is required.') if at.blank?
+
+      contact_subscriptions.subscribed_by(by).valid_at(now: at).alive.primary(primary).exists?
 
     end
 

data/app/models/unidom/contact/concerns/as_subscriber.rb

@@ -6,12 +6,21 @@ module Unidom::Contact::Concerns::AsSubscriber
 
     has_many :contact_subscriptions, class_name: 'Unidom::Contact::ContactSubscription', as: :subscriber
 
-    def subscribe_contact!(contact, at: Time.now, name: nil)
+    def subscribe_contact!(contact, at: Time.now, name: nil, primary: true)
 
       raise ArgumentError.new('The contact argument is required.') if contact.blank?
       raise ArgumentError.new('The at argument is required.'     ) if at.blank?
 
-      contact_subscriptions.create! contact: contact, opened_at: at, name: name||self.name
+      contact_subscriptions.contact_is(contact).valid_at(now: at).alive.first_or_create! name: name||self.name, elemental: primary, opened_at: at
+
+    end
+
+    def subscribe_contact?(contact, at: Time.now, primary: true)
+
+      raise ArgumentError.new('The contact argument is required.') if contact.blank?
+      raise ArgumentError.new('The at argument is required.'     ) if at.blank?
+
+      contact_subscriptions.contact_is(contact).valid_at(now: at).alive.primary(primary).exists?
 
     end
 

data/app/models/unidom/contact/contact_subscription.rb

@@ -16,16 +16,8 @@ class Unidom::Contact::ContactSubscription < ActiveRecord::Base
   scope :contact_is,    ->(contact)    { where contact:    contact    }
   scope :subscribed_by, ->(subscriber) { where subscriber: subscriber }
 
-  #def self.subscribe(contact, subscriber, name: subscriber.name, primary: false, grade: 0, priority: 0, opened_at: Time.now)
-  #  contact_is(contact).subscribed_by(subscriber).valid_at.alive.first_or_create name: name, elemental: primary, grade: grade, priority: priority, opened_at: opened_at
-  #end
-
-  def self.subscribe!(contact: nil, subscriber: nil, name: subscriber.name, primary: false, grade: 0, priority: 0, opened_at: Time.now)
-    contact_is(contact).subscribed_by(subscriber).valid_at.alive.first_or_create! name: name, elemental: primary, grade: grade, priority: priority, opened_at: opened_at
+  def self.subscribe!(contact: nil, subscriber: nil, name: subscriber.try(:name), primary: true, grade: 0, priority: 0, opened_at: Time.now)
+    contact_is(contact).subscribed_by(subscriber).valid_at(now: opened_at).alive.first_or_create! name: name, elemental: primary, grade: grade, priority: priority, opened_at: opened_at
   end
 
-  #class << self
-  #  deprecate subscribe: :subscribe!, deprecator: ActiveSupport::Deprecation.new('1.0', 'unidom-contact')
-  #end
-
 end

data/lib/unidom/contact/version.rb

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

metadata

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