pbw 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWExNjYwMWQ4NWQxYzk1YzU4YmQxNjE5MjIyZjdkNTc0NDZlNWI2OQ==
+    ZDE5MzY0MTBlZjgxMjU3OGMxMGMwZTAzMzk4ZThlZmQ4ZGE3YjVhZg==
   data.tar.gz: !binary |-
-    MDI2MjBiZWUyY2ZiMGQxODFiMDA0YWI1YjRkMTg5M2ViNTlmYjk0Mw==
+    NWFlMzkxMjY1MDFjYzZiNjljYjU1MWZiN2JiZjhlYTgzZTcxNzk4YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWE0MjUyYWE2ODRlZjI1NjA2OTA3MTE0MzIyZDNmZGM2ODA2MzBhMDRiOTZi
-    ODY4ZjBkOGUzNzZiODg2NDlkM2UzOWFhNTQ4YTAyYjFlZDE4N2NhZWU4OTY4
-    YmYwNTEwMmU4ZGFjZWY1NDQxZGY2NGM1NmYyMzM4OGYwZWQwZTY=
+    ZWNkMzU1NWIyMDEyYTg1YTY0OTQ1YTIzZWI3ZDAxNmVlYmM5ZTNiNTdjNjQy
+    MDA3MWQ0Y2JlYzIyMTQzODRkZWJiNmI4ZmFmODAyYjI2MzNlNjRiMWExYzRm
+    ZDJlMmJiNWM4MDczN2IxN2IzYmU4ZDI5YTg2ZDI2YmUxNDg3OWI=
   data.tar.gz: !binary |-
-    MWVlYmExMTU2OWNhMDhmZmE3Njg0Mjk0YTcxZmQ1ODY1YWQyMzRmZWFjZGMz
-    NzQ1YzNlOTQ5YWM1NGVhOTM0MmIzNTRhMDNiMzQ3YzA0OWU0YWFlZjVhMGE1
-    ZmJiODY4MTdkMWQyOGQwNjk1ZDM4N2JkZDYwZmJjNTUxYzQ0MDE=
+    NzI0YjMyZjI5ZWEzZGZjYWQ4NWQ3MThlMzQzM2VmMjI0NTU4ZGZlZjM2ZTUw
+    NDM5Zjk4MDkzYTMwZDk2Zjg1MWY2Yzc0ZjNjYTAwNTdiM2EwODFkMzIwNmY0
+    Y2Y0OTNhMDJjMjI2ODU3MzMyNDBmODkwY2NiOWEzMzdmNzQ5NGU=

data/app/controllers/pbw/base_models_controller.rb

@@ -9,6 +9,19 @@ module Pbw
 		before_filter :model_for_read, :only => [:show]
 		before_filter :model_for_update, :only => [:edit, :update, :destroy]
 		before_filter :index_models, :only => [:index]
+		before_filter :model_for_create, :only => [:new, :create]
+
+		def set_model_class
+			# stub method
+		end
+
+		def update_model_before_create(model)
+			# stub method
+		end
+
+		def update_model_before_update(model)
+			# stub method
+		end
 
 		def index
 	  		session[:referrer] = request.url
@@ -30,17 +43,12 @@ module Pbw
 		end
 
 		def new
-			authorize! :manage, Admin
-			@model = real_model_class.new
 			respond_with(@model) do |format|
 				format.json { render json: @model }
 			end
 		end
 
 		def create
-			authorize! :manage, real_model_class
-			@model = real_model_class.new(params[model_param])
-			@model.image = @image if @image
 			if @model.save
 				respond_with(@model) do |format|
 					format.json { render json: @model }
@@ -54,10 +62,6 @@ module Pbw
 
 		def update
 			if @model.update_attributes(params[model_param])
-				if @image
-					@model.image = @image 
-					@model.save
-				end
 				respond_with(@model) do |format|
 					format.json { render json: @model }
 				end
@@ -100,17 +104,25 @@ module Pbw
 		end
 
 		def index_models
-			authorize! :read, model_class
+			authorize! :manage, 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])
+			update_model_before_create(@model)
+		end
+
 	  	def model_for_read
 			@model = model_class.find(model_id)
+			authorize! :read, @model
 		end
 
 		def model_for_update
 			@model = model_class.find(model_id)
 			authorize! :update, @model
+			update_model_before_update(@model)
 		end
 	end
 

data/app/controllers/pbw/commands_controller.rb

@@ -0,0 +1,11 @@
+module Pbw
+	class CommandsController < BaseModelsController
+		def set_model_class
+			self.model_class = Command
+		end
+
+		def update_model_before_create(model)
+			model.user = current_user
+		end
+	end
+end

data/app/controllers/pbw/items_controller.rb

@@ -1,7 +1,7 @@
 module Pbw
 	class ItemsController < BaseModelsController
 		def set_model_class
-			self.model_class = Resource
+			self.model_class = Item
 		end
 	end
 end

data/app/models/pbw/ability.rb

@@ -1,13 +1,37 @@
+require 'cancan'
+
 class Ability
-  include ::CanCan::Ability
-  
-  def initialize(user)
-    user.role.permissions.each do |permission|
-      if permission.subject_class == "all"
-        can permission.action.to_sym, permission.subject_class.to_sym
-      else
-        can permission.action.to_sym, permission.subject_class.constantize
-      end
+    include CanCan::Ability
+
+    MANAGED_CLASSES = [Area, Capability, Command, Constraint, Item, ItemContainer, ItemConversion, ItemTransfer, Process, Rule, Token, Trigger, User]
+    
+    def initialize(user)
+        user ||= User.new
+        if user.superadmin?
+            can :manage, :all
+        else
+          can do |action, subject_class, subject|
+            case action.to_s
+            when "index", "show", "search"
+              check_method = :viewable_by?
+            when "create", "new"
+              check_method = :creatable_by?
+            when "edit", "update"
+              check_method = :editable_by?
+            when "delete", "destroy"
+              check_method = :deletable_by?
+            else 
+              check_method = :viewable_by?
+            end
+            check_class = subject_class.respond_to?(check_method) ? subject_class : parent_of_subject_class(subject_class)
+            check_class.send(check_method, user, subject)
+          end
+        end
     end
-  end
-end
+
+    def parent_of_subject_class(subject_class)
+        MANAGED_CLASSES.each do |klass|
+          return klass if subject_class.ancestors.include?(klass)
+        end
+    end
+end

data/app/models/pbw/area.rb

@@ -10,9 +10,26 @@ module Pbw
     has_many :item_containers
     has_and_belongs_to_many :constraints
     has_and_belongs_to_many :triggers
+    has_and_belongs_to_many :attached_processes
 
     attr_accessible :name
 
+    def self.viewable_by?(user, subject)
+        true
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
+
     def before_token_enters(token)
         # stub method
         true
@@ -49,6 +66,14 @@ module Pbw
         # stub method
     end
 
+    def attach_tick_process(process, ticks_to_wait=0)
+        AttachedProcess.create(area: self, process: process, tickable: true, ticks_waiting: ticks_to_wait)
+    end
+
+    def attach_update_process(process, updates_to_wait=0)
+        AttachedProcess.create(area: self, process: process, updatable: true, updates_waiting: updates_to_wait)
+    end
+
     def count_item(item)
         container = ItemContainer.find_for_area(self)
         container ? container.quantity : 0

data/app/models/pbw/attached_process.rb

@@ -0,0 +1,41 @@
+module Pbw
+  class AttachedProcess < Rule
+  	belongs_to :token
+  	belongs_to :area
+  	belongs_to :process
+
+  	field :tickable, :type => Boolean, :default => false
+    field :updatable, :type => Boolean, :default => false
+    field :ticks_waiting, :type => Integer, :default => 0
+    field :updates_waiting, :type => Integer, :default => 0
+
+    scope :tickable, where(tickable: true)
+    scope :updatable, where(updatable: true)
+
+    def tick!
+        return unless self.tickable && self.process && (self.token || self.area)
+        unless self.ticks_waiting > 0
+            self.process.run!(token_or_area)
+            destroy
+        else
+            self.ticks_waiting = self.ticks_waiting - 1
+            save!
+        end
+    end
+
+    def update!
+        return unless self.updatable && self.process && (self.token || self.area)
+        unless self.updates_waiting > 0
+            self.process.run!(token_or_area)
+            destroy
+        else
+            self.updates_waiting = self.updates_waiting - 1
+            save!
+        end
+    end
+
+    def token_or_area
+    	self.token || self.area
+    end
+  end
+end

data/app/models/pbw/capability.rb

@@ -2,6 +2,26 @@ module Pbw
   class Capability < Rule
     has_and_belongs_to_many :tokens
 
+    def self.viewable_by?(user, subject)
+        return true if user.admin?
+        subject.tokens.each do |token|
+            return true token.user && token.user == user
+        end
+        false
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
+
     def before_process(token, &changeset)
     	# stub method
     	true

data/app/models/pbw/command.rb

@@ -0,0 +1,105 @@
+module Pbw
+  class Command < Rule
+    belongs_to :token
+    belongs_to :user
+
+    before_validation :validate_token_and_user
+    
+    field :tickable, :type => Boolean, :default => false
+    field :updatable, :type => Boolean, :default => false
+    field :ticks_waiting, :type => Integer, :default => 0
+    field :updates_waiting, :type => Integer, :default => 0
+
+    before_save :set_tickable_and_updatable    
+
+    scope :tickable, where(tickable: true)
+    scope :updatable, where(updatable: true)
+
+    def self.viewable_by?(user, subject)
+        user.admin? || subject.user == user
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin? || subject.user.nil? || (subject.user == user && subject.token.user && subject.token.user == user)
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin? || (subject.user == user && subject.token.user && subject.token.user == user)
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin? || (subject.user == user && subject.token.user && subject.token.user == user)
+    end
+
+    def valid_for_token?(token)
+        # stub method
+        false
+    end
+
+    def valid_for_user?(user)
+        # stub method
+        false
+    end
+
+    def runs_on_ticks?
+        # stub method
+        false
+    end
+
+    def runs_on_updates?
+        # stub method
+        false
+    end
+
+    def processes
+        # stub method
+        []
+    end
+
+    def set_tickable_and_updatable
+        self.tickable = runs_on_ticks?
+        self.updatable = runs_on_updates?
+    end
+
+    def run_processes!
+        procs = processes
+        return if procs.nil?
+        if procs.responds_to?(:each)
+            procs.each do |process|
+                process.run!(self.token)
+            end
+        elsif procs.ancestors.include?(Process)
+            process.run!(self.token)
+        else
+            raise "Invalid return method from #{self.class.name}.processes"
+        end
+    end
+
+    def validate_token_and_user
+        errors.add(:token, 'Invalid token') unless valid_for_token?(self.token)
+        errors.add(:user, 'Invalid user') unless valid_for_user?(self.user)
+    end
+
+    def tick!
+        return unless self.tickable
+        unless self.ticks_waiting > 0
+            run_processes!
+            destroy
+        else
+            self.ticks_waiting = self.ticks_waiting - 1
+            save!
+        end
+    end
+
+    def update!
+        return unless self.updatable
+        unless self.updates_waiting > 0
+            run_processes!
+            destroy
+        else
+            self.updates_waiting = self.updates_waiting - 1
+            save!
+        end
+    end
+  end
+end

data/app/models/pbw/constraint.rb

@@ -3,6 +3,26 @@ module Pbw
     has_and_belongs_to_many :tokens
     has_and_belongs_to_many :areas
 
+    def self.viewable_by?(user, subject)
+        return true if user.admin?
+        subject.tokens.each do |token|
+            return true token.user && token.user == user
+        end
+        false
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
+
     def before_process(token_or_area, &changeset)
     	# stub method
     	true

data/app/models/pbw/item.rb

@@ -12,6 +12,22 @@ module Pbw
     
     attr_accessible :name
 
+    def self.viewable_by?(user, subject)
+        true
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
+
     def before_add(container, quantity)
         # stub method
         true

data/app/models/pbw/item_container.rb

@@ -12,6 +12,22 @@ module Pbw
 
     attr_accessible :item, :token, :area, :user, :quantity
 
+    def self.viewable_by?(user, subject)
+        user.admin? || subject.user == user || (subject.token && subject.token.user == user)
+    end
+
+    def self.creatable_by?(user, subject)
+        true
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin? || subject.user == user || (subject.token && subject.token.user == user)
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
+
     def self.find_or_create_for_token(token, item, quantity_to_add)
     	container = where(token: token, item: item).first
     	container = new(token: token, item: item) unless container

data/app/models/pbw/item_conversion.rb

@@ -5,6 +5,22 @@ module Pbw
     belongs_to :item
     field :from, :type => Hash
 
+    def self.viewable_by?(user, subject)
+        true
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
+
     def set_from_item(item, quantity)
     	return false unless item && quantity
     	self.from ||= {}

data/app/models/pbw/item_transfer.rb

@@ -5,5 +5,21 @@ module Pbw
     belongs_to :item
     field :from_class, :type => String
     field :to_class, :type => String
+
+    def self.viewable_by?(user, subject)
+        true
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
   end
 end

data/app/models/pbw/process.rb

@@ -1,9 +1,23 @@
 module Pbw
   class Process < Rule
     has_many :triggers
+    has_and_belongs_to_many :attached_processes
     
-    field :run_tick, :type => Boolean
-    field :run_update, :type => Boolean
+    def self.viewable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.creatable_by?(user, subject)
+        true
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
 
     def before_run(token_or_area)
     	# stub method
@@ -16,7 +30,7 @@ module Pbw
 
     def changeset(token_or_area)
     	# stub method
-    	raise "Not implemented"
+    	Pbw::Changeset.new
     end
 
     def execute_changeset!(&changeset)
@@ -40,10 +54,5 @@ module Pbw
     	token_or_area.check_triggers!
     	after_triggers(token_or_area)
     end
-
-    def schedule!(token_or_area)
-    	# TODO
-    	raise "Not implemented"
-    end
   end
 end

data/app/models/pbw/rule.rb

@@ -6,5 +6,21 @@ module Pbw
     validates :name, presence: true, uniqueness: true
 
     attr_accessible :name
+
+    def self.viewable_by?(user, subject)
+        true
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
   end
 end

data/app/models/pbw/token.rb

@@ -6,14 +6,31 @@ module Pbw
     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_and_belongs_to_many :users
+    has_and_belongs_to_many :attached_processes
     has_many :item_containers
 
     attr_accessible :name
 
+    def self.viewable_by?(user, subject)
+        user.admin? || subject.user == user
+    end
+
+    def self.creatable_by?(user, subject)
+        true
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin? || subject.user == user
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin? || subject.user == user
+    end
+
     def before_ownership(user)
         # stub method
         true
@@ -50,6 +67,14 @@ module Pbw
         # stub method
     end
 
+    def attach_tick_process(process, ticks_to_wait=0)
+        AttachedProcess.create(token: self, process: process, tickable: true, ticks_waiting: ticks_to_wait)
+    end
+
+    def attach_update_process(process, updates_to_wait=0)
+        AttachedProcess.create(token: self, process: process, updatable: true, updates_waiting: updates_to_wait)
+    end
+
     def can_convert?(item)
         self.capabilities.any?{|c| c.can_convert?(item)}
     end

data/app/models/pbw/trigger.rb

@@ -4,6 +4,26 @@ module Pbw
     has_and_belongs_to_many :areas
     belongs_to :process
 
+    def self.viewable_by?(user, subject)
+        return true if user.admin?
+        subject.tokens.each do |token|
+            return true token.user && token.user == user
+        end
+        false
+    end
+
+    def self.creatable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.editable_by?(user, subject)
+        user.admin?
+    end
+
+    def self.deletable_by?(user, subject)
+        user.admin?
+    end
+
     def trigger?(token_or_area)
     	# stub method
     end