dm-is-remixable 0.10.1 → 0.10.2

data/LICENSE

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

data/Rakefile

@@ -1,24 +1,29 @@
-require 'pathname'
+require 'rubygems'
+require 'rake'
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
 
-require ROOT + 'lib/dm-is-remixable/is/version'
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'dm-is-remixable'
+    gem.summary     = 'dm-is-remixable allow you to create reusable data functionality'
+    gem.description = gem.summary
+    gem.email       = 'dm-is-remixable [a] coryodaniel [d] com'
+    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/%s' % gem.name
+    gem.authors     = [ "Cory O'Daniel" ]
 
-AUTHOR = "Cory O'Daniel"
-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 = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
+    gem.rubyforge_project = 'datamapper'
 
-PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'dm-is-remixable allow you to create reusable data functionality'
+    gem.add_dependency 'dm-core', '~> 0.10.2'
 
-[ ROOT, ROOT.parent ].each do |dir|
-  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+    gem.add_development_dependency 'rspec', '~> 1.2.9'
+    gem.add_development_dependency 'yard',  '~> 0.4.0'
+  end
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -0,0 +1 @@
+0.10.2

data/dm-is-remixable.gemspec

@@ -0,0 +1,75 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-is-remixable}
+  s.version = "0.10.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Cory O'Daniel"]
+  s.date = %q{2009-12-11}
+  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"
+  ]
+  s.files = [
+    "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/metrics.rake",
+     "tasks/spec.rake",
+     "tasks/yard.rake",
+     "tasks/yardstick.rake"
+  ]
+  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-is-remixable}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{dm-is-remixable allow you to create reusable data functionality}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+    else
+      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+  end
+end
+

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

@@ -68,6 +68,8 @@ module DataMapper
       # ==== Description
       #   Methods available to all DataMapper::Resources
       module RemixerClassMethods
+        include Extlib::Assertions
+
         def self.included(base);end;
 
         def is_remixable?
@@ -135,13 +137,19 @@ module DataMapper
         #   => This would create user_id and commentor_id as the
         #
         def remix(cardinality, remixable, options={})
+          assert_kind_of 'remixable', Symbol, String, Module
+
           #A map for remixable names to Remixed Models
           @remixables = {} if @remixables.nil?
 
           # Allow nested modules to be remixable to better support using dm-is-remixable in gems
           # Example (from my upcoming dm-is-rateable gem)
           # remix n, "DataMapper::Is::Rateable::Rating", :as => :ratings
-          remixable_module = Object.full_const_get(Extlib::Inflection.classify(remixable))
+          remixable_module = case remixable
+            when Symbol then Object.full_const_get(Extlib::Inflection.classify(remixable))
+            when String then Object.full_const_get(remixable)
+            when Module then remixable
+          end
 
           unless remixable_module.is_remixable?
             raise Exception, "#{remixable_module} is not remixable"
@@ -154,14 +162,14 @@ module DataMapper
 
           #Merge defaults/options
           options = {
-            :as         => nil,
-            :model => Extlib::Inflection.classify(self.name.snake_case + "_" + remixable_module.suffix.pluralize),
-            :for        => nil,
-            :on         => nil,
-            :unique     => false,
-            :via        => nil,
-            :connect    => false
-          }.merge(options)
+            :as      => nil,
+            :model   => Extlib::Inflection.classify(self.name.snake_case + '_' + remixable_module.suffix.pluralize),
+            :for     => nil,
+            :on      => nil,
+            :unique  => false,
+            :via     => nil,
+            :connect => false
+          }.update(options)
 
           #Make sure the class hasn't been remixed already
           unless Object.full_const_defined?(Extlib::Inflection.classify(options[:model]))
@@ -290,7 +298,7 @@ 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 Extlib::Inflection.foreign_key(self.name).intern, Integer, :nullable => false
+          model.property Extlib::Inflection.foreign_key(self.name).intern, Integer, :min => 0, :required => true
           model.belongs_to belongs_to_name(self.name)
         end
 

data/spec/data/bot.rb

@@ -6,14 +6,7 @@ require 'data/rating'
 class Bot
   include DataMapper::Resource
 
-  property :id, Serial
-
-  property :bot_name,     String,
-    :nullable     => false,
-    :length       => 2..50
-
-  property :bot_version,      String,
-    :nullable     => false,
-    :length       => 2..50
-
+  property :id,          Serial
+  property :bot_name,    String, :required => true, :length => 2..50
+  property :bot_version, String, :required => true, :length => 2..50
 end

data/spec/data/rating.rb

@@ -14,8 +14,8 @@ module My
         # properties
 
         property :id, Serial
-        property :user_id, Integer, :nullable => false
-        property :rating,  Integer, :nullable => false, :default => 0
+        property :user_id, Integer, :required => true
+        property :rating,  Integer, :required => true, :default => 0
 
         module ClassMethods
 

data/spec/data/tag.rb

@@ -2,5 +2,5 @@ class Tag
   include DataMapper::Resource
 
   property :id, Serial
-  property :name, String, :unique => true, :nullable => false
+  property :name, String, :unique => true, :required => true
 end

data/spec/data/user.rb

@@ -8,8 +8,8 @@ class User
   include DataMapper::Resource
 
   property :id, Serial
-  property :first_name, String, :nullable => false,  :length=> 2..50
-  property :last_name, String, :nullable => false, :length => 2..50
+  property :first_name, String, :required => true,  :length=> 2..50
+  property :last_name, String, :required => true, :length => 2..50
 
   remix n, :viewables
   remix n, :billables, :model => "Account"

data/spec/rcov.opts

@@ -0,0 +1,6 @@
+--exclude "spec"
+--sort coverage
+--callsites
+--xrefs
+--profile
+--text-summary

data/spec/spec.opts

@@ -1,2 +1,4 @@
 --colour
 --loadby random
+--format profile
+--backtrace

data/tasks/ci.rake

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

data/tasks/metrics.rake

@@ -0,0 +1,36 @@
+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

data/tasks/spec.rake

@@ -0,0 +1,41 @@
+spec_defaults = lambda do |spec|
+  spec.pattern    = 'spec/**/*_spec.rb'
+  spec.libs      << 'lib' << 'spec'
+  spec.spec_opts << '--options' << 'spec/spec.opts'
+end
+
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+end
+
+begin
+  require 'rcov'
+  require 'spec/rake/verify_rcov'
+
+  Spec::Rake::SpecTask.new(:rcov) do |rcov|
+    spec_defaults.call(rcov)
+    rcov.rcov      = true
+    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  end
+
+  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
+    rcov.threshold = 100
+  end
+rescue LoadError
+  %w[ rcov verify_rcov ].each do |name|
+    task name do
+      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
+    end
+  end
+end
+
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
+task :default => :spec

data/tasks/yard.rake

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yard do
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
+  end
+end

data/tasks/yardstick.rake

@@ -0,0 +1,19 @@
+begin
+  require 'pathname'
+  require 'yardstick/rake/measurement'
+  require 'yardstick/rake/verify'
+
+  # yardstick_measure task
+  Yardstick::Rake::Measurement.new
+
+  # verify_measurements task
+  Yardstick::Rake::Verify.new do |verify|
+    verify.threshold = 100
+  end
+rescue LoadError
+  %w[ yardstick_measure verify_measurements ].each do |name|
+    task name.to_s do
+      abort "Yardstick is not available. In order to run #{name}, you must: gem install yardstick"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-remixable
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Cory O'Daniel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,32 +18,47 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
     version: 
 description: dm-is-remixable allow you to create reusable data functionality
-email: 
-- dm-is-remixable [a] coryodaniel [d] com
+email: dm-is-remixable [a] coryodaniel [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
-- TODO
-- History.rdoc
+- README.rdoc
 files: 
-- History.rdoc
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
-- TODO
+- VERSION
+- dm-is-remixable.gemspec
 - lib/dm-is-remixable.rb
 - lib/dm-is-remixable/is/remixable.rb
-- lib/dm-is-remixable/is/version.rb
 - spec/data/addressable.rb
 - spec/data/article.rb
 - spec/data/billable.rb
@@ -57,18 +72,21 @@ files:
 - spec/data/user.rb
 - spec/data/viewable.rb
 - spec/integration/remixable_spec.rb
+- spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/install.rb
-- tasks/spec.rb
+- tasks/ci.rake
+- tasks/metrics.rake
+- tasks/spec.rake
+- tasks/yard.rake
+- tasks/yardstick.rake
 has_rdoc: true
 homepage: http://github.com/datamapper/dm-more/tree/master/dm-is-remixable
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/History.rdoc

@@ -1,34 +0,0 @@
-=== 0.10.1 / 2009-09-30
-
-* No changes this version
-
-=== 0.10.0 / 2009-09-15
-
-* Updated to work with dm-core 0.10.0
-
-=== 0.9.11 / 2009-03-29
-
-* No changes this version
-
-=== 0.9.10 / 2009-01-19
-
-* No changes this version
-
-=== 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:
-
-  * Pre-Release, super beta.

data/Manifest.txt

@@ -1,26 +0,0 @@
-History.rdoc
-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-TODO
-lib/dm-is-remixable.rb
-lib/dm-is-remixable/is/remixable.rb
-lib/dm-is-remixable/is/version.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/spec.opts
-spec/spec_helper.rb
-tasks/install.rb
-tasks/spec.rb

data/TODO

@@ -1,18 +0,0 @@
-FIXME
-====
-Add ability to have a unique relationship when joining through remixable
-  This is stubbed at remixable.rb @~ line 223; waiting on stategic eager loading
-  M:M Video.remix n, :commentables, :as => "comments", :for => "User", :unique => false
-  M:M Article.remix n, :views, :for => "User", :unique => true
-    in the generated table article_views article_id and user_id would be a unique key,
-      only counting a users viewing of an article once
-
-TODO
-====
-- Add ability to set primary keys and indexes when remixing
-
-- Test nested remixing User remixes Photogenic; Photogenic Remixes comments
-- Test double+ remixing. User remixes Commentable; enhance Commentable remix Commentable
-
-- Remixable.related(*remixed_models)
-  Taggable.related(Article, JobPostings)

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

@@ -1,7 +0,0 @@
-module DataMapper
-  module Is
-    module Remixable
-      VERSION = '0.10.1'.freeze
-    end
-  end
-end

data/tasks/install.rb

@@ -1,13 +0,0 @@
-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 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

@@ -1,25 +0,0 @@
-begin
-  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.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
-
-    begin
-      require 'rcov'
-      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
-    rescue SyntaxError
-      # rcov syntax invalid
-    end
-  end
-rescue LoadError
-  # rspec not installed
-end