pbw 0.0.6 → 0.0.7

data/app/models/pbw/user.rb

@@ -2,9 +2,11 @@ module Pbw
   class User
     include ::Mongoid::Document
     include ::Mongoid::Timestamps
+
+    ROLES = %W{superadmin admin moderator player}
     
-    devise :database_authenticatable, :registerable, :timeoutable, :confirmable,
-           :recoverable, :rememberable, :trackable, :validatable, :lockable, :token_authenticatable
+    devise :database_authenticatable, :registerable, :timeoutable, 
+           :recoverable, :rememberable, :trackable, :validatable, :lockable
 
     ## Database authenticatable
     field :email,              :type => String, :default => ""
@@ -30,27 +32,61 @@ module Pbw
     validates_format_of :email, :with => /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/
     validates_confirmation_of :password
 
-    belongs_to :role
-
-    ## 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
+    field :role, :type => String, :default => 'player'
 
     ## 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
 
-    ## Token authenticatable
-    field :authentication_token, :type => String
-
     has_many :resource_containers
     has_many :tokens
 
-    def super_admin?
-      self.role.name == "Super Admin"
+    def superadmin?
+      self.role == "superadmin"
+    end
+
+    def make_superadmin!
+        self.role = "superadmin"
+        save!
+    end
+
+    def admin?
+        self.role == "admin"
+    end
+
+    def make_admin!
+        self.role = "admin"
+        save!
+    end
+
+    def moderator?
+        self.role == "moderator"
+    end
+
+    def make_moderator!
+        self.role = "moderator"
+        save!
+    end
+
+    def player?
+        self.role == "player"
+    end
+
+    def self.viewable_by?(user, subject)
+        true
+    end
+
+    def self.creatable_by?(user, subject)
+        true
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin? || subject == user
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
     end
   end
 end

data/config/initializers/devise.rb

@@ -29,14 +29,6 @@ Devise.setup do |config|
 
   config.pepper = "63818839cfabfff3dcf5983671b4d2f01708727af5d512fd79a8afe7e744187a8976280cd31e8d1b023c2c29f4f396810c90ef15de5faaa20595e84bee4c9545"
 
-  config.allow_unconfirmed_access_for = 2.days
-
-  config.confirm_within = 3.days
-
-  config.reconfirmable = true
-
-  config.confirmation_keys = [ :email ]
-
   config.remember_for = 2.weeks
 
   config.extend_remember_period = false

data/config/routes.rb

@@ -3,7 +3,7 @@ Pbw::Engine.routes.draw do
 	    class_name: 'Pbw::User',
 	    module: :devise
  	}
- 	%W{areas capabilities constraints processes items tokens triggers}.each do |controller|
+ 	%W{areas capabilities constraints processes items tokens triggers commands}.each do |controller|
  		get "#{controller}/:_type" => "#{controller}\#index"
  		get "#{controller}/:_type/:id" => "#{controller}\#show"
  		post "#{controller}/:_type" => "#{controller}\#create"

data/lib/generators/pbw/area/area_generator.rb

@@ -7,4 +7,8 @@ class Pbw::AreaGenerator < Pbw::Generators::ScaffoldGenerator
 	def base_model_class
 		"Pbw::Area"
 	end
+
+	def model_namespace
+		"Areas"
+	end
 end

data/lib/generators/pbw/item/item_generator.rb

@@ -7,4 +7,8 @@ class Pbw::ItemGenerator < Pbw::Generators::ScaffoldGenerator
 	def base_model_class
 		"Pbw::Item"
 	end
+
+	def model_namespace
+		"Items"
+	end
 end

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

@@ -8,4 +8,8 @@ class Pbw::Rules::CapabilityGenerator < Pbw::Generators::ScaffoldGenerator
 	def base_model_class
 		"Pbw::Capability"
 	end
+
+	def model_namespace
+		"Capabilities"
+	end
 end

data/lib/generators/pbw/rules/command/USAGE

@@ -1,9 +1,9 @@
 Description:
-    Generates command class plus Backbone scaffold
+    Generates command model class plus Backbone model, views and templates for submitting commands
 
 Example:
     rails generate pbw:rules:command MoveArmy area:string
 
     This will create:
-        * A command class that defines the methods needed for processing commands
-		* Backbone scaffold for your command class
+        * A model inheriting from Pbw::Command 
+		* Backbone model, views and templates for submitting commands

data/lib/generators/pbw/rules/command/command_generator.rb

@@ -1,18 +1,14 @@
 require 'generators/pbw/resource_helpers'
+require 'generators/pbw/model_generator'
 require 'generators/pbw/rules/rules'
 
-class Pbw::Rules::CommandGenerator < Rails::Generators::NamedBase
-	include Pbw::Generators::ResourceHelpers
+class Pbw::Rules::CommandGenerator < Pbw::Generators::ModelGenerator
 	source_root File.expand_path('../templates', __FILE__)
 
-	argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-	def create_command
-		template "command.rb", "app/models/commands/#{file_name}.rb"
-	end
-
-	def create_backbone_model
-		template "model.coffee", "#{backbone_path}/models/#{file_name}.js.coffee"
+	def create_resources
+		generate "model", "Commands::#{class_name} #{attributes.map{|attr| "#{attr.name}:#{attr.type}"}.join(' ')}"
+		gsub_file "app/models/commands/#{file_name}.rb", "class Commands::#{class_name}", "class Commands::#{class_name} < #{base_model_class}"
+		gsub_file "app/models/commands/#{file_name}.rb", "include Mongoid::Document", ""
 	end
 
 	def create_view_files
@@ -26,6 +22,10 @@ class Pbw::Rules::CommandGenerator < Rails::Generators::NamedBase
 
 	protected
 	def available_views
-		%w(index show new edit)
+		%w(new)
+	end
+
+	def base_model_class
+		"Pbw::Command"
 	end
 end

data/lib/generators/pbw/rules/command/templates/model.coffee

@@ -3,6 +3,7 @@ class <%= model_namespace %> extends Backbone.Model
   urlRoot: '/pbw/commands/<%= class_name%>'
 
   defaults:
+    token: null
     _type: '<%= class_name%>'
 <% attributes.each do |attribute| -%>
     <%= attribute.name %>: null

data/lib/generators/pbw/rules/constraint/constraint_generator.rb

@@ -8,4 +8,8 @@ class Pbw::Rules::ConstraintGenerator < Pbw::Generators::ScaffoldGenerator
 	def base_model_class
 		"Pbw::Constraint"
 	end
+
+	def model_namespace
+		"Constraints"
+	end
 end

data/lib/generators/pbw/rules/process/process_generator.rb

@@ -8,4 +8,8 @@ class Pbw::Rules::ProcessGenerator < Pbw::Generators::ScaffoldGenerator
 	def base_model_class
 		"Pbw::Process"
 	end
+
+	def model_namespace
+		"Processes"
+	end
 end

data/lib/generators/pbw/rules/trigger/trigger_generator.rb

@@ -8,4 +8,8 @@ class Pbw::Rules::TriggerGenerator < Pbw::Generators::ScaffoldGenerator
 	def base_model_class
 		"Pbw::Trigger"
 	end
+
+	def model_namespace
+		"Triggers"
+	end
 end

data/lib/generators/pbw/scaffold_generator.rb

@@ -18,11 +18,11 @@ module Pbw
 			end
 
 			def create_resources
-				generate "model", "#{class_name} #{attributes.map{|attr| "#{attr.name}:#{attr.type}"}.join(' ')}"
+				generate "model", "#{model_namespace}::#{class_name} #{attributes.map{|attr| "#{attr.name}:#{attr.type}"}.join(' ')}"
 				template "index.erb", "app/views/#{plural_name}/index.html.erb"
 				generate "controller", "#{plural_name} index --skip"
-				gsub_file "app/models/#{file_name}.rb", "class #{class_name}", "class #{class_name} < #{base_model_class}"
-				gsub_file "app/models/#{file_name}.rb", "include Mongoid::Document", ""
+				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
 
 			protected

data/lib/generators/pbw/token/token_generator.rb

@@ -7,4 +7,8 @@ class Pbw::TokenGenerator < Pbw::Generators::ScaffoldGenerator
 	def base_model_class
 		"Pbw::Token"
 	end
+
+	def model_namespace
+		"Tokens"
+	end
 end

data/lib/pbw/tick.rb

@@ -0,0 +1,8 @@
+module Pbw
+	class Tick
+		def self.run
+			Command.tickable.each{|command| command.tick! }
+			AttachedProcess.tickable.each{|ap| ap.tick! }
+		end
+	end
+end

data/lib/pbw/update.rb

@@ -0,0 +1,8 @@
+module Pbw
+	class Update
+		def self.run
+			Command.updatable.each{|command| command.update! }
+			AttachedProcess.updatable.each{|ap| ap.update! }
+		end
+	end
+end

data/lib/pbw/version.rb

@@ -1,3 +1,3 @@
 module Pbw
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/tasks/pbw_tasks.rake

@@ -1,4 +1,11 @@
-# desc "Explaining what the task does"
-# task :pbw do
-#   # Task goes here
-# end
+namespace :pbw do
+	desc "Runs ticks"
+	task :ticks do
+		Pbw::Tick.run
+	end
+
+	desc "Runs updates"
+	task :updates do
+		Pbw::Update.run
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbw
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Seyed P. Razavi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,7 +137,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -189,29 +217,29 @@ files:
 - app/controllers/pbw/areas_controller.rb
 - app/controllers/pbw/base_models_controller.rb
 - app/controllers/pbw/capabilities_controller.rb
+- app/controllers/pbw/commands_controller.rb
 - app/controllers/pbw/constraints_controller.rb
 - app/controllers/pbw/item_containers_controller.rb
 - app/controllers/pbw/item_conversions_controller.rb
 - app/controllers/pbw/item_transfers_controller.rb
 - app/controllers/pbw/items_controller.rb
 - app/controllers/pbw/processes_controller.rb
-- app/controllers/pbw/roles_controller.rb
 - app/controllers/pbw/tokens_controller.rb
 - app/controllers/pbw/triggers_controller.rb
 - app/controllers/pbw/user_tokens_controller.rb
 - app/helpers/pbw/application_helper.rb
 - app/models/pbw/ability.rb
 - app/models/pbw/area.rb
+- app/models/pbw/attached_process.rb
 - app/models/pbw/capability.rb
 - app/models/pbw/changeset.rb
+- app/models/pbw/command.rb
 - app/models/pbw/constraint.rb
 - app/models/pbw/item.rb
 - app/models/pbw/item_container.rb
 - app/models/pbw/item_conversion.rb
 - app/models/pbw/item_transfer.rb
-- app/models/pbw/permission.rb
 - app/models/pbw/process.rb
-- app/models/pbw/role.rb
 - app/models/pbw/rule.rb
 - app/models/pbw/token.rb
 - app/models/pbw/trigger.rb
@@ -272,19 +300,11 @@ files:
 - lib/generators/pbw/rules/capability/templates/views/show_view.coffee
 - lib/generators/pbw/rules/capability/USAGE
 - lib/generators/pbw/rules/command/command_generator.rb
-- lib/generators/pbw/rules/command/templates/command.rb
-- lib/generators/pbw/rules/command/templates/index.erb
 - lib/generators/pbw/rules/command/templates/model.coffee
-- lib/generators/pbw/rules/command/templates/templates/edit.jst
-- lib/generators/pbw/rules/command/templates/templates/index.jst
 - lib/generators/pbw/rules/command/templates/templates/model.jst
 - lib/generators/pbw/rules/command/templates/templates/new.jst
-- lib/generators/pbw/rules/command/templates/templates/show.jst
-- lib/generators/pbw/rules/command/templates/views/edit_view.coffee
-- lib/generators/pbw/rules/command/templates/views/index_view.coffee
 - lib/generators/pbw/rules/command/templates/views/model_view.coffee
 - lib/generators/pbw/rules/command/templates/views/new_view.coffee
-- lib/generators/pbw/rules/command/templates/views/show_view.coffee
 - lib/generators/pbw/rules/command/USAGE
 - lib/generators/pbw/rules/constraint/constraint_generator.rb
 - lib/generators/pbw/rules/constraint/templates/index.erb
@@ -349,6 +369,8 @@ files:
 - lib/generators/pbw/token/token_generator.rb
 - lib/generators/pbw/token/USAGE
 - lib/pbw/engine.rb
+- lib/pbw/tick.rb
+- lib/pbw/update.rb
 - lib/pbw/version.rb
 - lib/pbw.rb
 - lib/tasks/pbw_tasks.rake

data/app/controllers/pbw/roles_controller.rb

@@ -1,46 +0,0 @@
-module Pbw
-  class RolesController < ApplicationController
-    respond_to :json
-
-    before_filter :authenticate_user!
-    before_filter :is_super_admin?
-
-    def index
-      @roles = Role.all.keep_if{|i| i.name != "Super Admin"}
-      render json: @roles
-    end
-
-    def show
-      @role = Role.find(params[:id])
-      @permissions = @role.permissions
-      render json: {role: @role, permissions: @permissions}
-    end
-
-    def edit
-      @role = Role.find(params[:id])
-      @permissions = Permission.all
-      @role_permissions = @role.permissions.collect{|p| p.id}
-      render json: {role: @role, permissions: @permissions, role_permissions: @role_permissions}
-    end
-
-    def update
-      @role = Role.find(params[:id])
-      @role.permissions = []
-      @role.set_permissions(params[:permissions]) if params[:permissions]
-      if @role.save
-        render json: {notice: "Role updated"}
-        return
-      end
-      render 'edit'
-    end
-
-    private
-
-    def is_super_admin?
-      unless current_user.super_admin?
-        render json: {:error => "Access denied. You are not authorized to access the requested page."}, status: 401
-        return false
-      end
-    end
-  end
-end

data/app/models/pbw/permission.rb

@@ -1,13 +0,0 @@
-module Pbw
-  class Permission
-    include ::Mongoid::Document
-    include ::Mongoid::Timestamps
-    field :subject_class, type: String
-    field :action, type: String
-    field :name, type: String
-
-    attr_accessible :subject_class, :action, :name
-
-    has_and_belongs_to_many :roles
-  end
-end

data/app/models/pbw/role.rb

@@ -1,26 +0,0 @@
-module Pbw
-  class Role
-    include ::Mongoid::Document
-    include ::Mongoid::Timestamps
-    field :name, type: String
-    attr_accessible :name
-    has_many :users
-
-    validates :name, presence: true, uniqueness: true
-
-    has_and_belongs_to_many :permissions
-
-    def set_permission(subject_class, action)
-    	p = Permission.where(subject_class: subject_class, action: action)
-    	p = Permission.create(subject_class: subject_class, action: action) unless p
-    	self.permissions << p
-    end
-
-    def set_permissions(permissions)
-    	permissions.each do |id|
-    		permission = Permission.find(id)
-    		self.permissions << p
-    	end
-    end
-  end
-end

data/lib/generators/pbw/rules/command/templates/command.rb

@@ -1,18 +0,0 @@
-class Commands::<%=class_name%>
-	<% attributes.each do |attribute| -%>
-	attr_accessor :<%=attribute.name%>
-	<% end -%>
-	attr_accessor :token
-
-	def valid_token?(token)
-		# define checks to make sure token is valid for this command
-		false
-	end
-
-	def processes
-		# specify the processes that is called by this command
-		# return either a single object inheriting from Pbw::Process or an array of them
-		# Example:
-		# Process.where(name: 'Move')
-	end
-end

data/lib/generators/pbw/rules/command/templates/index.erb

@@ -1,6 +0,0 @@
-<script type="text/javascript">
-  $(function() {
-  	window.router = new <%= router_namespace %>Router;
-    Backbone.history.start();
-  });
-</script>

data/lib/generators/pbw/rules/command/templates/templates/edit.jst

@@ -1,17 +0,0 @@
-<h1>Edit <%= singular_table_name %></h1>
-
-<form id="edit-<%= singular_table_name %>" name="<%= singular_table_name %>">
-<% attributes.each do |attribute| -%>
-  <div class="field">
-    <label for="<%= attribute.name %>"> <%= attribute.human_name %>:</label>
-    <input type="text" name="<%= attribute.name %>" id="<%= attribute.name %>" value="<%%= <%= attribute.name %> %>" >
-  </div>
-
-<% end -%>
-  <div class="actions">
-    <input type="submit" value="Update <%= human_name %>" />
-  </div>
-
-</form>
-
-<a href="#/">Back</a>

data/lib/generators/pbw/rules/command/templates/templates/index.jst

@@ -1,16 +0,0 @@
-<h1>Listing <%= plural_table_name %></h1>
-
-<table id="<%= plural_name %>-table">
-  <tr>
-<% attributes.each do |attribute| -%>
-    <th><%= attribute.human_name %></th>
-<% end -%>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-</table>
-
-<br/>
-
-<a href="#/new">New <%= human_name %></a>

data/lib/generators/pbw/rules/command/templates/templates/show.jst

@@ -1,9 +0,0 @@
-<% attributes.each do |attribute| -%>
-<p>
-  <b><%= attribute.human_name %>:</b>
-  <%%= <%= attribute.name %> %>
-</p>
-
-<% end -%>
-
-<a href="#/">Back</a>

data/lib/generators/pbw/rules/command/templates/views/edit_view.coffee

@@ -1,24 +0,0 @@
-<%= view_namespace %> ||= {}
-
-class <%= view_namespace %>.EditView extends Backbone.View
-  template: JST["<%= jst 'edit' %>"]
-
-  events:
-    "submit #edit-<%= singular_name %>": "update"
-
-  update: (e) ->
-    e.preventDefault()
-    e.stopPropagation()
-
-    @model.save(null,
-      success: (<%= singular_name %>) =>
-        @model = <%= singular_name %>
-        window.location.hash = "/#{@model.id}"
-    )
-
-  render: ->
-    @$el.html(@template(@model.toJSON() ))
-
-    this.$("form").backboneLink(@model)
-
-    return this

data/lib/generators/pbw/rules/command/templates/views/index_view.coffee

@@ -1,20 +0,0 @@
-<%= view_namespace %> ||= {}
-
-class <%= view_namespace %>.IndexView extends Backbone.View
-  template: JST["<%= jst 'index' %>"]
-
-  initialize: () ->
-    @options.<%= plural_model_name %>.bind('reset', @addAll)
-
-  addAll: () =>
-    @options.<%= plural_model_name %>.each(@addOne)
-
-  addOne: (<%= singular_model_name %>) =>
-    view = new <%= view_namespace %>.<%= singular_name.camelize %>View({model : <%= singular_model_name %>})
-    @$("tbody").append(view.render().el)
-
-  render: =>
-    @$el.html(@template(<%= plural_model_name %>: @options.<%= plural_model_name %>.toJSON() ))
-    @addAll()
-
-    return this

data/lib/generators/pbw/rules/command/templates/views/show_view.coffee

@@ -1,8 +0,0 @@
-<%= view_namespace %> ||= {}
-
-class <%= view_namespace %>.ShowView extends Backbone.View
-  template: JST["<%= jst 'show' %>"]
-
-  render: ->
-    @$el.html(@template(@model.toJSON() ))
-    return this