pbw 0.0.10 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzAxY2I2YmFlYWQ4Y2FjNWU4ZGRiMGNlOGVmYTQ2Nzk3MDA3OWIxZQ==
+    NDBhYjIwMmM3NWQ0ODM0ZTY2OGFhZGU5YmQ4M2U3N2FmZjY3YmZkZQ==
   data.tar.gz: !binary |-
-    OWJjODBhYTY5NWJmMGY1Y2FlOThjNjdlZDY3YjE0ZTA4M2MwMWVhMQ==
+    OTk0NzNmYTE2NTY4MTE5YWVmNTUwMjcxY2I1ODJhNWE1ZWQ5NTM1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWFkNjg4NjIwMzM2ZTRkMjllYTgyNjBmMThhZDVjNjkyOWEzMWQwMjNmMTc1
-    ZTRkMTZiMjc5NzE4NmQ4ZTVlMjQxOTU5ZTliZDY5ZjJkNGQ1Njk1NjMxOGMw
-    Mjg2OTc5ODVkZjYwZGI1ZjBlMTA3MThlYzZmOTI1ODAzNjM2ZjM=
+    NmZlMDAxMTdhMmY2YjhjZmYyYjgxMWMzNDY5NzkzMzZiOWI3NGU5MTY0NTE0
+    Y2RiOWFhZWIyNjA1MThhN2EwMGE1N2ZiZDkyYjZkZDU2ZDI5ZTU2Y2QwMDRl
+    NmI1MzliZDA4YWMxNWFhMDc1NDU5MjExNTY2NDE2ZTY0ZmM0ODI=
   data.tar.gz: !binary |-
-    M2Y5ZWNhZjZlZDEwODVjZDAxYjc3NTUwYTc4MzJkNTIwNDNiNjM4YTAxYmJm
-    MGRiMDRmMTJkMGY2ZGY3ODgxY2U5ZDFiOWUzNmRiZDRjZjk2ZmU5Zjg3YzEz
-    NzdhZjIyMDEwYTRiMmE4ODdiOWQzMjBkNDQ0ZTRkMDljZjFhODU=
+    Y2IxMmU1YmI4ZWQxOTY3YjBkNGI2NGE5NjA4MmZhZTg4NjIyNTM2NzJkN2I4
+    ODhjNGEzOWVlMmZjOGFhNDZkZWM2NTc2MmIwMWU2MWFlZDczMjBhYjlkMjA1
+    NzEyMDg1OTYwY2JjMDIxMjYxOTQ4MGQzZTM3ZTJlMWNjMGY0Zjc=

data/Rakefile

@@ -19,9 +19,7 @@ namespace :backbone do
   task :download_latest do
     files = {
       'underscore.js'=>'http://underscorejs.org/underscore.js',
-      'backbone.js' => 'http://backbonejs.org/backbone.js',
-      'backbone_datalink.js' => 'https://raw.github.com/codebrew/backbone-rails/master/vendor/assets/javascripts/backbone_datalink.js',
-      'backbone_rails_sync.js' => 'https://raw.github.com/codebrew/backbone-rails/master/vendor/assets/javascripts/backbone_rails_sync.js'
+      'backbone.js' => 'http://backbonejs.org/backbone.js'
     }
     
     vendor_dir = "vendor/assets/javascripts"
@@ -36,13 +34,6 @@ namespace :backbone do
   end
 end
 
-namespace :compass do
-  desc "Compile scss in public with compass"
-  task :compile do
-    system "cd public && compass compile"
-  end
-end
-
 
 Bundler::GemHelper.install_tasks
 

data/app/controllers/pbw/{application_controller.rb → base_controller.rb}

@@ -1,5 +1,5 @@
 module Pbw
-  class ApplicationController < ActionController::Base
+  class BaseController < ActionController::Base
   	  respond_to :json
   	  
   	  rescue_from ::CanCan::AccessDenied do |exception|
@@ -10,8 +10,6 @@ module Pbw
 	  	render json: {:error => exception.message}, status: 404
 	  end
 
-	  protected
-
 	  def current_ability
 	    @current_ability ||= Ability.new(current_user)
 	  end

data/app/controllers/pbw/base_models_controller.rb

@@ -1,5 +1,5 @@
 module Pbw
-	class BaseModelsController < ApplicationController
+	class BaseModelsController < BaseController
 		attr_accessor :model_class
 
 		before_filter :authenticate_user!
@@ -23,21 +23,17 @@ module Pbw
 
 		def index
 	  		session[:referrer] = request.url
-			render json: @models
+	  		if @models && !@models.empty?
+				render json: @models.to_json
+			else
+				render json: '', status: :unprocessable_entity
+			end
 		end
 
 		def show
 			render json: @model.to_json
 		end
 
-		def edit
-			render json: @model.to_json
-		end
-
-		def new
-			render json: @model.to_json
-		end
-
 		def create
 			if @model.save
 				render json: @model.to_json
@@ -47,7 +43,7 @@ module Pbw
 		end
 
 		def update
-			if @model.update_attributes(params[model_param])
+			if @model.update_attributes(params)
 				render json: @model.to_json
 			else
 				render json: @model.errors.full_messages.to_json, status: :unprocessable_entity
@@ -73,33 +69,31 @@ module Pbw
 			self.model_class
 		end
 
-		def model_param
-			model_class.name.underscore.downcase.to_sym
-		end
-
 		def model_id
 			params[:id]
 		end
 
 		def index_models
-			authorize! :manage, model_class
+			authorize! :manage, real_model_class
 			@models = model_class.desc(:created_at)
 		end
 
 		def model_for_create
 			authorize! :create, real_model_class
-			@model = real_model_class.new(params[model_param])
+			@model = real_model_class.new(params)
+			@model.accessible = :all
 			update_model_before_create(@model)
 		end
 
 	  	def model_for_read
-			@model = model_class.find(model_id)
+			@model = real_model_class.find(model_id)
 			authorize! :read, @model
 		end
 
 		def model_for_update
-			@model = model_class.find(model_id)
+			@model = real_model_class.find(model_id)
 			authorize! :update, @model
+			@model.accessible = :all
 			update_model_before_update(@model)
 		end
 	end

data/app/controllers/pbw/item_containers_controller.rb

@@ -3,5 +3,41 @@ module Pbw
 		def set_model_class
 			self.model_class = ItemContainer
 		end
+
+		def real_model_class
+			self.model_class
+		end
+
+		def token_or_area_or_user
+			return @token_or_area_or_user if defined?(@token_or_area_or_user) && @token_or_area_or_user
+			begin
+				unless params[:_type].blank?
+					klass = Kernel.get_const(params[:_type])
+					return @token_or_area_or_user = klass.find(params[:container_id])
+				else
+					return @token_or_area_or_user = current_user
+				end
+			rescue
+				nil
+			end
+		end
+
+		def index_models
+			authorize! :read, token_or_area_or_user
+			@models = token_or_area_or_user.item_containers
+		end
+
+		def model_for_create
+			authorize! :update, token_or_area_or_user
+			@model = model_class.new(params)
+			if token_or_area_or_user.ancestors.include?(Area)
+				@model.area = token_or_area_or_user
+			elsif token_or_area_or_user.ancestors.include?(Token)
+				@model.token = token_or_area_or_user
+			elsif token_or_area_or_user.ancestors.include?(User)
+				@model.user = token_or_area_or_user
+			end
+			update_model_before_create(@model)
+		end
 	end
 end

data/app/controllers/pbw/passwords_controller.rb

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

data/app/controllers/pbw/registrations_controller.rb

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

data/app/controllers/pbw/sessions_controller.rb

@@ -1,16 +1,19 @@
 module Pbw
 	class SessionsController < Devise::SessionsController
 		respond_to :json
-
+		
 		def create
+			unwrapped = params
+			params[:user] = unwrapped
 			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 after_sign_out_path_for(resource_name)
-			"/"
+		def destroy
+			signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
+			render json: '', status: :ok
 		end
 	end
 end

data/app/controllers/pbw/tokens_controller.rb

@@ -3,5 +3,9 @@ module Pbw
 		def set_model_class
 			self.model_class = Token
 		end
+
+		def update_model_before_create(model)
+			model.user = current_user
+		end
 	end
 end

data/app/models/pbw/ability.rb

@@ -1,6 +1,5 @@
-require 'cancan'
-
-class Ability
+module Pbw
+  class Ability
     include CanCan::Ability
 
     MANAGED_CLASSES = [Area, Capability, Command, Constraint, Item, ItemContainer, ItemConversion, Process, Rule, Token, Trigger, User]
@@ -34,4 +33,5 @@ class Ability
           return klass if subject_class.ancestors.include?(klass)
         end
     end
+  end
 end

data/app/models/pbw/attached_process.rb

@@ -1,5 +1,7 @@
 module Pbw
   class AttachedProcess
+    include ::Mongoid::Document
+    include ::Mongoid::Timestamps
   	belongs_to :token, :class_name => 'Pbw::Token'
   	belongs_to :area, :class_name => 'Pbw::Area'
   	belongs_to :process, :class_name => 'Pbw::Process'

data/app/models/pbw/capability.rb

@@ -5,7 +5,7 @@ module Pbw
     def self.viewable_by?(user, subject)
         return true if user.admin?
         subject.tokens.each do |token|
-            return true token.user && token.user == user
+            return true if token.user && token.user == user
         end
         false
     end

data/app/models/pbw/constraint.rb

@@ -6,7 +6,7 @@ module Pbw
     def self.viewable_by?(user, subject)
         return true if user.admin?
         subject.tokens.each do |token|
-            return true token.user && token.user == user
+            return true if token.user && token.user == user
         end
         false
     end

data/app/models/pbw/trigger.rb

@@ -7,7 +7,7 @@ module Pbw
     def self.viewable_by?(user, subject)
         return true if user.admin?
         subject.tokens.each do |token|
-            return true token.user && token.user == user
+            return true if token.user && token.user == user
         end
         false
     end

data/app/models/pbw/user.rb

@@ -54,7 +54,7 @@ module Pbw
     end
 
     def admin?
-        self.role == "admin"
+        self.role == "admin" || superadmin?
     end
 
     def make_admin!
@@ -63,7 +63,7 @@ module Pbw
     end
 
     def moderator?
-        self.role == "moderator"
+        self.role == "moderator" || admin?
     end
 
     def make_moderator!
@@ -72,7 +72,7 @@ module Pbw
     end
 
     def player?
-        self.role == "player"
+        self.role == "player" || moderator?
     end
 
     def send_registration_email

data/config/initializers/mongoid_accessible_attributes.rb

@@ -0,0 +1,14 @@
+module Mongoid
+  module Document
+    attr_accessor :accessible
+ 
+    private
+    def mass_assignment_authorizer(role = :default)
+      if accessible == :all
+        self.class.protected_attributes
+      else
+        super + (accessible || [])
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -8,12 +8,21 @@ Pbw::Engine.routes.draw do
  		get "#{controller}/:_type" => "#{controller}\#index"
  		get "#{controller}/:_type/:id" => "#{controller}\#show"
  		post "#{controller}/:_type" => "#{controller}\#create"
- 		get "#{controller}/:_type/new" => "#{controller}\#new"
- 		get "#{controller}/:_type/:id/edit" => "#{controller}\#edit"
- 		delete "#{controller}/:_type/:id" => "#{controller}\#delete"
+ 		delete "#{controller}/:_type/:id" => "#{controller}\#destroy"
  		put "#{controller}/:_type/:id" => "#{controller}\#update"
  	end
- 	
- 	resources :item_containers
- 	resources :item_conversions
+
+ 	%W{areas tokens}.each do |controller|
+ 		get "#{controller}/:_type/:container_id/items" => "item_containers\#index"
+ 		get "#{controller}/:_type/:container_id/items/:id" => "item_containers\#show"
+ 		post "#{controller}/:_type/:container_id/items" => "item_containers\#create"
+ 		delete "#{controller}/:_type/:container_id/items/:id" => "item_containers\#destroy"
+ 		put "#{controller}/:_type/:container_id/items/:id" => "item_containers\#update"
+ 	end
+
+ 	get "users/items" => "item_containers\#index"
+ 	get "users/items/:id" => "item_containers\#show"
+ 	post "users/items" => "item_containers\#create"
+ 	put "users/items/:id" => "item_containers\#update"
+ 	delete "users/items/:id" => "item_containers\#destroy"
 end

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

@@ -10,4 +10,8 @@ class Pbw::AreaGenerator < Pbw::Generators::ScaffoldGenerator
 	def model_namespace
 		"Areas"
 	end
+
+	def param_root
+		'area'
+	end
 end

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

@@ -12,7 +12,7 @@ module Pbw
 
             def inject_backbone
 		        inject_into_file "app/assets/javascripts/application.js", :before => "//= require_tree" do
-		          "//= require underscore\n//= require backbone\n//= require backbone_rails_sync\n//= require backbone_datalink\n//= require #{application_name.underscore}\n"
+		          "//= require underscore\n//= require backbone\n//= require Backbone.ModelBinder\n//= require Backbone.CollectionBinder\n//= require #{application_name.underscore}\n"
 		        end
 		    end
 

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

@@ -10,4 +10,8 @@ class Pbw::ItemGenerator < Pbw::Generators::ScaffoldGenerator
 	def model_namespace
 		"Items"
 	end
+
+	def param_root
+		'item'
+	end
 end

data/lib/generators/pbw/resource_helpers.rb

@@ -13,6 +13,10 @@ module Pbw
       def js_user_model_namespace
         [js_app_name, "Models", 'User'].join(".")
       end
+
+      def class_namespace
+        ["",model_namespace, class_name].join("::")
+      end
       
       def singular_model_name
         uncapitalize singular_name.camelize

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

@@ -24,4 +24,14 @@ class Pbw::Rules::CommandGenerator < Pbw::Generators::ScaffoldGenerator
 	def model_namespace
 		"Commands"
 	end
+
+	def default_attributes
+		super
+		@default_attributes << {name: 'token', default_value: ''}
+		@default_attributes
+	end
+
+	def param_root
+		'command'
+	end
 end

data/lib/generators/pbw/scaffold_generator.rb

@@ -13,15 +13,15 @@ module Pbw
 				end
 				if available_views.include?('new')
 					routes << "#{route_entry("#{plural_model_name}/new","new#{model_namespace}#{class_name}")}" 
-					route_methods << "#{route_method("new#{model_namespace}#{plural_name.camelize}", "New")}"
+					route_methods << "#{route_method("new#{model_namespace}#{class_name.camelize}", "New")}"
 				end
 				if available_views.include?('edit')
 					routes << "#{route_entry("#{plural_model_name}/:id/edit","edit#{model_namespace}#{class_name}")}" 
-					route_methods << "#{route_method("edit#{model_namespace}#{plural_name.camelize}", "Edit")}"
+					route_methods << "#{route_method("edit#{model_namespace}#{class_name.camelize}", "Edit")}"
 				end
 				if available_views.include?('show')
 					routes << "#{route_entry("#{plural_model_name}/:id","show#{model_namespace}#{class_name}")}" 
-					route_methods << "#{route_method("show#{model_namespace}#{plural_name.camelize}", "Show")}"
+					route_methods << "#{route_method("show#{model_namespace}#{class_name.camelize}", "Show")}"
 				end
 				if available_views.include?('index') # needs to be at the end
 					routes << "#{route_entry("#{plural_model_name}/.*","index#{model_namespace}#{plural_name.camelize}")}" 
@@ -47,6 +47,14 @@ module Pbw
 			end
 
 			protected
+			def param_root
+				class_name.underscore
+			end
+
+			def default_attributes
+				@default_attributes = [{name: 'name', default_value: ''}, {name: '_type', default_value: "#{class_namespace}"}]
+			end
+
 			def available_views
 				%w(index show new edit)
 			end
@@ -70,19 +78,14 @@ module Pbw
 				when 'Index'
 					"@view = new #{view_namespace}.#{view}View(#{plural_model_name}: @#{plural_model_name})"
 				when 'New'
-					"#{singular_model_name} = new @#{plural_model_name}.model()\n        @view = new #{view_namespace}.#{view}View(#{plural_model_name}: @#{plural_model_name}, model: #{singular_model_name})"
+					"#{singular_model_name} = new #{js_model_namespace}\n    @view = new #{view_namespace}.#{view}View(model: #{singular_model_name})"
 				when 'Edit', 'Show'
-					"#{singular_model_name} = new @#{plural_model_name}.get(id)\n        @view = new #{view_namespace}.#{view}View(#{plural_model_name}: @#{plural_model_name}, model: #{singular_model_name})"
+					"#{singular_model_name} = new #{js_model_namespace}({_id: id})\n    @view = new #{view_namespace}.#{view}View(model: #{singular_model_name})"
 				end
 				"
   #{method_name}: #{method_params}->
-    @#{plural_model_name}.fetch
-      success: (collection) =>
-        #{view_js}
-        $(\"#app\").html(@view.render().el)
-      error: (model, response) ->
-        window.console && console.log response
-"
+    #{view_js}
+    $(\"#app\").html(@view.render().el)"
 			end
 		end
 	end