albumdy_development.sqlite3 app/controllers/application_controller.rb public/javascripts/controls.js public/javascripts/dragdrop.js public/javascripts/effects.js public/javascripts/prototype.js script/dbconsole script/rails vendor/plugins/acts_as_state_machine/.gitignore vendor/plugins/acts_as_state_machine/test/test_acts_as_state_machine.rb @@ -2,12 +2,12 @@ # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. if RUBY_VERSION > "1.9" + Gem::RubyGemsVersion class String alias_method :each, :each_line end end -Gem::RubyGemsVersion require(File.join(File.dirname(__FILE__), 'config', 'boot')) require 'rake' Rakefile @@ -7,10 +7,7 @@ class Album < ActiveRecord::Base validates_presence_of :user, :title validates_length_of :title, :within => 5..128 - validates_length_of :description, :within => 20..500, :allow_nil => true, :allow_blank => true - - has_friendly_id :title, :use_slug => true, :strip_diacritics => true - + validates_length_of :description, :within => 20..500, :allow_nil => true, :allow_blank => true # used as album cover def photo app/models/album.rb @@ -20,8 +20,6 @@ class User < ActiveRecord::Base # anything else you want your user to change should be added here. attr_accessible :login, :email, :password, :password_confirmation - has_friendly_id :login, :use_slug => true, :strip_diacritics => true - acts_as_state_machine :initial => :pending state :passive state :pending, :enter => :make_activation_code app/models/user.rb @@ -44,6 +44,7 @@ module Rails def load_initializer require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" Rails::Initializer.run(:install_gem_spec_stubs) + Rails::GemDependency.add_frozen_gem_path end end @@ -67,7 +68,7 @@ module Rails class << self def rubygems_version - Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion + Gem::RubyGemsVersion rescue nil end def gem_version @@ -82,14 +83,14 @@ module Rails def load_rubygems require 'rubygems' - - unless rubygems_version >= '0.9.4' - $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.) + min_version = '1.3.1' + unless rubygems_version >= min_version + $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.) exit 1 end rescue LoadError - $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org) + $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org) exit 1 end config/boot.rb @@ -28,7 +28,7 @@ namespace :db do fixtures = fixture_files.map do |fixture_path, table_name| Fixtures.new(connection, table_name, nil, fixture_path) end - connection.transaction(Thread.current['open_transactions'] == 0) do + connection.transaction do fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures } fixtures.each { |fixture| fixture.insert_fixtures } @@ -42,18 +42,18 @@ namespace :db do end # loop through for friendy_ids - users = User.find(:all) - for obj in users - obj.save - end - albums = Album.find(:all) - for obj in albums - obj.save - end - photos = Photo.find(:all) - for obj in photos - obj.save - end + # users = User.find(:all) + # for obj in users + # obj.save + # end + # albums = Album.find(:all) + # for obj in albums + # obj.save + # end + # photos = Photo.find(:all) + # for obj in photos + # obj.save + # end end end lib/tasks/bootstrap.rake @@ -1,3 +1,4 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/about' +$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info" +require 'commands/about' \ No newline at end of file script/about @@ -13,7 +13,7 @@ end desc 'Test the acts as state machine plugin.' Rake::TestTask.new(:test) do |t| t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' + t.pattern = 'test/**/test_*.rb' t.verbose = true end vendor/plugins/acts_as_state_machine/Rakefile @@ -5,71 +5,74 @@ module ScottBarron #:nodoc: end class NoInitialState < Exception #:nodoc: end - + def self.included(base) #:nodoc: base.extend ActMacro end - + module SupportingClasses + # Default transition action. Always returns true. + NOOP = lambda { |o| true } + class State - attr_reader :name - - def initialize(name, opts) - @name, @opts = name, opts + attr_reader :name, :value + + def initialize(name, options) + @name = name.to_sym + @value = (options[:value] || @name).to_s + @after = Array(options[:after]) + @enter = options[:enter] || NOOP + @exit = options[:exit] || NOOP end - + def entering(record) - enteract = @opts[:enter] - record.send(:run_transition_action, enteract) if enteract + record.send(:run_transition_action, @enter) end - + def entered(record) - afteractions = @opts[:after] - return unless afteractions - Array(afteractions).each do |afteract| - record.send(:run_transition_action, afteract) - end + @after.each { |action| record.send(:run_transition_action, action) } end - + def exited(record) - exitact = @opts[:exit] - record.send(:run_transition_action, exitact) if exitact + record.send(:run_transition_action, @exit) end end class StateTransition attr_reader :from, :to, :opts - - def initialize(opts) - @from, @to, @guard = opts[:from], opts[:to], opts[:guard] - @opts = opts + + def initialize(options) + @from = options[:from].to_s + @to = options[:to].to_s + @guard = options[:guard] || NOOP + @opts = options end - + def guard(obj) @guard ? obj.send(:run_transition_action, @guard) : true end def perform(record) return false unless guard(record) - loopback = record.current_state == to + loopback = record.current_state.to_s == to states = record.class.read_inheritable_attribute(:states) next_state = states[to] - old_state = states[record.current_state] - + old_state = states[record.current_state.to_s] + next_state.entering(record) unless loopback - - record.update_attribute(record.class.state_column, to.to_s) - + + record.update_attribute(record.class.state_column, next_state.value) + next_state.entered(record) unless loopback old_state.exited(record) unless loopback true end - + def ==(obj) @from == obj.from && @to == obj.to end end - + class Event attr_reader :name attr_reader :transitions @@ -84,17 +87,17 @@ module ScottBarron #:nodoc: @transitions.freeze freeze end - + def next_states(record) - @transitions.select { |t| t.from == record.current_state } + @transitions.select { |t| t.from == record.current_state.to_s } end - + def fire(record) next_states(record).each do |transition| break true if transition.perform(record) end end - + def transitions(trans_opts) Array(trans_opts[:from]).each do |s| @transitions << SupportingClasses::StateTransition.new(trans_opts.merge({:from => s.to_sym})) @@ -102,59 +105,61 @@ module ScottBarron #:nodoc: end end end - + module ActMacro # Configuration options are # # * +column+ - specifies the column name to use for keeping the state (default: state) # * +initial+ - specifies an initial state for newly created objects (required) - def acts_as_state_machine(opts) - self.extend(ClassMethods) - raise NoInitialState unless opts[:initial] - - write_inheritable_attribute :states, {} - write_inheritable_attribute :initial_state, opts[:initial] - write_inheritable_attribute :transition_table, {} - write_inheritable_attribute :event_table, {} - write_inheritable_attribute :state_column, opts[:column] || 'state' - - class_inheritable_reader :initial_state - class_inheritable_reader :state_column - class_inheritable_reader :transition_table - class_inheritable_reader :event_table - - self.send(:include, ScottBarron::Acts::StateMachine::InstanceMethods) - - before_create :set_initial_state - after_create :run_initial_state_actions + def acts_as_state_machine(options = {}) + class_eval do + extend ClassMethods + include InstanceMethods + + raise NoInitialState unless options[:initial] + + write_inheritable_attribute :states, {} + write_inheritable_attribute :initial_state, options[:initial] + write_inheritable_attribute :transition_table, {} + write_inheritable_attribute :event_table, {} + write_inheritable_attribute :state_column, options[:column] || 'state' + + class_inheritable_reader :initial_state + class_inheritable_reader :state_column + class_inheritable_reader :transition_table + class_inheritable_reader :event_table + + before_create :set_initial_state + after_create :run_initial_state_actions + end end end - + module InstanceMethods def set_initial_state #:nodoc: write_attribute self.class.state_column, self.class.initial_state.to_s end def run_initial_state_actions - initial = self.class.read_inheritable_attribute(:states)[self.class.initial_state.to_sym] + initial = self.class.read_inheritable_attribute(:states)[self.class.initial_state.to_s] initial.entering(self) initial.entered(self) end - + # Returns the current state the object is in, as a Ruby symbol. def current_state self.send(self.class.state_column).to_sym end - + # Returns what the next state for a given event would be, as a Ruby symbol. def next_state_for_event(event) ns = next_states_for_event(event) - ns.empty? ? nil : ns.first.to + ns.empty? ? nil : ns.first.to.to_sym end def next_states_for_event(event) self.class.read_inheritable_attribute(:transition_table)[event.to_sym].select do |s| - s.from == current_state + s.from == current_state.to_s end end @@ -167,9 +172,9 @@ module ScottBarron #:nodoc: module ClassMethods # Returns an array of all known states. def states - read_inheritable_attribute(:states).keys + read_inheritable_attribute(:states).keys.collect { |state| state.to_sym } end - + # Define an event. This takes a block which describes all valid transitions # for this event. # @@ -195,12 +200,12 @@ module ScottBarron #:nodoc: # Example: <tt>order.close_order!</tt>. def event(event, opts={}, &block) tt = read_inheritable_attribute(:transition_table) - - et = read_inheritable_attribute(:event_table) - e = et[event.to_sym] = SupportingClasses::Event.new(event, opts, tt, &block) + + e = SupportingClasses::Event.new(event, opts, tt, &block) + write_inheritable_hash(:event_table, event.to_sym => e) define_method("#{event.to_s}!") { e.fire(self) } end - + # Define a state of the system. +state+ can take an optional Proc object # which will be executed every time the system transitions into that # state. The proc will be passed the current object. @@ -214,12 +219,12 @@ module ScottBarron #:nodoc: # state :closed, Proc.new { |o| Mailer.send_notice(o) } # end def state(name, opts={}) - state = SupportingClasses::State.new(name.to_sym, opts) - read_inheritable_attribute(:states)[name.to_sym] = state - - define_method("#{state.name}?") { current_state == state.name } + state = SupportingClasses::State.new(name, opts) + write_inheritable_hash(:states, state.value => state) + + define_method("#{state.name}?") { current_state.to_s == state.value } end - + # Wraps ActiveRecord::Base.find to conveniently find all records in # a given state. Options: # @@ -231,7 +236,7 @@ module ScottBarron #:nodoc: find(number, *args) end end - + # Wraps ActiveRecord::Base.count to conveniently count all records in # a given state. Options: # @@ -242,7 +247,7 @@ module ScottBarron #:nodoc: count(*args) end end - + # Wraps ActiveRecord::Base.calculate to conveniently calculate all records in # a given state. Options: # @@ -253,11 +258,11 @@ module ScottBarron #:nodoc: calculate(*args) end end - + protected def with_state_scope(state) - raise InvalidState unless states.include?(state) - + raise InvalidState unless states.include?(state.to_sym) + with_scope :find => {:conditions => ["#{table_name}.#{state_column} = ?", state.to_s]} do yield if block_given? end @@ -265,4 +270,4 @@ module ScottBarron #:nodoc: end end end -end \ No newline at end of file +end vendor/plugins/acts_as_state_machine/lib/acts_as_state_machine.rb app/controllers/application.rb script/performance/request vendor/plugins/acts_as_state_machine/test/acts_as_state_machine_test.rb vendor/plugins/acts_as_state_machine/test/database.yml vendor/plugins/acts_as_state_machine/test/fixtures/conversation.rb vendor/plugins/acts_as_state_machine/test/fixtures/person.rb vendor/plugins/acts_as_state_machine/test/schema.rb vendor/plugins/acts_as_state_machine/test/test_helper.rb vendor/plugins/friendly_id/.gitignore vendor/plugins/friendly_id/CHANGES vendor/plugins/friendly_id/MIT-LICENSE vendor/plugins/friendly_id/README vendor/plugins/friendly_id/Rakefile vendor/plugins/friendly_id/friendly_id.gemspec vendor/plugins/friendly_id/generators/friendly_id_migration/friendly_id_migration_generator.rb vendor/plugins/friendly_id/generators/friendly_id_migration/templates/create_slugs.rb vendor/plugins/friendly_id/init.rb vendor/plugins/friendly_id/install.rb vendor/plugins/friendly_id/lib/friendly_id.rb vendor/plugins/friendly_id/lib/slug.rb vendor/plugins/friendly_id/tasks/friendly_id_tasks.rake vendor/plugins/friendly_id/test/database.yml vendor/plugins/friendly_id/test/fixtures/post.rb vendor/plugins/friendly_id/test/fixtures/posts.yml vendor/plugins/friendly_id/test/fixtures/slugs.yml vendor/plugins/friendly_id/test/fixtures/user.rb vendor/plugins/friendly_id/test/fixtures/users.yml vendor/plugins/friendly_id/test/schema.rb vendor/plugins/friendly_id/test/sluggable_test.rb vendor/plugins/friendly_id/test/test_helper.rb vendor/plugins/friendly_id/test/unique_column_test.rb vendor/plugins/friendly_id/uninstall.rb vendor/plugins/restful-authentication/.gitignore vendor/plugins/restful-authentication/CHANGELOG vendor/plugins/restful-authentication/README.textile vendor/plugins/restful-authentication/Rakefile vendor/plugins/restful-authentication/TODO vendor/plugins/restful-authentication/generators/authenticated/USAGE vendor/plugins/restful-authentication/generators/authenticated/authenticated_generator.rb vendor/plugins/restful-authentication/generators/authenticated/lib/insert_routes.rb vendor/plugins/restful-authentication/generators/authenticated/templates/_model_partial.html.erb vendor/plugins/restful-authentication/generators/authenticated/templates/activation.erb vendor/plugins/restful-authentication/generators/authenticated/templates/authenticated_system.rb vendor/plugins/restful-authentication/generators/authenticated/templates/authenticated_test_helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/controller.rb vendor/plugins/restful-authentication/generators/authenticated/templates/helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/login.html.erb vendor/plugins/restful-authentication/generators/authenticated/templates/mailer.rb vendor/plugins/restful-authentication/generators/authenticated/templates/migration.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model_controller.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model_helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model_helper_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/observer.rb vendor/plugins/restful-authentication/generators/authenticated/templates/signup.html.erb vendor/plugins/restful-authentication/generators/authenticated/templates/signup_notification.erb vendor/plugins/restful-authentication/generators/authenticated/templates/site_keys.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/access_control_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/authenticated_system_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/sessions_controller_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/users_controller_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/fixtures/users.yml vendor/plugins/restful-authentication/generators/authenticated/templates/spec/helpers/users_helper_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/models/user_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/rest_auth_stories.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/rest_auth_stories_helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/ra_navigation_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/ra_resource_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/ra_response_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/user_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/users/accounts.story vendor/plugins/restful-authentication/generators/authenticated/templates/stories/users/sessions.story vendor/plugins/restful-authentication/generators/authenticated/templates/test/functional_test.rb vendor/plugins/restful-authentication/generators/authenticated/templates/test/mailer_test.rb vendor/plugins/restful-authentication/generators/authenticated/templates/test/model_functional_test.rb vendor/plugins/restful-authentication/generators/authenticated/templates/test/unit_test.rb vendor/plugins/restful-authentication/init.rb vendor/plugins/restful-authentication/install.rb vendor/plugins/restful-authentication/lib/authentication.rb vendor/plugins/restful-authentication/lib/authentication/by_cookie_token.rb vendor/plugins/restful-authentication/lib/authentication/by_password.rb vendor/plugins/restful-authentication/lib/authorization.rb vendor/plugins/restful-authentication/lib/authorization/aasm_roles.rb vendor/plugins/restful-authentication/lib/authorization/stateful_roles.rb vendor/plugins/restful-authentication/lib/trustification.rb vendor/plugins/restful-authentication/lib/trustification/email_validation.rb vendor/plugins/restful-authentication/notes/AccessControl.txt vendor/plugins/restful-authentication/notes/Authentication.txt vendor/plugins/restful-authentication/notes/Authorization.txt vendor/plugins/restful-authentication/notes/RailsPlugins.txt vendor/plugins/restful-authentication/notes/SecurityFramework.graffle vendor/plugins/restful-authentication/notes/SecurityFramework.png vendor/plugins/restful-authentication/notes/SecurityPatterns.txt vendor/plugins/restful-authentication/notes/Tradeoffs.txt vendor/plugins/restful-authentication/notes/Trustification.txt vendor/plugins/restful-authentication/tasks/auth.rake vendor/plugins/will_paginate/.gitignore vendor/plugins/will_paginate/.manifest vendor/plugins/will_paginate/CHANGELOG.rdoc vendor/plugins/will_paginate/LICENSE vendor/plugins/will_paginate/README.rdoc vendor/plugins/will_paginate/Rakefile vendor/plugins/will_paginate/examples/apple-circle.gif vendor/plugins/will_paginate/examples/index.haml vendor/plugins/will_paginate/examples/index.html vendor/plugins/will_paginate/examples/pagination.css vendor/plugins/will_paginate/examples/pagination.sass vendor/plugins/will_paginate/init.rb vendor/plugins/will_paginate/lib/will_paginate.rb vendor/plugins/will_paginate/lib/will_paginate/array.rb vendor/plugins/will_paginate/lib/will_paginate/collection.rb vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb vendor/plugins/will_paginate/lib/will_paginate/finder.rb vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb vendor/plugins/will_paginate/lib/will_paginate/version.rb vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb vendor/plugins/will_paginate/test/boot.rb vendor/plugins/will_paginate/test/collection_test.rb vendor/plugins/will_paginate/test/console vendor/plugins/will_paginate/test/database.yml vendor/plugins/will_paginate/test/finder_test.rb vendor/plugins/will_paginate/test/fixtures/admin.rb vendor/plugins/will_paginate/test/fixtures/developer.rb vendor/plugins/will_paginate/test/fixtures/developers_projects.yml vendor/plugins/will_paginate/test/fixtures/project.rb vendor/plugins/will_paginate/test/fixtures/projects.yml vendor/plugins/will_paginate/test/fixtures/replies.yml vendor/plugins/will_paginate/test/fixtures/reply.rb vendor/plugins/will_paginate/test/fixtures/schema.rb vendor/plugins/will_paginate/test/fixtures/topic.rb vendor/plugins/will_paginate/test/fixtures/topics.yml vendor/plugins/will_paginate/test/fixtures/user.rb vendor/plugins/will_paginate/test/fixtures/users.yml vendor/plugins/will_paginate/test/helper.rb vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb vendor/plugins/will_paginate/test/lib/load_fixtures.rb vendor/plugins/will_paginate/test/lib/view_test_process.rb vendor/plugins/will_paginate/test/tasks.rake vendor/plugins/will_paginate/test/view_test.rb vendor/plugins/will_paginate/will_paginate.gemspec 826dfac4198470bab793b16b204b06e7c2344450 Andreas Haller andreashaller@gmail.com http://github.com/rapind/albumdy/commit/385add98bb2d20c8c9500e46c37b331cea1a1a85 385add98bb2d20c8c9500e46c37b331cea1a1a85 2009-04-02T14:53:19-07:00 2009-04-02T14:53:19-07:00 updated dependencies. seems to work with Ruby 1.9 de-vendored some gems, removed friendly_id removed friendly_id, because of an sqlite3 issue 758159b4074dd59e3d29b88a0c0da0857a8e5541 Andreas Haller andreashaller@gmail.com