muck-engine 0.2.22 → 0.2.23

data/VERSION

@@ -1 +1 @@
-0.2.22
+0.2.23

data/lib/muck_engine.rb

@@ -9,4 +9,9 @@ I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'rails_i18n', '*.
 Mime::Type.register "application/rdf+xml", :rdf
 Mime::Type.register "text/xml", :opml
 Mime::Type.register "text/javascript", :pjs
-Mime::Type.register_alias "text/html", :iphone
+Mime::Type.register_alias "text/html", :iphone
+
+# Use to determine whether or not ssl should be used
+def muck_routes_protocol
+  @@routes_protocol ||= GlobalConfig.enable_ssl ? (ENV["RAILS_ENV"] =~ /(development|test)/ ? "http" : "https") : 'http'
+end

data/lib/test/muck_factories.rb

@@ -209,9 +209,27 @@ end
 
 Factory.define :content_permission do |f|
   f.content { |a| a.association(:content) }
-  f.user {|a| a.association(:user)}
+  f.user { |a| a.association(:user) }
 end
 
 Factory.define :invitee do |f|
   f.email { Factory.next(:email) }
+end
+
+Factory.define :group do |f|
+  f.creator {|a| a.association(:user)}
+  f.name { Factory.next(:name) }
+  f.member_count 0
+end
+
+Factory.define :membership_requests do |f|
+  f.group {|a| a.association(:group)}
+  f.user {|a| a.association(:user)}
+end
+
+Factory.define :memberships do |f|
+  f.group {|a| a.association(:group)}
+  f.user {|a| a.association(:user)}
+  f.banned false
+  f.role "member"
 end

data/lib/test/muck_test_methods.rb

@@ -1,9 +1,5 @@
 module MuckTestMethods
   
-  def ensure_flash(val)
-    assert_contains flash.values, val, ", Flash: #{flash.inspect}"
-  end
-
   def login_as(user)
     success = UserSession.create(user)
     if !success

data/lib/test/shoulda_macros/controller.rb

@@ -1,8 +1,18 @@
 module MuckControllerMacros
 
+  # Ensure a login is required for the given actions
+  # Parameters:
+  #             Pass the following as arguements
+  #             :login_url => '/login'  -- url the user should be redirected to if they aren't logged in.  Defaults to '/login'
+  #             :get => 'index'
+  #             :post => 'create'
+  #
+  # Example:
+  #           should_require_login :login_url => '/signup', :get => 'index'
   def should_require_login(*args)
     args = Hash[*args]
     login_url = args.delete :login_url
+    login_url ||= '/login'
     args.each do |action, verb|
       should "Require login for '#{action}' action" do
         if [:put, :delete].include?(verb) # put and delete require an id even if it is a bogus one
@@ -15,12 +25,37 @@ module MuckControllerMacros
     end
   end
 
-  def should_require_role(role, redirect_url, *actions)
-    actions.each do |action|
+  # Ensure the user is in a given role for the given actions.  The test user will need to be logged in.
+  # Parameters:
+  #             role: The role required for the user
+  #
+  #             Pass the following as arguements
+  #             :login_url => '/login'  -- url the user should be redirected to if they aren't logged in.  Defaults to '/login'
+  #             :get => 'index'
+  #             :post => 'create'
+  #
+  # Example:
+  #            context "logged in not admin" do
+  #              setup do
+  #                @user = Factory(:user)
+  #                activate_authlogic
+  #                login_as @user
+  #              end
+  #              should_require_role('admin', :redirect_url => '/login', :index => :get)
+  #            end
+  def should_require_role(role, *args)
+    args = Hash[*args]
+    redirect_url = args.delete :redirect_url
+    redirect_url ||= '/login'
+    args.each do |action, verb|
       should "require role for '#{action}' action" do
-        get(action)
+        if [:put, :delete].include?(verb) # put and delete require an id even if it is a bogus one
+          send(verb, action, :id => 1)
+        else
+          send(verb, action)
+        end
         ensure_flash(/permission/i)
-        assert_response :redirect
+        assert_redirected_to(redirect_url)
       end
     end
   end

data/lib/test/shoulda_macros/scopes.rb

@@ -1,6 +1,6 @@
 # Named scopes tested by these macros:
 #
-# named_scope :by_title, :order => "name ASC"
+# named_scope :by_title, :order => "title ASC"
 # named_scope :by_name, :order => "name ASC"
 # named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
 # named_scope :newest, :order => "created_at DESC"

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.2.22"
+  s.version = "0.2.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2010-01-06}
   s.description = %q{The base engine for the muck system.  Contains common tables, custom for, css and javascript.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -180,6 +180,7 @@ Gem::Specification.new do |s|
      "public/images/service_icons/16/diigo.png",
      "public/images/service_icons/16/facebook.png",
      "public/images/service_icons/16/feed.png",
+     "public/images/service_icons/16/fireeagle.png",
      "public/images/service_icons/16/flickr.png",
      "public/images/service_icons/16/fotolog.png",
      "public/images/service_icons/16/friendfeed.png",
@@ -245,6 +246,7 @@ Gem::Specification.new do |s|
      "public/images/service_icons/24/diigo.png",
      "public/images/service_icons/24/facebook.png",
      "public/images/service_icons/24/feed.png",
+     "public/images/service_icons/24/fireeagle.png",
      "public/images/service_icons/24/flickr.png",
      "public/images/service_icons/24/fotolog.png",
      "public/images/service_icons/24/friendfeed.png",
@@ -310,6 +312,7 @@ Gem::Specification.new do |s|
      "public/images/service_icons/48/diigo.png",
      "public/images/service_icons/48/facebook.png",
      "public/images/service_icons/48/feed.png",
+     "public/images/service_icons/48/fireeagle.png",
      "public/images/service_icons/48/flickr.png",
      "public/images/service_icons/48/fotolog.png",
      "public/images/service_icons/48/friendfeed.png",
@@ -375,6 +378,7 @@ Gem::Specification.new do |s|
      "public/images/service_icons/60/diigo.png",
      "public/images/service_icons/60/facebook.png",
      "public/images/service_icons/60/feed.png",
+     "public/images/service_icons/60/fireeagle.png",
      "public/images/service_icons/60/flickr.png",
      "public/images/service_icons/60/fotolog.png",
      "public/images/service_icons/60/friendfeed.png",
@@ -452,6 +456,7 @@ Gem::Specification.new do |s|
      "public/images/service_icons/source/diigo.png",
      "public/images/service_icons/source/facebook.png",
      "public/images/service_icons/source/feed.png",
+     "public/images/service_icons/source/fireeagle.psd",
      "public/images/service_icons/source/flickr.png",
      "public/images/service_icons/source/fotolog.png",
      "public/images/service_icons/source/friendfeed.png",

data/test/rails_root/config/database.yml

@@ -1,14 +1,15 @@
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
+  adapter: mysql
+  database: muck_engine_development
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000
+  adapter: mysql
+  database: muck_engine_test
+  username: root
+  password:
+  host: localhost
+  encoding: utf8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -07:00
+date: 2010-01-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -216,6 +216,7 @@ files:
 - public/images/service_icons/16/diigo.png
 - public/images/service_icons/16/facebook.png
 - public/images/service_icons/16/feed.png
+- public/images/service_icons/16/fireeagle.png
 - public/images/service_icons/16/flickr.png
 - public/images/service_icons/16/fotolog.png
 - public/images/service_icons/16/friendfeed.png
@@ -281,6 +282,7 @@ files:
 - public/images/service_icons/24/diigo.png
 - public/images/service_icons/24/facebook.png
 - public/images/service_icons/24/feed.png
+- public/images/service_icons/24/fireeagle.png
 - public/images/service_icons/24/flickr.png
 - public/images/service_icons/24/fotolog.png
 - public/images/service_icons/24/friendfeed.png
@@ -346,6 +348,7 @@ files:
 - public/images/service_icons/48/diigo.png
 - public/images/service_icons/48/facebook.png
 - public/images/service_icons/48/feed.png
+- public/images/service_icons/48/fireeagle.png
 - public/images/service_icons/48/flickr.png
 - public/images/service_icons/48/fotolog.png
 - public/images/service_icons/48/friendfeed.png
@@ -411,6 +414,7 @@ files:
 - public/images/service_icons/60/diigo.png
 - public/images/service_icons/60/facebook.png
 - public/images/service_icons/60/feed.png
+- public/images/service_icons/60/fireeagle.png
 - public/images/service_icons/60/flickr.png
 - public/images/service_icons/60/fotolog.png
 - public/images/service_icons/60/friendfeed.png
@@ -488,6 +492,7 @@ files:
 - public/images/service_icons/source/diigo.png
 - public/images/service_icons/source/facebook.png
 - public/images/service_icons/source/feed.png
+- public/images/service_icons/source/fireeagle.psd
 - public/images/service_icons/source/flickr.png
 - public/images/service_icons/source/fotolog.png
 - public/images/service_icons/source/friendfeed.png