ish_models 0.0.33.68 → 0.0.33.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a5d8a29658dbe9204d9a01bc1d09bbeeb6f7fab
-  data.tar.gz: b1183b2873156a323fb12e600cbe1acdc71db0bf
+  metadata.gz: 1c974f7f7d2f077d558b554b718e59d128d08050
+  data.tar.gz: aeb535af35227c313e2c5d8111bd979919b2b09f
 SHA512:
-  metadata.gz: 7feea03c45f19e2da5709ab3efa6f1b3a6d599f32b02194af519843213ddf57b5a3da0ede76e3bfb559f2d0818cf5cad426b2e9f69e1ed2becdf51c9df021854
-  data.tar.gz: 64d209ae099568bd7646eb54ddd4409c1c1f0d79935f7f3ab79cdf38cf27ebd6460f0f4ab02b3bfeb3eba8066ddde52be2dad40b2f656001bdac5e7bb11f9417
+  metadata.gz: b43c44d5dc296dafd4f370d61602b7d6549c41e6f34e56d3c565a019fca35387b939b3b6cc14c1c2a0e3da9da41f5623d6ee37b93b7e19cbc80f56b741f15877
+  data.tar.gz: 472306420a2730c59d1bdd39611c86132901d7400bd702f1e6974aea718c1a7f424a5016acc6450a1eea82a089e656c05b128786d52d79749ef14fda31ed0282

data/lib/gallery.rb

@@ -98,5 +98,8 @@ class Gallery
 
   field :issue
 
+  RENDER_TITLES = :gallery_render_titles_const
+  RENDER_THUMBS = :gallery_render_thumbs_const
+
 end
 

data/lib/ish/invoice.rb

@@ -11,7 +11,7 @@ class Ish::Invoice
 
   store_in :collection => 'ish_invoice'
 
-  belongs_to :profile, :class_name => 'IshModels::UserProfile'
+  field :email, :type => String
 
   field :number, :type => Integer
   increments :number
@@ -19,6 +19,7 @@ class Ish::Invoice
   field :amount, :type => Float
 
   has_many :payments, :class_name => 'Ish::Payment'
+  field :paid_amount, :type => Float, :default => 0
 
   field :description, :type => String
 

data/lib/ish/payment.rb

@@ -3,10 +3,18 @@ class Ish::Payment
   include Mongoid::Timestamps
 
   belongs_to :invoice, :class_name => 'Ish::Invoice'
-  belongs_to :profile, :class_name => 'IshModels::UserProfile', :optional => true
+  # belongs_to :profile, :class_name => 'IshModels::UserProfile', :optional => true
 
   field :amount, :type => Float
   field :charge, :type => Hash
 
+  after_create :compute_paid_invoice_amount
+
+  protected
+
+  def compute_paid_invoice_amount
+    self.invoice.update_attributes :paid_amount => self.invoice.paid_amount + self.amount
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.68
+  version: 0.0.33.69
 platform: ruby
 authors:
 - piousbox
@@ -108,9 +108,7 @@ extra_rdoc_files: []
 files:
 - lib/app_model2.rb
 - lib/aux_model.rb
-- lib/cache_key.rb~
 - lib/cities_user.rb
-- lib/cities_user.rb~
 - lib/city.rb
 - lib/co_tailors.rb
 - lib/co_tailors/address.rb
@@ -133,16 +131,10 @@ files:
 - lib/ish/stock_option.rb
 - lib/ish/stock_watch.rb
 - lib/ish_models.rb
-- lib/ish_models.rb~
 - lib/ish_models/cache_key.rb
-- lib/ish_models/cache_key.rb~
 - lib/ish_models/configuration.rb
-- lib/ish_models/configuration.rb~
-- lib/ish_models/profile.rb~
 - lib/ish_models/railtie.rb
-- lib/ish_models/railtie.rb~
 - lib/ish_models/stock_watch.rb
-- lib/ish_models/user.rb~
 - lib/ish_models/user_profile.rb
 - lib/manager.rb
 - lib/newsitem.rb
@@ -151,7 +143,6 @@ files:
 - lib/report.rb
 - lib/site.rb
 - lib/tag.rb
-- lib/user_profile.rb~
 - lib/venue.rb
 - lib/video.rb
 homepage: http://wasya.co

data/lib/cache_key.rb~

@@ -1,10 +0,0 @@
-
-class CacheKey
-  include ::Mongoid::Document
-  include ::Mongoid::Timestamps
-
-  def self.one
-    CacheKey.first || CacheKey.new
-  end
-
-end

data/lib/cities_user.rb~

@@ -1,17 +0,0 @@
-
-class CitiesUser
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :date, :type => Time
-  field :name, :type => String
-  field :descr, :type => String
-
-  belongs_to :city
-  belongs_to :user
-  
-  has_many :reports
-  has_many :galleries
-  
-end

data/lib/ish_models.rb~

@@ -1,11 +0,0 @@
-
-require 'report.rb'
-
-=begin
-class IshModels
-  def self.hi
-    puts '+++ +++ Hello world from ish models!'
-  end
-end
-=end
-

data/lib/ish_models/cache_key.rb~

@@ -1,13 +0,0 @@
-
-class IshModels::CacheKey
-  include ::Mongoid::Document
-  include ::Mongoid::Timestamps
-
-  ## /api/cities.json
-  field :cities, :type => Time 
-
-  def self.one
-    CacheKey.first || CacheKey.new
-  end
-
-end

data/lib/ish_models/configuration.rb~

@@ -1,5 +0,0 @@
-
-module IshModels
-  class Configuration
-  end
-end

data/lib/ish_models/railtie.rb~

@@ -1,6 +0,0 @@
-
-module IshModels
-  class Railtie < Rails::Railtie
-  end
-end
-

data/lib/ish_models/user.rb~

@@ -1,122 +0,0 @@
-
-class IshModels::User  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  # Setup accessible (or protected) attributes for your model
-  # attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  ## Database authenticatable
-  field :email, type: String, default: ""
-  validates :email, :presence => true, :uniqueness => true
-
-  field :encrypted_password, type: String, default: ""
-
-  ## Recoverable
-  field :reset_password_token,   type: String
-  field :reset_password_sent_at, type: Time
-
-  ## Rememberable
-  field :remember_created_at, type: Time
-
-  ## Trackable
-  field :sign_in_count,      type: Integer, default: 0
-  field :current_sign_in_at, type: Time
-  field :last_sign_in_at,    type: Time
-  field :current_sign_in_ip, type: String
-  field :last_sign_in_ip,    type: String
-
-  ## Confirmable
-  # field :confirmation_token,   type: String
-  # field :confirmed_at,         type: Time
-  # field :confirmation_sent_at, type: Time
-  # field :unconfirmed_email,    type: String # Only if using reconfirmable
-
-  ## Lockable
-  # field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
-  # field :unlock_token,    type: String # Only if unlock strategy is :email or :both
-  # field :locked_at,       type: Time
-  
-  # :recoverable, :trackable :rememberable,
-  # :token_authenticatable, 
-  # :lockable, :timeoutable, :confirmable
-  devise :registerable, :validatable
-  devise :database_authenticatable, :authentication_keys => [ :email ]
-  # devise :omniauthable, :omniauth_providers => [ :facebook ]
-  # devise :encryptable, :encryptor => :sha1base64
-  #
-  #
-  # field :confirmed_at, :type => DateTime
-  # field :confirmation_token, :type => String
-  # field :confirmation_sent_at, :type => DateTime
-  
-  field :username, :type => String
-  validates :username, :presence => true, :uniqueness => true
-  
-  field :name, :type => String
-  validates :name, :presence => true
-  
-  field :group_id, :type => Integer, :default => 3
-
-  field :scratchpad, :type => String
-  field :github_path, :type => String
-  field :facebook_path, :type => String
-  field :stackoverflow_path, :type => String
-
-  field :is_feature, :type => Boolean, :default => false
-  field :is_trash, :type => Boolean, :default => false
-
-  field :display_ads, :type => Boolean, :default => true
-  field :display_help, :type => Boolean, :default => true
-  
-  has_many :reports
-  has_many :photos
-  has_many :user_profiles
-  has_many :galleries
-  has_many :videos
-
-  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_user
-
-  has_and_belongs_to_many :viewable_photos, :class_name => 'Photo', :inverse_of => :viewer
-
-  belongs_to :guide_city, :class_name => 'City', :inverse_of => :guide
-  belongs_to :current_city, :class_name => 'City', :inverse_of => :city_users
-
-  def self.list conditions = { :is_trash => false }
-    out = self.where( conditions ).order_by( :name => :asc )
-    [['', nil]] + out.map { |item| [ item.name, item.id ] }
-  end
-
-  embeds_many :newsitems
-
-  def self.all
-    self.where( :is_trash => false ).order_by( :created_at => :desc )
-  end
-
-  def create_newsitem args = {}
-    unless args[:photo].blank?
-      n = Newsitem.new
-      n.photo = args[:photo]
-      n.descr = 'uploaded new photo on'
-      n.username = self.username
-      self.newsitems << n
-      self.save
-    end
-  end
-  
-  def self.per_page
-    16
-  end
-
-  def self.clear
-    if Rails.env.test?
-      User.unscoped.each { |u| u.remove }
-    end
-  end
-  
-  def generate_auth_token
-    payload = { user_id: self.id }
-    AuthToken.encode(payload)
-  end
-  
-end

data/lib/user_profile.rb~

@@ -1,8 +0,0 @@
-
-class UserProfile
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :username
-
-end