dm-is-remixable 0.9.8 → 0.9.9

data/History.txt

@@ -1,5 +1,18 @@
+=== 0.9.9 / 2009-01-04
+
+* 1 bug fix:
+
+  * belongs_to association names are no longer made plural.
+
+=== 0.9.8 / 2008-12-07
+
+* 2 minor enhancements:
+
+  * When using :as remixables ONLY create the given accessor instead of creating the default and aliasing it.
+  * Remixable Modules can now namespace methods to remixing classes and generated class.
+
 === 0.9.3 / 2008-07-31
 
-* 1 major enhancement
+* 1 major enhancement:
 
   * Pre-Release, super beta.

data/Manifest.txt

@@ -22,3 +22,5 @@ spec/data/viewable.rb
 spec/integration/remixable_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/install.rb
+tasks/spec.rb

data/README.txt

@@ -133,38 +133,38 @@ modules are present the are attached appropriately to the other classes.
 module ExampleRemixable
   include DataMapper::Resource
   is :remixable
-  
+
   #... 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
-  
+
   # 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
-  
+
   # 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

@@ -1,51 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-is-remixable/is/version'
 
 AUTHOR = "Cory O'Daniel"
-EMAIL  = "dm-is-remixable [a] coryodaniel [d] com"
-GEM_NAME = "dm-is-remixable"
+EMAIL  = 'dm-is-remixable [a] coryodaniel [d] com'
+GEM_NAME = 'dm-is-remixable'
 GEM_VERSION = DataMapper::Is::Remixable::VERSION
 GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
-GEM_CLEAN = ["log", "pkg"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
-
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-is-remixable"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "dm-is-remixable allow you to create reusable data functionality"
-
-require ROOT.parent + 'tasks/hoe'
-
-task :default => [ :spec ]
-
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION}"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-ri --no-rdoc --no-update-sources", :verbose => false
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'dm-is-remixable allow you to create reusable data functionality'
 
-  begin
-    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/TODO

@@ -15,4 +15,4 @@ TODO
 - Test double+ remixing. User remixes Commentable; enhance Commentable remix Commentable
 
 - Remixable.related(*remixed_models)
-  Taggable.related(Article, JobPostings)
+  Taggable.related(Article, JobPostings)

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

@@ -55,7 +55,7 @@ module DataMapper
         extend  DataMapper::Is::Remixable::RemixeeClassMethods
         include DataMapper::Is::Remixable::RemixeeInstanceMethods
         @is_remixable = true
-        
+
         # support clean suffixes for nested modules
         default_suffix = Extlib::Inflection.demodulize(self.name).singular.snake_case
         suffix(options.delete(:suffix) || default_suffix)
@@ -287,7 +287,7 @@ module DataMapper
         def remix_one_to_many(cardinality, model, options)
           self.has cardinality, (options[:as] || options[:table_name]).to_sym, :class_name => model.name
           model.property Extlib::Inflection.foreign_key(self.name).intern, Integer, :nullable => false
-          model.belongs_to Extlib::Inflection.tableize(self.name).intern
+          model.belongs_to belongs_to_name(self.name)
         end
 
         # - remix_many_to_many
@@ -309,13 +309,13 @@ module DataMapper
             self.has cardinality, (options[:as] || options[:table_name]).to_sym, :class_name => model.name
             options[:other_model].has cardinality, options[:table_name].intern
 
-            model.belongs_to  Extlib::Inflection.tableize(self.name).intern
-            model.belongs_to  Extlib::Inflection.tableize(options[:other_model].name).intern
+            model.belongs_to belongs_to_name(self.name)
+            model.belongs_to belongs_to_name(options[:other_model].name)
           else
             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, :class_name => model.name
-            model.belongs_to Extlib::Inflection.tableize(self.name).intern
+            model.belongs_to belongs_to_name(self.name)
             model.belongs_to options[:via].intern, :class_name => options[:other_model].name, :child_key => ["#{options[:via]}_id".intern]
           end
         end
@@ -353,16 +353,20 @@ module DataMapper
           if Object.full_const_defined? "#{remixable}::RemixeeInstanceMethods"
             model.send :include, Object.full_const_get("#{remixable}::RemixeeInstanceMethods")
           end
-          
+
           model
         end
 
+        def belongs_to_name(class_name)
+          class_name.to_const_path.gsub(/\//, '_').to_sym
+        end
+
       end # RemixerClassMethods
 
       # - RemixeeClassMethods
       # ==== Description
       #   Methods available to any model that is :remixable
-      module RemixeeClassMethods                
+      module RemixeeClassMethods
         # - suffix
         # ==== Description
         #   modifies the storage name suffix, which is by default based on the Remixable Module name

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

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Remixable
-      VERSION = "0.9.8"
+      VERSION = '0.9.9'
     end
   end
 end

data/lib/dm-is-remixable.rb

@@ -1,15 +1,11 @@
-# Needed to import datamapper and other gems
-require 'rubygems'
 require 'pathname'
+require 'rubygems'
 
-# Add all external dependencies for the plugin here
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.9'
 require 'dm-core'
 
-# Require plugin-files
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-remixable' / 'is' / 'remixable.rb'
+require Pathname(__FILE__).dirname.expand_path / 'dm-is-remixable' / 'is' / 'remixable'
 
-# Include the plugin in Resource
 module DataMapper
   module Resource
     module ClassMethods

data/spec/data/commentable.rb

@@ -7,5 +7,5 @@ module Commentable
   property :id,         Integer, :key => true, :serial => true
   property :comment,    String
   property :created_at, DateTime
-  
+
 end

data/spec/data/image.rb

@@ -6,7 +6,7 @@ module Image
   property :id,           Integer, :key => true, :serial => true
   property :description,  String
   property :path,         String
-  
+
   # These methods will be available to the class remixing this module
   #   If 'User' remixes 'Images', these methods will be available to a User class
   #
@@ -15,7 +15,7 @@ module Image
       'CLASS METHOD FOR REMIXER'
     end
   end
-  
+
   # These methods will be available to instantiated objects of the remixing this module
   #   If 'User' remixes 'Images', these methods will be available to a User object
   #
@@ -24,7 +24,7 @@ module Image
       'INSTANCE METHOD FOR REMIXER'
     end
   end
-  
+
   # These methods will be available to the Generated Remixed Class
   #   If 'User' remixes 'Images', these methods will be available to UserImage class
   #
@@ -33,7 +33,7 @@ module Image
       'CLASS METHOD FOR REMIXEE'
     end
   end
-  
+
   # These methods will be available to an instantiated Generated Remixed Class
   #   If 'User' remixes 'Images', these methods will be available to a UserImage object
   #

data/spec/integration/remixable_spec.rb

@@ -213,7 +213,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       user2.comments.length.should be(0)
 
       comment.commentor.first_name.should == "Testy"
-      
+
       user.comments.length.should be(1)
     end
 
@@ -240,7 +240,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       article.comments.first.should be(ac)
       user.article_comments.first.should be(ac)
     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
@@ -249,17 +249,17 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     #   User.remixes n, :images
     #   User.total_images => count of all images owned by all users
     #   User.first.most_viewed_image => would return the most viewed image
-    # 
+    #
     it "should add a remixables' 'RemixerClassMethods' modules to the remixing class" do
       Article.respond_to?(:test_remixer_class_method).should be(true)
       Article.test_remixer_class_method.should == 'CLASS METHOD FOR REMIXER'
     end
-    
+
     it "should add a remixables' 'RemixerInstanceMethods' modules to the remixing class" do
       Article.new.respond_to?(:test_remixer_instance_method).should be(true)
       Article.new.test_remixer_instance_method.should == 'INSTANCE METHOD FOR REMIXER'
     end
-    
+
     # Example:
     # Remixable Image add functionality to any class that remixes it
     #   Image::RemixeeClassMethods defines a method called 'damaged_files' would return a list of all images with invalid checksums (or whatev)
@@ -274,49 +274,49 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       ArticleImage.respond_to?(:test_remixee_class_method).should be(true)
       ArticleImage.test_remixee_class_method.should == 'CLASS METHOD FOR REMIXEE'
     end
-    
+
     it "should add a remixables' 'RemixeeInstanceMethods' modules to the generated remixed class" do
       ArticleImage.new.respond_to?(:test_remixee_instance_method).should be(true)
       ArticleImage.new.test_remixee_instance_method.should == 'INSTANCE METHOD FOR REMIXEE'
     end
-    
+
     # Example:
     # User.remixes n, :images, :as => "pics"
     # User.first.pics would be the acessor for images
     # User.first.user_images should raise method not found
     #
     it 'should remove the original attribute accessor when attaching an optional one' do
-      Article.new.respond_to?(:pics).should be(true)      
+      Article.new.respond_to?(:pics).should be(true)
       User.new.respond_to?(:user_addresses).should be(true)
     end
-    
+
     # Currently:
     #   Submission.remixes n, :comments
     #   SubmissionComment.new.user = User.first => throws exception, accessor name is 'users' instead
     #
     # Example:
-    #   User.remix 1, :images 
+    #   User.remix 1, :images
     #     # => User.image & UserImage.user
     #
-    #   User.remix n, :images 
+    #   User.remix n, :images
     #     # => User.images & UserImage.user
-    #   
+    #
     #   User.remix n, :comments, :for => 'User', :via => 'commentor'
     #     # => User.comments & UserComment.user & UserComment.commentor
     #
     it 'should pluralize accessor names with respect to cardinality' do
       pending
     end
-    
+
     # Note:
     # Currently the :via flag allows one to specify another name for the field, but it always appends _id
-    # 
+    #
     # Example:
     #   User w/ PK being 'login_name'
     #   User.remixes n, :comments, :for => 'User', :via => 'commentor'
-    #   
+    #
     #   Comment Table:
-    #     * id 
+    #     * id
     #     * text
     #     * user_login_name
     #     * commentor_id #=> should be able to specify it to be commentor_login_name

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/spec/spec_helper.rb

@@ -1,22 +1,26 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-is-remixable'
+
+ROOT = Pathname(__FILE__).dirname.parent.expand_path
+
+# use local dm-types if running from dm-more directly
+lib = ROOT.parent.join('dm-types', 'lib').expand_path
+$LOAD_PATH.unshift(lib) if lib.directory?
+
+require ROOT + 'lib/dm-is-remixable'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
-  lib = "do_#{name}"
-
   begin
-    gem lib, '~>0.9.7'
-    require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
     true
-  rescue Gem::LoadError => e
-    warn "Could not load #{lib}: #{e}"
+  rescue LoadError => e
+    warn "Could not load do_#{name}: #{e}"
     false
   end
 end

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-remixable
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Cory O'Daniel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 -08:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 description: dm-is-remixable allow you to create reusable data functionality
 email: 
@@ -33,6 +33,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -58,6 +59,8 @@ files:
 - spec/integration/remixable_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-is-remixable
 post_install_message: