brentano 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in brentano.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,94 @@
+PATH
+  remote: .
+  specs:
+    brentano (0.0.1)
+      activerecord (~> 3)
+      activesupport (~> 3)
+      hashie (>= 0.4)
+      railties (~> 3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    hashie (1.0.0)
+    i18n (0.5.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.0)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.27)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  brentano!
+  rails (= 3.0.7)
+  rspec (~> 2)
+  sqlite3 (~> 1.3.3)

data/brentano.gemspec

@@ -12,12 +12,16 @@ Gem::Specification.new do |s|
   s.summary     = %q{Classy presenters for Rails 3}
   s.description = %q{Brentano helps you present ActiveRecord collections to your controllers and avoid repetitive ORM logic}
 
-  s.rubyforge_project = "brentano"
-  
-  s.add_dependency "activesupport", "~> 3.0"
-  s.add_dependency "activerecord",  "~> 3.0"
-  s.add_dependency "actionpack",  "~> 3.0"
-  s.add_dependency "hashie",  "~> 0.4"
+  s.rubyforge_project = "Brentano"
+
+  s.add_dependency "activesupport", "~> 3"
+  s.add_dependency "activerecord",  "~> 3"
+  s.add_dependency "railties", "~> 3"
+  s.add_dependency "hashie",  ">= 0.4"
+
+  s.add_development_dependency "rails", '3.0.7'
+  s.add_development_dependency "sqlite3", "~> 1.3.3"
+  s.add_development_dependency "rspec", "~> 2"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/brentano.rb

@@ -1,21 +1,21 @@
-require 'brentano/rails'
+require 'brentano/railtie'
 
 module Brentano
-  
+
   autoload :Presenter, 'brentano/presenter'
   autoload :Query, 'brentano/query'
-  
+
   mattr_accessor :query_limit
   @@query_limit = 20
-  
+
   mattr_accessor :qualifier_key
   @@qualifier_key = :options
-  
+
   mattr_accessor :presenter_module
-  @@presenter_module = "Presenters"  
-  
+  @@presenter_module = "Presenters"
+
   def config
     yield self
   end
-  
-end
+
+end

data/lib/brentano/presenter.rb

@@ -1,13 +1,15 @@
+require 'hashie'
+
 module Brentano
   class Presenter
-    
+
     class_attribute :sizes
 
     attr_reader :subject, :options, :collection, :maximum_size
 
     alias_method :proxy_respond_to?, :respond_to?
 
-    def initialize(subject, options, &blk)
+    def initialize(subject, options = {}, &blk)
       @subject = subject
       @options = Hashie::Mash.new(options)
       yield self if block_given?
@@ -22,7 +24,7 @@ module Brentano
       @maximum_size = if size.is_a? Fixnum
        size
       else
-        sizes[size] 
+        sizes[size]
       end
       options.limit = @maximum_size
     end
@@ -53,6 +55,6 @@ module Brentano
     def to_sql
       @collection.to_sql
     end
-    
+
   end
 end

data/lib/brentano/query.rb

@@ -3,38 +3,38 @@
 # queries from request params
 module Brentano
   class Query
-  
+
     attr_accessor_with_default :allowed_methods, [:limit, :offset].freeze
     attr_accessor_with_default :allowed_scopes,  [].freeze
     attr_accessor_with_default :absolute_limit,  Brentano.query_limit
-          
+
     def self.finish(relation, options)
-      obj = new relation
+      obj = self.new relation
       yield obj if block_given?
       obj.apply options
     end
-  
-    def apply(options)    
+
+    def apply(options)
       supplied_scopes = Array.wrap(options[:scopes] || options[:scope])
       supplied_scopes << "by_#{options[:by]}" if options[:by].present?
       supplied_scopes.map!(&:to_sym)
       scopes = allowed_scopes & supplied_scopes
-      scoped_relation = scopes.inject(@relation) { |r, s| r.send(s) }   
+      scoped_relation = scopes.inject(@relation) { |r, s| r.send(s) }
       if absolute_limit.present?
         options[:limit] ||= absolute_limit
         options[:limit] = [ options[:limit].to_i, absolute_limit ].min
       end
       options[:offset] &&= options[:offset].to_i
       options[:limit] &&= options[:limit].to_i
-      allowed_methods.inject(scoped_relation) do |r, m| 
+      allowed_methods.inject(scoped_relation) do |r, m|
         r = r.send(m, options[m]) if options[m].present?
         r
       end
     end
-  
+
     def initialize(relation)
       @relation = relation
     end
-  
+
   end
 end

data/lib/brentano/{rails.rb → railtie.rb}

@@ -1,14 +1,13 @@
-require 'brentano/rails/helpers'
+require File.join(File.dirname(__FILE__), '..', '..', 'rails', 'helpers')
 
 module Brentano
   class Railtie < ::Rails::Railtie
-    
-    initializer 'brentano.extend_action_contrller' do 
+
+    initializer 'brentano.extend_action_controller' do
       ActiveSupport.on_load(:action_controller) do
         self.send :include, Brentano::Helpers
       end
     end
-    
-  end
-end
 
+  end
+end

data/lib/brentano/version.rb

@@ -1,3 +1,3 @@
 module Brentano
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/{lib/brentano/rails → rails}/helpers.rb

@@ -1,10 +1,10 @@
 module Brentano
   module Helpers
-    
-    def presenter(klass_name, subject, options = params[Brentano.qualifier_key], &blk) 
+
+    def presenter(klass_name, subject, options = params[Brentano.qualifier_key], &blk)
       klass = "#{Brentano.presenter_module}::#{klass_name.to_s.camelcase}".constantize
       klass.new subject, options, &blk
     end
-  
+
   end
 end

data/spec/presenter_spec.rb

@@ -0,0 +1,164 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe TestPresenter do
+
+  before { @subject = Post.first }
+
+  describe ".new" do
+
+    it "sets the subject instance variable" do
+      presenter = TestPresenter.new @subject
+      presenter.subject.should == @subject
+    end
+
+    context "when options are passed" do
+      before do
+        @options   = { :limit => 10 }
+        @presenter = TestPresenter.new @subject, @options
+      end
+
+      it "sets the options instance variable" do
+        @presenter.options.with_indifferent_access.should == @options.with_indifferent_access
+      end
+
+      it "makes the options into a Hashie Mash" do
+        @presenter.options.should be_a(Hashie::Mash)
+      end
+
+    end
+
+    it "calls #finish" do
+      TestPresenter.any_instance.should_receive(:finish)
+      TestPresenter.new @subject
+    end
+
+    context "when a block is given" do
+      out = nil
+      it "yields self to the block" do
+        presenter = TestPresenter.new @subject do |obj|
+          out = obj
+        end
+        presenter.should equal(out)
+      end
+    end
+  end
+
+  describe "#finish" do
+    before { @presenter = TestPresenter.new @subject }
+    specify { @presenter.collection.should be }
+  end
+
+  describe "#maximum_size=" do
+    before { @presenter = TestPresenter.new @subject }
+
+    context "when the size is a Fixnum" do
+      before do
+        @size = 3
+        @presenter.maximum_size = @size
+      end
+
+      it "sets the maximum size instance variable to the size" do
+        @presenter.maximum_size.should eql(@size)
+      end
+
+      it "sets the limit option to the size" do
+        @presenter.options.limit.should eql(@size)
+      end
+    end
+
+    context "when the size is not a Fixnum" do
+      before do
+        @size = size = 4
+        @presenter.class_eval do
+          self.sizes = { :large => size }
+        end
+        @presenter.maximum_size = :large
+      end
+
+      it "sets the corresponding size" do
+        @presenter.maximum_size.should eql(@size)
+      end
+    end
+  end
+
+  describe "#respond_to?" do
+    before { @presenter = TestPresenter.new @subject }
+
+    context "given the presenter responds to the method" do
+      before { @presenter.stub(:foo) { "ok" } }
+      specify { @presenter.respond_to?(:foo).should be_true }
+    end
+
+    context "given the presenter does not respond to the method" do
+      before { @presenter.stub(:proxy_respond_to?) { |method| false } }
+
+      context "and the collection responds to the method" do
+        specify { @presenter.respond_to?(:find).should be_true }
+      end
+
+      context "and the collection does not respond to the method" do
+        before { @presenter.collection.stub(:respond_to?) { |method| false } }
+        specify { @presenter.respond_to?(:foo).should be_false }
+      end
+    end
+  end
+
+  describe "#method_missing" do
+    before do
+      @presenter = TestPresenter.new @subject
+    end
+
+    context "given the collection responds to the method" do
+
+      context "and the method returns an ActiveRecord::Relation" do
+        before do
+          @presenter.maximum_size = 2
+          @presenter.instance_variable_set :@options, :awesome => true
+          @method = [:limit, 1]
+          @result =  @presenter.method_missing(*@method)
+        end
+        subject { @result }
+
+        describe "the result" do
+          specify { should be_a_kind_of Brentano::Presenter }
+
+          it "should have the same maximum size as receiver" do
+            @presenter.maximum_size.should eql(@result.maximum_size)
+          end
+
+          it "should have the same options as the receiver" do
+            @presenter.options.should eql(@result.options)
+          end
+
+          it "should have the collection set to the returned ActiveRecord::Relation" do
+            # Use #to_sql to compare the same method on the presenters collection
+            @result.collection.to_sql.should eql(@presenter.collection.send(*@method).to_sql)
+          end
+        end
+      end
+
+      context "and the method does not return an ActiveRecord::Relation" do
+        describe "the result" do
+          it "should be the same as if the method was sent to the collection directly" do
+            @presenter.method_missing(:to_a).should eql(@presenter.collection.to_a)
+          end
+        end
+      end
+    end
+  end
+
+  describe "#as_json" do
+    before { @presenter = TestPresenter.new @subject }
+    it "delegates to the collection" do
+      @presenter.as_json.should eql(@presenter.collection.as_json)
+    end
+  end
+
+  describe "#to_sql" do
+    before { @presenter = TestPresenter.new @subject }
+    it "delegates to the collection" do
+      @presenter.to_sql.should eql(@presenter.collection.to_sql)
+    end
+  end
+
+end

data/spec/query_spec.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+SPEC_DIR = File.dirname(__FILE__)
+lib_path = File.expand_path("#{SPEC_DIR}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+
+require 'rails'
+require 'active_record'
+require 'active_support/core_ext'
+
+require 'brentano'
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+
+  config.before(:all) do
+    TestMigration.up
+    post = Post.new
+    50.times { post.comments << Comment.new }
+    post.save
+  end
+
+  config.after(:all) do
+    TestMigration.down
+  end
+
+end

data/spec/support/active_record.rb

@@ -0,0 +1,29 @@
+dbconfig = {
+  :adapter => 'sqlite3',
+  :database => ':memory:'
+}
+
+ActiveRecord::Base.establish_connection(dbconfig)
+ActiveRecord::Migration.verbose = false
+
+class TestMigration < ActiveRecord::Migration
+  def self.up
+    create_table :posts, :force => true
+    create_table :comments, :force => true do |t|
+      t.references :post
+    end
+  end
+
+  def self.down
+    drop_table :posts
+    drop_table :comments
+  end
+end
+
+class Post < ActiveRecord::Base
+  has_many :comments
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end

data/spec/support/presenters.rb

@@ -0,0 +1,22 @@
+class TestPresenter < Brentano::Presenter
+
+  self.sizes = {
+    :large => 4
+  }
+
+  def relation
+    subject.comments
+  end
+
+end
+
+module CustomFinisher
+
+  def finish
+    super do |with|
+      with.absolute_limit = false
+      with.allowed_scopes = [ :by_rank ]
+    end
+  end
+
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: brentano
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - Roberto Thais
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -05:00
+date: 2011-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: "3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,24 +32,18 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: "3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: railties
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: "3"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -65,14 +52,44 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
         version: "0.4"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.0.7
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.3
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2"
+  type: :development
+  version_requirements: *id007
 description: Brentano helps you present ActiveRecord collections to your controllers and avoid repetitive ORM logic
 email: 
 - roberto.n.thais@gmail.com
@@ -85,15 +102,21 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - brentano.gemspec
 - lib/brentano.rb
 - lib/brentano/presenter.rb
 - lib/brentano/query.rb
-- lib/brentano/rails.rb
-- lib/brentano/rails/helpers.rb
+- lib/brentano/railtie.rb
 - lib/brentano/version.rb
+- rails/helpers.rb
+- spec/presenter_spec.rb
+- spec/query_spec.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb
+- spec/support/presenters.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -108,23 +131,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: brentano
-rubygems_version: 1.3.7
+rubyforge_project: Brentano
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Classy presenters for Rails 3
-test_files: []
-
+test_files: 
+- spec/presenter_spec.rb
+- spec/query_spec.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb
+- spec/support/presenters.rb