pbw 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y3MjQ0ODBkMzVkZmM3Y2MxYTdlZDhmNDYzY2NjMDY4YjRmOWE0YQ==
+    YzAxY2I2YmFlYWQ4Y2FjNWU4ZGRiMGNlOGVmYTQ2Nzk3MDA3OWIxZQ==
   data.tar.gz: !binary |-
-    OGNhMWJkMDEzMTEwNzQ5ZmU4YWE4MzcxY2Y4MjgyN2E0YjU1ZjJhMA==
+    OWJjODBhYTY5NWJmMGY1Y2FlOThjNjdlZDY3YjE0ZTA4M2MwMWVhMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWQ0ZDQ2MmJjNGRhYjc3ODIyNWJlNjkxM2U3NTU5OWFlMTQ1OTE1ZjI0ZDMz
-    MDQ0ZjdiOTA2NDY4OTNhZmEzZTUyMTg3ZTMyM2RhNmI3Y2FhOWFlNTM3OWQz
-    NjE2ZTQxZjQxYmJkN2YxOTY5MjkxN2FlN2Y2MThjMDRkNDZmMjY=
+    YWFkNjg4NjIwMzM2ZTRkMjllYTgyNjBmMThhZDVjNjkyOWEzMWQwMjNmMTc1
+    ZTRkMTZiMjc5NzE4NmQ4ZTVlMjQxOTU5ZTliZDY5ZjJkNGQ1Njk1NjMxOGMw
+    Mjg2OTc5ODVkZjYwZGI1ZjBlMTA3MThlYzZmOTI1ODAzNjM2ZjM=
   data.tar.gz: !binary |-
-    YjFlNmJiNjlkZTM5YjVlYmNjZmFkNDExYTMxZDM1NjY4NTA2ZmVjYmIwYWMy
-    MTk1MzZkNGJkOTE4MDZhZGVkMDJjOTQwYTE0NDdmZWY2MDViMzMyZWM3Mjll
-    YmRiYzJjOTI0YjQzYjk2NzgxNmJlM2Y4YzM5NDgxODdkZGY5Yzk=
+    M2Y5ZWNhZjZlZDEwODVjZDAxYjc3NTUwYTc4MzJkNTIwNDNiNjM4YTAxYmJm
+    MGRiMDRmMTJkMGY2ZGY3ODgxY2U5ZDFiOWUzNmRiZDRjZjk2ZmU5Zjg3YzEz
+    NzdhZjIyMDEwYTRiMmE4ODdiOWQzMjBkNDQ0ZTRkMDljZjFhODU=

data/app/controllers/pbw/application_controller.rb

@@ -1,32 +1,19 @@
 module Pbw
   class ApplicationController < ActionController::Base
+  	  respond_to :json
   	  
   	  rescue_from ::CanCan::AccessDenied do |exception|
-	    respond_to do |format|
-	    	format.json {render json: {:error => exception.message}, status: 401}
-	    	format.html {redirect_to root_path, :error => exception.message}
-	    end
+  	  	render json: {:error => exception.message}, status: 401
 	  end
 
 	  rescue_from Mongoid::Errors::DocumentNotFound do |exception|
-		respond_to do |format|
-			format.html {redirect_to root_url, :error => exception.message}
-			format.json {render json: {:error => exception.message}, status: 404}
-		end
+	  	render json: {:error => exception.message}, status: 404
 	  end
 
 	  protected
 
-	  def self.permission
-	    return name = self.name.gsub('Controller','').singularize.split('::').last.constantize.name rescue nil
-	  end
-
 	  def current_ability
 	    @current_ability ||= Ability.new(current_user)
 	  end
-
-	  def load_permissions
-	    @current_permissions = current_user.role.permissions.collect{|i| [i.subject_class, i.action]}
-	  end
   end
 end

data/app/controllers/pbw/base_models_controller.rb

@@ -1,7 +1,5 @@
 module Pbw
 	class BaseModelsController < ApplicationController
-		respond_to :json
-
 		attr_accessor :model_class
 
 		before_filter :authenticate_user!
@@ -25,62 +23,42 @@ module Pbw
 
 		def index
 	  		session[:referrer] = request.url
-			respond_with(@models) do |format|
-				format.json { render json: @models }
-			end
+			render json: @models
 		end
 
 		def show
-			respond_with(@model) do |format|
-				format.json { render json: @model }
-			end
+			render json: @model.to_json
 		end
 
 		def edit
-			respond_with(@model) do |format|
-				format.json { render json: @model }
-			end
+			render json: @model.to_json
 		end
 
 		def new
-			respond_with(@model) do |format|
-				format.json { render json: @model }
-			end
+			render json: @model.to_json
 		end
 
 		def create
 			if @model.save
-				respond_with(@model) do |format|
-					format.json { render json: @model }
-				end
+				render json: @model.to_json
 			else
-				respond_with(@model) do |format|
-					format.json { render json: @model.errors.full_messages, status: :unprocessable_entity}
-				end
+				render json: @model.errors.full_messages.to_json, status: :unprocessable_entity
 			end
 		end
 
 		def update
 			if @model.update_attributes(params[model_param])
-				respond_with(@model) do |format|
-					format.json { render json: @model }
-				end
+				render json: @model.to_json
 			else
-				respond_with(@model) do |format|
-					format.json { render json: @model.errors.full_messages, status: :unprocessable_entity}
-				end
+				render json: @model.errors.full_messages.to_json, status: :unprocessable_entity
 			end
 		end
 
 		def destroy
 			if @model.destroy
-				respond_with(@model) do |format|
-					format.json { head :no_content }
-				end
+				head :no_content
 			else
-				respond_with(@model) do |format|
-					format.json { render json: @model.errors.full_messages, status: :unprocessable_entity}
-				end
+				render json: @model.errors.full_messages.to_json, status: :unprocessable_entity
 			end
 		end
 

data/app/controllers/pbw/passwords_controller.rb

@@ -0,0 +1,14 @@
+module Pbw
+	class PasswordsController < Devise::PasswordsController
+		respond_to :json
+
+		def create
+			self.resource = resource_class.where(resource_params).first
+			if resource && resource.reset_password!
+				head :no_content
+			else
+				render status: :unprocessable_entity
+			end
+		end
+	end
+end

data/app/controllers/pbw/registrations_controller.rb

@@ -1,12 +1,15 @@
 module Pbw
 	class RegistrationsController < Devise::RegistrationsController
-		after_filter :add_user, :only => [:create]
+		respond_to :json
 
-		protected
-
-		def add_user
-			if resource.persisted?
-				Pbw::Engine.user_lifecycle_class.after_signup(resource)
+		def create
+			self.resource = User.new(params[:user])
+			logger.error "Password confirmed? #{params[:user][:password] == params[:user][:password_confirmation]}"
+			if resource.save && resource.send_registration_email
+				Pbw.user_lifecycle_class.after_signup(resource)
+				render json: resource
+			else
+				render json: resource.errors.full_messages.to_json, status: :unprocessable_entity
 			end
 		end
 	end

data/app/controllers/pbw/sessions_controller.rb

@@ -1,11 +1,16 @@
 module Pbw
 	class SessionsController < Devise::SessionsController
-		after_filter :login_user, :only => [:create]
+		respond_to :json
 
-		protected
+		def create
+			self.resource = warden.authenticate!(auth_options)
+			sign_in(resource_name, resource)
+			Pbw.user_lifecycle_class.after_login(current_user)
+			render json: current_user.to_json, status: :ok
+		end
 
-		def login_user
-			Pbw::Engine.user_lifecycle_class.after_signup(current_user)
+		def after_sign_out_path_for(resource_name)
+			"/"
 		end
 	end
 end

data/app/mailers/pbw/user_mailer.rb

@@ -0,0 +1,16 @@
+module Pbw
+  class UserMailer < ActionMailer::Base
+    default :from => Pbw.email_from_address
+
+    def registration(user_id)
+      @user = User.find(user_id)
+      mail(:to => @user.email, :subject => I18n.t('pbw.users.registration.subject'))
+    end
+
+    def password_reset(user_id, password)
+      @user = User.find(user_id)
+      @password = password
+      mail(:to => @user.email, :subject => I18n.t('pbw.users.password_reset.subject'))
+    end 
+  end
+end

data/app/models/pbw/area.rb

@@ -6,11 +6,11 @@ module Pbw
     validates_presence_of :name
     validates_uniqueness_of :name
 
-    has_many :tokens
-    has_many :item_containers
-    has_many :attached_processes
-    has_and_belongs_to_many :constraints
-    has_and_belongs_to_many :triggers
+    has_many :tokens, :class_name => 'Pbw::Token'
+    has_many :item_containers, :class_name => 'Pbw::ItemContainer'
+    has_many :attached_processes, :class_name => 'Pbw::AttachedProcess'
+    has_and_belongs_to_many :constraints, :class_name => 'Pbw::Constraint'
+    has_and_belongs_to_many :triggers, :class_name => 'Pbw::Trigger'
     
     attr_accessible :name
 

data/app/models/pbw/attached_process.rb

@@ -1,8 +1,8 @@
 module Pbw
   class AttachedProcess
-  	belongs_to :token
-  	belongs_to :area
-  	belongs_to :process
+  	belongs_to :token, :class_name => 'Pbw::Token'
+  	belongs_to :area, :class_name => 'Pbw::Area'
+  	belongs_to :process, :class_name => 'Pbw::Process'
 
   	field :tickable, :type => Boolean, :default => false
     field :updatable, :type => Boolean, :default => false

data/app/models/pbw/capability.rb

@@ -1,6 +1,6 @@
 module Pbw
   class Capability < Rule
-    has_and_belongs_to_many :tokens
+    has_and_belongs_to_many :tokens, :class_name => 'Pbw::Token'
 
     def self.viewable_by?(user, subject)
         return true if user.admin?

data/app/models/pbw/command.rb

@@ -1,7 +1,7 @@
 module Pbw
   class Command < Rule
-    belongs_to :token
-    belongs_to :user
+    belongs_to :token, :class_name => 'Pbw::Token'
+    belongs_to :user, :class_name => 'Pbw::User'
 
     before_validation :validate_token_and_user
     

data/app/models/pbw/constraint.rb

@@ -1,7 +1,7 @@
 module Pbw
   class Constraint < Rule
-    has_and_belongs_to_many :tokens
-    has_and_belongs_to_many :areas
+    has_and_belongs_to_many :tokens, :class_name => 'Pbw::Token'
+    has_and_belongs_to_many :areas, :class_name => 'Pbw::Area'
 
     def self.viewable_by?(user, subject)
         return true if user.admin?

data/app/models/pbw/item.rb

@@ -6,8 +6,8 @@ module Pbw
     validates_presence_of :name
     validates_uniqueness_of :name
 
-    has_many :item_containers
-    has_many :item_conversions
+    has_many :item_containers, :class_name => 'Pbw::ItemContainer'
+    has_many :item_conversions, :class_name => 'Pbw::ItemConversion'
     
     attr_accessible :name
 

data/app/models/pbw/item_container.rb

@@ -2,13 +2,13 @@ module Pbw
   class ItemContainer
     include ::Mongoid::Document
     include ::Mongoid::Timestamps
-    belongs_to :item
+    belongs_to :item, :class_name => 'Pbw::Item'
     field :quantity, :type => Float, :default => 0
     validates_numericality_of :quantity, :greater_than_or_equal_to => 0
 
-    belongs_to :token
-    belongs_to :area
-    belongs_to :user
+    belongs_to :token, :class_name => 'Pbw::Token'
+    belongs_to :area, :class_name => 'Pbw::Area'
+    belongs_to :user, :class_name => 'Pbw::User'
 
     attr_accessible :item, :token, :area, :user, :quantity
 

data/app/models/pbw/item_conversion.rb

@@ -2,7 +2,7 @@ module Pbw
   class ItemConversion
     include ::Mongoid::Document
     include ::Mongoid::Timestamps
-    belongs_to :item
+    belongs_to :item, :class_name => 'Pbw::Item'
     field :from, :type => Hash
 
     def self.viewable_by?(user, subject)

data/app/models/pbw/process.rb

@@ -1,7 +1,7 @@
 module Pbw
   class Process < Rule
-    has_many :triggers
-    has_many :attached_processes
+    has_many :triggers, :class_name => 'Pbw::Trigger'
+    has_many :attached_processes, :class_name => 'Pbw::AttachedProcess'
     
     def self.viewable_by?(user, subject)
         user.admin?

data/app/models/pbw/token.rb

@@ -5,13 +5,13 @@ module Pbw
     field :name, type: String
     validates_presence_of :name
 
-    belongs_to :area
-    belongs_to :user
-    has_and_belongs_to_many :capabilities
-    has_and_belongs_to_many :constraints
-    has_and_belongs_to_many :triggers
-    has_many :attached_processes
-    has_many :item_containers
+    belongs_to :area, :class_name => 'Pbw::Area'
+    belongs_to :user, :class_name => 'Pbw::User'
+    has_and_belongs_to_many :capabilities, :class_name => 'Pbw::Capability'
+    has_and_belongs_to_many :constraints, :class_name => 'Pbw::Constraint'
+    has_and_belongs_to_many :triggers, :class_name => 'Pbw::Trigger'
+    has_many :attached_processes, :class_name => 'Pbw::AttachedProcess'
+    has_many :item_containers, :class_name => 'Pbw::ItemContainer'
 
     attr_accessible :name
 

data/app/models/pbw/trigger.rb

@@ -1,8 +1,8 @@
 module Pbw
   class Trigger < Rule
-    has_and_belongs_to_many :tokens
-    has_and_belongs_to_many :areas
-    belongs_to :process
+    has_and_belongs_to_many :tokens, :class_name => 'Pbw::Token'
+    has_and_belongs_to_many :areas, :class_name => 'Pbw::Area'
+    belongs_to :process, :class_name => 'Pbw::Process'
 
     def self.viewable_by?(user, subject)
         return true if user.admin?

data/app/models/pbw/user.rb

@@ -6,7 +6,7 @@ module Pbw
     ROLES = %W{superadmin admin moderator player}
     
     devise :database_authenticatable, :registerable, :timeoutable, 
-           :recoverable, :rememberable, :trackable, :validatable, :lockable
+           :recoverable, :rememberable, :trackable, :lockable
 
     ## Database authenticatable
     field :email,              :type => String, :default => ""
@@ -27,11 +27,7 @@ module Pbw
     field :last_sign_in_ip,    :type => String
 
     field :name,   :type => String
-    validates_presence_of :name
-    validates_uniqueness_of :name, :email, :case_sensitive => false
-    validates_format_of :email, :with => /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/
-    validates_confirmation_of :password
-
+    
     field :role, :type => String, :default => 'player'
 
     ## Lockable
@@ -39,8 +35,14 @@ module Pbw
     field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
     field :locked_at,       :type => Time
 
-    has_many :resource_containers
-    has_many :tokens
+    has_many :item_containers, :class_name => 'Pbw::ItemContainer'
+    has_many :tokens, :class_name => 'Pbw::Token'
+
+    validates :name, presence: true
+    validates :password, confirmation: true, length: {minimum: 8}
+    validates :email, uniqueness: {case_sensitive: false}, format: {with: /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/}
+    
+    attr_accessible :email, :name, :password, :password_confirmation
 
     def superadmin?
       self.role == "superadmin"
@@ -73,6 +75,22 @@ module Pbw
         self.role == "player"
     end
 
+    def send_registration_email
+        UserMailer.registration(self).deliver
+    end
+
+    def reset_password!
+        token = User.friendly_token
+        self.password = token
+        self.password_confirmation = token
+        save!
+        send_password_email(token)
+    end
+
+    def send_password_email(password)
+        UserMailer.password_reset(self,password).deliver
+    end
+
     def self.viewable_by?(user, subject)
         true
     end
@@ -88,5 +106,9 @@ module Pbw
     def self.deletable_by?(user, subject)
         user.admin?
     end
+
+    def self.friendly_token
+      SecureRandom.base64(15).tr('+/=lIO0', 'pqrsxyz')
+    end
   end
 end

data/config/initializers/devise.rb

@@ -1,71 +1,6 @@
 Devise.setup do |config|
-  #config.mailer_sender = Pbw::Engine.config.mail_sender
-
-  config.mailer = "Devise::Mailer"
-
   require 'devise/orm/mongoid'
-
-  config.authentication_keys = [ :email ]
-
-  config.request_keys = []
-
-  config.case_insensitive_keys = [ :email ]
-
-  config.strip_whitespace_keys = [ :email ]
-
-  config.params_authenticatable = true
-
-  config.http_authenticatable = false
-
-  config.http_authenticatable_on_xhr = true
-
-  config.http_authentication_realm = "Application"
-
-  config.paranoid = true
-
-  config.skip_session_storage = [:http_auth]
-
-  config.stretches = Rails.env.test? ? 1 : 10
-
-  config.pepper = "63818839cfabfff3dcf5983671b4d2f01708727af5d512fd79a8afe7e744187a8976280cd31e8d1b023c2c29f4f396810c90ef15de5faaa20595e84bee4c9545"
-
-  config.remember_for = 2.weeks
-
-  config.extend_remember_period = false
-
-  config.rememberable_options = {}
-
-  config.password_length = 8..128
-
-  config.email_regexp = /\A[^@]+@[^@]+\z/
-
-  config.timeout_in = 30.minutes
-
-  config.expire_auth_token_on_timeout = false
-
-  config.lock_strategy = :failed_attempts
-
-  config.unlock_keys = [ :email ]
-
-  config.unlock_strategy = :email
-
-  config.maximum_attempts = 5
-
-  config.reset_password_keys = [ :email ]
-
-  config.reset_password_within = 6.hours
-
-  config.token_authentication_key = :auth_token
-
-  config.scoped_views = false
-
-  config.default_scope = :user
-
-  config.sign_out_all_scopes = true
-
-  config.navigational_formats = ["*/*", :html]
-
   config.sign_out_via = :delete
-
   config.router_name = :pbw
+  DeviseController.respond_to :json
 end

data/config/locales/pbw.en.yml

@@ -0,0 +1,7 @@
+en:
+  pbw:
+     users:
+       registration: 
+         subject: "Account registered"
+       password_reset:
+         subject: "Password reset"

data/config/routes.rb

@@ -1,10 +1,10 @@
 Pbw::Engine.routes.draw do
 	devise_for :users, {
 	    class_name: 'Pbw::User',
-	    controllers: { registrations: 'pbw/registrations', :sessions => 'pbw/sessions'},
+	    controllers: { registrations: 'pbw/registrations', :sessions => 'pbw/sessions', :passwords => 'pbw/passwords'},
 	    module: :devise
  	}
- 	%W{areas capabilities constraints processes items tokens triggers commands}.each do |controller|
+ 	%W{areas commands items tokens}.each do |controller|
  		get "#{controller}/:_type" => "#{controller}\#index"
  		get "#{controller}/:_type/:id" => "#{controller}\#show"
  		post "#{controller}/:_type" => "#{controller}\#create"
@@ -16,6 +16,4 @@ Pbw::Engine.routes.draw do
  	
  	resources :item_containers
  	resources :item_conversions
- 	resources :item_transfers
- 	resources :user_tokens
 end

data/lib/generators/pbw/install/install_generator.rb

@@ -28,11 +28,14 @@ module Pbw
 			def create_home_controller
 				template "index.erb", "app/views/home/index.html.erb"
 				generate "controller", "home index --skip"
+				inject_into_file "app/controllers/home_controller.rb", :before => "def index" do
+					"layout '#{application_name.underscore}'\n  "
+				end
 				gsub_file "config/routes.rb", "get \"home/index\"", "root :to => \"home#index\""
 			end
 
 		    def create_dir_layout
-		        %W{routers models views templates}.each do |dir|
+		        %W{helpers routers models views templates}.each do |dir|
 		          empty_directory "app/assets/javascripts/#{dir}" 
 		          create_file "app/assets/javascripts/#{dir}/.gitkeep" unless options[:skip_git]
 		        end
@@ -50,13 +53,29 @@ module Pbw
 		    	route "mount Pbw::Engine, :at => '/pbw'"
 		    end
 
-		    def devise_views
-		    	generate "devise:views"
+		    def create_user_backbone
+		    	template "user_registration.coffee", "app/assets/javascripts/models/user_registration.js.coffee"
+		    	template "user_recovery.coffee", "app/assets/javascripts/models/user_recovery.js.coffee"
+		    	template "user_session.coffee", "app/assets/javascripts/models/user_session.js.coffee"
+		    	template "views/login_view.coffee", "app/assets/javascripts/views/users/login_view.js.coffee"
+		    	template "views/recovery_view.coffee", "app/assets/javascripts/views/users/recovery_view.js.coffee"
+		    	template "views/signup_view.coffee", "app/assets/javascripts/views/users/signup_view.js.coffee"
+		    	template "templates/login.jst", "app/assets/javascripts/templates/users/login.jst.ejs"
+		    	template "templates/recover_password.jst", "app/assets/javascripts/templates/users/recover_password.jst.ejs"
+		    	template "templates/signup.jst", "app/assets/javascripts/templates/users/signup.jst.ejs"
 		    end
 
 		    def user_lifecycle
 		    	template "lifecycle.rb", "app/models/user/lifecycle.rb"
 		    end
+
+		    def create_helper_javascript
+		    	template "pbw.coffee", "app/assets/javascripts/helpers/pbw.js.coffee"
+		    end
+
+		    def create_application_layout
+		    	template "application.erb", "app/views/layouts/#{application_name.underscore}.html.erb"
+		    end
 		end
 	end
 end

data/lib/generators/pbw/model_generator.rb

@@ -10,6 +10,12 @@ module Pbw
 			def create_backbone_model
 				template "model.coffee", "#{backbone_path}/models/#{model_namespace.downcase}/#{file_name}.js.coffee"
 			end
+
+			def create_model
+				generate "model", "#{model_namespace}::#{class_name} #{attributes.map{|attr| "#{attr.name}:#{attr.type}"}.join(' ')}"
+				gsub_file "app/models/#{model_namespace.downcase}/#{file_name}.rb", "class #{model_namespace}::#{class_name}", "class #{model_namespace}::#{class_name} < #{base_model_class}"
+				gsub_file "app/models/#{model_namespace.downcase}/#{file_name}.rb", "include Mongoid::Document", ""
+			end
 		end
 	end
 end

data/lib/generators/pbw/resource_helpers.rb

@@ -9,6 +9,10 @@ module Pbw
       def js_model_namespace
         [js_app_name, "Models", model_namespace, class_name].join(".")
       end
+
+      def js_user_model_namespace
+        [js_app_name, "Models", 'User'].join(".")
+      end
       
       def singular_model_name
         uncapitalize singular_name.camelize
@@ -22,6 +26,10 @@ module Pbw
         [js_app_name, "Collections", model_namespace, plural_name.camelize].join(".")
       end
 
+      def user_collection_namespace
+        [js_app_name, "Collections", 'Users'].join(".")
+      end
+
       def home_view_namespace
         [js_app_name, "Views", 'Home'].join(".")
       end
@@ -29,11 +37,19 @@ module Pbw
       def view_namespace
         [js_app_name, "Views", model_namespace, plural_name.camelize].join(".")
       end
+
+      def user_view_namespace
+        [js_app_name, "Views", 'Users'].join(".")
+      end
       
       def jst(action)
         "templates/#{model_namespace.downcase}/#{plural_name}/#{action}"
       end
 
+      def user_jst(action)
+        "templates/users/#{action}"
+      end
+
       def router_name
         [js_app_name, "Routers", 'AppRouter'].join(".")
       end

data/lib/generators/pbw/rules/capability/capability_generator.rb

@@ -1,8 +1,10 @@
-require 'generators/pbw/scaffold_generator'
+require 'generators/pbw/model_generator'
 require 'generators/pbw/rules/rules'
 
-class Pbw::Rules::CapabilityGenerator < Pbw::Generators::ScaffoldGenerator
+class Pbw::Rules::CapabilityGenerator < Pbw::Generators::ModelGenerator
 	source_root File.expand_path("../../../templates", __FILE__)
+	def create_backbone_model
+	end
   	protected
 	def base_model_class
 		"Pbw::Capability"