ish_models 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74ea9863f9415a3ed7040bb7d2795f3b83a91931
-  data.tar.gz: 6feeb500ac6ad5c3aa91fd5171a49a93fd3fc9fe
+  metadata.gz: f16c35ed3fc7b44581a02934673f0280ce18890b
+  data.tar.gz: 70fb6987337c420c4389495c2a4b1b5fd87d5cdf
 SHA512:
-  metadata.gz: dc094b80304bf175c24466a20a0140fa5a1943094ca6a2bc204102e188f6dcd0010c28ca3ce7a6445dadc20d80de651be162d3da6ec46d0c3dd13c1236367a96
-  data.tar.gz: b2c5ac536916cbbb1c81b5673cc416f11e3af85e0a6cccca7e1d31daaf32b7c1ca5c862f09aaf5a1a29408d624b6fa249f9138f0a4542d8bc7b1baa9cd461218
+  metadata.gz: f51c9143bb4491e867a2b79908558c93d7efb5ba2c4cacaf643d9dc48fabc83ad8e1ccc953072c0887d5b269febe8e2a0382492947900132c56de06f9d15f3a5
+  data.tar.gz: 081082d09d1871da3ca18f84a691860ea599261c1a62f20ee4bc20f6adce692f9232e90dde733028ccd0d46f6120994e68bf3d2d146ed17a864e7f738aaad8c7

data/lib/ish_models/railtie.rb

@@ -1,27 +1,18 @@
-
 require 'rails'
-require 'byebug'
+# require 'byebug'
 
-File.open('/tmp/this', 'a') { |f| f.puts "#{Time.now} - load railtie" }
+# File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie root: #{Rails.root}" }
+# require Rails.root.join("config/initializers/00_s3.rb")        
 
 module IshModels
   class Railtie < Rails::Railtie
 
-    config.ish_models = ActiveSupport::OrderedOptions.new
+    # File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie config: #{config.inspect}" }
+    # File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie callback root: #{Rails.root}" }
 
     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")
+      # File.open( '/tmp/this', 'a' ) { |f| f.puts "ish_models/railtie callback initializer root: #{Rails.root}" }
+      # require Rails.root.join("config/initializers/00_s3.rb")
     end
   end
 end
-

data/lib/ish_models.rb

@@ -1,7 +1,8 @@
 
-require 'ish_models/configuration'
 require 'ish_models/railtie' if defined?(Rails)
+# require 'ish_models/configuration'
 
+=begin
 module IshModels
 
   class << self
@@ -16,6 +17,7 @@ module IshModels
     yield(configuration)
   end
 end
+=end
 
 require 'ish_models/cache_key.rb'
 require 'ish_models/user.rb'
@@ -34,5 +36,6 @@ require 'public_item.rb'
 require 'report.rb'
 require 'site.rb'
 require 'tag.rb'
+# require 'user.rb'
 require 'venue.rb'
 require 'video.rb'

data/lib/photo.rb

@@ -31,7 +31,7 @@ class Photo
   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" }
+  # File.open('/tmp/this', 'a') { |f| f.puts "#{Time.now} - inside photo.rb" }
 
   has_mongoid_attached_file :photo, 
                             :styles => {

data/lib/user.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - piousbox
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+- !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'
 description: models of ish
 email: victor@wasya.co
 executables: []
@@ -64,6 +78,7 @@ files:
 - lib/report.rb
 - lib/site.rb
 - lib/tag.rb
+- lib/user.rb
 - lib/venue.rb
 - lib/video.rb
 homepage: http://wasya.co