ish_models 0.0.33.58 → 0.0.33.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d73c7fc9057a840ccdd310d679761b892fc9cff3
-  data.tar.gz: 5893aec735ad991c95208b14eb5f6e4cc13ea926
+  metadata.gz: bef50c4f8ef407bd36558e04017952197f006d62
+  data.tar.gz: 944d11f7eb25042fdd72e055d8053a4d566703b2
 SHA512:
-  metadata.gz: 8b436094b78efe9a3caee0009bc4237cf0360b89d1ce67cafaef0fce935c1faa664278c2fdd1d6d06e4bf46e470d922259d6a6d44bff909a430e0251600aab75
-  data.tar.gz: d80ff5cb7a1c6bbb53d53a7b3d21b4742db99f5ea0a77f3a54b37194496670fa2bfb248d3aec377bd106eeda36eb5fba0465a0a4fc74d044d30b077a7bd17b31
+  metadata.gz: b3a72b4efe76e65ecb6e9dd71c855a3f037a9b4a7e92cbd457b0c25df28923a338751f8f9e724a3ca48f877337e9da2c788cae3c4ea35d9d528c73d7aeabdefa
+  data.tar.gz: 2313fd87be13bdd161d92203fdac4099406db61705a8b2dbd560c2a4f5a459955456b6818961cfc6ee9b4adc2d74df3cf447949d45ef9a5f6aeec38e1bf2f296

data/lib/co_tailors/order.rb

@@ -1,3 +1,4 @@
+require_relative 'order_item'
 
 class CoTailors::Order
   include Mongoid::Document

data/lib/co_tailors/order_item.rb

@@ -5,13 +5,22 @@ class CoTailors::OrderItem
 
   belongs_to :order, :class_name => 'CoTailors::Order'
 
+  KIND_SHIRT = :shirt
+  KIND_PANTS = :pants
+  KIND_SUIT = :suit
   KINDS = [ :shirt, :pants, :suit ]
   field :kind, :type => Symbol
+  validates :kind, :presence => true
 
   FABRICS = [ :white, :black, :light_blue, :dark_blue, :dark_green, :pink, :gray ]
   field :fabric, :type => Symbol
+  validates :fabric, :presence => true
 
   has_one :measurement, :class_name => 'CoTailors::ProfileMeasurement'
+  validates :measurement, :presence => true
+
+  field :quantity, :type => Integer
+  validates :quantity, :presence => true
 
 end
 

data/lib/co_tailors/profile_measurement.rb

@@ -4,10 +4,12 @@ class CoTailors::ProfileMeasurement
   include Mongoid::Timestamps
 
   UNITS = [ :inches, :centimeters ]
+  UNITS_INCHES = :inches
+  UNITS_CENTIMETERS = :centimeters
   field :units, :type => Symbol
 
-  belongs_to :profile,    :class_name => 'IshModels::UserProfile'
-  belongs_to :order_item, :class_name => 'CoTailors::OrderItem'
+  belongs_to :profile,    :class_name => 'IshModels::UserProfile', :optional => true
+  belongs_to :order_item, :class_name => 'CoTailors::OrderItem',   :optional => true
 
   ## shirt
   field :neck_around,    :type => Float

data/lib/gallery.rb

@@ -1,3 +1,4 @@
+require 'kaminari/mongoid'
 
 class Gallery
   include ::Mongoid::Document
@@ -95,5 +96,7 @@ class Gallery
   end
   ACTIONS = [ 'show_mini', 'show_long', 'show' ]
 
+  field :issue
+
 end
 

data/lib/ish/campaign.rb

@@ -0,0 +1,30 @@
+
+#
+# Campaign
+# _vp_ 20180128
+#
+class Ish::Campaign
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  store_in :collection => 'ish_campaign'
+
+  belongs_to :profile, :class_name => 'IshModels::UserProfile'
+
+  has_and_belongs_to_many :leads,             :class_name => 'Ish::Lead'
+  has_and_belongs_to_many :unsubscribe_leads, :class_name => 'Ish::Lead'
+
+  field :subject
+  field :body
+
+  
+
+  field :is_done,  :type => Boolean, :default => false
+  field :is_trash, :type => Boolean, :default => false
+
+  field :applied_on, :type => Time
+
+  field :tag # 'hired_com_ror', not enumerated for now _vp_ 20180103
+  field :location
+
+end

data/lib/ish/issue.rb

@@ -0,0 +1,14 @@
+
+#
+# Issue
+# _vp_ 20171204
+#
+class Ish::Issue
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  store_in :collection => 'ish_issue'
+
+  field :name
+
+end

data/lib/ish/lead.rb

@@ -11,6 +11,9 @@ class Ish::Lead
 
   belongs_to :profile, :class_name => 'IshModels::UserProfile'
 
+  has_and_belongs_to_many :campaigns,             :class_name => 'Ish::Campaign', :inverse_of => :leads
+  has_and_belongs_to_many :unsubscribe_campaigns, :class_name => 'Ish::Campaign', :inverse_of => :unsubscribe_leads
+
   field :email
   field :job_url
 

data/lib/ish_models/user_profile.rb

@@ -68,4 +68,8 @@ class IshModels::UserProfile
   has_many :addresses,    :class_name => '::CoTailors::Address'
   has_many :orders,       :class_name => '::CoTailors::Order'
 
+  def current_order
+    self.orders.where( :submitted_at => nil ).first || CoTailors::Order.create( :profile => self )
+  end
+
 end

data/lib/ish_models.rb

@@ -2,6 +2,8 @@
 require 'ish_models/railtie' if defined?(Rails)
 require 'ish_models/configuration'
 
+::S3_CREDENTIALS ||= {}
+
 module IshModels
 
   class << self
@@ -23,7 +25,7 @@ require 'co_tailors/shirt.rb'
 require 'co_tailors/suit.rb'
 require 'co_tailors/profile_measurement.rb'
 require 'co_tailors/order.rb'
-require 'co_tailors/order_item.rb'
+# require 'co_tailors/order_item.rb' # this is required from within order.rb
 require 'co_tailors/address.rb'
 
 require 'ish/gallery_name.rb'
@@ -33,9 +35,11 @@ require 'ish/stock_option.rb'
 require 'ish/stock_watch.rb'
 require 'ish/invoice.rb'
 require 'ish/lead.rb'
+require 'ish/campaign.rb'
+require 'ish/issue.rb'
 
 # obsolete, use `ish` namespace now
-require 'ish_models/cache_key.rb'
+require 'ish_models/cache_key.rb' # this is really obsolete? _vp_ 20180123
 require 'ish_models/user_profile.rb'
 
 require 'app_model2.rb'

data/lib/report.rb

@@ -141,4 +141,6 @@ class Report
     self.venues[0] || nil
   end
 
+  field :issue
+
 end

data/lib/site.rb

@@ -38,6 +38,7 @@ class Site
   has_many :tags
   has_many :videos
   has_many :newsitems, :order => :created_at.desc
+  has_many :issues, :class_name => 'Ish::Issue'
 
   embeds_many :features, :order => :created_at.desc
   
@@ -63,7 +64,7 @@ class Site
   # manager uses it.
   def self.list
     out = self.all.order_by( :domain => :asc, :lang => :asc )
-    [['Select Site', nil, { :disabled => true }]] + out.map { |item| [ "#{item.domain} #{item.lang}", item.id ] }
+    [['Select Site', nil]] + out.map { |item| [ "#{item.domain} #{item.lang}", item.id ] }
   end
 
   def self.mobi

data/lib/video.rb

@@ -43,4 +43,6 @@ class Video
     
   end
 
+  field :issue
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.58
+  version: 0.0.33.59
 platform: ruby
 authors:
 - piousbox
@@ -31,33 +31,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.1.0
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: mongoid-autoinc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid-autoinc
+  name: mongoid-paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: models of ish
 email: victor@wasya.co
 executables: []
@@ -97,8 +125,10 @@ files:
 - lib/feature.rb
 - lib/gallery.rb
 - lib/gallery2.rb
+- lib/ish/campaign.rb
 - lib/ish/gallery_name.rb
 - lib/ish/invoice.rb
+- lib/ish/issue.rb
 - lib/ish/lead.rb
 - lib/ish/payment.rb
 - lib/ish/stock_action.rb