sinatraband 0.1.6 → 0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2c2a69bf80cf74e6a52023dbf56bb13303c2e3da
+  data.tar.gz: d5d90224627f06ef502a737e5992baf74138d4ba
+SHA512:
+  metadata.gz: 1a819b441a132259b034a13627ddcad196fafcb471394985880f16336e3a508dccde53d40346c6ed3f3b37319e0583a537d7fa9fc2b49c99b76cec65fc633bd7
+  data.tar.gz: c32046a3219fc251aca15ae49bbd1e26289e3ea4ec738651e821774af372c2c8db987a6d412ef45f9f9cc4fe3af08baaa0a88209beec5bac47eaa2fa1f2625f5

data/bin/app.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'erb'
+require 'active_support/inflector'
 require_relative './helper.rb'
 
 class App
@@ -7,25 +8,25 @@ class App
 
   def proccess_arguments
   	if ARGV.empty?
-  		put_error_and_quit :error_message => "Error: Missing arguments"
+  		put_error_and_quit error_message: "Error: Missing arguments"
   	end
 
     #Get the global current path
-    @root = Pathname(__FILE__).dirname.realpath.to_s+"/../lib/templates"
+    @root =  "#{Pathname(__FILE__).dirname.realpath.to_s}/../lib/templates"
 
     #Defines operation
     case ARGV[0].downcase
       when "create"
-        #Get de App name
+        #Get the App name
         if ARGV[1].nil?
-          put_error_and_quit :error_message => "Error: Missing arguments for create action"
+          put_error_and_quit error_message: "Error: Missing arguments for create action"
         else
           @name = ARGV[1]
           create_app
         end
       when "model"
         if ARGV[1].nil?
-          put_error_and_quit :error_message => "Error: Missing arguments for model action"
+          put_error_and_quit error_message: "Error: Missing arguments for model action"
         else
           if ARGV.length > 2
             model_properties = Array.new
@@ -35,52 +36,65 @@ class App
               end
             end
           end
-          create_model :model_name => ARGV[1], :model_properties => model_properties
+          create_model model_name: ARGV[1], model_properties: model_properties
         end
       else
-        put_error_and_quit :error_message => "Error: Unknow arguments"
+        put_error_and_quit error_message: "Error: Unknow arguments"
     end
   end
 
   def create_app
-    #Creates de App diretory
-    mkdir :directory => "./#{@name}"
+    #Creates the App diretory
+    mkdir directory: "./#{@name}"
 
-    #Creates de App file
-    generate_file_from_template :directory => "", :template => "app", :final_file => "app", :extension => "rb"
+    #Creates the Models diretory
+    mkdir directory: "./#{@name}/models"
 
-    #Creates de Database file
-    generate_file_from_template :directory => "", :template => "database", :final_file => "database", :extension => "rb"
+    #Creates the Controllers diretory
+    mkdir directory: "./#{@name}/controllers"
 
-    #Creates de Models diretory
-    mkdir :directory => "./#{@name}/models"
+    #Creates the View diretory
+    mkdir directory: "./#{@name}/views"
 
-    #Creates de Controllers diretory
-    mkdir :directory => "./#{@name}/controllers"
+    #Creates the Database diretory
+    mkdir directory: "./#{@name}/db"
+    mkdir directory: "./#{@name}/db/migrate"
 
-    #Creates de View diretory
-    mkdir :directory => "./#{@name}/views"
+    #Creates the Gemfile
+    generate_file_from_template directory: "", template: "Gemfile", final_file: "Gemfile", extension: ""
 
-    #Creates de index file
-    generate_file_from_template :directory => "/views", :template => "index", :final_file => "index", :extension => "erb"
+    #Creates the Rakefile file
+    generate_file_from_template directory: "", template: "rakefile", final_file: "rakefile", extension: ".rb"
+
+    #Creates the App file
+    generate_file_from_template directory: "", template: "app", final_file: "app", extension: ".rb"
+
+    #Creates the Database file
+    generate_file_from_template directory: "/db", template: "connection", final_file: "connection", extension: ".rb"
+
+    #Creates the index file
+    generate_file_from_template directory: "/views", template: "index", final_file: "index", extension: ".erb"
   end
 
-  def create_model input={:model_name => '', :model_properties => {}}
+  def create_model input={model_name: '', model_properties: {}}
     if input[:model_properties].nil?
-      put_error_and_quit :error_message => "Error: Missing arguments for model action"
+      put_error_and_quit error_message: "Error: Missing arguments for model action"
     end
     
     @model_name = input[:model_name].capitalize
-    @model_properties = elaborates_model_properties :model_properties => input[:model_properties]
+    @model_properties = elaborates_model_properties model_properties: input[:model_properties]
+
+    #Creates the Model file
+    generate_file_from_template directory: "/models", template: "model", final_file: input[:model_name].downcase, extension: ".rb"
 
-    #Creates de Model file
-    generate_file_from_template :directory => "/models", :template => "model", :final_file => input[:model_name].downcase, :extension => "rb"
+    #Creates the Controller file
+    generate_file_from_template directory: "/controllers", template: "controller", final_file: input[:model_name].downcase.pluralize, extension: ".rb"
 
-    #Creates de Controller file
-    generate_file_from_template :directory => "/controllers", :template => "controller", :final_file => input[:model_name].downcase, :extension => "rb"
+    #Creates the migration file
+    generate_file_from_template directory: "/db/migrate", template: "migration", final_file: "#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_#{input[:model_name].downcase}", extension: ".rb"
 
-    #Creates de View diretory
-    mkdir :directory => ".#{@name}/views/"+input[:model_name].downcase
+    #Creates the View diretory
+    mkdir directory: ".#{@name}/views/#{input[:model_name].downcase.pluralize}"
   end
 
 end

data/bin/helper.rb

@@ -1,6 +1,6 @@
-def generate_file_from_template input={:directory => './'+@name, :template => '', :final_file => '', :extension => ''}
+def generate_file_from_template input={directory: "./#{@name}", template: '', final_file: '', extension: ''}
 
-  file_name = "./#{@name}#{input[:directory]}/#{input[:final_file]}.#{input[:extension]}"
+  file_name = "./#{@name}#{input[:directory]}/#{input[:final_file]}#{input[:extension]}"
 
   if File.exists?(file_name) && File.file?(file_name)
   	File.delete(file_name)
@@ -11,20 +11,20 @@ def generate_file_from_template input={:directory => './'+@name, :template => ''
 	begin
      file_template = ERB.new(File.open("#{@root}#{input[:directory]}/#{input[:template]}.erb").read)
 	rescue (Errno::ENOENT)
-	  put_error_and_quit "Error: Missing template for file #{@root}#{input[:directory]}/#{input[:template]}.#{input[:extension]}."
+	  put_error_and_quit "Error: Missing template for file #{@root}#{input[:directory]}/#{input[:template]}#{input[:extension]}."
 	end
 
 	begin
 	  f.write(file_template.result(binding))
-	  puts ".#{input[:directory]}/#{input[:final_file]}.#{input[:extension]} file created."  
+	  puts ".#{input[:directory]}/#{input[:final_file]}#{input[:extension]} file created."  
 	rescue (Errno::ENOENT)
-      put_error_and_quit "Error creating #{input[:final_file]}.#{input[:extension]}."
+      put_error_and_quit "Error creating #{input[:final_file]}#{input[:extension]}."
 	end
   end
 end
 
 
-def mkdir input={:directory => './'+@name}
+def mkdir input={directory: './'+@name}
   begin
     Dir.mkdir input[:directory]
     puts "#{input[:directory]} directory created."
@@ -34,18 +34,18 @@ def mkdir input={:directory => './'+@name}
 end
 
 
-def elaborates_model_properties input={:model_properties => ''}
+def elaborates_model_properties input={model_properties: ''}
   
   new_model_properties = Array.new
 
   input[:model_properties].each do |model_property|
     name = model_property.to_s.split(':')[0].downcase
-    type = model_property.to_s.split(':')[1].capitalize
+    type = model_property.to_s.split(':')[1].downcase
     
     if type == "Datetime" then type = "DateTime" end
 
     if !["id", "created_at", "updated_at"].include? name
-  	  new_model_properties << "property :" + name + ", " + type
+  	  new_model_properties <<  "t.#{type} :#{name}"
     end
   end
 
@@ -53,7 +53,7 @@ def elaborates_model_properties input={:model_properties => ''}
 end
 
 
-def put_error_and_quit input={:error_message => 'An error has ocorred.'}
+def put_error_and_quit input={error_message: 'An error has ocorred.'}
   puts input[:error_message]
   exit
 end

data/lib/templates/Gemfile.erb

@@ -0,0 +1,6 @@
+# Gemfile
+source "https://rubygems.org"
+ 
+gem "mysql2"
+gem "rake"
+gem "sinatra-activerecord"

data/lib/templates/app.erb

@@ -1,16 +1,18 @@
 require 'sinatra'
 
 # Loads database configuration
-require_relative './database.rb'
+require_relative './db/connection.rb'
 
 # Loads all models in models directory
 Dir["./models/*.rb"].each {|file| require_relative file }
 
-# Perform basic sanity checks and initialize all relationships
-DataMapper.finalize
-
 # Enables session
 enable :sessions
 
 # Loads all controllers in controllers directory
-Dir["./controllers/*.rb"].each {|file| require_relative file }
+Dir["./controllers/*.rb"].each {|file| require_relative file }
+
+# Default root_route
+get '/' do
+  erb :'index'
+end

data/lib/templates/controllers/controller.erb

@@ -1,38 +1,38 @@
-get '/<%= @model_name.downcase %>' do
-  @<%= @model_name.downcase %> = <%= @model_name %>.all
-  erb :'<%= @model_name.downcase %>/index'
+get '/<%= @model_name.downcase.pluralize %>' do
+  @<%= @model_name.downcase.pluralize %> = <%= @model_name %>.all
+  erb :'<%= @model_name.downcase.pluralize %>/index'
 end
 
-get '/<%= @model_name.downcase %>/new' do
-  erb :'<%= @model_name.downcase %>/new'
+get '/<%= @model_name.downcase.pluralize %>/new' do
+  erb :'<%= @model_name.downcase.pluralize %>/new'
 end
 
-post '/<%= @model_name.downcase %>/create' do
+post '/<%= @model_name.downcase.pluralize %>/create' do
   @<%= @model_name.downcase %> = <%= @model_name %>.new(params)
   if @<%= @model_name.downcase %>.save
-    redirect '/<%= @model_name.downcase %>'
+    redirect '/<%= @model_name.downcase.pluralize %>'
   else
-    erb :'<%= @model_name.downcase %>/new'
+    erb :'<%= @model_name.downcase.pluralize %>/new'
   end
 end
 
-get '/<%= @model_name.downcase %>/edit/:id' do
-  @<%= @model_name.downcase %> = <%= @model_name %>.get(params[:id])
-  erb :'<%= @model_name.downcase %>/edit'
+get '/<%= @model_name.downcase.pluralize %>/edit/:id' do
+  @<%= @model_name.downcase %> = <%= @model_name %>.where(params[:id]).first
+  erb :'<%= @model_name.downcase.pluralize %>/edit'
 end
 
-post '/<%= @model_name.downcase %>/update/:id' do
-  @<%= @model_name.downcase %> = <%= @model_name %>.get(params[:id])
+post '/<%= @model_name.downcase.pluralize %>/update/:id' do
+  @<%= @model_name.downcase %> = <%= @model_name %>.where(params[:id]).first
 
   if @<%= @model_name.downcase %>.update(params)
     redirect '/<%= @model_name.downcase %>'
   else
-    erb :'<%= @model_name.downcase %>/edit'
+    erb :'<%= @model_name.downcase.pluralize %>/edit'
   end
 end
 
-get '/<%= @model_name.downcase %>/delete/:id' do
-  @<%= @model_name.downcase %> = <%= @model_name %>.get(params[:id])
+get '/<%= @model_name.downcase.pluralize %>/delete/:id' do
+  @<%= @model_name.downcase %> = <%= @model_name %>.where(params[:id]).first
   @<%= @model_name.downcase %>.destroy
-  redirect '/<%= @model_name.downcase %>'
+  redirect '/<%= @model_name.downcase.pluralize %>'
 end

data/lib/templates/db/connection.erb

@@ -0,0 +1,2 @@
+require 'sinatra/activerecord'
+set :database, "mysql2://root:@localhost/<%= @name %>"

data/lib/templates/db/migrate/migration.erb

@@ -0,0 +1,14 @@
+class Create<%=@model_name%> < ActiveRecord::Migration
+  def up
+    create_table :<%=@model_name.downcase.pluralize%> do |t|
+      <% @model_properties.each do |property|%>
+      <%= property %>
+      <% end %>
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :<%=@model_name.downcase.pluralize%>
+  end
+end

data/lib/templates/models/model.erb

@@ -1,30 +1,21 @@
-class <%= @model_name %>
-  include DataMapper::Resource
-
-  property :id, Serial
-  <% @model_properties.each do |property|%>
-  <%= property %>
-  <% end%>
-  property :created_at, DateTime
-
-  property :updated_at, DateTime
-
-  #validates_absence_of
+class <%= @model_name %> < ActiveRecord::Base
   #validates_acceptance_of
-  #validates_with_block
+  #validates_associated
   #validates_confirmation_of
+  #validates_exclusion_of
   #validates_format_of
+  #validates_inclusion_of
   #validates_length_of
-  #validates_with_method
   #validates_numericality_of
-  #validates_primitive_type_of
   #validates_presence_of
   #validates_uniqueness_of
-  #validates_within
+  #validates_each
 
-  #validates_with_method
+  #validate :custom_method
 
-end
+  #def custom_method
+  #  errors.add(:field, "that's an error") if
+  #    some_condition != true
+  #end
 
-# Automatically create the <%= @model_name %> table if you haven't already
-<%= @model_name %>.auto_upgrade!
+end

data/lib/templates/rakefile.erb

@@ -0,0 +1,2 @@
+require "sinatra/activerecord/rake"
+require "./app.rb"

metadata

@@ -1,61 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatraband
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.6
+version: !ruby/object:Gem::Version
+  version: '0.2'
 platform: ruby
-authors: 
+authors:
 - Julio Bueno
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-20 00:00:00 Z
-dependencies: []
-
-description: Ruby gem to create a basic scaffold sinatra app.
+date: 2013-11-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby gem to create a basic scaffold sinatra app with activerecord.
 email: julioce@gmail.com
-executables: 
+executables:
 - sinatraband
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/templates/controllers/controller.erb
 - lib/templates/models/model.erb
 - lib/templates/views/index.erb
 - lib/templates/app.erb
-- lib/templates/database.erb
+- lib/templates/Gemfile.erb
+- lib/templates/rakefile.erb
+- lib/templates/db/migrate/migration.erb
+- lib/templates/db/connection.erb
 - bin/app.rb
 - bin/helper.rb
 - bin/sinatraband
 homepage: https://github.com/julioce/SinatraBand
-licenses: []
-
+licenses:
+- OSL-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
-summary: Sinatra app generator
+specification_version: 4
+summary: Sinatra simple app generator
 test_files: []
-

data/lib/templates/database.erb

@@ -1,7 +0,0 @@
-require 'data_mapper'
-
-# A MySQL connection:
-DataMapper.setup(:default, 'mysql://root:@127.0.0.1/<%= @name %>')
-
-# Set all String properties to have a default length of 255
-DataMapper::Property::String.length(255)