padrino-gen 0.11.1 → 0.11.2

data/lib/padrino-gen/generators/app/app.rb.tt

@@ -31,7 +31,7 @@ module <%= @project_name %>
     # set :public_folder, 'foo/bar' # Location for static assets (default root/public)
     # set :reload, false            # Reload application files (default in development)
     # set :default_builder, 'foo'   # Set a custom form builder (default 'StandardFormBuilder')
-    # set :locale_path, 'bar'       # Set path for I18n translations (default your_app/locales)
+    # set :locale_path, 'bar'       # Set path for I18n translations (default your_apps_root_path/locale)
     # disable :sessions             # Disabled sessions by default (enable if needed)
     # disable :flash                # Disables sinatra-flash (enabled by default if Sinatra::Flash is defined)
     # layout  :my_layout            # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)

data/lib/padrino-gen/generators/components/actions.rb

@@ -33,9 +33,9 @@ module Padrino
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m, options[:up]).gsub(/!DOWN!\n/m, options[:down])
             contents = contents.gsub(/!NAME!/, model_name.underscore.camelize).gsub(/!TABLE!/, model_name.underscore)
             contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.underscore.camelize)
-            current_migration_number = return_last_migration_number
-            contents = contents.gsub(/!FIELDS!/, column_declarations).gsub(/!VERSION!/, (current_migration_number + 1).to_s)
-            migration_filename = "#{format("%03d", current_migration_number+1)}_#{filename.underscore}.rb"
+            migration_number = current_migration_number
+            contents = contents.gsub(/!FIELDS!/, column_declarations).gsub(/!VERSION!/, migration_number)
+            migration_filename = "#{format("%03d", migration_number)}_#{filename.underscore}.rb"
             create_file(destination_root('db/migrate/', migration_filename), contents, :skip => true)
           end
         end
@@ -98,7 +98,7 @@ module Padrino
         # For migration files
         # returns the number of the migration that is being created
         # returna timestamp instead if :migration_format: in .components is "timestamp"
-				#
+        #
         # @api private
         def current_migration_number
           if fetch_component_choice(:migration_format).to_s == 'timestamp'

data/lib/padrino-gen/generators/components/orms/datamapper.rb

@@ -100,7 +100,7 @@ MIGRATION
 
 def create_model_migration(migration_name, name, columns)
   output_model_migration(migration_name, name, columns,
-       :column_format => Proc.new { |field, kind| "column :#{field}, #{kind.classify}#{', :length => 255' if kind =~ /string/i}" },
+       :column_format => Proc.new { |field, kind| "column :#{field}, DataMapper::Property::#{kind.classify}#{', :length => 255' if kind =~ /string/i}" },
        :base => DM_MIGRATION, :up => DM_MODEL_UP_MG, :down => DM_MODEL_DOWN_MG)
 end
 

data/lib/padrino-gen/generators/components/orms/ohm.rb

@@ -20,63 +20,10 @@ OHM = (<<-OHM) unless defined?(OHM)
 #  when :production then Ohm.connect(:db => 1)
 #  when :test then Ohm.connect(:db => 2)
 # end
-
-# This monkey patch provides traditional (hash of arrays) error handling for ohm models
-# Also add compatiblity with admin generator.
-module Ohm
-  class Model
-
-    alias_method :old_errors, :errors
-    def errors
-      @errors ||= ErrorsHash.new(self.class.to_reference, self.old_errors)
-    end
-
-    def update_attributes(attrs)
-      attrs.each do |key, value|
-        send(:"\#{key}=", value)
-      end if attrs
-    end
-
-    class << self
-      alias_method :old_attribute, :attribute
-      def attribute(name, cast=nil)
-        attributes << name
-        old_attribute(name, cast)
-      end
-
-      def attributes
-        @_attributes ||= []
-      end
-    end
-
-    class ErrorsHash < Hash
-      def initialize(scope, errors)
-        @scope  = scope
-        self.replace Hash.new { |hash, key| hash[key] = [] }
-
-        errors.each do |key, value|
-          self[key] << value
-        end
-      end
-
-      def push(arr)
-        self[arr[0]] << arr[1]
-      end
-
-      def full_messages
-        self.map do |key, value|
-          value.uniq.map do |reason|
-            I18n::t("ohm.%s.%s.%s" % [@scope, key, reason])
-          end.join(', ')
-        end
-      end
-    end
-  end
-end # unless Ohm::Model.new.errors.is_a?(Hash)
 OHM
 
 def setup_orm
-  require_dependencies 'ohm'
+  require_dependencies 'ohm', :version => "~> 1.3.0"
   create_file("config/database.rb", OHM)
 end
 

data/lib/padrino-gen/generators/components/orms/sequel.rb

@@ -32,9 +32,9 @@ def setup_orm
     require_dependencies 'pg'
     'pg'
   else
-    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_development.db\")")
-    sequel.gsub!(/!DB_PRODUCTION!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_production.db\")")
-    sequel.gsub!(/!DB_TEST!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_test.db\")")
+    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite:///\" + Padrino.root('db', \"#{db}_development.db\")")
+    sequel.gsub!(/!DB_PRODUCTION!/,"\"sqlite:///\" + Padrino.root('db', \"#{db}_production.db\")")
+    sequel.gsub!(/!DB_TEST!/,"\"sqlite:///\" + Padrino.root('db', \"#{db}_test.db\")")
     require_dependencies 'sqlite3'
     'sqlite3'
   end

data/lib/padrino-gen/generators/components/tests/bacon.rb

@@ -6,11 +6,18 @@ class Bacon::Context
   include Rack::Test::Methods
 end
 
-def app
-  ##
-  # You can handle all padrino applications using instead:
-  #   Padrino.application
-  CLASS_NAME.tap { |app|  }
+# You can use this method to custom specify a Rack app
+# you want rack-test to invoke:
+#
+#   app CLASS_NAME
+#   app CLASS_NAME.tap { |a| }
+#   app(CLASS_NAME) do
+#     set :foo, :bar
+#   end
+#
+def app(app = nil &blk)
+  @app ||= block_given? ? app.instance_eval(&blk) : app
+  @app ||= Padrino.application
 end
 TEST
 

data/lib/padrino-gen/generators/components/tests/minitest.rb

@@ -5,11 +5,18 @@ require File.expand_path('../../config/boot', __FILE__)
 class MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
-  def app
-    ##
-    # You can handle all padrino applications using instead:
-    #   Padrino.application
-    CLASS_NAME.tap { |app|  }
+  # You can use this method to custom specify a Rack app
+  # you want rack-test to invoke:
+  #
+  #   app CLASS_NAME
+  #   app CLASS_NAME.tap { |a| }
+  #   app(CLASS_NAME) do
+  #     set :foo, :bar
+  #   end
+  #
+  def app(app = nil &blk)
+    @app ||= block_given? ? app.instance_eval(&blk) : app
+    @app ||= Padrino.application
   end
 end
 TEST

data/lib/padrino-gen/generators/components/tests/riot.rb

@@ -9,30 +9,25 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
 class Riot::Situation
   include Rack::Test::Methods
-  ##
-  # You can handle all padrino applications using instead:
-  #   Padrino.application
-  # Or just the Application itself like:
-  #   CLASS_NAME.tap { |app|  }
-
-  def app
-    @app || Padrino.application
-  end
-end
 
-class Riot::Context
-  # Set the Rack app which is to be tested.
+  # You can use this method to custom specify a Rack app
+  # you want rack-test to invoke:
   #
-  #   context "MyApp" do
-  #     app { [200, {}, "Hello!"] }
-  #     setup { get '/' }
-  #     asserts(:status).equals(200)
+  #   app CLASS_NAME
+  #   app CLASS_NAME.tap { |a| }
+  #   app(CLASS_NAME) do
+  #     set :foo, :bar
   #   end
-  def app(app=nil, &block)
-    setup { @app = (app || block.call) }
+  #
+  def app(app = nil &blk)
+    @app ||= block_given? ? app.instance_eval(&blk) : app
+    @app ||= Padrino.application
   end
 end
 
+class Riot::Context
+end
+
 TEST
 
 RIOT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_CONTROLLER_TEST)

data/lib/padrino-gen/generators/components/tests/rspec.rb

@@ -6,11 +6,18 @@ RSpec.configure do |conf|
   conf.include Rack::Test::Methods
 end
 
-def app
-  ##
-  # You can handle all padrino applications using instead:
-  #   Padrino.application
-  CLASS_NAME.tap { |app|  }
+# You can use this method to custom specify a Rack app
+# you want rack-test to invoke:
+#
+#   app CLASS_NAME
+#   app CLASS_NAME.tap { |a| }
+#   app(CLASS_NAME) do
+#     set :foo, :bar
+#   end
+#
+def app(app = nil &blk)
+  @app ||= block_given? ? app.instance_eval(&blk) : app
+  @app ||= Padrino.application
 end
 TEST
 

data/lib/padrino-gen/generators/components/tests/shoulda.rb

@@ -7,11 +7,18 @@ require "test/unit"
 class Test::Unit::TestCase
   include Rack::Test::Methods
 
-  def app
-    ##
-    # You can handle all padrino applications using instead:
-    #   Padrino.application
-    CLASS_NAME.tap { |app|  }
+  # You can use this method to custom specify a Rack app
+  # you want rack-test to invoke:
+  #
+  #   app CLASS_NAME
+  #   app CLASS_NAME.tap { |a| }
+  #   app(CLASS_NAME) do
+  #     set :foo, :bar
+  #   end
+  #
+  def app(app = nil &blk)
+    @app ||= block_given? ? app.instance_eval(&blk) : app
+    @app ||= Padrino.application
   end
 end
 TEST

data/lib/padrino-gen/generators/components/tests/testspec.rb

@@ -5,11 +5,18 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 class Test::Unit::TestCase
   include Rack::Test::Methods
 
-  def app
-    ##
-    # You can handle all padrino applications using instead:
-    #   Padrino.application
-    CLASS_NAME.tap { |app|  }
+  # You can use this method to custom specify a Rack app
+  # you want rack-test to invoke:
+  #
+  #   app CLASS_NAME
+  #   app CLASS_NAME.tap { |a| }
+  #   app(CLASS_NAME) do
+  #     set :foo, :bar
+  #   end
+  #
+  def app(app = nil &blk)
+    @app ||= block_given? ? app.instance_eval(&blk) : app
+    @app ||= Padrino.application
   end
 end
 TEST

data/lib/padrino-gen/generators/templates/mailer.rb.tt

@@ -30,17 +30,23 @@
 #
 #   set :delivery_method, :test
 #
+# or storing emails locally:
+#
+#   set :delivery_method, :file => {
+#     :location => "#{Padrino.root}/tmp/emails",
+#   }
+#
 # and then all delivered mail will use these settings unless otherwise specified.
 #
 
 <%= @project_name %>::<%= @app_name %>.mailer :<%= @short_name %> do
   <%- if @actions.nil? || @actions.empty? -%>
-  # Message definitions here...
+  # Message definitions here ...
   <%- else -%>
     <%- @actions.each do |action| -%>
 
   email <%=action.inspect%> do
-    # Your mailer goes here
+    # Your mailer goes here ...
   end
 
     <%- end -%>

data/lib/padrino-gen/padrino-tasks/datamapper.rb

@@ -58,7 +58,12 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
       puts "=> Creating database '#{database}'"
       case config[:adapter]
         when 'postgres'
-          system("createdb", "-E", charset, "-h", host, "-U", user, database)
+          arguments = []
+          arguments << "--encoding=#{charset}" if charset
+          arguments << "--host=#{host}" if host
+          arguments << "--username=#{user}" if user
+          arguments << database
+          system("createdb", *arguments)
           puts "<= dm:create executed"
         when 'mysql'
           arguments = ["--user=#{user}"]
@@ -88,7 +93,11 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
       puts "=> Dropping database '#{database}'"
       case config[:adapter]
         when 'postgres'
-          system("dropdb", "-h", host, "-U", user, database)
+          arguments = []
+          arguments << "--host=#{host}" if host
+          arguments << "--username=#{user}" if user
+          arguments << database
+          system("dropdb", *arguments)
           puts "<= dm:drop executed"
         when 'mysql'
           arguments = ["--user=#{user}"]

data/test/test_model_generator.rb

@@ -67,7 +67,7 @@ describe "ModelGenerator" do
     end
 
     should "generate migration file versions properly" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'account', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'bank', "-r=#{@apptmp}/sample_project") }
@@ -76,6 +76,15 @@ describe "ModelGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/003_create_banks.rb")
     end
 
+    should "generate migration file versions properly when timestamped" do
+      capture_io { generate(:project, 'sample_project', "--migration_format=timestamp", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+
+      time = stop_time_for_test.utc.strftime("%Y%m%d%H%M%S")
+
+      capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
+      assert_file_exists("#{@apptmp}/sample_project/db/migrate/#{time}_create_users.rb")
+    end
+
     should "generate a default type value for fields" do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
@@ -224,9 +233,9 @@ describe "ModelGenerator" do
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
       assert_match_in_file(/migration 1, :create_people do/m, migration_file_path)
       assert_match_in_file(/create_table :people do/m, migration_file_path)
-      assert_match_in_file(/column :name, String/m, migration_file_path)
-      assert_match_in_file(/column :created_at, DateTime/m, migration_file_path)
-      assert_match_in_file(/column :email, String/m, migration_file_path)
+      assert_match_in_file(/column :name, DataMapper::Property::String/m, migration_file_path)
+      assert_match_in_file(/column :created_at, DataMapper::Property::DateTime/m, migration_file_path)
+      assert_match_in_file(/column :email, DataMapper::Property::String/m, migration_file_path)
       assert_match_in_file(/drop_table :people/m, migration_file_path)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1271294022320842473
+      hash: -2733379671843302871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: