ish_models 0.0.6 → 0.0.29.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8efda6f73dc85f020d688125566693bed7aca87
-  data.tar.gz: b907052ec21d45b83d0e084450c82dcf178ca0a4
+  metadata.gz: 733636d40b3fe04776da37c40360541136e61166
+  data.tar.gz: 3357164a8dc078c5a0c0fd4424de16feb5a000e7
 SHA512:
-  metadata.gz: d410149815d472eef473f1a047a4c8dc54a11bcb7659484866e2503b9a284ef7bd2b44d742713d486a8ef69f64e36a153571725106a10bd9b743e7aa1a996995
-  data.tar.gz: 0857285ab83fca6aca9cf7304404767ee417ceac4c5ae62e55e2518af33aabd9256a10c8745d8e4357dd451c334a6cb35ed66c70c0cb758eed5d75bd7b46e1b3
+  metadata.gz: 944c55cce78cda9b9a9ad51195bf90676c4b20811af2601693e00e9ffa6cd56f0319a18b263cf72dd82061e519c999a214b86c97b67a4e3b06978d3e232de326
+  data.tar.gz: 8ccfb1542fe5aea56acca00f97c5c4d3236657bbdf56d75a151e5587c0659c0ec637ab2fd3c2de2239cf610df3fccb7e45b465d169f8e761d1d21fc1dff698ed

data/lib/cache_key.rb~

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

data/lib/cities_user.rb

@@ -0,0 +1,17 @@
+
+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/cities_user.rb~

@@ -0,0 +1,17 @@
+
+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/city.rb

@@ -1,12 +1,11 @@
-
-class City  
-
+class City
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
-  # this does not have to be validated because I can autogenerate this value, yes?
   field :name, :type => String
 
+  field :description, :type => String, :default => 'The description of this city'
+
   field :cityname, :type => String
   validates :cityname, :uniqueness => true, :allow_nil => false, :presence => true
   
@@ -24,7 +23,7 @@ class City
   field :x, :type => Float
   field :y, :type => Float
   
-  belongs_to :country
+  belongs_to :country, :optional => true
  
   has_many :events 
   has_many :galleries 
@@ -32,13 +31,13 @@ class City
   has_many :reports
   has_many :venues
   has_many :videos
+  has_many :current_users, :class_name => 'User', :inverse_of => :current_city
 
   has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
   has_one :guide, :class_name => 'User', :inverse_of => :guide_city
-  has_many :current_users, :class_name => 'User', :inverse_of => :current_city
 
-  embeds_many :newsitems, cascade_callbacks: true
-  accepts_nested_attributes_for :newsitems
+  has_many :newsitems
+
   # @TODO @deprecated, I wish I don't use it.
   field :n_newsitems, :type => Integer, :default => 16
 
@@ -112,6 +111,14 @@ class City
       self.newsitems << Newsitem.new({ :descr => '', :username => '', :video => doc })
     end
   end
-  
+ 
+  def self.method_missing name, *args, &block
+    city = City.where( :cityname => name ).first
+    return city if city
+    super
+  end
+   
 end
 
+
+

data/lib/gallery.rb

@@ -3,8 +3,8 @@ class Gallery < AppModel2
   belongs_to :site
   validates :site, :presence => true
 
-  belongs_to :user
-  validates :user, :presence => true
+  belongs_to :user, :optional => true, :class_name => 'IshModels::User'
+  # validates :user, :presence => true
   field :username, :type => String
   
   field :name, :type => String
@@ -22,10 +22,12 @@ class Gallery < AppModel2
 
   has_many :photos
 
-  belongs_to :tag
-  belongs_to :city
-  belongs_to :venue
-    
+  belongs_to :tag, :optional => true
+  belongs_to :city, :optional => true
+  belongs_to :venue, :optional => true
+
+  has_many :newsitems
+
   set_callback(:create, :before) do |doc|
     doc.username = doc.user.username
     doc.galleryname = doc.name.to_simple_string

data/lib/ish_models/cache_key.rb

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

data/lib/ish_models/cache_key.rb~

@@ -0,0 +1,13 @@
+
+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

@@ -0,0 +1,11 @@
+
+module IshModels
+  class Configuration
+    attr_accessor :s3_credentials
+
+    def initialize
+      # @s3_credentials ||= { :bucket => '' }
+    end
+
+  end
+end

data/lib/ish_models/configuration.rb~

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

data/lib/ish_models/profile.rb

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

data/lib/ish_models/railtie.rb

@@ -0,0 +1,27 @@
+
+require 'rails'
+require 'byebug'
+
+File.open('/tmp/this', 'a') { |f| f.puts "#{Time.now} - load railtie" }
+
+module IshModels
+  class Railtie < Rails::Railtie
+
+    config.ish_models = ActiveSupport::OrderedOptions.new
+
+    initializer "ish_models.configure" do |app|
+      File.open('/tmp/this', 'a') { |f| f.puts "#{Time.now} - in railtie of ish_models" }
+
+      IshModels.configure do |config|
+        File.open('/tmp/this', 'a') { |f| f.puts "#{Time.now} - inside IshModels.configure inside... railtie" }
+
+        require Rails.root.join("config/initializers/00_s3.rb")
+        
+        config.s3_cretendials = ::S3_CREDENTIALS
+      end
+
+      require Rails.root.join("config/initializers/00_s3.rb")
+    end
+  end
+end
+

data/lib/ish_models/railtie.rb~

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

data/lib/ish_models/user.rb

@@ -0,0 +1,125 @@
+
+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
+
+  # herehere, this was in (now its out)
+  # 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/ish_models/user.rb~

@@ -0,0 +1,122 @@
+
+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/ish_models.rb

@@ -1,7 +1,29 @@
 
+require 'ish_models/configuration'
+require 'ish_models/railtie' if defined?(Rails)
+
+module IshModels
+
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    @configuration ||= Configuration.new
+  end
+
+  def self.setup
+    yield(configuration)
+  end
+end
+
+require 'ish_models/cache_key.rb'
+require 'ish_models/user.rb'
+
 require 'app_model2.rb'
 require 'aux_model.rb'
 require 'city.rb'
+require 'cities_user.rb'
 require 'country.rb'
 require 'event.rb'
 require 'feature.rb'
@@ -14,4 +36,3 @@ require 'site.rb'
 require 'tag.rb'
 require 'venue.rb'
 require 'video.rb'
-

data/lib/newsitem.rb

@@ -1,17 +1,19 @@
 class Newsitem
   include Mongoid::Document
   include Mongoid::Timestamps
-  # include Mongoid::Paranoia
-  
+
+=begin  
   embedded_in :user
   embedded_in :site
   embedded_in :city
   embedded_in :tag
+=end
 
-  belongs_to :photo
-  belongs_to :report
-  belongs_to :gallery
-  belongs_to :video
+  belongs_to :site, :optional => true
+  belongs_to :city, :optional => true
+  belongs_to :report, :optional => true
+  belongs_to :gallery, :optional => true
+  # has_one :video
 
   field :name, :type => String
   field :descr, :type => String

data/lib/photo.rb

@@ -1,15 +1,13 @@
-
 class Photo
   require 'aws-sdk'
-  require 'aws-sdk-v1'
 
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paperclip
 
-  belongs_to :user, :inverse_of => :photos
-  validates :user, :presence => true
-  field :username, :type => String
+  belongs_to :user,     :inverse_of => :photos
+  validates  :user,     :presence => true
+  field      :username, :type => String
 
   has_and_belongs_to_many :viewers, :class_name => 'User', :inverse_of => :viewable_photos
   
@@ -23,47 +21,35 @@ class Photo
   belongs_to :feature
   belongs_to :gallery
   
-  field :name, :type => String
-  field :descr, :type => String
-  
+  field :name,   :type => String
+  field :descr,  :type => String
   field :weight, :type => Integer, :default => 10
   
-  field :is_public, :type => Boolean, :default => true  
-  field :is_trash, :type => Boolean, :default => false
-    
-  # default_scope ->{ where({ :is_trash => false, :is_public => true }) }
+  field :is_public, :type => Boolean, :default => true
+
+  # @TODO: nuke this boolean _vp_ 20170515
+  field :is_trash,  :type => Boolean, :default => false
   default_scope ->{ where({ :is_trash => false }) }
 
+  File.open('/tmp/this', 'a') { |f| f.puts "#{Time.now} - inside photo.rb" }
+
   has_mongoid_attached_file :photo, 
                             :styles => {
                               :mini => '20x20#',
                               :thumb => "100x100#",
-                              # :two_hundred => '200x200#',
                               :small  => "400x400>",
-                              # :small_square => "400x400#",
-                              # :large_square => '950x650',
                               :large => '950x650>'
                             },
                             :storage => :s3,
                             :s3_credentials => ::S3_CREDENTIALS,
-                            :path => "photos/:style/:id/:filename"
+                            :path => "photos/:style/:id/:filename",
+                            :s3_protocol => 'http'
   
   def self.n_per_manager_gallery
     25
   end
 
   validates_attachment_content_type :photo, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif"]
-
-  set_callback(:create, :before) do |doc|
-#    if doc.is_public
-#      Site.languages.each do |lang|
-#        n = Newsitem.new({
-#            # :descr => t('photos.new'),
-#            :photo => doc, :username => doc.user.username })
-#        Site.where( :domain => DOMAIN, :lang => lang ).first.newsitems << n
-#      end
-#    end
-  end
   
 end
 

data/lib/report.rb

@@ -34,22 +34,20 @@ class Report
   field :lang, :type => String, :default => 'en'
   index({ :lang => 1 })
    
+  belongs_to :user, :optional => true, :class_name => 'IshModels::User'
+  # validates :user, :presence => true, :allow_nil => false
   field :username, :type => String, :default => 'anonymous'
   validates :username, :presence => true, :allow_nil => false
-  belongs_to :user
-  validates :user, :presence => true, :allow_nil => false
   index({ :username => 1 })
 
   field :subhead, :type => String
   
-  belongs_to :tag
-  belongs_to :city
-  
-  belongs_to :site
-  validates :site, :presence => true
-  
+  belongs_to :tag,         :optional => true
+  belongs_to :city,        :optional => true
+  belongs_to :site,        :optional => true
+  belongs_to :cities_user, :optional => true
+
   has_and_belongs_to_many :venues
-  belongs_to :cities_user
   
   has_one :photo
 
@@ -60,6 +58,8 @@ class Report
     where({ is_public: true, is_trash: false }).order_by({ created_at: :desc })
   }
   
+  has_many :newsitems
+
   def self.list conditions = { :is_trash => false }
     out = self.where( conditions ).order_by( :name => :asc ).limit( 100 )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
@@ -97,7 +97,7 @@ class Report
       if !doc.venue_ids.blank?
         ( doc.venue_ids || [] ).each do |venue_id|
           v = Venue.find venue_id
-          u = User.find doc.user_id
+          u = ::IshModels::User.find doc.user_id
           n = Newsitem.new
           n.username = u.username unless u.blank?
           n.report = doc

data/lib/site.rb

@@ -34,9 +34,9 @@ class Site
   has_many :galleries
   has_many :tags
   has_many :videos
+  has_many :newsitems
 
   embeds_many :features
-  embeds_many :newsitems
   
   default_scope ->{ where({ :is_trash => false }).order_by({ :domain => :asc, :lang => :asc }) }
 
@@ -78,5 +78,9 @@ class Site
   def its_locales
     Site.where( :domain => self.domain ).map { |s| s.lang.to_sym }
   end
-  
+
+  def self.Tgm
+    Site.find_by( :domain => 'travel-guide.mobi', :lang => :en )
+  end
+
 end

data/lib/video.rb

@@ -1,6 +1,4 @@
-
 class Video
-
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -32,7 +30,6 @@ class Video
   
   accepts_nested_attributes_for :site, :tag, :city
 
-
   def self.list
     [['', nil]] + Video.all.order_by( :name => :desc ).map { |item| [ item.name, item.id ] }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.29.9
 platform: ruby
 authors:
 - piousbox
@@ -38,6 +38,9 @@ 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/country.rb
 - lib/event.rb
@@ -45,6 +48,16 @@ files:
 - lib/gallery.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/profile.rb~
+- lib/ish_models/railtie.rb
+- lib/ish_models/railtie.rb~
+- lib/ish_models/user.rb
+- lib/ish_models/user.rb~
 - lib/newsitem.rb
 - lib/photo.rb
 - lib/public_item.rb