dm-is-remixable 1.0.2 → 1.1.0.rc1

data/Gemfile

@@ -1,113 +1,44 @@
-# If you're working on more than one datamapper gem at a time, then it's
-# recommended to create a local Gemfile and use this instead of the git
-# sources. This will make sure that you are  developing against your
-# other local datamapper sources that you currently work on. Gemfile.local
-# will behave identically to the standard Gemfile apart from the fact that
-# it fetches the datamapper gems from local paths. This means that you can use
-# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
-# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
-# worry about accidentally checking local development paths into git.
-# In order to create a local Gemfile, all you need to do is run:
-#
-#   bundle exec rake local_gemfile
-#
-# This will give you a Gemfile.local file that points to your local clones of
-# the various datamapper gems. It's assumed that all datamapper repo clones
-# reside in the same directory. You can use the Gemfile.local like so for
-# running any bundle command:
-#
-#   BUNDLE_GEMFILE=Gemfile.local bundle foo
-#
-# You can also specify which adapter(s) should be part of the bundle by setting
-# an environment variable. This of course also works when using the Gemfile.local
-#
-#   bundle foo                        # dm-sqlite-adapter
-#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
-#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
-#
-# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
-# and running specs against selected adapters.
-#
-# For easily working with adapters supported on your machine, it's recommended
-# that you first install all adapters that you are planning to use or work on
-# by doing something like
-#
-#   ADAPTERS=sqlite,mysql,postgres bundle install
-#
-# This will clone the various repositories and make them available to bundler.
-# Once you have them installed you can easily switch between adapters for the
-# various development tasks. Running something like
-#
-#   ADAPTER=mysql bundle exec rake spec
-#
-# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
-# when running the specs.
-#
-# You can also specify which plugin(s) should be part of the bundle by setting
-# an environment variable. This also works when using the Gemfile.local
-#
-#   bundle foo                                 # dm-migrations
-#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
-#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
-#
-# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
-# for certain adapter/plugin combinations.
-#
-# Finally, to speed up running specs and other tasks, it's recommended to run
-#
-#   bundle lock
-#
-# after running 'bundle install' for the first time. This will make 'bundle exec' run
-# a lot faster compared to the unlocked version. With an unlocked bundle you would
-# typically just run 'bundle install' from time to time to fetch the latest sources from
-# upstream. When you locked your bundle, you need to run
-#
-#   bundle install --relock
-#
-# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
-# is added to the .gitignore file, so you don't need to worry about accidentally checking
-# it into version control.
+require 'pathname'
 
 source 'http://rubygems.org'
 
-DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
+SOURCE       = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+DM_VERSION   = '~> 1.1.0.rc1'
 
-group :runtime do # Runtime dependencies (as in the gemspec)
+group :runtime do
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
   else
-    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
+    gem 'activesupport', '~> 3.0.4', :require => nil
+    gem 'i18n',          '~> 0.5.0'
   end
 
-  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 
 end
 
-group(:development) do # Development dependencies (as in the gemspec)
-
-  gem 'dm-validations', DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
-  gem 'dm-types',       DM_VERSION, :git => "#{DATAMAPPER}/dm-types.git"
+group :development do
 
+  gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}"
+  gem 'dm-types',       DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-types#{REPO_POSTFIX}"
+  gem 'jeweler',        '~> 1.5.2'
   gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
-  gem 'jeweler',        '~> 1.4'
+  gem 'rspec',          '~> 1.3.1'
 
 end
 
-group :quality do # These gems contain rake tasks that check the quality of the source code
+group :quality do
 
-  gem 'metric_fu',      '~> 1.3'
-  gem 'rcov',           '~> 0.9.8'
-  gem 'reek',           '~> 1.2.8'
-  gem 'roodi',          '~> 2.1'
-  gem 'yard',           '~> 0.5'
-  gem 'yardstick',      '~> 0.1'
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+group :datamapper do
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
   adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
@@ -117,27 +48,27 @@ group :datamapper do # We need this because we want to pin these dependencies to
 
   if (do_adapters = DM_DO_ADAPTERS & adapters).any?
     options = {}
-    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+    options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, options.dup
+    gem 'data_objects', DO_VERSION, options.dup
 
     do_adapters.each do |adapter|
       adapter = 'sqlite3' if adapter == 'sqlite'
       gem "do_#{adapter}", DO_VERSION, options.dup
     end
 
-    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
   end
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
   end
 
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Cory ODaniel
+Copyright (c) 2011 Cory ODaniel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -3,168 +3,165 @@
 DataMapper::Is::Remixable allows you to create re-usable chunks of relational data, its kind of like multiple
 inheritance for models.
 
-
 For example:
-#Comments are everywhere, why define them over and over?
-module Comment
-  include DataMapper::Resource
-  is :remixable
 
-  property :id,         Serial
-  property :body,       String
-  property :created_at, DateTime
-end
+  # Comments are everywhere, why define them over and over?:
+  module Comment
+    include DataMapper::Resource
+    is :remixable
 
-#Lots of things can be addressable; people, buildings
-module Addressable
-  include DataMapper::Resource
+    property :id,         Serial
+    property :body,       String
+    property :created_at, DateTime
+  end
 
-  is :remixable,
-    :suffix => "address" #Default suffix is module name pluralized
+  # Lots of things can be addressable; people, buildings
+  module Addressable
+    include DataMapper::Resource
 
-  property :id,         Serial
+    is :remixable,
+      :suffix => "address" #Default suffix is module name pluralized
 
-  property :label,      String #home, work, etc...
+    property :id,         Serial
 
-  property :address1,   String, :length => 255
-  property :address2,   String, :length => 255
+    property :label,      String #home, work, etc...
 
-  property :city,       String, :length => 128
-  property :state,      String, :length => 2
-  property :zip,        String, :length => 5..10
-end
+    property :address1,   String, :length => 255
+    property :address2,   String, :length => 255
 
-module Vote
-  include DataMapper::Resource
+    property :city,       String, :length => 128
+    property :state,      String, :length => 2
+    property :zip,        String, :length => 5..10
+  end
 
-  is :remixable
+  module Vote
+    include DataMapper::Resource
 
-  property :id,         Serial
-  property :opinion,    Enum.new("good","bad")
+    is :remixable
 
-end
+    property :id,         Serial
+    property :opinion,    Enum["good","bad"]
+  end
 
-class Location
-  include DataMapper::Resource
+  class Location
+    include DataMapper::Resource
 
-  #Location can have 1 address
-  remix 1, :addressables
+    #Location can have 1 address
+    remix 1, :addressables
 
-  # This does the following:
-  # - creates a class called LocationAddress
-      (default name would be LocationAddressable, but Addressable#suffix was specified)
-  # - duplicates the properties of Addressable within LocationAddress
-  # - a table called location_addresses
-  # - creates Location#location_addresses accessor
+    # This does the following:
+    # - creates a class called LocationAddress
+        (default name would be LocationAddressable, but Addressable#suffix was specified)
+    # - duplicates the properties of Addressable within LocationAddress
+    # - a table called location_addresses
+    # - creates Location#location_addresses accessor
 
-  #... methods, properties, etc ...#
-end
+    #... methods, properties, etc ...#
+  end
 
+  class User
+    include DataMapper::Resource
 
-class User
-  include DataMapper::Resource
+    #User can have many addresses
+    remix n, :addressables, :as => "addresses"
+    # - creates a class called UserAddress
+        (default name would be UserAddressable, but Addressable#suffix was specified)
+    # - duplicates the properties of Addressable within UserAddress
+    # - a table called user_addresses
+    # - creates User#user_addresses accessor
+    # - creates an accessor alias User#addresses
 
-  #User can have many addresses
-  remix n, :addressables, :as => "addresses"
-  # - creates a class called UserAddress
-      (default name would be UserAddressable, but Addressable#suffix was specified)
-  # - duplicates the properties of Addressable within UserAddress
-  # - a table called user_addresses
-  # - creates User#user_addresses accessor
-  # - creates an accessor alias User#addresses
+    enhance :addressables do
+      storage_names[:default] = "a_different_table_name"
+      property :label, Enum["work","home"]
 
-  enhance :addressables do
-    storage_names[:default] = "a_different_table_name"
-    property :label, Enum.new("work","home")
+      #This adds a column to user_addresses to store an address label
+    end
 
-    #This adds a column to user_addresses to store an address label
+    #... methods, properties, etc ...#
   end
 
-  #... methods, properties, etc ...#
-end
-
-class Article
-  include DataMapper::Resource
-
-  remix n, :comments, :for => "User"
-  # - creates a class called ArticleComment
-  # - duplicates the properties of Comment within ArticleComment
-  # - a table called article_comments
-  # - creates Article#article_comments
-  # - creates User#article_comments
+  class Article
+    include DataMapper::Resource
 
-  #... methods, properties, etc ...#
+    remix n, :comments, :for => "User"
+    # - creates a class called ArticleComment
+    # - duplicates the properties of Comment within ArticleComment
+    # - a table called article_comments
+    # - creates Article#article_comments
+    # - creates User#article_comments
 
-end
+    #... methods, properties, etc ...#
 
-class Video
-  include DataMapper::Resource
+  end
 
-  remix n, :comments, :for => "User", :as => "comments"
-  # - creates a class called VideoComment
-  # - duplicates the properties of Comment within VideoComment
-  # - a table called video_comments
-  # - creates Video#video_comments
-  # - creates User#video_comments
-  # - create Video#comments
+  class Video
+    include DataMapper::Resource
+
+    remix n, :comments, :for => "User", :as => "comments"
+    # - creates a class called VideoComment
+    # - duplicates the properties of Comment within VideoComment
+    # - a table called video_comments
+    # - creates Video#video_comments
+    # - creates User#video_comments
+    # - create Video#comments
+
+    enhance :comments do
+      # VideoComment now has the method #reverse
+      def reverse
+        return self.body.reverse
+      end
+
+      #I like YouTubes ability for users to vote comments up and down
+      remix 1, :votes, :for => "User"
+      # - creates a class called VideoCommentVote
+      # - duplicates the properties of Vote within VideoCommentVote
+      # - a table called video_comment_votes
+      # - creates Video#video_comments#votes
 
-  enhance :comments do
-    # VideoComment now has the method #reverse
-    def reverse
-      return self.body.reverse
     end
 
-    #I like YouTubes ability for users to vote comments up and down
-    remix 1, :votes, :for => "User"
-    # - creates a class called VideoCommentVote
-    # - duplicates the properties of Vote within VideoCommentVote
-    # - a table called video_comment_votes
-    # - creates Video#video_comments#votes
-
+    #... methods, properties, etc ...#
   end
 
-  #... methods, properties, etc ...#
-end
-
-
 Further, remixables can namespace methods that should exist in the generated and remixing classes, if these
 modules are present the are attached appropriately to the other classes.
 
-module ExampleRemixable
-  include DataMapper::Resource
-  is :remixable
+  module ExampleRemixable
+    include DataMapper::Resource
+    is :remixable
 
-  #... your properies ...
+    #... your properies ...
 
-  # Class methods that will be attached to class doing the remixing...
-  #
-  # These methods would be attached to the User class given:
-  #   User.remixes n, :images
-  #
-  module RemixerClassMethods
-  end
+    # Class methods that will be attached to class doing the remixing...
+    #
+    # These methods would be attached to the User class given:
+    #   User.remixes n, :images
+    #
+    module RemixerClassMethods
+    end
 
-  # Instances methods that will be attached to objects of the class doing the remixing...
-  #
-  # These methods would be attached to User objects given:
-  #   User.remixes n, :images
-  #
-  module RemixerInstanceMethods
-  end
+    # Instances methods that will be attached to objects of the class doing the remixing...
+    #
+    # These methods would be attached to User objects given:
+    #   User.remixes n, :images
+    #
+    module RemixerInstanceMethods
+    end
 
-  # Class methods that will be attached to genereated remixed class
-  #
-  # These methods would be attached to the UserImage class given:
-  #   User.remixes n, :images
-  #
-  module RemixeeClassMethods
-  end
+    # Class methods that will be attached to genereated remixed class
+    #
+    # These methods would be attached to the UserImage class given:
+    #   User.remixes n, :images
+    #
+    module RemixeeClassMethods
+    end
 
-  # Instances methods that will be attached to objects of the genereated remixed class
-  #
-  # These methods would be attached to UserImage objects given:
-  #   User.remixes n, :images
-  #
-  module RemixeeInstanceMethods
+    # Instances methods that will be attached to objects of the genereated remixed class
+    #
+    # These methods would be attached to UserImage objects given:
+    #   User.remixes n, :images
+    #
+    module RemixeeInstanceMethods
+    end
   end
-end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -15,12 +15,6 @@ begin
     gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'dm-core', '~> 1.0.2'
-
-    gem.add_development_dependency 'dm-validations', '~> 1.0.2'
-    gem.add_development_dependency 'dm-types',       '~> 1.0.2'
-    gem.add_development_dependency 'rspec',          '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0.rc1

data/dm-is-remixable.gemspec

@@ -1,98 +1,105 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-remixable}
-  s.version = "1.0.2"
+  s.version = "1.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cory O'Daniel"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2011-02-28}
   s.description = %q{dm-is-remixable allow you to create reusable data functionality}
   s.email = %q{dm-is-remixable [a] coryodaniel [d] com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dm-is-remixable.gemspec",
-     "lib/dm-is-remixable.rb",
-     "lib/dm-is-remixable/is/remixable.rb",
-     "spec/data/addressable.rb",
-     "spec/data/article.rb",
-     "spec/data/billable.rb",
-     "spec/data/bot.rb",
-     "spec/data/commentable.rb",
-     "spec/data/image.rb",
-     "spec/data/rating.rb",
-     "spec/data/tag.rb",
-     "spec/data/taggable.rb",
-     "spec/data/topic.rb",
-     "spec/data/user.rb",
-     "spec/data/viewable.rb",
-     "spec/integration/remixable_spec.rb",
-     "spec/rcov.opts",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "tasks/ci.rake",
-     "tasks/local_gemfile.rake",
-     "tasks/metrics.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dm-is-remixable.gemspec",
+    "lib/dm-is-remixable.rb",
+    "lib/dm-is-remixable/is/remixable.rb",
+    "spec/data/addressable.rb",
+    "spec/data/article.rb",
+    "spec/data/billable.rb",
+    "spec/data/bot.rb",
+    "spec/data/commentable.rb",
+    "spec/data/image.rb",
+    "spec/data/project.rb",
+    "spec/data/rating.rb",
+    "spec/data/tag.rb",
+    "spec/data/taggable.rb",
+    "spec/data/topic.rb",
+    "spec/data/user.rb",
+    "spec/data/viewable.rb",
+    "spec/integration/remixable_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
-  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-is-remixable}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{dm-is-remixable allow you to create reusable data functionality}
   s.test_files = [
     "spec/data/addressable.rb",
-     "spec/data/article.rb",
-     "spec/data/billable.rb",
-     "spec/data/bot.rb",
-     "spec/data/commentable.rb",
-     "spec/data/image.rb",
-     "spec/data/rating.rb",
-     "spec/data/tag.rb",
-     "spec/data/taggable.rb",
-     "spec/data/topic.rb",
-     "spec/data/user.rb",
-     "spec/data/viewable.rb",
-     "spec/integration/remixable_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/data/article.rb",
+    "spec/data/billable.rb",
+    "spec/data/bot.rb",
+    "spec/data/commentable.rb",
+    "spec/data/image.rb",
+    "spec/data/project.rb",
+    "spec/data/rating.rb",
+    "spec/data/tag.rb",
+    "spec/data/taggable.rb",
+    "spec/data/topic.rb",
+    "spec/data/user.rb",
+    "spec/data/viewable.rb",
+    "spec/integration/remixable_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<dm-types>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<dm-types>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.0.2"])
-      s.add_dependency(%q<dm-types>, ["~> 1.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<dm-types>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.0.2"])
-    s.add_dependency(%q<dm-types>, ["~> 1.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<dm-types>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end
 

data/lib/dm-is-remixable/is/remixable.rb

@@ -11,7 +11,7 @@ rescue LoadError
   end
 end
 
-# reopen sam/extlib/lib/extlib/object.rb
+# reopen datamapper/extlib/lib/extlib/object.rb
 class Object
 
   def full_const_defined?(name)
@@ -68,7 +68,7 @@ module DataMapper
         @is_remixable = true
 
         # support clean suffixes for nested modules
-        default_suffix = ActiveSupport::Inflector.demodulize(self.name).singularize.underscore
+        default_suffix = DataMapper::Inflector.demodulize(self.name).singularize.underscore
         suffix(options.delete(:suffix) || default_suffix)
       end
 
@@ -157,7 +157,7 @@ module DataMapper
           # Example (from my upcoming dm-is-rateable gem)
           # remix n, "DataMapper::Is::Rateable::Rating", :as => :ratings
           remixable_module = case remixable
-            when Symbol then Object.full_const_get(ActiveSupport::Inflector.classify(remixable))
+            when Symbol then Object.full_const_get(DataMapper::Inflector.classify(remixable))
             when String then Object.full_const_get(remixable)
             when Module then remixable
           end
@@ -174,7 +174,7 @@ module DataMapper
           #Merge defaults/options
           options = {
             :as      => nil,
-            :model   => ActiveSupport::Inflector.classify(self.name.underscore + '_' + remixable_module.suffix.pluralize),
+            :model   => DataMapper::Inflector.camelize(self.name.underscore + '_' + remixable_module.suffix),
             :for     => nil,
             :on      => nil,
             :unique  => false,
@@ -183,10 +183,10 @@ module DataMapper
           }.update(options)
 
           #Make sure the class hasn't been remixed already
-          unless Object.full_const_defined?(ActiveSupport::Inflector.classify(options[:model]))
+          unless Object.full_const_defined?(DataMapper::Inflector.classify(options[:model]))
 
             #Storage name of our remixed model
-            options[:table_name] = ActiveSupport::Inflector.tableize(options[:model])
+            options[:table_name] = DataMapper::Inflector.tableize(DataMapper::Inflector.demodulize(options[:model]))
 
             #Other model to mix with in case of M:M through Remixable
             options[:other_model] = options[:for] || options[:on]
@@ -197,7 +197,7 @@ module DataMapper
             # map the remixable to the remixed model
             # since this will be used from 'enhance api' i think it makes perfect sense to
             # always refer to a remixable by its demodulized underscored constant name
-            remixable_key = ActiveSupport::Inflector.demodulize(remixable_module.name).underscore.to_sym
+            remixable_key = DataMapper::Inflector.demodulize(remixable_module.name).underscore.to_sym
             populate_remixables_mapping(model, options.merge(:remixable_key => remixable_key))
 
             # attach RemixerClassMethods and RemixerInstanceMethods to remixer if defined by remixee
@@ -269,7 +269,7 @@ module DataMapper
           class_name = if remixable_model.nil?
             @remixables[remixable_name].keys.first
           else
-            ActiveSupport::Inflector.demodulize(remixable_model.to_s).underscore.to_sym
+            DataMapper::Inflector.demodulize(remixable_model.to_s).underscore.to_sym
           end
 
           model = @remixables[remixable_name][class_name][:model] unless @remixables[remixable_name][class_name].nil?
@@ -293,7 +293,7 @@ module DataMapper
           key = options[:remixable_key]
           accessor_name = options[:as] ? options[:as] : options[:table_name]
           @remixables[key] ||= {}
-          model_key = ActiveSupport::Inflector.demodulize(remixable_model.to_s).underscore.to_sym
+          model_key = DataMapper::Inflector.demodulize(remixable_model.to_s).underscore.to_sym
           @remixables[key][model_key] ||= {}
           @remixables[key][model_key][:reader] ||= accessor_name.to_sym
           @remixables[key][model_key][:writer] ||= "#{accessor_name}=".to_sym
@@ -309,8 +309,8 @@ module DataMapper
         #   options     <Hash> options hash
         def remix_one_to_many(cardinality, model, options)
           self.has cardinality, (options[:as] || options[:table_name]).to_sym, :model => model.name
-          model.property ActiveSupport::Inflector.foreign_key(self.name).intern, Integer, :min => 0, :required => true
-          model.belongs_to belongs_to_name(self.name)
+          model.property DataMapper::Inflector.foreign_key(self.name).intern, Integer, :min => 0, :required => true
+          model.belongs_to belongs_to_name(self.name), self.name
         end
 
         # - remix_many_to_many
@@ -321,7 +321,7 @@ module DataMapper
         #   model       <Class> remixed model that 'self' is relating through
         #   options     <Hash> options hash
         def remix_many_to_many(cardinality, model, options)
-          options[:other_model] = Object.full_const_get(ActiveSupport::Inflector.classify(options[:other_model]))
+          options[:other_model] = Object.full_const_get(DataMapper::Inflector.classify(options[:other_model]))
 
           #TODO if options[:unique] the two *_id's need to be a unique composite key, maybe even
           # attach a validates_is_unique if the validator is included.
@@ -330,10 +330,10 @@ module DataMapper
           # Is M:M between two different classes or the same class
           unless self.name == options[:other_model].name
             self.has cardinality, (options[:as] || options[:table_name]).to_sym, :model => model.name
-            options[:other_model].has cardinality, options[:table_name].intern
+            options[:other_model].has cardinality, options[:table_name].intern, :model => model.name
 
-            model.belongs_to belongs_to_name(self.name)
-            model.belongs_to belongs_to_name(options[:other_model].name)
+            model.belongs_to belongs_to_name(self.name), self.name
+            model.belongs_to belongs_to_name(options[:other_model].name), options[:other_model].name
             if options[:connect]
               remixed = options[:as]
               remixed ||= options[:other_model].to_s.underscore
@@ -343,7 +343,7 @@ module DataMapper
             raise Exception, "options[:via] must be specified when Remixing a module between two of the same class" unless options[:via]
 
             self.has cardinality, (options[:as] || options[:table_name]).to_sym, :model => model.name
-            model.belongs_to belongs_to_name(self.name)
+            model.belongs_to belongs_to_name(self.name), self.name
             model.belongs_to options[:via].intern, :model => options[:other_model].name, :child_key => ["#{options[:via]}_id".intern]
           end
         end
@@ -357,16 +357,16 @@ module DataMapper
         # ==== Returns
         #   <Class> remixed model
         def generate_remixed_model(remixable,options)
-          #Create Remixed Model
-          klass = Class.new Object do
-            include DataMapper::Resource
-          end
 
-          # Give remixed model a name and create its constant
-          model = Object.full_const_set(options[:model], klass)
+          # Create Remixed Model
+          # TODO clean this up!
+          parts     = options[:model].split('::')
+          name      = parts.last
+          namespace = Object.full_const_get((parts - [name]).join('::'))
 
-          # Get instance methods and the :default context validator
-          model.send(:include,remixable)
+          model = Model.new(name, namespace) do
+            include remixable
+          end
 
           if DataMapper.const_defined?('Validations')
 
@@ -381,8 +381,7 @@ module DataMapper
 
           # Port the properties over
           remixable.properties.each do |prop|
-            type = prop.type ? prop.type : prop.class
-            model.property(prop.name, type, prop.options)
+            model.property(prop.name, prop.class, prop.options)
           end
 
           # Attach remixed model access to RemixeeClassMethods and RemixeeInstanceMethods if defined
@@ -400,7 +399,7 @@ module DataMapper
         end
 
         def belongs_to_name(class_name)
-          class_name.underscore.gsub(/\//, '_').to_sym
+          DataMapper::Inflector.demodulize(class_name).underscore.gsub(/\//, '_').to_sym
         end
 
       private

data/spec/data/project.rb

@@ -0,0 +1,13 @@
+module Portfolio
+  class Project
+    include DataMapper::Resource
+
+    property :id,     Serial
+    property :title,  String, :required => true,  :length=> 2..50
+    property :url,    String
+
+    remix 1, :images
+    remix n, :viewables
+    remix n, :commentables, :as => 'comments', :for => 'User', :via => 'commentor'
+  end
+end

data/spec/integration/remixable_spec.rb

@@ -10,6 +10,7 @@ describe 'DataMapper::Is::Remixable' do
         Image.is_remixable?.should be(true)
         Article.is_remixable?.should be(false)
         Commentable.is_remixable?.should be(true)
+        Portfolio::Project.is_remixable?.should be(false)
       end
     end
 
@@ -169,6 +170,30 @@ describe 'DataMapper::Is::Remixable' do
       user.user_addresses.length.should be(2)
     end
 
+    let(:project) { Portfolio::Project.new }
+
+    it 'should create the correctly named relationship when using namespaced Models' do
+      project.should_not respond_to(:portfolio_project_images)
+      project.should_not respond_to(:portfolio_project_views)
+      project.should respond_to(:project_images)
+      project.should respond_to(:project_views)
+    end
+
+    it 'should allow 1:M relationships with the Remixable Module and a namespaced Model' do
+      {
+        '123.202.201.209' => DateTime.parse('2009/01/02'),
+        '32.21.21.21'     => DateTime.parse('2010/05/12'),
+        '88.999.910.101'  => DateTime.parse('1999/12/15')
+      }.each do |ip, date|
+        view            = Portfolio::ProjectView.new
+        view.ip         = ip
+        view.created_at = date
+        project.project_views << view
+      end
+
+      project.project_views.length.should be(3)
+    end
+
     it "should allow 1:1 relationships with the Remixable Module" do
       article = Article.new
       image1  = ArticleImage.new
@@ -194,6 +219,30 @@ describe 'DataMapper::Is::Remixable' do
       article.pics.path.should == image2.path
     end
 
+    it "should allow 1:1 relationships with the Remixable Module and a namespaced Model" do
+      image1  = Portfolio::ProjectImage.new
+      image2  = Portfolio::ProjectImage.new
+
+      project.title = "My best work"
+      project.url   = "http://example.com/work/success-in-five-steps.html"
+
+      image1.description  = 'Business Failure'
+      image1.path         = '~/pictures/biz.jpg'
+
+      image2.description  = '73 Signals Sucess'
+      image2.path         = '~/pictures/hhd.png'
+
+      begin
+        project.project_images << image1
+        false
+      rescue Exception => e
+        e.class.should be(NoMethodError)
+      end
+
+      project.project_images = image2
+      project.project_images.path.should == image2.path
+    end
+
     # Example:
     #   Users are Commentable by many Users
     #
@@ -226,6 +275,27 @@ describe 'DataMapper::Is::Remixable' do
       user.article_comments.first.should == ac
     end
 
+    it 'should allow M:M relationships through the Remixable Module and a namespaced Model' do
+      user    = User.new
+      pc      = Portfolio::ProjectComment.new
+
+      user.first_name = 'John'
+      user.last_name  = 'Jameson'
+      user.save
+
+      project.url   = 'http://example.com/'
+      project.title = 'A showcase of my best work'
+      project.save
+
+      pc.comment = 'You overprice your work!'
+      pc.user    = user
+      pc.project = project
+      pc.save
+
+      project.comments.first.should == pc
+      user.project_comments.first.should == pc
+    end
+
     # Example:
     # Remixable Image add functionality to any class that remixes it
     #   Image::RemixerClassMethods defines a method called 'total_images' that counts the total number of images for the class

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'data/billable'
 require 'data/bot'
 require 'data/commentable'
 require 'data/image'
+require 'data/project'
 require 'data/rating'
 require 'data/tag'
 require 'data/taggable'

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-remixable
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Cory O'Daniel
@@ -14,68 +10,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
-  prerelease: false
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  type: :development
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: dm-types
-  prerelease: false
+  name: dm-core
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  type: :development
+        version: 1.1.0.rc1
+  type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: dm-validations
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+        version: 1.1.0.rc1
   type: :development
+  prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: dm-types
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc1
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: dm-is-remixable allow you to create reusable data functionality
 email: dm-is-remixable [a] coryodaniel [d] com
 executables: []
@@ -86,7 +111,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -101,6 +125,7 @@ files:
 - spec/data/bot.rb
 - spec/data/commentable.rb
 - spec/data/image.rb
+- spec/data/project.rb
 - spec/data/rating.rb
 - spec/data/tag.rb
 - spec/data/taggable.rb
@@ -111,19 +136,16 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/ci.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-is-remixable
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -131,21 +153,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: dm-is-remixable allow you to create reusable data functionality
@@ -156,6 +174,7 @@ test_files:
 - spec/data/bot.rb
 - spec/data/commentable.rb
 - spec/data/image.rb
+- spec/data/project.rb
 - spec/data/rating.rb
 - spec/data/tag.rb
 - spec/data/taggable.rb

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-spec/db/

data/tasks/ci.rake

@@ -1 +0,0 @@
-task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
-task :local_gemfile do |t|
-
-  root       = Pathname(__FILE__).dirname.parent
-  datamapper = root.parent
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
-      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
-      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
-      f.puts line
-    end
-  end
-
-end

data/tasks/metrics.rake

@@ -1,36 +0,0 @@
-begin
-  require 'metric_fu'
-rescue LoadError
-  namespace :metrics do
-    task :all do
-      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
-    end
-  end
-end
-
-begin
-  require 'reek/adapters/rake_task'
-
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose       = false
-    t.source_files  = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort 'Reek is not available. In order to run reek, you must: gem install reek'
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
-  end
-end