quirkey-static_model 0.2.0 → 0.2.1

data/History.txt

@@ -1,4 +1,10 @@
-== 0.2.0 2008-10-27
+== 0.2.1 2008-12-03
+
+* 1 minor enhancement
+	
+		* IDs are assigned automatically if not given in the YAML file
+		
+== 0.2.0 2008-11-27
 	
 	* 2 major enhancements
 			

data/lib/static_model/base.rb

@@ -9,10 +9,12 @@ module StaticModel
     attr_reader :id
     
     
-    def initialize(attribute_hash = {})
+    def initialize(attribute_hash = {}, force_load = true)
+      self.class.load if force_load
       raise(StaticModel::BadOptions, "Initializing a model is done with a Hash {} given #{attribute_hash.inspect}") unless attribute_hash.is_a?(Hash)
-      @id = attribute_hash.delete('id') || attribute_hash.delete(:id) || (self.class.count + 1)
+      @id = attribute_hash.delete('id') || attribute_hash.delete(:id) || self.class.next_id
       self.attributes = attribute_hash
+      self.class.last_id = @id
     end
 
     def to_s
@@ -74,7 +76,11 @@ module StaticModel
       def load(reload = false)
         return if loaded? && !reload
         raise(StaticModel::DataFileNotFound, "You must set a data file to load from") unless File.readable?(data_file) 
-        data = YAML::load_file(data_file)
+        begin
+          data = YAML::load_file(data_file)
+        rescue
+          raise(StaticModel::BadDataFile, "The data file you specified '#{data_file}' was not in a readable format.")
+        end
         records = []
         if data.is_a?(Hash) && data.has_key?('records')
           records = data.delete('records')
@@ -82,10 +88,13 @@ module StaticModel
         elsif data.is_a?(Array)
           records = data
         end
-        @records = records && !records.empty? ? records.dup.collect {|r| new(r) } : []
+        @last_id = 0
+        @records = records && !records.empty? ? records.dup.collect {|r| new(r, false) } : []
         @loaded = true
-      # rescue
-      #   raise(StaticModel::BadDataFile, "The data file you specified '#{data_file}' was not in a readable format.")
+      end
+      
+      def reload!
+        load(true)
       end
 
       def loaded?
@@ -121,12 +130,24 @@ module StaticModel
         load
         @records
       end
+      
+      def next_id
+        last_id + 1
+      end
+      
+      def last_id
+        @last_id ||= 0
+      end
 
+      def last_id=(new_last_id)
+        @last_id = new_last_id if new_last_id > self.last_id
+      end
+      
       protected
       def default_data_file_path
         File.join(@@load_path, "#{self.to_s.tableize}.yml")
       end
-
+      
       private
       def method_missing(meth, *args)
         meth_name = meth.to_s

data/lib/static_model/version.rb

@@ -2,7 +2,7 @@ module StaticModel #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_helper.rb

@@ -39,6 +39,10 @@ class Page < StaticModel::Base
   
 end
   
+class Store < StaticModel::Base
+  set_data_file File.join(File.dirname(__FILE__), 'data', 'stores.yml')
+  
+end
 
 
 

data/test/test_static_model.rb

@@ -85,6 +85,69 @@ class TestStaticModel < Test::Unit::TestCase
           end
         end
 
+        context "next_id" do
+          context "if id's were automaticaly assigned" do
+            should "be length + 1" do
+              Store.load
+              assert_equal Store.count + 1, Store.next_id
+            end            
+          end
+          
+          context "if ids were manualy assigned" do
+            should "be 1 after the last id" do
+              Publisher.load
+              assert_equal 8, Publisher.next_id
+            end
+          end
+        end
+        
+        context "where the records are defined without ids" do
+          setup do
+            Store.reload!
+          end
+          
+          context "loading" do
+            setup do
+              @stores = Store.all
+            end
+            
+            should "automaticaly assign ids" do
+              @stores.each do |store|
+                assert store.id
+                assert store.id.is_a?(Fixnum)
+              end
+            end
+            
+            should "assign next id" do
+              assert Store.next_id
+              assert_equal 3, Store.next_id
+            end
+          end
+          
+          context "initializing without id" do
+            setup do
+              @store = Store.new({:name => 'Metro Comics', :city => 'New York'})
+            end
+                                    
+            should "return instance" do
+              assert @store.is_a?(Store)
+            end
+            
+            should "set attributes" do
+              assert_equal 'New York', @store.city
+            end
+            
+            should "assign id from next id" do
+              assert_equal 3, @store.id
+            end
+            
+            should "increment next_id" do
+              assert_equal 4, Store.next_id
+            end
+            
+          end
+        end
+
         context "find" do
 
           context "with an integer" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quirkey-static_model
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-28 00:00:00 -08:00
+date: 2008-12-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.2
     version: 
 description: ActiveRecord like functionalities for reading from YAML with a simple class implementation
 email: 
@@ -41,7 +41,6 @@ extra_rdoc_files:
 - History.txt
 - License.txt
 - Manifest.txt
-- README.rdoc
 files: 
 - History.txt
 - License.txt
@@ -71,7 +70,7 @@ homepage: http://quirkey.rubyforge.org
 post_install_message: ""
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement