static_model 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2008-12-07
+
+* 1 minor enhancements
+	* YAML data files can now include ERB - see tests for examples
+	
 == 0.2.1 2008-12-03
 
 * 1 minor enhancement

data/lib/static_model/base.rb

@@ -77,7 +77,9 @@ module StaticModel
         return if loaded? && !reload
         raise(StaticModel::DataFileNotFound, "You must set a data file to load from") unless File.readable?(data_file) 
         begin
-          data = YAML::load_file(data_file)
+          raw_data = File.open(data_file) {|f| f.read }
+          parsed_data = ERB.new(raw_data).result
+          data = YAML::load(parsed_data)
         rescue
           raise(StaticModel::BadDataFile, "The data file you specified '#{data_file}' was not in a readable format.")
         end

data/lib/static_model/version.rb

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

data/lib/static_model.rb

@@ -1,12 +1,15 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'yaml'
-
-require 'active_support/inflector'
-require 'active_support/core_ext/hash'
-require 'active_support/core_ext/string'
+require 'yaml' unless defined?(YAML)
+require 'erb'  unless defined?(ERB)
 
+unless defined?(ActiveSupport::CoreExtensions)
+  require 'active_support/inflector'
+  require 'active_support/core_ext/hash'
+  require 'active_support/core_ext/string'
+  require 'active_support/core_ext/integer' 
+end
 
 require 'static_model/errors'
 require 'static_model/associations'

data/test/test_helper.rb

@@ -44,7 +44,10 @@ class Store < StaticModel::Base
   
 end
 
-
+class Project < StaticModel::Base
+  set_data_file File.join(File.dirname(__FILE__), 'data', 'projects.yml')
+  belongs_to :author
+end
 
 class Test::Unit::TestCase
   

data/test/test_static_model.rb

@@ -147,6 +147,20 @@ class TestStaticModel < Test::Unit::TestCase
             
           end
         end
+        
+        context "loading a data_file with embedded erb" do
+          setup do
+            @projects = Project.all
+          end
+          
+          should "evaluate erb expressions at load time" do
+            assert_equal 1.day.ago.strftime('%m/%d/%Y %I:%M%p'), @projects.first.created_at
+          end
+          
+          should "evaluate erb in current context" do
+            assert_equal Author.first, @projects[1].author
+          end
+        end
 
         context "find" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: static_model
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-03 00:00:00 -05:00
+date: 2008-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.8.0
     version: 
 description: ActiveRecord like functionalities for reading from YAML with a simple class implementation
 email: 
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - History.txt
 - License.txt
 - Manifest.txt
+- README.rdoc
 files: 
 - History.txt
 - License.txt
@@ -66,7 +67,7 @@ homepage: http://quirkey.rubyforge.org
 post_install_message: ""
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quirkey
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: ActiveRecord like functionalities for reading from YAML with a simple class implementation