[neelix-devel] neelix/model model.rb,1.1,1.2

[<fu...@us...>]

Update of /cvsroot/neelix/neelix/model
In directory sc8-pr-cvs1:/tmp/cvs-serv22349/model

Modified Files:
	model.rb 
Log Message:
In the middle of major refactoring for the GUI. The GUI as a result is less
functional than before, but much cleaner.


Index: model.rb
===================================================================
RCS file: /cvsroot/neelix/neelix/model/model.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** model.rb	12 Dec 2003 22:50:47 -0000	1.1
--- model.rb	13 Dec 2003 17:56:48 -0000	1.2
***************
*** 3,8 ****
--- 3,11 ----
  require 'dbi'
  require 'singleton'
+ require 'observer'
  
  class Food
+     include Observable
+ 
      attr_reader :id
      attr_accessor :name, :measures
***************
*** 38,41 ****
--- 41,45 ----
  	    @dbh.commit
  	end
+ 	changed
      end
  
***************
*** 46,49 ****
--- 50,54 ----
  	end
  	@name = @dbh.select_one("select name from food where food_id=?",@id)['name']
+ 	changed
      end
  
***************
*** 54,57 ****
--- 59,64 ----
  
  class Measure
+     include Observable
+ 
      attr_reader :id
      attr_accessor :name
***************
*** 69,72 ****
--- 76,80 ----
  	@dbh.do("update measure set name=? where measure_id=?",@name,@id)
  	@dbh.commit
+ 	changed
      end
  
***************
*** 74,77 ****
--- 82,86 ----
  	# revert to DB state
  	@name = @dbh.select_one("select name from measure where measure_id=?",@id)['name']
+ 	changed
      end
  
***************
*** 82,85 ****
--- 91,96 ----
  
  class Ingredient
+     include Observable
+ 
      attr_reader :id
      attr_accessor :measure, :food, :quantity, :modifier
***************
*** 98,101 ****
--- 109,113 ----
  	    @measure.id, @food.id, @quantity, @modifier, @id)
  	@dbh.commit
+ 	changed
      end
  
***************
*** 107,110 ****
--- 119,123 ----
  	@quantity = row['quantity']
  	@modifier = row['modifier']
+ 	changed
      end
  
***************
*** 117,120 ****
--- 130,135 ----
  
  class Recipe
+     include Observable
+ 
      attr_reader :id
      attr_accessor :name, :author, :yields, :tottime, :temp, :directions, :note, :ingredients
***************
*** 148,151 ****
--- 163,167 ----
  	end
  	@dbh.commit
+ 	changed
      end
  
***************
*** 157,164 ****
--- 173,183 ----
  	end
  	@name,@author,@yields,@tottime,@temp,@directions,@note = @dbh.select_one("select name,author,yields,tottime,temp,directions,note from recipe where recipe_id=?", @id)
+ 	changed
      end
  end
  
  class Category
+     include Observable
+ 
      attr_reader :id
      attr_accessor :name, :recipes
***************
*** 194,200 ****
  	    @dbh.commit
  	end
      end
  
-     # revert to DB state
      def rollback
  	@recipes = Array.new
--- 213,219 ----
  	    @dbh.commit
  	end
+ 	changed
      end
  
      def rollback
  	@recipes = Array.new
***************
*** 203,210 ****
--- 222,232 ----
  	end
  	@name = @dbh.select_one("select name from category where category_id=?",@id)['name']
+ 	changed
      end
  end
  
  class Cookbook
+     include Observable
+ 
      attr_reader :id
      attr_accessor :name, :categories
***************
*** 239,242 ****
--- 261,265 ----
  	end
  	@dbh.commit
+ 	changed
      end
  
***************
*** 248,251 ****
--- 271,275 ----
  	end
  	@name = @dbh.select_one("select name from cookbook where cookbook_id=?",@id)['name']
+ 	changed
      end
  end
***************
*** 254,257 ****
--- 278,282 ----
  class Replicator
      include Singleton
+ 
      attr_accessor :shelf