taza 0.8.3 → 0.8.4

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.8.4
+
+* Added one to many relationship in fixtures
+* Added Templating of fixtures
+* Added Site Secific fixtures
+* Spec Rake Tasks are now generated Recursively
+
 === 0.8.2 / 2009-01-11
 
 * Added Partials

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-patch: 3
-major: 0
-minor: 8
+:major: 0
+:minor: 8
+:patch: 4

data/lib/taza/entity.rb

@@ -1,4 +1,5 @@
 module Taza
+
   class Entity
     #Creates a entity, pass in a hash to be methodized and the fixture to look up other fixtures (not entirely happy with this abstraction)
     def initialize(hash,fixture)
@@ -18,7 +19,9 @@ module Taza
 
     #This method will lookup another fixture if a pluralized fixture exists otherwise return the value in the hash
     def get_value_for_entry(key) # :nodoc:
-      if @fixture.pluralized_fixture_exists?(key)
+      if @fixture.fixture_exists?(key)
+        @fixture.specific_fixture_entities(key.to_sym, @hash[key])
+      elsif @fixture.pluralized_fixture_exists?(key)
         @fixture.get_fixture_entity(key.pluralize_to_sym,@hash[key])
       else
         @hash[key]

data/lib/taza/fixture.rb

@@ -1,3 +1,6 @@
+require 'find'
+require "erb"
+
 module Taza
   class Fixture # :nodoc:
 
@@ -5,10 +8,13 @@ module Taza
       @fixtures = {}
     end
 
-    def load_all # :nodoc:
-      Dir.glob(fixtures_pattern) do |file|
+    def load_all(fixtures_pattern) # :nodoc:
+      index_of_fixtures = fixtures_pattern.index("fixtures")
+      truncated_pattern = fixtures_pattern[index_of_fixtures..-1]
+      Dir.glob(File.join(base_path,truncated_pattern)) do |file|
+        templatized_fixture=ERB.new(File.read(file))
         entitized_fixture = {}
-        YAML.load_file(file).each do |key, value|
+        YAML.load(templatized_fixture.result()).each do |key, value|
           entitized_fixture[key] = value.convert_hash_keys_to_methods(self)
         end
         @fixtures[File.basename(file,'.yml').to_sym] = entitized_fixture
@@ -18,22 +24,31 @@ module Taza
     def fixture_names # :nodoc:
       @fixtures.keys
     end
+
+    def get_fixture(fixture_file_key)
+      @fixtures[fixture_file_key]
+    end  
     
     def get_fixture_entity(fixture_file_key,entity_key) # :nodoc:
       @fixtures[fixture_file_key][entity_key]
     end
 
     def pluralized_fixture_exists?(singularized_fixture_name) # :nodoc:
-      fixture_names.include?(singularized_fixture_name.pluralize_to_sym)
+      fixture_exists?(singularized_fixture_name.pluralize_to_sym)
     end
-
-    def fixtures_pattern # :nodoc:
-      File.join(base_path, 'fixtures','*.yml')
+    
+    def specific_fixture_entities(fixture_key, select_array)
+      cloned_fixture = @fixtures[fixture_key].clone
+      cloned_fixture.delete_if {|key , value| !select_array.include?(key)}
     end
 
-    def base_path # :nodoc:
-      File.join('.','spec')
+    def fixture_exists?(fixture_name)
+      fixture_names.include?(fixture_name.to_sym)
     end
+
+   def base_path # :nodoc:
+     File.join('.','spec')
+   end
   end
   
   # The module that will mixin methods based on the fixture files in your 'spec/fixtures'
@@ -49,18 +64,25 @@ module Taza
   # jane_smith:
   #   first_name: jane
   #   last_name: smith
-  module Fixtures
-    def Fixtures.included(other_module) # :nodoc:
-      fixture = Fixture.new
-      fixture.load_all
-      fixture.fixture_names.each do |fixture_name|
-        self.class_eval do
-          define_method(fixture_name) do |entity_key|
-            fixture.get_fixture_entity(fixture_name,entity_key.to_s)
+    dirs = Dir.glob(File.join(Fixture.new.base_path,"**","**")).select {|d| File.directory?(d) }
+    dirs[0,0] = File.join(Fixture.new.base_path,"fixtures")
+    dirs.each do |mod|
+      base_module = mod == dirs[0] ? "" : "Fixtures::"
+      self.class_eval <<-EOS
+      module #{base_module}#{mod.split('/')[-1].camelize}
+        def self.included(other_module) 
+          fixture = Fixture.new
+          fixture.load_all(File.join("#{mod}","*.yml"))
+          fixture.fixture_names.each do |fixture_name|
+            self.class_eval do
+              define_method(fixture_name) do |entity_key|
+                fixture.get_fixture_entity(fixture_name,entity_key.to_s)
+              end
+            end
           end
         end
       end
-    end
-  end
+      EOS
+   end
+end
 
-end

data/lib/taza/tasks.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake'
-require 'taglob/rake/tasks'
+require 'taglob'
 require 'spec/rake/spectask'
 
 def tags
@@ -26,27 +26,22 @@ module Taza
 
       def define
         namespace :spec do
-          desc "Run all functional specs"
-          define_spec_task(:functional,'spec/functional/**/*_spec.rb')
-          desc "Run all integration specs"
-          define_spec_task(:integration,'spec/integration/**/*_spec.rb')
-
-          namespace :functional do
-            Dir.glob('./spec/functional/*/').each do |dir|
-              site_name = File.basename(dir)
-              desc "Run all functional specs for #{site_name}"
-              define_spec_task(site_name,"#{dir}**/*_spec.rb")
-
-              namespace site_name do
-                Dir.glob("./spec/functional/#{site_name}/*_spec.rb").each do |page_spec_file|
-                  page_name = File.basename(page_spec_file,'_spec.rb')
-                  define_spec_task(page_name,page_spec_file)
-                end
-              end
-
-            end
+          Dir.glob('./spec/*/').each do |dir|
+            recurse_to_create_rake_tasks(dir)
+          end
+        end
+      end
+      def recurse_to_create_rake_tasks(dir)
+        basename = File.basename(dir)
+        define_spec_task(basename,File.join(dir,"**","*_spec.rb"))
+        namespace basename do
+          Dir.glob(File.join(dir,"*_spec.rb")).each do |spec_file|
+            spec_name = File.basename(spec_file,'_spec.rb')
+            define_spec_task(spec_name,spec_file)
+          end
+          Dir.glob(File.join(dir,"*/")).each do |sub_dir|
+            recurse_to_create_rake_tasks(sub_dir)
           end
-
         end
       end
     end

data/spec/fixture_spec.rb

@@ -6,7 +6,7 @@ describe Taza::Fixture do
   it "should be able to load entries from fixtures" do
     Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all
+    fixture.load_all(File.join('fixtures','*.yml'))
     example = fixture.get_fixture_entity(:examples,'first_example')
     example.name.should eql("first")
     example.price.should eql(1)
@@ -19,16 +19,41 @@ describe Taza::Fixture do
   it "should know if a pluralized fixture of that name exists" do
     Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all
+    fixture.load_all(File.join('fixtures','*.yml'))
     fixture.pluralized_fixture_exists?('example').should be_true
-    fixture.pluralized_fixture_exists?('foo').should be_false
+    fixture.pluralized_fixture_exists?('boo').should be_false
   end
   
-  it "should be able to get all fixtures loaded" do
+  it "should be able to get all fixtures loaded excluding sub-folder fixtures" do
     Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all
-    fixture.fixture_names.should be_equivalent([:examples,:users])
+    fixture.load_all(File.join('fixtures','*.yml'))
+    fixture.fixture_names.should be_equivalent([:examples,:users,:foos])
+  end
+  
+  it "should be able to get all fixtures loaded including sub-folder fixtures" do
+    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
+    fixture = Taza::Fixture.new
+    fixture.load_all(File.join('fixtures','**','*.yml'))
+    fixture.fixture_names.should be_equivalent([:examples,:users,:foos,:bars])
+  end
+
+  it "should be able to get specific fixture entities" do
+    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
+    fixture = Taza::Fixture.new
+    fixture.load_all(File.join('fixtures','*.yml'))
+    examples = fixture.specific_fixture_entities(:examples, ['third_example'])
+    examples.length.should eql(1)
+    examples['third_example'].name.should eql('third')
+  end
+
+  it "should not modified the fixtures when you get specific entities off a fixture" do
+    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
+    fixture = Taza::Fixture.new
+    fixture.load_all(File.join('fixtures','*.yml'))
+    previous_count = fixture.get_fixture(:examples).length
+    examples = fixture.specific_fixture_entities(:examples, ['third_example'])
+    fixture.get_fixture(:examples).length.should eql(previous_count)
   end
 
-end
+ end

data/spec/fixtures_spec.rb

@@ -18,4 +18,21 @@ describe Taza::Fixtures do
     examples(:first_example).user.name.should eql(users(:shatner).name)
   end
   
-end
+  it "should be able to resolve one to many relationships" do
+    foos(:gap).examples.length.should eql(2)
+  end
+  
+  it "should be able to get one to many entities" do
+    foos(:gap).examples['first_example'].name.should eql('first')
+    foos(:gap).examples['second_example'].name.should eql('second')
+  end
+
+  it "should not be able to access fixtures in sub-folders if not included" do
+    lambda{bars(:foo)}.should raise_error(NoMethodError)
+  end
+
+  it "should template fixture files" do
+    users(:shatner).age.should eql(66)
+  end
+
+end

data/spec/sandbox/fixtures/examples.yml

@@ -5,4 +5,8 @@ first_example:
 second_example:
   name: second
   price: 2
-  user: shatner
+  user: shatner
+third_example:
+  name: third
+  price: 3
+  user: shatner

data/spec/sandbox/fixtures/foo_site/bars.yml

@@ -0,0 +1,2 @@
+foo:
+  name: "foo"

data/spec/sandbox/fixtures/foos.yml

@@ -0,0 +1,3 @@
+gap:
+  examples: first_example, second_example
+

data/spec/sandbox/fixtures/users.yml

@@ -1,2 +1,3 @@
 shatner:
-  name: William Shatner
+  name: William Shatner
+  age: <%=65+1%>

data/spec/site_fixtures_spec.rb

@@ -0,0 +1,15 @@
+require 'spec/spec_helper'
+require 'taza/fixture'
+
+describe "Site Specific Fixtures" do
+  include Taza::Fixtures::FooSite
+ 
+  it "should be able to access fixtures in sub-folders" do
+    bars(:foo).name.should eql("foo")
+  end
+
+  it "should not be able to access non-site-specific fixtures" do
+    lambda{foos(:gap)}.should raise_error(NoMethodError)
+  end
+
+end

data/spec/taza_tasks_spec.rb

@@ -13,6 +13,15 @@ describe "Taza Tasks" do
 
   before :each do
     Dir.stubs(:taglob).returns([])
+    Dir.expects(:glob).with('./spec/*/').returns(['./spec/functional/'])
+    Dir.expects(:glob).with('./spec/functional/*/').returns(['./spec/functional/foo/'])
+    Dir.expects(:glob).with('./spec/functional/*_spec.rb').returns([])
+    Dir.expects(:glob).with('./spec/functional/foo/*/').returns(['./spec/functional/foo/page/'])
+    Dir.expects(:glob).with('./spec/functional/foo/*_spec.rb').returns([])
+    Dir.expects(:glob).with('./spec/functional/foo/page/*/').returns([])
+    Dir.expects(:glob).with('./spec/functional/foo/page/*_spec.rb').returns(['./spec/functional/foo/page/bar_spec.rb'])
+    load @file_name
+    Taza::Rake::Tasks.new
   end
 
   after :all do
@@ -20,21 +29,16 @@ describe "Taza Tasks" do
   end
 
   it "should create rake spec tasks for all sites" do
-    Dir.stubs(:glob).with('./spec/functional/*/').returns(['./spec/functional/foo/'])
-    Dir.stubs(:glob).with('./spec/functional/foo/*_spec.rb').returns([])
-    load @file_name
-    Taza::Rake::Tasks.new
     tasks.include?("spec:functional:foo").should be_true
   end
 
   it "should create rake spec tasks for all sites page specs" do
-    Dir.expects(:glob).with('./spec/functional/*/').returns(['./spec/functional/foo/'])
-    Dir.expects(:glob).with('./spec/functional/foo/*_spec.rb').returns(['./spec/functional/foo/page_spec.rb'])
-    load @file_name
-    Taza::Rake::Tasks.new
     tasks.include?("spec:functional:foo:page").should be_true
   end
 
+  it "should create rake spec tasks for all sites page specs in sub-folders" do
+    tasks.include?("spec:functional:foo:page:bar").should be_true
+  end
 
   def tasks
     @rake.tasks.collect{|task| task.name }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taza
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Adam Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-02-16 00:00:00 -08:00
 default_executable: taza
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,9 @@ files:
 - spec/sandbox/config.yml
 - spec/sandbox/fixtures
 - spec/sandbox/fixtures/examples.yml
+- spec/sandbox/fixtures/foo_site
+- spec/sandbox/fixtures/foo_site/bars.yml
+- spec/sandbox/fixtures/foos.yml
 - spec/sandbox/fixtures/users.yml
 - spec/sandbox/flows
 - spec/sandbox/flows/batman.rb
@@ -147,6 +150,7 @@ files:
 - spec/sandbox/pages/foo/partials
 - spec/sandbox/pages/foo/partials/partial_the_reckoning.rb
 - spec/settings_spec.rb
+- spec/site_fixtures_spec.rb
 - spec/site_generator_spec.rb
 - spec/site_spec.rb
 - spec/spec_helper.rb
@@ -161,6 +165,8 @@ post_install_message:
 rdoc_options: 
 - --main
 - README
+- --inline-source
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement