muck-engine 0.4.26 → 0.4.27

data/Rakefile

@@ -57,6 +57,7 @@ begin
     gemspec.add_dependency "validation_reflection"
     gemspec.add_dependency "will_paginate"
     gemspec.add_dependency "git"
+    gemspec.add_dependency "overlord"
     gemspec.add_development_dependency "shoulda"
   end
   Jeweler::RubyforgeTasks.new do |rubyforge|

data/VERSION

@@ -1 +1 @@
-0.4.26
+0.4.27

data/app/models/country.rb

@@ -9,53 +9,5 @@
 #
 
 class Country < ActiveRecord::Base
-  
-  has_many :states
-  
-  named_scope :by_name, :order => "name ASC"
-  
-  def self.us
-    self.find_by_abbreviation('US')
-  end
-  
-  def self.uk_country?(country_id)
-    unless defined?(@@uk_country_ids)
-      uk_countries = Country.find(:all, :conditions => ["abbreviation in (?)", ['ENG', 'IE', 'WAL', 'SCT']])
-      @@uk_country_ids = uk_countries.map(&:id)
-    end
-    @@uk_country_ids.include?(country_id.to_i)
-  end
-  
-  def self.canada?(country_id)
-    @@canada_id ||= Country.find_by_abbreviation('CA').id
-    @@canada_id == country_id.to_i
-  end
-  
-  # Note that the strings from here are also hard coded into application.js
-  def self.build_state_prompts(country_id, any = false)
-    if uk_country?(country_id)
-      label = 'Choose County'
-      if any
-        prompt = 'Any County (or unknown)'
-      else
-        prompt = 'Please select a county'
-      end
-    elsif canada?(country_id)
-      label = 'Choose Province'
-      if any
-        prompt = 'Any Province (or unknown)'
-      else
-        prompt = 'Please select a Province'
-      end
-    else
-      label = 'Choose State'
-      if any
-        prompt = 'Any State (or unknown)'
-      else
-        prompt = 'Please select a state'
-      end
-    end
-    [label, prompt]
-  end
-  
+  acts_as_muck_country  
 end

data/app/models/language.rb

@@ -11,26 +11,5 @@
 #
 
 class Language < ActiveRecord::Base
-
-  @@locale_ids = nil
-
-  def self.locale_id
-    cache_locale_ids
-    @@locale_ids[I18n.locale]
-  end
-
-  def self.supported_locale? locale
-    cache_locale_ids
-    @@locale_ids[locale.to_sym] != nil
-  end
-
-  private
-
-  def self.cache_locale_ids
-    if !@@locale_ids
-      languages = Language.find(:all, :select => 'id, locale', :conditions => ['languages.supported = ?', true])
-      @@locale_ids = Hash[*languages.collect {|v|[v.locale[0..1].to_sym, v.id]}.flatten]
-    end
-  end
-  
+  acts_as_muck_language
 end

data/app/models/state.rb

@@ -9,7 +9,5 @@
 #
 
 class State < ActiveRecord::Base
-  belongs_to :country
-  named_scope :by_name, :order => "name ASC"
-  
+  acts_as_muck_state
 end

data/lib/active_record/acts/muck_country.rb

@@ -0,0 +1,84 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckCountry #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def acts_as_muck_country
+          has_many :states
+          named_scope :by_name, :order => "name ASC"
+        
+          include ActiveRecord::Acts::MuckCountry::InstanceMethods
+          extend ActiveRecord::Acts::MuckCountry::SingletonMethods
+        
+        end
+      end
+      
+      # class methods
+      module SingletonMethods
+        def us
+          self.find_by_abbreviation('US')
+        end
+
+        def uk_country?(country, refresh_ids = false)
+          if refresh_ids || !defined?(@@uk_country_ids)
+            uk_countries = Country.find(:all, :conditions => ["abbreviation in (?)", ['ENG', 'IE', 'WAL', 'SCT']])
+            @@uk_country_ids = uk_countries.map(&:id)
+          end
+          @@uk_country_ids.include?(get_country_id(country))
+        end
+
+        def canada?(country, refresh_ids = false)
+          @@canada_id = nil if refresh_ids
+          @@canada_id ||= Country.find_by_abbreviation('CA').id
+          @@canada_id == get_country_id(country)
+        end
+        
+        # Note that the strings from here are also hard coded into application.js
+        def build_state_prompts(country_id, any = false)
+          if uk_country?(country_id)
+            label = 'Choose County'
+            if any
+              prompt = 'Any County (or unknown)'
+            else
+              prompt = 'Please select a county'
+            end
+          elsif canada?(country_id)
+            label = 'Choose Province'
+            if any
+              prompt = 'Any Province (or unknown)'
+            else
+              prompt = 'Please select a province'
+            end
+          else
+            label = 'Choose State'
+            if any
+              prompt = 'Any State (or unknown)'
+            else
+              prompt = 'Please select a state'
+            end
+          end
+          [label, prompt]
+        end
+        
+        private
+        
+          def get_country_id(country)
+            if country.is_a?(Country)
+              country.id
+            else
+              country.to_i
+            end
+          end
+          
+      end
+      
+      # All the methods available to a record that has had <tt>acts_as_muck_invite</tt> specified.
+      module InstanceMethods
+      end
+      
+    end
+  end
+end

data/lib/active_record/acts/muck_language.rb

@@ -0,0 +1,50 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckLanguage #:nodoc:
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def acts_as_muck_language
+          include ActiveRecord::Acts::MuckLanguage::InstanceMethods
+          extend ActiveRecord::Acts::MuckLanguage::SingletonMethods
+        end
+      end
+      
+      # class methods
+      module SingletonMethods        
+        def locale_id(refresh_ids = false)
+          cache_locale_ids
+          @@locale_ids[I18n.locale]
+        end
+
+        def supported_locale?(locale, refresh_ids = false)
+          cache_locale_ids
+          @@locale_ids[locale.to_sym] != nil
+        end
+
+        private
+
+          def cache_locale_ids(refresh_ids = false)
+            if refresh_ids || !defined?(@@locale_ids)
+              languages = Language.find(:all, :select => 'id, locale', :conditions => ['languages.supported = ?', true])
+              @@locale_ids = Hash[*languages.collect {|v|[v.locale[0..1].to_sym, v.id]}.flatten]
+            end
+          end
+          
+      end
+      
+      # All the methods available to a record that has had <tt>acts_as_muck_invite</tt> specified.
+      module InstanceMethods
+      end
+      
+    end
+  end
+end
+
+
+
+
+

data/lib/active_record/acts/muck_state.rb

@@ -0,0 +1,30 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckState #:nodoc:
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def acts_as_muck_state
+          belongs_to :country
+          named_scope :by_name, :order => "name ASC"
+        
+          include ActiveRecord::Acts::MuckState::InstanceMethods
+          extend ActiveRecord::Acts::MuckState::SingletonMethods
+        
+        end
+      end
+      
+      # class methods
+      module SingletonMethods        
+      end
+      
+      # All the methods available to a record that has had <tt>acts_as_muck_invite</tt> specified.
+      module InstanceMethods
+      end
+      
+    end
+  end
+end

data/lib/muck_engine.rb

@@ -3,6 +3,9 @@ require 'muck_engine/flash_errors'
 ActionController::Base.send :include, ActionController::MuckApplication
 ActionController::Base.send :include, MuckEngine::FlashErrors
 ActiveRecord::Base.send :include, ActiveRecord::MuckModel
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckLanguage }
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckCountry }
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckState }
 ActionMailer::Base.send :include, ActionMailer::MuckMailer
 ActionController::Base.send :helper, MuckEngineHelper
 ActionController::Base.send :helper, MuckAdminHelper

data/lib/muck_engine/tasks.rb

@@ -2,6 +2,8 @@ require 'rake'
 require 'rake/tasklib'
 require 'fileutils'
 require 'jcode'
+require 'rubygems'
+
 begin
   require 'git'
 rescue LoadError
@@ -163,22 +165,22 @@ class MuckEngine
           version = IO.read(version_file).strip
           environment = IO.read(gem_file)
         
-          search = Regexp.new(/\:require_as\s*=>\s*['"]#{gem_lib}['"],\s*['"][ <>=~]*\d+\.\d+\.\d+['"]/)
-          failure = environment.gsub!(search, "'>=#{version}', :require_as => '#{gem_lib}'").nil?
+          search = Regexp.new(/\:require\s*=>\s*['"]#{gem_lib}['"],\s*['"][ <>=~]*\d+\.\d+\.\d+['"]/)
+          failure = environment.gsub!(search, "'#{version}', :require => '#{gem_lib}'").nil?
         
           if failure
             search = Regexp.new(/gem\s*['"]#{gem_name}['"],\s*['"][ <>=~]*\d+\.\d+\.\d+['"]/)
-            failure = environment.gsub!(search, "gem '#{gem_name}', '>=#{version}'").nil?
+            failure = environment.gsub!(search, "gem '#{gem_name}', '#{version}'").nil?
           end  
 
           if failure
-            search = Regexp.new(/gem\s*['"]#{gem_name}['"],\s*\:require_as\s*=>\s*['"]#{gem_lib}['"]/)
-            failure = environment.gsub!(search, "gem '#{gem_name}', '>=#{version}', :require_as => '#{gem_lib}'").nil?
+            search = Regexp.new(/gem\s*['"]#{gem_name}['"],\s*\:require\s*=>\s*['"]#{gem_lib}['"]/)
+            failure = environment.gsub!(search, "gem '#{gem_name}', '#{version}', :require => '#{gem_lib}'").nil?
           end
         
           if failure
             search = Regexp.new(/gem\s*['"]#{gem_name}['"]/)
-            failure = environment.gsub!(search, "gem '#{gem_name}', '>=#{version}'").nil?
+            failure = environment.gsub!(search, "gem '#{gem_name}', '#{version}'").nil?
           end
         
           if failure
@@ -188,6 +190,44 @@ class MuckEngine
           File.open(gem_file, 'w') { |f| f.write(environment) }
         end
 
+        # Rewrite the Gemfile with the latest gem versions installed on the local machine.
+        def update_gem_file
+          gemfile = File.join(RAILS_ROOT, 'Gemfile')
+          contents = IO.read(gemfile)
+          gems = contents.scan(/gem\s*['"]([-_\d\w]+)['"],\s*(['"][~><>=\d\.]+['"])?\s*(\:require\s*=>\s*['"]\w+['"])?/)
+          gems.each do |g|
+            success = false
+            search = "gem #{g[0]}"
+            search << ", #{g[1]}" if g[1] # add on version if it was present
+            search << ", #{g[2]}" if g[2] # add on require if it was present
+            new_version = get_gem_version(g[0])
+            if new_version
+              replace = "gem #{g[0]}, '#{new_version}'"
+              replace << ", #{g[2]}" if g[2] # add on require if it was present
+              success = !contents.gsub!(search, replace)
+            end
+            if !success
+              puts "Failed to update version for #{g[0]}"
+            end
+          end
+          File.open(gemfile, 'w') { |f| f.write(contents) }
+        end
+        
+        # Get the latest gem version
+        def get_gem_version(gem_name)
+          @si ||= Gem::SourceIndex.from_installed_gems
+          gems = @si.find_name(gem_name)
+          newest_gem = gems[0]
+          if newest_gem
+            gems.each do |gem|
+              newest_gem = gem if gem.version > newest_gem.version
+            end
+            newest_gem.version.version
+          else
+            #puts "Failed to find #{gem_name} in index"
+          end
+        end
+        
         def git_commit(path, message)
           puts "Commiting #{BLUE}#{File.basename(path)}#{INVERT}"
           repo = Git.open("#{path}")
@@ -349,13 +389,18 @@ class MuckEngine
           end
         end
 
-        desc "Write muck gem versions into application's gem file"
-        task :bundle do
+        desc "Write muck gem versions into application's 'Gemfile'"
+        task :vers do
           muck_gem_names.each do |gem_name|
             write_new_gem_version_in_bundle("#{projects_path}", gem_name)
           end
         end
         
+        desc "Write gem versions (for all gems) into application's 'Gemfile'. Be sure to test with the updated gems and check the new versions."
+        task :vers_all => :environment do
+          update_gem_file
+        end
+        
         desc 'Translate app into all languages supported by Google'
         task :translate_app => :environment do
           puts 'translating app'

data/lib/test/muck_factories.rb

@@ -55,6 +55,15 @@ Factory.define :language do |f|
   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) }

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.4.26"
+  s.version = "0.4.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-05-31}
   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 = [
@@ -72,6 +72,9 @@ Gem::Specification.new do |s|
      "install.rb",
      "lib/action_controller/muck_application.rb",
      "lib/action_mailer/muck_mailer.rb",
+     "lib/active_record/acts/muck_country.rb",
+     "lib/active_record/acts/muck_language.rb",
+     "lib/active_record/acts/muck_state.rb",
      "lib/active_record/muck_model.rb",
      "lib/muck_engine.rb",
      "lib/muck_engine/flash_errors.rb",
@@ -667,6 +670,7 @@ Gem::Specification.new do |s|
      "tasks/rails.rake",
      "test/rails_root/.gitignore",
      "test/rails_root/.rake_tasks",
+     "test/rails_root/Gemfile",
      "test/rails_root/Rakefile",
      "test/rails_root/app/controllers/admin/default_controller.rb",
      "test/rails_root/app/controllers/application_controller.rb",
@@ -690,6 +694,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/mime_types.rb",
      "test/rails_root/config/initializers/requires.rb",
      "test/rails_root/config/initializers/session_store.rb",
+     "test/rails_root/config/preinitializer.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/.keep",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
@@ -1274,13 +1279,17 @@ Gem::Specification.new do |s|
      "test/rails_root/test/functional/.keep",
      "test/rails_root/test/functional/admin/default_controller_test.rb",
      "test/rails_root/test/functional/default_controller_test.rb",
+     "test/rails_root/test/functional/helper_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/test_helper.rb",
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/basic_mailer_test.rb",
+     "test/rails_root/test/unit/country_test.rb",
+     "test/rails_root/test/unit/language_test.rb",
      "test/rails_root/test/unit/muck_engine_helper_test.rb",
+     "test/rails_root/test/unit/state_test.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/README",
      "test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb",
@@ -1290,7 +1299,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-engine}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{The base engine for the muck system.}
   s.test_files = [
     "test/rails_root/app/controllers/admin/default_controller.rb",
@@ -1308,6 +1317,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/mime_types.rb",
      "test/rails_root/config/initializers/requires.rb",
      "test/rails_root/config/initializers/session_store.rb",
+     "test/rails_root/config/preinitializer.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
@@ -1320,9 +1330,13 @@ Gem::Specification.new do |s|
      "test/rails_root/script/create_project.rb",
      "test/rails_root/test/functional/admin/default_controller_test.rb",
      "test/rails_root/test/functional/default_controller_test.rb",
+     "test/rails_root/test/functional/helper_controller_test.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/basic_mailer_test.rb",
+     "test/rails_root/test/unit/country_test.rb",
+     "test/rails_root/test/unit/language_test.rb",
      "test/rails_root/test/unit/muck_engine_helper_test.rb",
+     "test/rails_root/test/unit/state_test.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb"
   ]
@@ -1331,21 +1345,24 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<validation_reflection>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<git>, [">= 0"])
+      s.add_runtime_dependency(%q<overlord>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<validation_reflection>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
       s.add_dependency(%q<git>, [">= 0"])
+      s.add_dependency(%q<overlord>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<validation_reflection>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
     s.add_dependency(%q<git>, [">= 0"])
+    s.add_dependency(%q<overlord>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end

data/test/rails_root/Gemfile

@@ -0,0 +1,30 @@
+source :gemcutter
+
+gem "rails", "2.3.5"
+gem 'mysql'
+gem 'ruby-debug'
+gem "authlogic", '2.1.3'
+
+gem 'ruby-debug'
+gem 'mocha', '>= 0.9.8'
+gem 'redgreen'
+gem 'factory_girl'
+gem 'shoulda'
+gem 'treetop', '>=1.2.4'
+gem 'term-ansicolor', '>=1.0.3', :require => 'term/ansicolor'
+gem 'cucumber', '>=0.1.13', :require => 'cucumber'
+gem 'polyglot', '>=0.2.4'
+gem "rcov", '>=0.8.1.2.0'
+gem "webrat", '>=0.4.4'
+gem 'redgreen'
+
+# gem 'rspec', '>=1.1.12', :require_as => 'spec'
+# gem 'rspec-rails', '>=1.1.12', :require_as => 'spec/rails'
+# only required if you want to use selenium for testing
+# gem 'selenium-client', :require_as => 'selenium/client'
+# gem 'database_cleaner'
+
+gem 'muck-users', '0.3.13', :require => 'muck_users'
+gem 'muck-engine', :require => 'muck_engine', :path => File.join(File.dirname(__FILE__), *%w(.. .. ..))
+# gem 'muck-engine', :require => 'muck_engine', :path => "~/projects/muck-engine"
+# gem 'muck-users', :require => 'muck_users', :path => "~/projects/muck-users"

data/test/rails_root/Rakefile

@@ -11,5 +11,3 @@ require 'tasks/rails'
 
 require 'muck_engine/tasks'
 require 'muck_users/tasks'
-require 'muck_comments/tasks'
-require 'muck_activities/tasks'

data/test/rails_root/config/boot.rb

@@ -105,5 +105,19 @@ module Rails
   end
 end
 
+class Rails::Boot
+  def run
+    load_initializer
+
+    Rails::Initializer.class_eval do
+      def load_gems
+        @bundler_loaded ||= Bundler.require :default, Rails.env
+      end
+    end
+
+    Rails::Initializer.run(:set_load_path)
+  end
+end
+
 # All that for this:
 Rails.boot!

data/test/rails_root/config/preinitializer.rb

@@ -0,0 +1,20 @@
+begin
+  require "rubygems"
+  require "bundler"
+rescue LoadError
+  raise "Could not load the bundler gem. Install it with `gem install bundler`."
+end
+
+if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+  raise RuntimeError, "Your bundler version is too old." +
+   "Run `gem install bundler` to upgrade."
+end
+
+begin
+  # Set up load paths for all bundled gems
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end

data/test/rails_root/test/functional/admin/default_controller_test.rb

@@ -4,26 +4,32 @@ class Admin::Muck::DefaultControllerTest < ActionController::TestCase
 
   tests Admin::DefaultController
 
-  context "GET to admin index" do
+  context "logged in as admin" do
+    
+    setup do
+      User.destroy_all
+      activate_authlogic
+      @admin = Factory(:user)
+      @admin_role = Factory(:role, :rolename => 'administrator')
+      @admin.roles << @admin_role
+      login_as @admin
+    end
+    
+    context "GET to admin index" do
+      setup do
+        get :index
+      end
+      should_respond_with :success
+      should_render_template :index
+    end
+    
+  end
+  
+  context "not logged in" do
     setup do
-      @user = stub(:display_name => 'test')
-      @controller.stubs(:current_user).returns(@user)
-      @controller.stubs(:login_required).returns(true)
-      @controller.stubs(:admin_access_required).returns(true)
       get :index
     end
-    should_respond_with :success
-    should_render_template :index
+    should_respond_with :redirect
   end
 
-  # TODO add tests to confirm admin UI access requires login and role 'administrator'
-  # context "GET to admin index not logged in" do
-  #   setup do
-  #     @controller.stubs(:login_required).returns(false)
-  #     @controller.stubs(:admin_access_required).returns(false)
-  #     get :index
-  #   end
-  #   should_respond_with :redirect
-  # end
-  
 end

data/test/rails_root/test/functional/helper_controller_test.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class HelperControllerTest < ActionController::TestCase
+
+  tests Muck::HelperController
+
+  context "load_states_for_country" do
+
+    setup do
+      @country = Factory(:country)
+      @state = Factory(:state, :country => @country)
+      get :load_states_for_country, :id => @country.to_param, :format => 'json'
+    end
+    should_respond_with :success
+    should "include state in resulting json" do
+      assert @response.body.include?(@state.name)
+    end
+  end
+
+end

data/test/rails_root/test/test_helper.rb

@@ -1,12 +1,28 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-gem 'muck-engine'
-require 'muck_test_helper'
 
+require 'test_help'
+require 'ruby-debug'
+require 'authlogic/test_case'
+require 'muck_test_helper'
+require 'pp'
 
 class ActiveSupport::TestCase
   include MuckTestMethods
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
+  
+  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
+  
 end

data/test/rails_root/test/unit/country_test.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CountryTest < ActiveSupport::TestCase
+
+  context "a country instance" do
+    
+    setup do
+      @country = Factory(:country)
+    end
+    
+    subject { @country }
+    should_have_many :states
+    should_scope_by_name
+    
+    context "us" do
+      setup do
+        Country.destroy_all
+        @us_country = Factory(:country, :abbreviation => 'US')
+        @other_country = Factory(:country)
+      end
+      should "find countries with abbreviation 'US'" do
+        assert_equal @us_country, Country.us
+      end
+      should "not find other countries" do
+        assert_not_equal @other_country, Country.us
+      end
+    end
+    
+    context "uk_country?" do
+      setup do
+        Country.destroy_all
+        @eng_country = Factory(:country, :abbreviation => 'ENG')
+        @ie_country = Factory(:country, :abbreviation => 'IE')
+        @wal_country = Factory(:country, :abbreviation => 'WAL')
+        @sct_country = Factory(:country, :abbreviation => 'SCT')
+        @other_country = Factory(:country)
+      end
+      should "determine if the country is a UK country" do
+        assert Country.uk_country?(@eng_country.id, true)
+        assert Country.uk_country?(@ie_country.id, true)
+        assert Country.uk_country?(@wal_country.id, true)
+        assert Country.uk_country?(@sct_country.id, true)
+        assert !Country.uk_country?(@other_country.id, true)
+      end
+      should "be able to use country object or id" do
+        assert Country.uk_country?(@eng_country, true)
+        assert Country.uk_country?(@eng_country.id, true)
+      end
+    end
+    
+    context "canada?" do
+      setup do
+        Country.destroy_all
+        @canada = Factory(:country, :abbreviation => 'CA')
+        @other_country = Factory(:country)
+      end
+      should "determine if the country is canada" do
+        assert Country.canada?(@canada.id, true)
+        assert !Country.canada?(@other_country.id, true)
+      end
+    end
+    
+    context "build_state_prompts" do
+      setup do
+        Country.destroy_all
+        @us_country = Factory(:country, :abbreviation => 'US')
+        @eng_country = Factory(:country, :abbreviation => 'ENG')
+        @canada = Factory(:country, :abbreviation => 'CA')
+      end
+      should "return county for UK" do
+        label, prompt = Country.build_state_prompts(@eng_country)
+        assert prompt.include?('county')
+      end
+      should "return province for canada" do
+        label, prompt = Country.build_state_prompts(@canada)
+        assert prompt.include?('province')
+      end
+      should "return state for other" do
+        label, prompt = Country.build_state_prompts(@us_country)
+        assert prompt.include?('state')
+      end
+    end
+    
+  end
+  
+end

data/test/rails_root/test/unit/language_test.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class LangaugeTest < ActiveSupport::TestCase
+
+  context "a language instance" do
+    
+    context "locale_id" do
+      setup do
+        @language = Factory(:unmodified_language, :locale => 'zz', :supported => true)
+        I18n.stubs(:locale).returns(:zz)
+      end
+      should "find the language id for the current locale" do
+        assert_equal @language.id, Language.locale_id(true)
+      end
+    end
+    
+    context "supported_locale?" do
+      setup do
+        @supported_locale = 'zz'
+        @not_supported_locale = 'aa'
+        @supported_language = Factory(:unmodified_language, :locale => @supported_locale, :supported => true)
+      end
+      should "indicate the locale is supported" do
+        assert Language.supported_locale?(@supported_locale, true)
+      end
+      should "indicate the locale is not supported" do
+        assert !Language.supported_locale?(@not_supported_locale, true)
+      end
+    end
+    
+  end
+  
+end

data/test/rails_root/test/unit/state_test.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class StateTest < ActiveSupport::TestCase
+
+  context "a state instance" do
+    
+    setup do
+      @state = Factory(:state)
+    end
+    
+    subject { @state }
+    
+    should_belong_to :country
+    should_scope_by_name
+    
+  end
+  
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 4
-  - 26
-  version: 0.4.26
+  - 27
+  version: 0.4.27
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -06:00
+date: 2010-05-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: validation_reflection
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -34,9 +37,11 @@ dependencies:
   name: will_paginate
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -46,26 +51,44 @@ dependencies:
   name: git
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: overlord
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: The base engine for the muck system.  Contains common tables, custom for, css and javascript.
 email: justin@tatemae.com
 executables: []
@@ -131,6 +154,9 @@ files:
 - install.rb
 - lib/action_controller/muck_application.rb
 - lib/action_mailer/muck_mailer.rb
+- lib/active_record/acts/muck_country.rb
+- lib/active_record/acts/muck_language.rb
+- lib/active_record/acts/muck_state.rb
 - lib/active_record/muck_model.rb
 - lib/muck_engine.rb
 - lib/muck_engine/flash_errors.rb
@@ -726,6 +752,7 @@ files:
 - tasks/rails.rake
 - test/rails_root/.gitignore
 - test/rails_root/.rake_tasks
+- test/rails_root/Gemfile
 - test/rails_root/Rakefile
 - test/rails_root/app/controllers/admin/default_controller.rb
 - test/rails_root/app/controllers/application_controller.rb
@@ -749,6 +776,7 @@ files:
 - test/rails_root/config/initializers/mime_types.rb
 - test/rails_root/config/initializers/requires.rb
 - test/rails_root/config/initializers/session_store.rb
+- test/rails_root/config/preinitializer.rb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/.keep
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
@@ -1333,13 +1361,17 @@ files:
 - test/rails_root/test/functional/.keep
 - test/rails_root/test/functional/admin/default_controller_test.rb
 - test/rails_root/test/functional/default_controller_test.rb
+- test/rails_root/test/functional/helper_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/test_helper.rb
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/basic_mailer_test.rb
+- test/rails_root/test/unit/country_test.rb
+- test/rails_root/test/unit/language_test.rb
 - test/rails_root/test/unit/muck_engine_helper_test.rb
+- test/rails_root/test/unit/state_test.rb
 - test/rails_root/vendor/plugins/ssl_requirement/README
 - test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
@@ -1354,23 +1386,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: muck-engine
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The base engine for the muck system.
@@ -1390,6 +1426,7 @@ test_files:
 - test/rails_root/config/initializers/mime_types.rb
 - test/rails_root/config/initializers/requires.rb
 - test/rails_root/config/initializers/session_store.rb
+- test/rails_root/config/preinitializer.rb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
 - test/rails_root/db/migrate/20090402234137_create_languages.rb
@@ -1402,8 +1439,12 @@ test_files:
 - test/rails_root/script/create_project.rb
 - test/rails_root/test/functional/admin/default_controller_test.rb
 - test/rails_root/test/functional/default_controller_test.rb
+- test/rails_root/test/functional/helper_controller_test.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/basic_mailer_test.rb
+- test/rails_root/test/unit/country_test.rb
+- test/rails_root/test/unit/language_test.rb
 - test/rails_root/test/unit/muck_engine_helper_test.rb
+- test/rails_root/test/unit/state_test.rb
 - test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb