ryanb-scope-builder 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.1.2* (August 28th, 2008)
+
+* scope_builder can be called on association proxy
+
 *0.1.1* (June 26th, 2008)
 
 * scope_builder can be called on any Scope

data/Manifest

@@ -1,16 +1,14 @@
 CHANGELOG
 lib/scope_builder/builder.rb
 lib/scope_builder/model_additions.rb
-lib/scope_builder/scope_additions.rb
 lib/scope_builder.rb
 LICENSE
 Manifest
 README
 scope-builder.gemspec
+spec/models/category.rb
 spec/models/product.rb
 spec/scope_builder/builder_spec.rb
 spec/spec_helper.rb
-spec/test.sqlite3
 tasks/deployment.rake
 tasks/spec.rake
-TODO

data/lib/scope_builder/model_additions.rb

@@ -11,3 +11,11 @@ end
 class ActiveRecord::Base
   extend ScopeBuilder::ModelAdditions
 end
+
+class ActiveRecord::Associations::AssociationProxy
+  include ScopeBuilder::ModelAdditions
+end
+
+class ActiveRecord::NamedScope::Scope
+  include ScopeBuilder::ModelAdditions
+end

data/lib/scope_builder.rb

@@ -1,4 +1,3 @@
 $:.unshift(File.dirname(__FILE__))
 require 'scope_builder/model_additions'
-require 'scope_builder/scope_additions'
 require 'scope_builder/builder'

data/scope-builder.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Scope-builder-0.1.1
+# Gem::Specification for Scope-builder-0.1.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{scope-builder}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates"]
-  s.date = %q{2008-06-26}
+  s.date = %q{2008-08-28}
   s.description = %q{Build up named scopes conditionally.}
   s.email = %q{ryan (at) railscasts (dot) com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/scope_builder/builder.rb", "lib/scope_builder/model_additions.rb", "lib/scope_builder/scope_additions.rb", "lib/scope_builder.rb", "LICENSE", "README", "tasks/deployment.rake", "tasks/spec.rake", "TODO"]
-  s.files = ["CHANGELOG", "lib/scope_builder/builder.rb", "lib/scope_builder/model_additions.rb", "lib/scope_builder/scope_additions.rb", "lib/scope_builder.rb", "LICENSE", "Manifest", "README", "scope-builder.gemspec", "spec/models/product.rb", "spec/scope_builder/builder_spec.rb", "spec/spec_helper.rb", "spec/test.sqlite3", "tasks/deployment.rake", "tasks/spec.rake", "TODO"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/scope_builder/builder.rb", "lib/scope_builder/model_additions.rb", "lib/scope_builder.rb", "LICENSE", "README", "tasks/deployment.rake", "tasks/spec.rake"]
+  s.files = ["CHANGELOG", "lib/scope_builder/builder.rb", "lib/scope_builder/model_additions.rb", "lib/scope_builder.rb", "LICENSE", "Manifest", "README", "scope-builder.gemspec", "spec/models/category.rb", "spec/models/product.rb", "spec/scope_builder/builder_spec.rb", "spec/spec_helper.rb", "tasks/deployment.rake", "tasks/spec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/ryanb/scope-builder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Scope-builder", "--main", "README"]
@@ -37,22 +37,15 @@ end
 # 
 # require 'rubygems'
 # require 'rake'
-#  
-# begin
-#   require 'echoe'
+# require 'echoe' 
 # 
-#   Echoe.new('scope-builder', '0.1.1') do |p|
-#     p.summary        = "Build up named scopes conditionally."
-#     p.description    = "Build up named scopes conditionally."
-#     p.url            = "http://github.com/ryanb/scope-builder"
-#     p.author         = 'Ryan Bates'
-#     p.email          = "ryan (at) railscasts (dot) com"
-#     p.ignore_pattern = ["script/*"]
-#   end
-# 
-# rescue LoadError => boom
-#   puts "You are missing a dependency required for meta-operations on this gem."
-#   puts "#{boom.to_s.capitalize}."
+# Echoe.new('scope-builder', '0.1.2') do |p|
+#   p.summary        = "Build up named scopes conditionally."
+#   p.description    = "Build up named scopes conditionally."
+#   p.url            = "http://github.com/ryanb/scope-builder"
+#   p.author         = 'Ryan Bates'
+#   p.email          = "ryan (at) railscasts (dot) com"
+#   p.ignore_pattern = ["script/*", "**/*.sqlite3"]
 # end
 # 
 # Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/spec/models/category.rb

@@ -0,0 +1,15 @@
+class Category < ActiveRecord::Base
+  has_many :products
+end
+
+class CreateCategories < ActiveRecord::Migration
+  def self.up
+    create_table :categories do |t|
+      t.string :name
+    end
+  end
+  
+  def self.down
+    drop_table :categories
+  end
+end

data/spec/models/product.rb

@@ -1,5 +1,6 @@
 class Product < ActiveRecord::Base
   named_scope :released, :conditions => ['released=?', true]
+  belongs_to :category
 end
 
 class CreateProducts < ActiveRecord::Migration
@@ -7,6 +8,7 @@ class CreateProducts < ActiveRecord::Migration
     create_table :products do |t|
       t.string :name
       t.boolean :released
+      t.integer :category_id
     end
   end
   

data/spec/scope_builder/builder_spec.rb

@@ -52,4 +52,22 @@ describe ScopeBuilder::Builder do
     builder = Product.released.scope_builder
     builder.all.should == Product.released.all
   end
+  
+  describe "products in category" do
+    before(:each) do
+      Category.delete_all
+      @category = Category.create!(:products => Product.find_all_by_name(['a', 'b']))
+    end
+    
+    it "should work on named scope through association" do
+      builder = @category.products.released.scope_builder
+      builder.all.should == @category.products.released.all
+    end
+    
+    it "should work directly on assocation" do
+      builder = @category.products.scope_builder
+      builder.released
+      builder.all.should == @category.products.released.all
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,13 +6,15 @@ require File.dirname(__FILE__) + '/../lib/scope_builder.rb'
 
 # setup database adapter
 ActiveRecord::Base.establish_connection({
-  :adapter => "sqlite3", 
-  :dbfile => File.dirname(__FILE__) + "/test.sqlite3" 
+  :adapter => "sqlite3",
+  :dbfile => File.dirname(__FILE__) + "/test.sqlite3"
 })
 
 # load models
 # there's probably a better way to handle this
+require File.dirname(__FILE__) + '/models/category.rb'
 require File.dirname(__FILE__) + '/models/product.rb'
+CreateCategories.migrate(:up) unless Category.table_exists?
 CreateProducts.migrate(:up) unless Product.table_exists?
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ryanb-scope-builder
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-26 00:00:00 -07:00
+date: 2008-08-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,30 +23,26 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/scope_builder/builder.rb
 - lib/scope_builder/model_additions.rb
-- lib/scope_builder/scope_additions.rb
 - lib/scope_builder.rb
 - LICENSE
 - README
 - tasks/deployment.rake
 - tasks/spec.rake
-- TODO
 files: 
 - CHANGELOG
 - lib/scope_builder/builder.rb
 - lib/scope_builder/model_additions.rb
-- lib/scope_builder/scope_additions.rb
 - lib/scope_builder.rb
 - LICENSE
 - Manifest
 - README
 - scope-builder.gemspec
+- spec/models/category.rb
 - spec/models/product.rb
 - spec/scope_builder/builder_spec.rb
 - spec/spec_helper.rb
-- spec/test.sqlite3
 - tasks/deployment.rake
 - tasks/spec.rake
-- TODO
 has_rdoc: true
 homepage: http://github.com/ryanb/scope-builder
 post_install_message: 

data/lib/scope_builder/scope_additions.rb

@@ -1,13 +0,0 @@
-module ScopeBuilder
-  module ScopeAdditions
-    def scope_builder
-      builder = Builder.new(self)
-      yield(builder) if block_given?
-      builder
-    end
-  end
-end
-
-class ActiveRecord::NamedScope::Scope
-  include ScopeBuilder::ScopeAdditions
-end