garnish 0.0.4 → 0.0.5

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+0.0.5 (February 29, 2012)
+
+* Remove cruft from Guardfile so Guard works again. Fix broken tests from last
+push.
+
 0.0.4 (February 16, 2012)
 
 * Overhaul on how relationships are manager by a Collection class now.

data/Gemfile

@@ -8,7 +8,6 @@ gem 'i18n' #Why doesn't activesupport require this?
 group :development do
   gem 'guard'
   gem 'guard-rspec'
-  gem 'guard-spin'
 end
 
 gemspec

data/Guardfile

@@ -1,24 +1,4 @@
-guard 'bundler' do
-  watch('Gemfile')
-  # Uncomment next line if Gemfile contain `gemspec' command
-  # watch(/^.+\.gemspec/)
-end
-
-guard 'spin' do
-  # uses the .rspec file
-  # --colour --fail-fast --format documentation --tag ~slow
-  watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^app/(.+)\.rb})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.+)\.haml})                         { |m| "spec/#{m[1]}.haml_spec.rb" }
-  watch(%r{^lib/(.+)\.rb})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
-  watch('Gemfile')
-  watch('Gemfile.lock')
-  watch('spec/spec_helper.rb')
-  watch('Guardfile')
-end
-
-guard 'rspec', :cli => "--color --order random", :version => 2, :rvm => ['1.9.3'] do
+guard 'rspec', :cli => "--color --order random", :version => 2 do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')                        { "spec" }

data/lib/garnish/collection.rb

@@ -13,18 +13,26 @@ module Garnish
       @template = template
     end
 
-    # Call the method on the relation object and then convert the results
+    # Call each on the relation and return the block
     #
     # @example
     #   blog.posts.each { |post| post.name }
     #
     # @return [Collection]
-    [:to_a, :each].map do |method|
-      define_method method do
-        records = @relation.send(method)
-        convert(records)
-        records
-      end
+    def each(&block)
+      to_a.each { |member| block.call(member) }
+    end
+
+    # Call to_a and return converted records
+    #
+    # @example
+    #   blog.posts.each { |post| post.name }
+    #
+    # @return [Collection]
+    def to_a
+      records = @relation.to_a
+      convert(records)
+      records
     end
 
     def respond_to?(method)

data/lib/garnish/version.rb

@@ -1,3 +1,3 @@
 module Garnish
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/garnish/collection_spec.rb

@@ -10,9 +10,20 @@ describe Garnish::Collection do
     collection.relation.should eq(relation)
   end
 
-  it "should pass the each method to the relation" do
-    relation.should_receive(:each)
-    collection.each
+  describe "the each method" do
+    let(:array) { stub(:array, :each => nil) }
+    before { collection.stub(:convert => array) }
+
+    it "should call to_a" do
+      relation.should_receive(:to_a).and_return(array)
+      collection.each
+    end
+
+    it "should call each on the resulting array" do
+      relation.stub(:to_a => array)
+      array.should_receive(:each)
+      collection.each
+    end
   end
 
   it "should pass the to_a method to the relation" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garnish
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70340124404820 !ruby/object:Gem::Requirement
+  requirement: &70136304742880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340124404820
+  version_requirements: *70136304742880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70340124404220 !ruby/object:Gem::Requirement
+  requirement: &70136304742360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340124404220
+  version_requirements: *70136304742360
 description: Provides an easy to use and transparent system for implementing the Decorator
   Pattern
 email: