muck-engine 3.3.18 → 3.4.0

data/VERSION

@@ -1 +1 @@
-3.3.18
+3.4.0

data/app/controllers/admin/muck/base_controller.rb

@@ -24,7 +24,7 @@ class Admin::Muck::BaseController < ApplicationController
     def permission_denied
       respond_to do |format|
         format.html do
-          redirect_to home_path
+          redirect_to root_path
         end
       end
     end

data/lib/test/muck_factories.rb

@@ -1,279 +1,283 @@
 # This file defines factories for all muck related models.  You must have the 
 # muck gem installed and the related migrations run for all of these to work.
-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 :title do |n|
-  "a_title#{n}"
-end
-
-Factory.sequence :abbr do |n|
-  "abbr#{n}"
-end
-
-Factory.sequence :uri do |n|
-  "n#{n}.example.com"
-end
-
-Factory.sequence :description do |n|
-  "This is the description: #{n}"
-end
-
-Factory.sequence :locale do |n|
-  "a#{n}"
-end
-
-Factory.sequence :address do |n|
-  "#{n} West #{n} South"
-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 :language do |f|
-  f.name { Factory.next(:name) }
-  f.english_name { Factory.next(:name) }
-  f.locale { Factory.next(:locale) }
-  f.supported true
-  f.muck_raker_supported true
-end
-
-# This is used for tests within muck-engine. The language
-# model is modified by migrations in other gems to include 'muck_raker_supported'
-Factory.define :unmodified_language, :class => Language do |f|
-  f.name { Factory.next(:name) }
-  f.english_name { Factory.next(:name) }
-  f.locale { Factory.next(:locale) }
-  f.supported true
-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 :profile do |f|
-  f.user {|a| a.association(:user)}
-  f.photo fixture_file_upload("#{::Rails.root}/public/images/profile_default.jpg", 'image/jpg')
-  f.location 'Jackson Hole, WY'
-  f.about 'A great person'
-  f.city 'Jackson Hole'
-  f.state {|a| a.association(:state)}
-  f.country {|a| a.association(:country)}
-#  f.language {|a| a.association(:language)}
-  f.policy 'a great policy'
-end
-
-Factory.define :content_page do |f|
-  f.creator {|a| a.association(:user)}
-  f.title { Factory.next(:name) }
-  f.body_raw { Factory.next(:description) }
-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 { Factory.next(:name) }
-end
-
-Factory.define :access_code do |f|
-  f.code { Factory.next(:name) }
-  f.uses 0
-  f.unlimited false
-  f.expires_at  { DateTime.now + 2.weeks }
-  f.use_limit 1
-end
-
-Factory.define :access_code_request do |f|
-  f.email { Factory.next(:email) }
-end
-
-Factory.define :activity do |f|
-  f.item {|a| a.association(:user)}
-  f.template ''
-  f.source {|a| a.association(:user)}
-  f.content ''
-  f.title ''
-  f.is_status_update false
-  f.is_public true
-  f.created_at DateTime.now
-end
-
-Factory.define :activity_feed do |f|
-  f.activity {|a| a.association(:activity)}
-  f.ownable {|a| a.association(:user)}
-end
-
-Factory.define :comment do |f|
-  f.body { Factory.next(:description) }
-  f.user {|a| a.association(:user)}
-  f.commentable {|a| a.association(:user)}
-end
-
-Factory.define :share do |f|
-  f.uri { Factory.next(:uri) }
-  f.title { Factory.next(:title) }
-  f.shared_by {|a| a.association(:user)}
-end
-
-Factory.define :blog do |f|
-  f.title { Factory.next(:title) }
-  f.blogable {|a| a.association(:user)}
-end
-
-Factory.define :domain_theme do |f|
-  f.name { Factory.next(:name) }
-  f.uri { Factory.next(:uri) }
-end
-
-Factory.define :theme do |f|
-  f.name { Factory.next(:name) }
-end
-
-Factory.define :feed do |f|
-  f.contributor { |a| a.association(:user) }
-  f.uri { Factory.next(:uri) }
-  f.display_uri { Factory.next(:uri) }
-  f.title { Factory.next(:title) }
-  f.short_title { Factory.next(:title) }
-  f.description { Factory.next(:description) }
-  f.top_tags { Factory.next(:name) }
-  f.priority 1
-  f.status 1
-  f.last_requested_at DateTime.now
-  f.last_harvested_at DateTime.now
-  f.harvest_interval 86400
-  f.failed_requests 0
-  f.harvested_from_display_uri { Factory.next(:uri) }
-  f.harvested_from_title { Factory.next(:title) }
-  f.harvested_from_short_title { Factory.next(:title) }
-  f.entries_count 0
-  f.default_language { |a| a.association(:language) }
-  f.default_grain_size 'unknown'
-end
-
-Factory.define :entry do |f|
-  f.feed { |a| a.association(:feed) }
-  f.permalink { Factory.next(:uri) }
-  f.author { Factory.next(:name) }
-  f.title { Factory.next(:title) }
-  f.description { Factory.next(:description) }
-  f.content { Factory.next(:description) }
-  f.unique_content { Factory.next(:description) }
-  f.published_at DateTime.now
-  f.entry_updated_at DateTime.now
-  f.harvested_at DateTime.now
-  f.language { |a| a.association(:language) }
-  f.direct_link { Factory.next(:uri) }
-  f.grain_size 'unknown'
-end
-
-Factory.define :aggregation do |f|
-  f.title { Factory.next(:name) }
-  f.terms { Factory.next(:name) }
-  f.description { Factory.next(:description) }
-  f.ownable {|a| a.association(:user)}
-end
-
-Factory.define :aggregation_feed do |f|
-  f.feed {|a| a.association(:feed)}
-  f.aggregation {|a| a.association(:aggregation)}
-end
-
-Factory.define :oai_endpoint do |f|
-  f.contributor { |a| a.association(:user) }
-  f.uri { Factory.next(:uri) }
-  f.display_uri { Factory.next(:uri) }
-  f.title { Factory.next(:title) }
-  f.short_title { Factory.next(:title) }
-  f.status 1
-end
-
-Factory.define :service do |f|
-  f.uri { Factory.next(:uri) }
-  f.name { Factory.next(:name) }
-  f.service_category { |a| a.association(:service_category) }
-end
-
-Factory.define :service_category do |f|
-  f.name { Factory.next(:name) }
-end
-
-Factory.define :content do |f|
-  f.creator { |a| a.association(:user) }
-  f.title { Factory.next(:title) }
-  f.body_raw { Factory.next(:description) }
-  f.is_public true
-  f.locale 'en'
-end
-
-Factory.define :content_translation do |f|
-  f.content { |a| a.association(:content) }
-  f.title { Factory.next(:title) }
-  f.body { Factory.next(:description) }
-  f.locale 'en'
-end
-
-Factory.define :content_permission do |f|
-  f.content { |a| a.association(:content) }
-  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.description { Factory.next(:description) }
-  f.member_count 0
-end
-
-Factory.define :membership_request do |f|
-  f.group {|a| a.association(:group)}
-  f.user {|a| a.association(:user)}
-end
-
-Factory.define :membership do |f|
-  f.group {|a| a.association(:group)}
-  f.user {|a| a.association(:user)}
-  f.banned false
-  f.role "member"
-end
-
-Factory.define :authentication do |f|
-  f.authenticatable {|a| a.association(:user)}
-  f.provider 'twitter'
-  f.name { Factory.next(:name) }
-  f.uid { Factory.next(:uri) }
-  f.token { Factory.next(:uri) }
-  f.secret { Factory.next(:uri) }
-  f.raw_auth { Factory.next(:description) }
+FactoryGirl.define do
+  
+  sequence :email do |n|
+    "somebody#{n}@example.com"
+  end
+
+  sequence :login do |n|
+    "inquire#{n}"
+  end
+
+  sequence :name do |n|
+    "a_name#{n}"
+  end
+
+  sequence :title do |n|
+    "a_title#{n}"
+  end
+
+  sequence :abbr do |n|
+    "abbr#{n}"
+  end
+
+  sequence :uri do |n|
+    "n#{n}.example.com"
+  end
+
+  sequence :description do |n|
+    "This is the description: #{n}"
+  end
+
+  sequence :locale do |n|
+    "a#{n}"
+  end
+
+  sequence :address do |n|
+    "#{n} West #{n} South"
+  end
+
+  factory :state do
+    name { Factory.next(:name) }
+    abbreviation { Factory.next(:abbr) }
+    country {|a| a.association(:country) }
+  end
+
+  factory :country do
+    name { Factory.next(:name) }
+    abbreviation { Factory.next(:abbr) }
+  end
+
+  factory :language do
+    name { Factory.next(:name) }
+    english_name { Factory.next(:name) }
+    locale { Factory.next(:locale) }
+    supported true
+    muck_raker_supported true
+  end
+
+  # This is used for tests within muck-engine. The language
+  # model is modified by migrations in other gems to include 'muck_raker_supported'
+  factory :unmodified_language, :class => Language do
+    name { Factory.next(:name) }
+    english_name { Factory.next(:name) }
+    locale { Factory.next(:locale) }
+    supported true
+  end
+
+  factory :user do
+    login { Factory.next(:login) }
+    email { Factory.next(:email) }
+    password 'inquire_pass'
+    password_confirmation 'inquire_pass'
+    first_name 'test'
+    last_name 'guy'
+    terms_of_service true
+    activated_at DateTime.now
+  end
+
+  factory :profile do
+    user {|a| a.association(:user)}
+    photo fixture_file_upload("#{::Rails.root}/public/images/profile_default.jpg", 'image/jpg')
+    location 'Jackson Hole, WY'
+    about 'A great person'
+    city 'Jackson Hole'
+    state {|a| a.association(:state)}
+    country {|a| a.association(:country)}
+  #  language {|a| a.association(:language)}
+    policy 'a great policy'
+  end
+
+  factory :content_page do
+    creator {|a| a.association(:user)}
+    title { Factory.next(:name) }
+    body_raw { Factory.next(:description) }
+  end
+
+  factory :permission do
+    role {|a| a.association(:role)}
+    user {|a| a.association(:user)}
+  end
+
+  factory :role do
+    rolename { Factory.next(:name) }
+  end
+
+  factory :access_code do
+    code { Factory.next(:name) }
+    uses 0
+    unlimited false
+    expires_at  { DateTime.now + 2.weeks }
+    use_limit 1
+  end
+
+  factory :access_code_request do
+    email { Factory.next(:email) }
+  end
+
+  factory :activity do
+    item {|a| a.association(:user)}
+    template ''
+    source {|a| a.association(:user)}
+    content ''
+    title ''
+    is_status_update false
+    is_public true
+    created_at DateTime.now
+  end
+
+  factory :activity_feed do
+    activity {|a| a.association(:activity)}
+    ownable {|a| a.association(:user)}
+  end
+
+  factory :comment do
+    body { Factory.next(:description) }
+    user {|a| a.association(:user)}
+    commentable {|a| a.association(:user)}
+  end
+
+  factory :share do
+    uri { Factory.next(:uri) }
+    title { Factory.next(:title) }
+    shared_by {|a| a.association(:user)}
+  end
+
+  factory :blog do
+    title { Factory.next(:title) }
+    blogable {|a| a.association(:user)}
+  end
+
+  factory :domain_theme do
+    name { Factory.next(:name) }
+    uri { Factory.next(:uri) }
+  end
+
+  factory :theme do
+    name { Factory.next(:name) }
+  end
+
+  factory :feed do
+    contributor { |a| a.association(:user) }
+    uri { Factory.next(:uri) }
+    display_uri { Factory.next(:uri) }
+    title { Factory.next(:title) }
+    short_title { Factory.next(:title) }
+    description { Factory.next(:description) }
+    top_tags { Factory.next(:name) }
+    priority 1
+    status 1
+    last_requested_at DateTime.now
+    last_harvested_at DateTime.now
+    harvest_interval 86400
+    failed_requests 0
+    harvested_from_display_uri { Factory.next(:uri) }
+    harvested_from_title { Factory.next(:title) }
+    harvested_from_short_title { Factory.next(:title) }
+    entries_count 0
+    default_language { |a| a.association(:language) }
+    default_grain_size 'unknown'
+  end
+
+  factory :entry do
+    feed { |a| a.association(:feed) }
+    permalink { Factory.next(:uri) }
+    author { Factory.next(:name) }
+    title { Factory.next(:title) }
+    description { Factory.next(:description) }
+    content { Factory.next(:description) }
+    unique_content { Factory.next(:description) }
+    published_at DateTime.now
+    entry_updated_at DateTime.now
+    harvested_at DateTime.now
+    language { |a| a.association(:language) }
+    direct_link { Factory.next(:uri) }
+    grain_size 'unknown'
+  end
+
+  factory :aggregation do
+    title { Factory.next(:name) }
+    terms { Factory.next(:name) }
+    description { Factory.next(:description) }
+    ownable {|a| a.association(:user)}
+  end
+
+  factory :aggregation_feed do
+    feed {|a| a.association(:feed)}
+    aggregation {|a| a.association(:aggregation)}
+  end
+
+  factory :oai_endpoint do
+    contributor { |a| a.association(:user) }
+    uri { Factory.next(:uri) }
+    display_uri { Factory.next(:uri) }
+    title { Factory.next(:title) }
+    short_title { Factory.next(:title) }
+    status 1
+  end
+
+  factory :service do
+    uri { Factory.next(:uri) }
+    name { Factory.next(:name) }
+    service_category { |a| a.association(:service_category) }
+  end
+
+  factory :service_category do
+    name { Factory.next(:name) }
+  end
+
+  factory :content do
+    creator { |a| a.association(:user) }
+    title { Factory.next(:title) }
+    body_raw { Factory.next(:description) }
+    is_public true
+    locale 'en'
+  end
+
+  factory :content_translation do
+    content { |a| a.association(:content) }
+    title { Factory.next(:title) }
+    body { Factory.next(:description) }
+    locale 'en'
+  end
+
+  factory :content_permission do
+    content { |a| a.association(:content) }
+    user { |a| a.association(:user) }
+  end
+
+  factory :invitee do
+    email { Factory.next(:email) }
+  end
+
+  factory :group do
+    creator {|a| a.association(:user)}
+    name { Factory.next(:name) }
+    description { Factory.next(:description) }
+    member_count 0
+  end
+
+  factory :membership_request do
+    group {|a| a.association(:group)}
+    user {|a| a.association(:user)}
+  end
+
+  factory :membership do
+    group {|a| a.association(:group)}
+    user {|a| a.association(:user)}
+    banned false
+    role "member"
+  end
+
+  factory :authentication do
+    authenticatable {|a| a.association(:user)}
+    provider 'twitter'
+    name { Factory.next(:name) }
+    uid { Factory.next(:uri) }
+    token { Factory.next(:uri) }
+    secret { Factory.next(:uri) }
+    raw_auth { Factory.next(:description) }
+  end
+  
 end

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "muck-engine"
-  s.version = "3.3.18"
+  s.version = "3.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = "2011-09-21"
+  s.date = "2011-10-07"
   s.description = "The base engine for the muck system.  Contains common tables, custom for, css and javascript."
   s.email = "justin@tatemae.com"
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 23
   prerelease: 
   segments: 
   - 3
-  - 3
-  - 18
-  version: 3.3.18
+  - 4
+  - 0
+  version: 3.4.0
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 Z
+date: 2011-10-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement