muck-friends 0.1.15 → 0.1.16

data/README.rdoc

@@ -57,4 +57,4 @@ and a user model thus:
   end
 
 
-Copyright (c) 2009 Justin Ball, released under the MIT license
+Copyright (c) 2009 Tatemae, released under the MIT license

data/Rakefile

@@ -50,10 +50,10 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "muck-friends"
     gemspec.summary = "Friends engine for the muck system"
-    gemspec.email = "justinball@gmail.com"
-    gemspec.homepage = "http://github.com/jbasdf/muck_friends"
+    gemspec.email = "justin@tatemae.com"
+    gemspec.homepage = "http://github.com/tatemae/muck_friends"
     gemspec.description = "Friend engine for the muck system."
-    gemspec.authors = ["Justin Ball"]
+    gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-friends'
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/muck-friends.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-friends}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin Ball"]
-  s.date = %q{2009-11-10}
+  s.authors = ["Justin Ball", "Joel Duffin"]
+  s.date = %q{2009-11-13}
   s.description = %q{Friend engine for the muck system.}
-  s.email = %q{justinball@gmail.com}
+  s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -94,7 +94,6 @@ Gem::Specification.new do |s|
      "tasks/rails.rake",
      "test/rails_root/.gitignore",
      "test/rails_root/.rake_tasks",
-     "test/rails_root/Capfile",
      "test/rails_root/Rakefile",
      "test/rails_root/app/controllers/application_controller.rb",
      "test/rails_root/app/controllers/default_controller.rb",
@@ -316,18 +315,10 @@ Gem::Specification.new do |s|
      "test/rails_root/script/process/spawner",
      "test/rails_root/script/runner",
      "test/rails_root/script/server",
-     "test/rails_root/test/factories.rb",
      "test/rails_root/test/functional/.keep",
      "test/rails_root/test/functional/default_controller_test.rb",
      "test/rails_root/test/functional/friends_controller_test.rb",
      "test/rails_root/test/integration/.keep",
-     "test/rails_root/test/mocks/development/.keep",
-     "test/rails_root/test/mocks/test/.keep",
-     "test/rails_root/test/shoulda_macros/controller.rb",
-     "test/rails_root/test/shoulda_macros/forms.rb",
-     "test/rails_root/test/shoulda_macros/models.rb",
-     "test/rails_root/test/shoulda_macros/pagination.rb",
-     "test/rails_root/test/shoulda_macros/plugins.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/friend_mailer_test.rb",
@@ -338,7 +329,7 @@ Gem::Specification.new do |s|
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb",
      "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/jbasdf/muck_friends}
+  s.homepage = %q{http://github.com/tatemae/muck_friends}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-friends}
@@ -378,14 +369,8 @@ Gem::Specification.new do |s|
      "test/rails_root/features/support/paths.rb",
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/script/create_project.rb",
-     "test/rails_root/test/factories.rb",
      "test/rails_root/test/functional/default_controller_test.rb",
      "test/rails_root/test/functional/friends_controller_test.rb",
-     "test/rails_root/test/shoulda_macros/controller.rb",
-     "test/rails_root/test/shoulda_macros/forms.rb",
-     "test/rails_root/test/shoulda_macros/models.rb",
-     "test/rails_root/test/shoulda_macros/pagination.rb",
-     "test/rails_root/test/shoulda_macros/plugins.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/friend_mailer_test.rb",
      "test/rails_root/test/unit/friend_test.rb",

data/test/rails_root/config/environment.rb

@@ -15,7 +15,7 @@ end
 
 Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
-  config.gem 'mislav-will_paginate', :lib => 'will_paginate', :source => 'http://gems.github.com'
+  config.gem "will_paginate"
   config.gem "authlogic"
   config.gem "bcrypt-ruby", :lib => "bcrypt"
   config.gem 'thoughtbot-paperclip', :lib => 'paperclip', :source => "http://gems.github.com"

data/test/rails_root/config/environments/test.rb

@@ -22,13 +22,3 @@ config.action_controller.allow_forgery_protection    = false
 config.action_mailer.delivery_method = :test
 
 HOST = "localhost"
-
-config.gem 'thoughtbot-shoulda',
-  :lib     => 'shoulda',
-  :source  => "http://gems.github.com",
-  :version => '>= 2.9.1'
-config.gem 'thoughtbot-factory_girl',
-  :lib     => 'factory_girl',
-  :source  => "http://gems.github.com",
-  :version => '>= 1.2.0'
-config.gem "rcov", :version => '>=0.8.1.2.0'

data/test/rails_root/config/routes.rb

@@ -1,4 +1,8 @@
 ActionController::Routing::Routes.draw do |map|
+  
+  map.home '', :controller => 'default', :action => 'index'
+  map.root :controller => 'default', :action => 'index'
+  
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
   

data/test/rails_root/test/test_helper.rb

@@ -1,38 +1,11 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-gem 'thoughtbot-factory_girl' # from github
-require 'factory_girl'
-require 'mocha'
+gem 'muck-engine'
+require 'muck_test_helper'
 require 'authlogic/test_case'
-require 'redgreen' rescue LoadError
-require File.expand_path(File.dirname(__FILE__) + '/factories')
-require File.join(File.dirname(__FILE__), 'shoulda_macros', 'controller')
-require File.join(File.dirname(__FILE__), 'shoulda_macros', 'models')
-
-class ActiveSupport::TestCase 
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
 
+class ActiveSupport::TestCase
+  include MuckTestMethods
   include Authlogic::TestCase
-  
-  def login_as(user)
-    success = UserSession.create(user)
-    if !success
-      errors = user.errors.full_messages.to_sentence
-      message = 'User has not been activated' if !user.active?
-      raise "could not login as #{user.to_param}.  Please make sure the user is valid. #{message} #{errors}"
-    end
-    UserSession.find
-  end
-  
-  def assure_logout
-    user_session = UserSession.find
-    user_session.destroy if user_session
-  end
-  
-  def ensure_flash(val)
-    assert_contains flash.values, val, ", Flash: #{flash.inspect}"
-  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: muck-friends
 version: !ruby/object:Gem::Version 
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors: 
 - Justin Ball
+- Joel Duffin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -07:00
+date: 2009-11-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +44,7 @@ dependencies:
         version: "0"
     version: 
 description: Friend engine for the muck system.
-email: justinball@gmail.com
+email: justin@tatemae.com
 executables: []
 
 extensions: []
@@ -129,7 +130,6 @@ files:
 - tasks/rails.rake
 - test/rails_root/.gitignore
 - test/rails_root/.rake_tasks
-- test/rails_root/Capfile
 - test/rails_root/Rakefile
 - test/rails_root/app/controllers/application_controller.rb
 - test/rails_root/app/controllers/default_controller.rb
@@ -351,18 +351,10 @@ files:
 - test/rails_root/script/process/spawner
 - test/rails_root/script/runner
 - test/rails_root/script/server
-- test/rails_root/test/factories.rb
 - test/rails_root/test/functional/.keep
 - test/rails_root/test/functional/default_controller_test.rb
 - test/rails_root/test/functional/friends_controller_test.rb
 - test/rails_root/test/integration/.keep
-- test/rails_root/test/mocks/development/.keep
-- test/rails_root/test/mocks/test/.keep
-- test/rails_root/test/shoulda_macros/controller.rb
-- test/rails_root/test/shoulda_macros/forms.rb
-- test/rails_root/test/shoulda_macros/models.rb
-- test/rails_root/test/shoulda_macros/pagination.rb
-- test/rails_root/test/shoulda_macros/plugins.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/friend_mailer_test.rb
@@ -373,7 +365,7 @@ files:
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
 - uninstall.rb
 has_rdoc: true
-homepage: http://github.com/jbasdf/muck_friends
+homepage: http://github.com/tatemae/muck_friends
 licenses: []
 
 post_install_message: 
@@ -434,14 +426,8 @@ test_files:
 - test/rails_root/features/support/paths.rb
 - test/rails_root/public/dispatch.rb
 - test/rails_root/script/create_project.rb
-- test/rails_root/test/factories.rb
 - test/rails_root/test/functional/default_controller_test.rb
 - test/rails_root/test/functional/friends_controller_test.rb
-- test/rails_root/test/shoulda_macros/controller.rb
-- test/rails_root/test/shoulda_macros/forms.rb
-- test/rails_root/test/shoulda_macros/models.rb
-- test/rails_root/test/shoulda_macros/pagination.rb
-- test/rails_root/test/shoulda_macros/plugins.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/friend_mailer_test.rb
 - test/rails_root/test/unit/friend_test.rb

data/test/rails_root/Capfile

@@ -1,3 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy'

data/test/rails_root/test/factories.rb

@@ -1,50 +0,0 @@
-Factory.sequence :email do |n|
-  "somebody#{n}@example.com"
-end
-
-Factory.sequence :login do |n|
-  "inquire#{n}"
-end
-
-Factory.sequence :name do |n|
-  "a_name#{n}"
-end
-
-Factory.sequence :abbr do |n|
-  "abbr#{n}"
-end
-
-Factory.sequence :description do |n|
-  "This is the description: #{n}"
-end
-
-Factory.define :state do |f|
-  f.name { Factory.next(:name) }
-  f.abbreviation { Factory.next(:abbr) }
-  f.country {|a| a.association(:country) }
-end
-
-Factory.define :country do |f|
-  f.name { Factory.next(:name) }
-  f.abbreviation { Factory.next(:abbr) }
-end
-
-Factory.define :user do |f|
-  f.login { Factory.next(:login) }
-  f.email { Factory.next(:email) }
-  f.password 'inquire_pass'
-  f.password_confirmation 'inquire_pass'
-  f.first_name 'test'
-  f.last_name 'guy'
-  f.terms_of_service true
-  f.activated_at DateTime.now
-end
-
-Factory.define :permission do |f|
-  f.role {|a| a.association(:role)}
-  f.user {|a| a.association(:user)}
-end
-
-Factory.define :role do |f|
-  f.rolename 'administrator'
-end

data/test/rails_root/test/shoulda_macros/controller.rb

@@ -1,45 +0,0 @@
-module MuckControllerMacros
-
-  def should_require_login(*args)
-    args = Hash[*args]
-    login_url = args.delete :login_url
-    args.each do |action, verb|
-      should "Require login for '#{action}' action" do
-        send(verb, action)
-        assert_redirected_to(login_url)
-      end
-    end
-  end
-
-  def should_require_role(role, redirect_url, *actions)
-    actions.each do |action|
-      should "require role for '#{action}' action" do
-        get(action)
-        ensure_flash(/permission/i)
-        assert_response :redirect
-      end
-    end
-  end
-  
-  #from: http://blog.internautdesign.com/2008/9/11/more-on-custom-shoulda-macros-scoping-of-instance-variables
-  def should_not_allow action, object, url= "/login", msg=nil
-    msg ||= "a #{object.class.to_s.downcase}" 
-    should "not be able to #{action} #{msg}" do
-      object = eval(object, self.send(:binding), __FILE__, __LINE__)
-      get action, :id => object.id
-      assert_redirected_to url
-    end
-  end
-
-  def should_allow action, object, msg=nil
-    msg ||= "a #{object.class.to_s.downcase}" 
-    should "be able to #{action} #{msg}" do
-      object = eval(object, self.send(:binding), __FILE__, __LINE__)
-      get action, :id => object.id
-      assert_response :success
-    end
-  end
-
-end
-
-ActionController::TestCase.extend(MuckControllerMacros)

data/test/rails_root/test/shoulda_macros/forms.rb

@@ -1,32 +0,0 @@
-module ShouldaFormMacros
-  def self.should_have_form(opts)
-    model = self.name.gsub(/ControllerTest$/, '').singularize.downcase
-    model = model[model.rindex('::')+2..model.size] if model.include?('::')
-    http_method, hidden_http_method = form_http_method opts[:method]
-    should "have a #{model} form" do
-      assert_select "form[action=?][method=#{http_method}]", eval(opts[:action]) do
-        if hidden_http_method
-          assert_select "input[type=hidden][name=_method][value=#{hidden_http_method}]"
-        end
-        opts[:fields].each do |attribute, type|
-          attribute = attribute.is_a?(Symbol) ? "#{model}[#{attribute.to_s}]" : attribute
-          assert_select "input[type=#{type.to_s}][name=?]", attribute
-        end
-        assert_select "input[type=submit]"
-      end
-    end
-  end
-
-  def self.form_http_method(http_method)
-    http_method = http_method.nil? ? 'post' : http_method.to_s
-    if http_method == "post" || http_method == "get"
-      return http_method, nil
-    else
-      return "post", http_method
-    end
-  end  
-end
-
-class ActiveSupport::TestCase
-  extend ShouldaFormMacros
-end

data/test/rails_root/test/shoulda_macros/models.rb

@@ -1,50 +0,0 @@
-module ShouldaModelMacros
-
-  def self.should_whitelist(*attributes)
-    bad_scripts = [
-      %|';alert(String.fromCharCode(88,83,83))//\';alert(String.fromCharCode(88,83,83))//";alert(String.fromCharCode(88,83,83))//\";alert(String.fromCharCode(88,83,83))//--></SCRIPT>">'><SCRIPT>alert(String.fromCharCode(88,83,83))</SCRIPT>|,
-      %|'';!--"<XSS>=&{()}|,
-      %|<SCRIPT SRC=http://ha.ckers.org/xss.js></SCRIPT>|,
-      %|<IMG SRC="javascript:alert('XSS');">|,
-      %|<IMG SRC=javascript:alert('XSS')>|,
-      %|<IMG SRC=JaVaScRiPt:alert('XSS')>|,
-      %|<IMG SRC=JaVaScRiPt:alert('XSS')>|,
-      %|<IMG SRC=`javascript:alert("RSnake says, 'XSS'")`>|,
-      %|<IMG """><SCRIPT>alert("XSS")</SCRIPT>">|,
-      %|<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>|,
-      %|<A HREF="h
-      tt	p://6&#9;6.000146.0x7.147/">XSS</A>|,
-      %|<script>alert('message');</script>| ]
-      
-    klass = model_class
-    attributes.each do |attribute|
-      attribute = attribute.to_sym
-      should "white list #{attribute}" do
-        assert object = klass.find(:first), "Can't find first #{klass}"
-        bad_scripts.each do |bad_value|
-          object.send("#{attribute}=", bad_value)
-          object.save
-          clean_value = object.send("#{attribute}")
-          assert !clean_value.include?(bad_value), "#{attribute} is not white listed. #{bad_value} made it through"
-        end
-      end
-    end
-  end
-
-  def should_accept_nested_attributes_for(*attr_names)
-    klass = self.name.gsub(/Test$/, '').constantize
- 
-    context "#{klass}" do
-      attr_names.each do |association_name|
-        should "accept nested attrs for #{association_name}" do
-          assert  klass.instance_methods.include?("#{association_name}_attributes="),
-                  "#{klass} does not accept nested attributes for #{association_name}"
-        end
-      end
-    end
-  end
-end
-
-class ActiveSupport::TestCase
-  extend ShouldaModelMacros
-end

data/test/rails_root/test/shoulda_macros/pagination.rb

@@ -1,53 +0,0 @@
-module ShouldaPaginationMacros
-  # Example:
-  #  context "a GET to index logged in as admin" do
-  #    setup do
-  #      login_as_admin 
-  #      get :index
-  #    end
-  #    should_paginate_collection :users
-  #    should_display_pagination
-  #  end
-  def self.should_paginate_collection(collection_name)
-    should "paginate #{collection_name}" do
-      assert collection = assigns(collection_name), 
-        "Controller isn't assigning to @#{collection_name.to_s}."
-      assert_kind_of WillPaginate::Collection, collection, 
-        "@#{collection_name.to_s} isn't a WillPaginate collection."
-    end
-  end
-  
-  def self.should_display_pagination
-    should "display pagination" do
-      assert_select "div.pagination", { :minimum => 1 }, 
-        "View isn't displaying pagination. Add <%= will_paginate @collection %>."
-    end
-  end
-  
-  # Example:
-  #  context "a GET to index not logged in as admin" do
-  #    setup { get :index }
-  #    should_not_paginate_collection :users
-  #    should_not_display_pagination
-  #  end
-  def self.should_not_paginate_collection(collection_name)
-    should "not paginate #{collection_name}" do
-      assert collection = assigns(collection_name), 
-        "Controller isn't assigning to @#{collection_name.to_s}."
-      assert_not_equal WillPaginate::Collection, collection.class, 
-        "@#{collection_name.to_s} is a WillPaginate collection."
-    end
-  end
-  
-  def self.should_not_display_pagination
-    should "not display pagination" do
-      assert_select "div.pagination", { :count => 0 }, 
-        "View is displaying pagination. Check your logic."
-    end
-  end
-end
-
-
-class ActiveSupport::TestCase
-  extend ShouldaPaginationMacros
-end

data/test/rails_root/test/shoulda_macros/plugins.rb

@@ -1,34 +0,0 @@
-module ShouldaPluginMacros
-
-  def self.should_act_as_taggable_on_steroids
-    klass = self.name.gsub(/Test$/, '').constantize
-
-    should "include ActsAsTaggableOnSteroids methods" do
-      assert klass.extended_by.include?(ActiveRecord::Acts::Taggable::ClassMethods)
-      assert klass.extended_by.include?(ActiveRecord::Acts::Taggable::SingletonMethods)
-      assert klass.include?(ActiveRecord::Acts::Taggable::InstanceMethods)
-    end
-
-    should_have_many :taggings, :tags
-  end
-
-
-  def self.should_act_as_list
-    klass = self.name.gsub(/Test$/, '').constantize
-
-    context "To support acts_as_list" do
-      should_have_db_column('position', :type => :integer)
-    end
-
-    should "include ActsAsList methods" do
-      assert klass.include?(ActiveRecord::Acts::List::InstanceMethods)
-    end
-
-    should_have_instance_methods :acts_as_list_class, :position_column, :scope_condition
-  end
-
-end
-
-ActiveSupport::TestCase.extend(ShouldaPluginMacros)
-Test::Unit::TestCase.extend(ShouldaPluginMacros)
-ActionController::TestCase.extend(ShouldaPluginMacros)