talentbox-sequel-rails 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    talentbox-sequel-rails (0.3.2)
+    talentbox-sequel-rails (0.3.3)
       rails (~> 3.2.0)
       sequel (~> 3.28)
 
@@ -45,13 +45,13 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    json (1.6.6)
+    json (1.7.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.3.2)
+    multi_json (1.3.5)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -88,7 +88,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
     sequel (3.34.1)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)

data/History.md

@@ -1,42 +1,59 @@
-== 0.3.2
+0.3.3
+=====
+
+* Fix generators and use better model and migration template (Joshua Hansen)
+
+0.3.2
+=====
 * Ignore environments without `database` key (like ActiveRecord do it), to allow
   shared configurations in `database.yml`.
 * Fix db creation commands to let the `system` method escape the arguments
 * Fix error when using `mysql2` gem
 
-== 0.3.1
+0.3.1
+=====
 * Make `db:schema:dump` Rake task depends on Rails `environment` task (Gabor Ratky)
 
-== 0.3.0
+0.3.0
+=====
 * Update dependency to Rails (~> 3.2.0)
 
-== 0.2.3
+0.2.3
+=====
 * Set `PGPASSWORD` environment variable before trying to create DB using `createdb`
 
-== 0.2.2
+0.2.2
+=====
 * Ensure Sequel is disconnected before trying to drop a db
 
-== 0.2.1
+0.2.1
+=====
 * Make dependency on Sequel more open (~> 3.28)
 
-== 0.2.0
+0.2.0
+=====
 * Fix deprecation warning for config.generators
 * Update dependency to Rails 3.1.1
 * Update dependency to Sequel 3.28.0
 * Update dependency to RSpec 2.7.0
 
-== 0.1.4
+0.1.4
+=====
 * Merged in changes to rake tasks and timestamp migrations
 
-== 0.1.3
+0.1.3
+=====
 * update sequel dependency, configuration change
 
-== 0.1.2
+0.1.2
+=====
 * fixed log_subscriber bug that 0.1.1 was -supposed- to fix.
 * fixed controller_runtime bug
 
-== 0.1.1
+0.1.1
+=====
 * bug fixes, no additional functionality
 
-== 0.1.0
+0.1.0
+=====
 * initial release

data/README.rdoc

@@ -89,6 +89,14 @@ This fork:
 
 * Jonathan Tron (JonathanTron)
 
+== Contributors
+
+Improvements has been made by those awesome contributors:
+
+* Benjamin Atkin (benatkin)
+* Gabor Ratky (rgabo)
+* Joshua Hansen (binarypaladin)
+
 == Copyright
 
 Copyright (c) 2010 The sequel-rails team. See {LICENSE}[http://github.com/brasten/sequel-rails/blob/master/LICENSE] for details.

data/lib/generators/sequel.rb

@@ -38,7 +38,7 @@ module Sequel
       end
 
       def self.find(klass, params=nil)
-        "#{klass}.get(#{params})"
+        "#{klass}[#{params}]"
       end
 
       def self.build(klass, params=nil)

data/lib/generators/sequel/migration/migration_generator.rb

@@ -13,14 +13,29 @@ module Sequel
         migration_template "migration.rb", "db/migrate/#{file_name}.rb"
       end
 
-      protected
-
-      attr_reader :migration_action
+      attr_reader :migration_action, :table_action, :column_action, :use_change
 
+      protected
       def set_local_assigns!
-        if file_name =~ /^(add|remove|drop)_.*_(?:to|from)_(.*)/
-          @migration_action = $1 == 'add' ? 'add' : 'drop'
-          @table_name       = $2.pluralize
+        if file_name =~ /^(create|drop)_(.*)$/
+          @table_action   = $1
+          @table_name     = $2.pluralize
+          @column_action  = 'add'
+          @use_change     = @table_action == 'create' ? true : false
+        elsif file_name =~ /^(add|drop|remove)_.*_(?:to|from)_(.*)/
+          @table_action   = 'alter'
+          @table_name     = $2.pluralize
+          @column_action  = $1 == 'add' ? 'add' : 'drop'
+          @use_change     = @column_action == 'add' ? true : false
+        else
+          @table_action   = 'alter'
+          if file_name =~ /^(alter)_(.*)/
+            @table_name   = $2.pluralize
+          else
+            @table_name   = file_name.pluralize
+          end
+          @use_change     = false
+          @column_action  = 'add'
         end
       end
 

data/lib/generators/sequel/migration/templates/migration.rb

@@ -1,16 +1,48 @@
-class <%= migration_file_name.camelize %>Migration < Sequel::Migration
-
-  def up
-    create_table :<%= table_name %> do
+Sequel.migration do
+  <%- if use_change -%>
+  change do
+    <%= table_action %>_table :<%= table_name %> do
+      <%- if table_action == 'create' -%>
       primary_key :id
-<% attributes.each do |attribute| -%>
+      <%- end -%>
+      <%- attributes.each do |attribute| -%>
+      <%- if table_action == 'create' -%>
       <%= attribute.type_class %> :<%= attribute.name %>
-<% end -%>
+      <%- else -%>
+      <%= column_action %>_column :<%= attribute.name %><% if column_action == 'add' %>, <%= attribute.type_class %><% end %>
+      <%- end -%>
+      <%- end -%>
     end
   end
-
-  def down
+  <%- else -%>
+  up do
+    <%- if table_action == 'drop' -%>
     drop_table :<%= table_name %>
+    <%- else -%>
+    <%= table_action %>_table :<%= table_name %> do
+      <%- attributes.each do |attribute| -%>
+      <%- if table_action == 'create' -%>
+      <%= attribute.type_class %> :<%= attribute.name %>
+      <%- else -%>
+      <%= column_action %>_column :<%= attribute.name %><% if column_action == 'add' %>, <%= attribute.type_class %><% end %>
+      <%- end -%>
+      <%- end -%>
+    end
+    <%- end -%>
+  end
+  
+  down do
+    <%- alter_table_action = (table_action == 'drop') ? 'create' : table_action -%>
+    <%- alter_column_action = (column_action == 'add') ? 'drop' : 'add' -%>
+    <%= alter_table_action %>_table :<%= table_name %> do
+      <%- attributes.each do |attribute| -%>
+      <%- if alter_table_action == 'create' -%>
+      <%= attribute.type_class %> :<%= attribute.name %>
+      <%- else -%>
+      <%= alter_column_action %>_column :<%= attribute.name %><% if alter_column_action == 'add' %>, <%= attribute.type_class %><% end %>
+      <%- end -%>
+      <%- end -%>
+    end
   end
-
+  <%- end -%>
 end

data/lib/generators/sequel/model/model_generator.rb

@@ -8,9 +8,15 @@ module Sequel
 
       check_class_collision
 
+      class_option :migration,  :type => :boolean
       class_option :timestamps, :type => :boolean
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
 
+      def create_migration_file
+        return unless options[:migration]
+        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
+      end
+
       def create_model_file
         template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
       end

data/lib/generators/sequel/model/templates/migration.rb

@@ -0,0 +1,16 @@
+Sequel.migration do 
+  change do
+
+    create_table :<%= table_name %> do
+      primary_key :id
+      <%- if options[:timestamps] -%>
+      DateTime :created_at
+      DateTime :updated_at
+      <%- end -%>
+      <%- attributes.each do |attribute| -%>
+      <%= attribute.type_class %> :<%= attribute.name %>
+      <%- end -%>
+    end
+
+  end
+end

data/lib/generators/sequel/model/templates/model.rb

@@ -1,3 +1,6 @@
 class <%= class_name %><%= options[:parent] ? " < #{options[:parent].classify}" : " < Sequel::Model" %>
-
+  <%- if options[:timestamps] -%>
+  plugin :timestamps
+  <%- end -%>
+  
 end

data/lib/sequel-rails/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sequel
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2166376760 !ruby/object:Gem::Requirement
+  requirement: &2162139960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.28'
   type: :runtime
   prerelease: false
-  version_requirements: *2166376760
+  version_requirements: *2162139960
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2166392200 !ruby/object:Gem::Requirement
+  requirement: &2162137040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166392200
+  version_requirements: *2162137040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2166391160 !ruby/object:Gem::Requirement
+  requirement: &2162133700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2166391160
+  version_requirements: *2162133700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2166390060 !ruby/object:Gem::Requirement
+  requirement: &2162129900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *2166390060
+  version_requirements: *2162129900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166389020 !ruby/object:Gem::Requirement
+  requirement: &2162126940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2166389020
+  version_requirements: *2162126940
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2166388360 !ruby/object:Gem::Requirement
+  requirement: &2162122940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 4.4.6
   type: :development
   prerelease: false
-  version_requirements: *2166388360
+  version_requirements: *2162122940
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2166387540 !ruby/object:Gem::Requirement
+  requirement: &2162120160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 0.9.11
   type: :development
   prerelease: false
-  version_requirements: *2166387540
+  version_requirements: *2162120160
 description: Integrate Sequel with Rails 3
 email:
 - brasten@gmail.com
@@ -112,6 +112,7 @@ files:
 - lib/generators/sequel/migration/migration_generator.rb
 - lib/generators/sequel/migration/templates/migration.rb
 - lib/generators/sequel/model/model_generator.rb
+- lib/generators/sequel/model/templates/migration.rb
 - lib/generators/sequel/model/templates/model.rb
 - lib/generators/sequel/observer/observer_generator.rb
 - lib/generators/sequel/observer/templates/observer.rb
@@ -154,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3768588127880768772
+      hash: 1061361385848004113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3768588127880768772
+      hash: 1061361385848004113
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15