ish_models 0.0.33.193 → 0.0.33.194

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc895b3cb92cc734e59ab08fba5811a59ca160946065f741548a9d6cad80be6
-  data.tar.gz: 10d141e79f4b95490f217751152f117801b5ffb3543457f890ba89d3fe29b059
+  metadata.gz: 18d1d504900c0b683dc0d876ac2c7a00552a0baed0e364f8ca53d40a20607a9d
+  data.tar.gz: 0dc8f5df4aba00affe8c276647c76155ab07495ad8fb25ac2524af1b4096aa13
 SHA512:
-  metadata.gz: 3e867c1540b0759257d40f318f0636dff5f537b1a4c3d727c83b0d8f905c12966c485885c60e48b23ebce496309a9c500b05800eb322712d10a59095fe09a168
-  data.tar.gz: cdca53cb93a7925c869a690347313040023ca6c0b840d934f8a3e6f40d344f2f15cd7df3477844b3751d3e062d87366e8fd712156f0f1b7889be1977a0a80e54
+  metadata.gz: 0feae87ac0aeb2d409ac578e604d8b574a86b72668001bda1b7f3fa4e5f821c283e2d1a97ecdd387b4dc0099c6599c63bda6c0c5771b4dbf6a57aa4140fdb4d5
+  data.tar.gz: b0eca2407e7950188a0b5525261f4fda5d37e3e42413781d71e4001079d996c2f89809dba4a9f3e60defdfac51ae15e92a4b4e46c8e874b6cc97e5fbb6877114

data/lib/iro/{option_price_item.rb → option_price_item.rb-trash}

@@ -1,4 +1,6 @@
 
+require 'active_record'
+
 class ::Iro::OptionPriceItem < ActiveRecord::Base
 
   self.table_name = 'iro_option_price_items'

data/lib/ish/email_campaign.rb

@@ -35,13 +35,13 @@ class Ish::EmailCampaign
   field :sent_at, type: DateTime
   field :send_at, type: DateTime
 
-  # def campaign_leads
-  #   return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead )
-  # end
+  def campaign_leads
+    return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead )
+  end
 
-  # def leads
-  #   campaign_leads&.map { |p| p.lead }
-  # end
+  def leads
+    campaign_leads&.map { |p| p.lead }
+  end
 
 
   ##
@@ -57,9 +57,6 @@ class Ish::EmailCampaign
     out
   end
 
-  field :to_email
-  validates_presence_of :to_email, if: -> { type == TYPE_SINGLE }
-
   #
   # For tracking
   #

data/lib/ish/email_context.rb

@@ -25,15 +25,6 @@ class Ish::EmailContext
     [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
   end
 
-  ## @deprecated, campaigns are now separate.
-  TYPE_SINGLE = 'TYPE_SINGLE'
-  TYPE_CAMPAIGN = 'TYPE_CAMPAIGN'
-  field :type, default: TYPE_SINGLE
-  def self.types_list
-    [ [TYPE_SINGLE, TYPE_SINGLE], [TYPE_CAMPAIGN, TYPE_CAMPAIGN] ]
-  end
-
-
   field :subject
   validates_presence_of :subject
 
@@ -47,23 +38,6 @@ class Ish::EmailContext
   field :sent_at, type: DateTime
   field :send_at, type: DateTime
 
-  def self.all_campaigns
-    Ish::EmailContext.where( type: TYPE_CAMPAIGN )
-  end
-
-  def self.unsent_campaigns
-    Ish::EmailContext.where( type: TYPE_CAMPAIGN, sent_at: nil )
-  end
-
-  def campaign_leads
-    if self.type == TYPE_CAMPAIGN
-      return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead )
-    end
-  end
-
-  def leads
-    campaign_leads&.map { |p| p.lead }
-  end
 
   def self.unsent
     new.unsent
@@ -95,7 +69,7 @@ class Ish::EmailContext
   end
 
   field :to_email
-  validates_presence_of :to_email, if: -> { type == TYPE_SINGLE }
+  validates_presence_of :to_email
 
   #
   # For tracking
@@ -103,4 +77,3 @@ class Ish::EmailContext
   attr_reader :tid
 
 end
-EmailCampaign = Ish::EmailContext

data/lib/ish_models.rb

@@ -8,7 +8,7 @@ require 'kaminari/mongoid'
 
 class Gameui; end
 
-module Iro; end
+# module Iro; end
 class Ish::InputError < RuntimeError; end
 module Ish; end
 
@@ -44,6 +44,8 @@ require 'gameui/map_bookmark'
 require 'gameui/marker'
 require 'gameui/premium_purchase'
 
+# require 'iro/option_price_item'
+
 require 'ish/cache_key'
 require 'ish/crawler'
 require 'ish/email_campaign'

data/lib/office/email_message.rb

@@ -23,7 +23,7 @@ class Office::EmailMessage
 
   field :to,   type: Array, default: []
   field :cc,   type: Array, default: []
-  field :bss,  type: Array, default: []
+  field :bcc,  type: Array, default: []
   field :date, type: DateTime
   def received_at
     date

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.193
+  version: 0.0.33.194
 platform: ruby
 authors:
 - piousbox
@@ -108,34 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 description: models of ish
 email: victor@wasya.co
 executables: []
@@ -150,7 +122,7 @@ files:
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
 - lib/gameui/premium_purchase.rb
-- lib/iro/option_price_item.rb
+- lib/iro/option_price_item.rb-trash
 - lib/ish/cache_key.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb