unveil 0.1.2 → 0.1.3

data/lib/unveil/core_ext.rb

@@ -1,5 +1,5 @@
 Array.class_eval do
-  def unveil(options = {})
-    map {|obj| obj.unveil(options)}
+  def unveil(*args)
+    map {|obj| obj.unveil(*args)}
   end
 end

data/lib/unveil/error.rb

@@ -0,0 +1,4 @@
+module Unveil
+  # Raised when a scope that doesn't exist is called
+  class UndefinedScopeError < StandardError; end
+end

data/lib/unveil.rb

@@ -1,3 +1,4 @@
+require 'unveil/error'
 require 'unveil/core_ext'
 
 module Unveil
@@ -6,17 +7,26 @@ module Unveil
   end
 
   module ClassMethods
-    def unveil(options = {})
-      cattr_accessor :unveil_options
-      self.unveil_options = options
-      send :include, InstanceMethods
+    def unveil(*args)
+      name = args[0].is_a?(Symbol) ? args.shift : :default
+      self.unveil_scopes[name] = args[0] || {}
+    end
+
+    def unveil_scopes
+      @@unveil_scopes ||= {:default => {}}
     end
   end
 
-  module InstanceMethods
-    def unveil(options = {})
-      serializable_hash(self.class.unveil_options.merge(options))
+  def unveil(*args)
+    name = args[0].is_a?(Symbol) ? args.shift : :default
+    options = args[0] || {}
+
+    unless self.class.unveil_scopes[name]
+      raise Unveil::UndefinedScopeError,
+        ":#{name} hasn't been defined. Try adding `unveil :#{name}` to #{self.class.name}."
     end
+
+    return serializable_hash(self.class.unveil_scopes[name].merge(options))
   end
 end
 

data/test/fixtures/users.yml

@@ -0,0 +1,9 @@
+john:
+  first_name: John
+  last_name: Smith
+  email: johnsmith@example.com
+
+jane:
+  first_name: Jane
+  last_name: Smith
+  email: janesmith@example.com

data/test/schema.rb

@@ -0,0 +1,7 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :users, :force => true do |t|
+    t.string :first_name
+    t.string :last_name
+    t.string :email
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,21 @@
 require 'rubygems'
 require 'test/unit'
+require 'active_record'
+require 'active_record/fixtures'
 require 'active_support'
+
+def load_schema
+  # Connect to the database
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+  # Load the schema
+  load(File.dirname(__FILE__) + '/schema.rb')
+
+  # Create the fixtures
+  fixtures = ActiveRecord::Schema.tables
+  fixtures.delete('schema_migrations')
+  Fixtures.create_fixtures(File.dirname(__FILE__) + '/fixtures', fixtures)
+
+  # Require Unveil
+  require File.dirname(__FILE__) + '/../init'
+end

data/test/unveil_test.rb

@@ -1,8 +1,55 @@
 require 'test_helper'
 
 class UnveilTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  load_schema
+
+  class User < ActiveRecord::Base
+    unveil :limited, :except => :email
+  end
+
+  test 'should define unveil in objects of ActiveRecord::Base' do
+    assert User.first.unveil
+  end
+
+  test 'should use the default scope when no scope is specified' do
+    default_user = { 'id' => 1, 'first_name' => 'John', 'last_name' => 'Smith', 'email' => 'johnsmith@example.com' }
+
+    user = User.first
+
+    assert_equal user.unveil(:default), user.unveil
+    assert_equal user.unveil, default_user
+  end
+
+  test 'should use a named scope when specified' do
+    limited_user = { 'id' => 1, 'first_name' => 'John', 'last_name' => 'Smith' }
+
+    user = User.first
+
+    assert_not_equal user.unveil, user.unveil(:limited)
+    assert_equal user.unveil(:limited), limited_user
+  end
+
+  test 'should call unveil for each object in an array' do
+    users = [
+      { 'id' => 1, 'first_name' => 'John', 'last_name' => 'Smith', 'email' => 'johnsmith@example.com' },
+      { 'id' => 2, 'first_name' => 'Jane', 'last_name' => 'Smith', 'email' => 'janesmith@example.com' }
+    ]
+
+    assert_equal User.all.unveil, users
+  end
+
+  test 'should use a named scope for each object in an array when specified' do
+    default_users = [
+      { 'id' => 1, 'first_name' => 'John', 'last_name' => 'Smith', 'email' => 'johnsmith@example.com' },
+      { 'id' => 2, 'first_name' => 'Jane', 'last_name' => 'Smith', 'email' => 'janesmith@example.com' }
+    ]
+
+    limited_users = [
+      { 'id' => 1, 'first_name' => 'John', 'last_name' => 'Smith' },
+      { 'id' => 2, 'first_name' => 'Jane', 'last_name' => 'Smith' }
+    ]
+
+    assert_equal User.all.unveil, default_users
+    assert_equal User.all.unveil(:limited), limited_users
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Shaun Chapman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -29,7 +29,10 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - lib/unveil/core_ext.rb
+- lib/unveil/error.rb
 - lib/unveil.rb
+- test/fixtures/users.yml
+- test/schema.rb
 - test/test_helper.rb
 - test/unveil_test.rb
 has_rdoc: true