migrant 0.1.4 → 0.1.5

data/Gemfile

@@ -0,0 +1,9 @@
+source :gemcutter
+
+gem "jeweler"
+gem "thoughtbot-shoulda"
+gem "ansi"
+gem "turn"
+gem "sqlite3-ruby"
+gem "simplecov", "0.3.5"
+gem "rails", "3.0.0"

data/Gemfile.lock

@@ -0,0 +1,91 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    ansi (1.2.2)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.4.2)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    mail (2.2.12)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    simplecov (0.3.5)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
+    sqlite3-ruby (1.3.2)
+    thor (0.14.6)
+    thoughtbot-shoulda (2.11.1)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    turn (0.8.1)
+      ansi (>= 1.2.2)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ansi
+  jeweler
+  rails (= 3.0.0)
+  simplecov (= 0.3.5)
+  sqlite3-ruby
+  thoughtbot-shoulda
+  turn

data/Rakefile

@@ -1,27 +1,27 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "migrant"
-    gem.summary = %Q{All the fun of ActiveRecord, without writing your migrations, and a dash of mocking.}
-    gem.description = %Q{Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!}
-    gem.email = "101pascal@gmail.com"
-    gem.homepage = "http://github.com/pascalh1011/migrant"
-    gem.authors = ["Pascal Houliston"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_development_dependency "ansi", "= 1.2.2"
-    gem.add_development_dependency "turn", "= 0.8.1"  
-    gem.add_development_dependency "sqlite3-ruby", ">= 0"
-    gem.add_development_dependency "simplecov", "= 0.3.5"
-    gem.add_dependency "rails", ">= 3.0.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "migrant"
+  gem.summary = %Q{All the fun of ActiveRecord, without writing your migrations, and a dash of mocking.}
+  gem.description = %Q{Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!}
+  gem.email = "101pascal@gmail.com"
+  gem.homepage = "http://github.com/pascalh1011/migrant"
+  gem.authors = ["Pascal Houliston"]
+  gem.add_development_dependency "bundler"
+  gem.add_runtime_dependency "rails", ">= 3.0.0"
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 end
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -30,8 +30,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'
@@ -43,3 +41,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/migrant/schema.rb

@@ -9,19 +9,25 @@ module Migrant
   # into a schema on that model class by calling method_missing(my_field)
   # and deciding what the best schema type is for the user's requiredments
   class Schema
+    # Global scope resolution operators will make the Migrant DSL fucking useless
+    # So, I am doing this rather than inhering from SimpleObject, just live with it.
+  #  instance_methods.each { |m| raise 'fuckoff' if m == 'system' ; undef_method unless ['__send__', 'object_id'].include?(m) }
+
     attr_accessor :indexes, :columns, :methods_to_alias
 
-    def initialize  
+    def initialize
+      @proxy = SchemaProxy.new(self)
       @columns = Hash.new
       @indexes = Array.new
       @methods_to_alias = Array.new
-    end      
+    end
 
-    def define_structure(&block)      
+    def define_structure(&block)
       # Runs method_missing on columns given in the model "structure" DSL
-      self.instance_eval(&block) if block_given?
+      @proxy.translate_fancy_dsl(&block) if block_given?
+#      self.instance_eval(&block) if block_given?
     end
-    
+
     def add_associations(associations)
       associations.each do |association|
         field = association.options[:foreign_key] || (association.name.to_s+'_id').to_sym
@@ -36,22 +42,21 @@ module Migrant
         end
       end
     end
-    
+
     def requires_migration?
       !(@columns.blank? && @indexes.blank?)
     end
-    
+
     def column_migrations
       @columns.collect {|field, data| [field, data.column] } # All that needs to be migrated
     end
-    
+
     # This is where we decide what the best schema is based on the structure requirements
-    # The output of this is essentially a formatted schema hash that is processed 
+    # The output of this is essentially a formatted schema hash that is processed
     # on each model by Migrant::MigrationGenerator
-    def method_missing(*args, &block)
-      field = args.slice!(0)
-      data_type = (args.first.nil?)? DataType::String : args.slice!(0)
-      options = args.extract_options!
+
+    def add_field(field, data_type = nil, options = {})
+      data_type = DataType::String if data_type.nil?
 
       # Add index if explicitly asked
       @indexes << field if options.delete(:index) || data_type.class.to_s == 'Hash' && data_type.delete(:index)
@@ -74,18 +79,43 @@ module Migrant
       puts [":#{field}", "#{@columns[field].class}", "#{options.inspect}"].collect { |s| s.ljust(25) }.join if ENV['DEBUG']
     end
   end
-  
+
   class InheritedSchema < Schema
     attr_accessor :parent_schema
-    
+
     def initialize(parent_schema)
       @parent_schema = parent_schema
       @columns = Array.new
       @indexes = Array.new
     end
-    
+
     def requires_migration?
       false # All added to base table
     end
   end
+
+  # Why does this class exist? Excellent question.
+  # Basically, Kernel gives a whole bunch of global methods, like system, puts, etc. This is bad because
+  # our DSL relies on being able to translate any arbitrary method into a method_missing call.
+  # So, we call method missing in this happy bubble where these magic methods don't exist.
+  # The reason we don't inherit Schema itself in this way, is that we'd lose direct access to all other classes
+  # derived from Object. Normally this would just mean scope resolution operators all over the class, but the real
+  # killer is that the DSL would need to reference classes in that manner as well, which would reduce sexy factor by at least 100.
+  class SchemaProxy < BasicObject
+    def initialize(binding)
+      @binding = binding
+    end
+
+    def translate_fancy_dsl(&block)
+      self.instance_eval(&block)
+    end
+
+    def method_missing(*args, &block)
+      field = args.slice!(0)
+      data_type = args.slice!(0) unless args.first.nil?
+
+      @binding.add_field(field, data_type, args.extract_options!)
+    end
+  end
 end
+

data/migrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migrant}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pascal Houliston"]
-  s.date = %q{2010-11-25}
+  s.date = %q{2010-12-14}
   s.description = %q{Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!}
   s.email = %q{101pascal@gmail.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -136,26 +138,35 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_development_dependency(%q<ansi>, ["= 1.2.2"])
-      s.add_development_dependency(%q<turn>, ["= 0.8.1"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, ["= 0.3.5"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<ansi>, [">= 0"])
+      s.add_runtime_dependency(%q<turn>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<simplecov>, ["= 0.3.5"])
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<ansi>, ["= 1.2.2"])
-      s.add_dependency(%q<turn>, ["= 0.8.1"])
+      s.add_dependency(%q<ansi>, [">= 0"])
+      s.add_dependency(%q<turn>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<simplecov>, ["= 0.3.5"])
+      s.add_dependency(%q<rails>, ["= 3.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<ansi>, ["= 1.2.2"])
-    s.add_dependency(%q<turn>, ["= 0.8.1"])
+    s.add_dependency(%q<ansi>, [">= 0"])
+    s.add_dependency(%q<turn>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<simplecov>, ["= 0.3.5"])
+    s.add_dependency(%q<rails>, ["= 3.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Pascal Houliston
@@ -14,12 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +02:00
+date: 2010-12-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
+  name: jeweler
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,41 +27,37 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ansi
-  prerelease: false
+  name: thoughtbot-shoulda
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
-  type: :development
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: turn
-  prerelease: false
+  name: ansi
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 8
-        - 1
-        version: 0.8.1
-  type: :development
+        version: "0"
+  type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
+  name: turn
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -71,12 +66,25 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: simplecov
-  prerelease: false
+  name: sqlite3-ruby
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -86,12 +94,40 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  type: :development
-  version_requirements: *id005
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rails
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,7 +138,8 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *id009
 description: Migrant gives you a super-clean DSL to describe your ActiveRecord models (somewhat similar to DataMapper) and generates all your migrations for you so you can spend more time coding the stuff that counts!
 email: 101pascal@gmail.com
 executables: []
@@ -113,6 +150,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -199,6 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -454091891
       segments: 
       - 0
       version: "0"