napa 0.4.3 → 0.5.0

data/lib/napa/cli/model.rb

@@ -0,0 +1,126 @@
+require 'thor'
+require 'active_support/all'
+require 'napa/cli/generated_attribute'
+
+module Napa
+  module CLI
+    class Error < Thor::Error # :nodoc:
+    end
+
+    # Note: This currently does not support namespaced model creation.
+    class Model < Thor::Group
+      include Thor::Actions
+
+      # Largely modeled off of Rails's:
+      #  - activerecord/lib/rails/generators/active_record/model/model_generator.rb,
+      #  - railties/lib/rails/generators/base.rb, and
+      #  - railties/lib/rails/generators/named_base.rb
+
+      argument :name
+      argument :attributes, :type => :array, :default => []
+
+      class_option :migration,  :type => :boolean, :default => true
+      class_option :timestamps, :type => :boolean, :default => true
+      class_option :indexes,    :type => :boolean, :default => true
+      class_option :parent,     :type => :string
+
+      def parse_attributes!
+        self.attributes = (attributes || []).map do |attr|
+          GeneratedAttribute.parse(attr)
+        end
+      end
+
+      def generate_model
+        # In order to check for class collisions, the Grape environment needs to be loaded.
+        say 'Generating model...'
+        self.class.source_root "#{File.dirname(__FILE__)}/templates"
+        create_migration_file
+        create_model_file
+        create_factory_file
+        create_model_spec_file
+        say 'Done!', :green
+      end
+
+      protected
+
+      def version
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      end
+
+      def create_migration_file
+        return unless options[:migration] && options[:parent].nil?
+        attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
+
+        # This does not currently check for similar migrations.
+        #   This can be done by overriding the CreateFile Thor action and
+        #   implementing the exists? and on_conflict_behavior methods.
+        template migration_template, "#{migration_output_directory}/#{version}_#{migration_name}.rb"
+      end
+
+      def create_model_file
+        template model_template, "#{model_output_directory}/#{model_name}.rb"
+      end
+
+      def create_factory_file
+        template factory_template, "#{factory_output_directory}/#{table_name}.rb"
+      end
+
+      def create_model_spec_file
+        template model_spec_template, "#{model_spec_output_directory}/#{model_name}_spec.rb"
+      end
+
+      def model_name
+        name.underscore
+      end
+
+      def migration_name
+        "create_#{table_name}"
+      end
+
+      def table_name
+        model_name.pluralize
+      end
+
+      def migration_template
+        "model/db/migrate/migration.rb.tt"
+      end
+
+      def parent_class_name
+        options[:parent] || "ActiveRecord::Base"
+      end
+
+      def migration_output_directory
+        './db/migrate'
+      end
+
+      def model_template
+        "model/app/models/model.rb.tt"
+      end
+
+      def model_output_directory
+        './app/models'
+      end
+
+      def factory_template
+        "model/spec/factories/factory.rb.tt"
+      end
+
+      def factory_output_directory
+        './spec/factories'
+      end
+
+      def model_spec_template
+        "model/spec/models/model_spec.rb.tt"
+      end
+
+      def model_spec_output_directory
+        './spec/models'
+      end
+
+      def attributes_with_index
+        attributes.select { |a| !a.reference? && a.has_index? }
+      end
+
+    end
+  end
+end

data/lib/napa/cli/templates/model/app/models/model.rb.tt

@@ -0,0 +1,9 @@
+class <%= model_name.camelize %> < <%= parent_class_name.classify %>
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
+<% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+  # Note: This requires bcrypt to be added to your Gemfile.
+  has_secure_password
+<% end -%>
+end

data/lib/napa/cli/templates/model/spec/factories/factory.rb.tt

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :<%= model_name %> do
+<% attributes.each do |attribute| -%>
+<% if attribute.reference? -%>
+    association :<%= attribute.name %>
+<% elsif attribute.password_digest? -%>
+    password <%= attribute.factory_stub %>
+    password_confirmation <%= attribute.factory_stub %>
+<% else -%>
+    <%= attribute.name %> <%= attribute.factory_stub %>
+<% end -%>
+<% end -%>
+  end
+end

data/lib/napa/cli/templates/model/spec/models/model_spec.rb.tt

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe <%= model_name.camelize %> do
+
+  it 'can be created' do
+    <%= model_name %> = create :<%= model_name %>
+    expect(<%= model_name %>).to_not be_nil
+  end
+
+  it 'needs tests to be written!' do
+    pending('write tests for <%= model_name.camelize.classify %>!')
+  end
+
+end

data/lib/napa/cli/templates/new/Gemfile.tt

@@ -4,6 +4,7 @@ ruby "2.0.0"
 gem 'rack-cors'
 gem '<%= @database_gem %>'
 gem 'activerecord', '~> 4.0.0', :require => 'active_record'
+gem 'hashie-forbidden_attributes'
 gem 'honeybadger', '~> 1.16.7'
 gem 'json'
 gem 'napa'

data/lib/napa/middleware/authentication.rb

@@ -34,7 +34,11 @@ module Napa
 
         if env['HTTP_PASSWORDS'].present?
           possible_passwords = env['HTTP_PASSWORDS'].to_s.split(',')
-          (@allowed_header_passwords & possible_passwords).any?
+          successful_auth = (@allowed_header_passwords & possible_passwords).any?
+          return successful_auth if successful_auth
+
+          # check old header password if the new one fails
+          @old_allowed_passwords.include? env['HTTP_PASSWORD']
         else
           @old_allowed_passwords.include? env['HTTP_PASSWORD']
         end

data/lib/napa/rspec_extensions/response_helpers.rb

@@ -29,6 +29,10 @@ module Napa
         expect(result_count).to eq(count)
       end
 
+      def expect_error_code(error_code)
+        expect(parsed_response.error.code).to eq(error_code.to_s)
+      end
+
       def expect_only(object)
         expect_count_of 1
         expect(first_result.id).to eq(object.id)

data/lib/napa/setup.rb

@@ -18,7 +18,7 @@ module Napa
     end
 
     def env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV['RACK_ENV'] || 'development')
+      @_env ||= ActiveSupport::StringInquirer.new(lookup_env)
     end
 
     def env=(environment)
@@ -32,5 +32,9 @@ module Napa
     def cache=(store_option)
       @_cache = ActiveSupport::Cache.lookup_store(store_option)
     end
+
+    def lookup_env
+      ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
+    end
   end
 end

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 
   class Version
     class << self

data/lib/tasks/db.rake

@@ -27,6 +27,9 @@ unless defined?(Rails)
       options = {}.tap do |o|
         o[:adapter]                 = db['adapter']
         o[:database]                = 'postgres' if db['adapter'] == 'postgresql'
+        %w(host port username password).each do |f|
+          o[f.to_sym] = db[f] if db.has_key? f
+        end
       end
 
       ActiveRecord::Base.establish_connection(options)
@@ -41,6 +44,9 @@ unless defined?(Rails)
       options = {}.tap do |o|
         o[:adapter]                 = db['adapter']
         o[:database]                = 'postgres' if db['adapter'] == 'postgresql'
+        %w(host port username password).each do |f|
+          o[f.to_sym] = db[f] if db.has_key? f
+        end
       end
 
       ActiveRecord::Base.establish_connection(options)

data/napa.gemspec

@@ -18,25 +18,25 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.0'
 
 
-  gem.add_dependency 'rake', '~> 10.3'
-  gem.add_dependency 'logging', '~> 1.8'
-  gem.add_dependency 'dotenv', '~> 1.0'
-  gem.add_dependency 'octokit', '~> 3.5'
-  gem.add_dependency 'thor', '~> 0.19'
-  gem.add_dependency 'virtus', '~> 1.0'
-  gem.add_dependency 'grape', '~> 0.9'
-  gem.add_dependency 'grape-swagger', '~> 0.8'
-  gem.add_dependency 'roar', '~> 0.12'
-  gem.add_dependency 'statsd-ruby', '~> 1.2'
-  gem.add_dependency 'racksh', '~> 1.0'
-  gem.add_dependency 'git', '~> 1.2'
-  gem.add_dependency 'actionpack', '>= 3.2'
+  gem.add_dependency 'rake', '~> 10.3.0'
+  gem.add_dependency 'logging', '~> 1.8.0'
+  gem.add_dependency 'dotenv', '~> 1.0.0'
+  gem.add_dependency 'octokit', '~> 3.5.0'
+  gem.add_dependency 'thor', '~> 0.19.0'
+  gem.add_dependency 'virtus', '~> 1.0.0'
+  gem.add_dependency 'grape', '~> 0.9.0'
+  gem.add_dependency 'grape-swagger', '~> 0.8.0'
+  gem.add_dependency 'roar', '~> 0.12.0'
+  gem.add_dependency 'statsd-ruby', '~> 1.2.0'
+  gem.add_dependency 'racksh', '~> 1.0.0'
+  gem.add_dependency 'git', '~> 1.2.0'
+  gem.add_dependency 'actionpack', '>= 3.2.0'
 
-  gem.add_development_dependency 'rspec', '~> 3.1'
-  gem.add_development_dependency 'pry', '~> 0.10'
-  gem.add_development_dependency 'rubocop', '~> 0.25'
-  gem.add_development_dependency 'activerecord', '~> 3.2'
-  gem.add_development_dependency 'sqlite3', '~> 1.3'
+  gem.add_development_dependency 'rspec', '~> 3.1.0'
+  gem.add_development_dependency 'pry', '~> 0.10.0'
+  gem.add_development_dependency 'rubocop', '~> 0.25.0'
+  gem.add_development_dependency 'activerecord', '~> 3.2.0'
+  gem.add_development_dependency 'sqlite3', '~> 1.3.0'
   gem.add_development_dependency 'acts_as_fu', '~> 0'
   gem.add_development_dependency 'codeclimate-test-reporter'
 end

data/spec/cli/generate/api_spec.rb

@@ -24,13 +24,6 @@ describe Napa::CLI::Generate do
       expect(api_code).to match(/class FoosApi/)
     end
 
-    it 'creates a model class' do
-      expected_model_file = File.join(test_api_directory, 'app/models/foo.rb')
-      model_code = File.read(expected_model_file)
-
-      expect(model_code).to match(/class Foo/)
-    end
-
     it 'creates a representer class' do
       expected_representer_file = File.join(test_api_directory, 'app/representers/foo_representer.rb')
       representer_code = File.read(expected_representer_file)
@@ -52,13 +45,6 @@ describe Napa::CLI::Generate do
 
       expect(api_code).to match(/describe FoosApi/)
     end
-
-    it 'creates a model spec' do
-      expected_model_file = File.join(test_api_directory, 'spec/models/foo_spec.rb')
-      model_code = File.read(expected_model_file)
-
-      expect(model_code).to match(/describe Foo/)
-    end
   end
 
 end

data/spec/cli/model_spec.rb

@@ -0,0 +1,297 @@
+require 'spec_helper'
+require 'napa/cli/model'
+
+describe Napa::CLI::Model do
+  let(:test_output_directory) { 'spec/tmp' }
+  let(:version) { '20000101000000' }
+
+  silence_thor
+
+  before do
+    allow_any_instance_of(described_class).to receive(:model_output_directory).and_return(test_output_directory)
+    allow_any_instance_of(described_class).to receive(:migration_output_directory).and_return(test_output_directory)
+    allow_any_instance_of(described_class).to receive(:factory_output_directory).and_return(test_output_directory)
+    allow_any_instance_of(described_class).to receive(:model_spec_output_directory).and_return(test_output_directory)
+    allow_any_instance_of(described_class).to receive(:version).and_return(version)
+  end
+
+  after do
+    FileUtils.rm_rf(test_output_directory)
+  end
+
+  describe 'Car model' do
+    before do
+      model = Napa::CLI::Model.new([ 'Car',
+                                     'transmission_type:references',
+                                     'has_navigation:boolean' ],
+                                   [ '--parent=Vehicle' ])
+      model.invoke_all
+
+      # The migration should not be created because a parent model is specified.
+      @migration_file = File.join(test_output_directory, "#{version}_create_cars.rb")
+
+      expected_model_file = File.join(test_output_directory, 'car.rb')
+      @model_content = File.read(expected_model_file)
+
+      expected_model_spec_file = File.join(test_output_directory, 'car_spec.rb')
+      @model_spec_content = File.read(expected_model_spec_file)
+
+      expected_factory_file = File.join(test_output_directory, 'cars.rb')
+      @factory_content = File.read(expected_factory_file)
+    end
+
+    describe 'migration' do
+      it 'is not created' do
+        expect(File.exists?(@migration_file)).to eq(false)
+      end
+    end
+
+    describe 'model' do
+      it 'creates a model class' do
+        expect(@model_content).to match(/class Car/)
+      end
+
+      it 'model inherits from ActiveRecord::Base' do
+        expect(@model_content).to match(/Car < Vehicle/)
+      end
+
+      it 'adds belongs_to association for references attributes' do
+        expect(@model_content).to match(/belongs_to :transmission_type/)
+      end
+    end
+
+    describe 'model spec' do
+      it 'loads the spec_helper' do
+        expect(@model_spec_content).to match(/require 'spec_helper'/)
+      end
+
+      it 'describes the model' do
+        expect(@model_spec_content).to match(/describe Car/)
+      end
+
+      it 'tests the creation of an model instance' do
+        expect(@model_spec_content).to match(/car = create :car/)
+      end
+
+      it 'creates a pending test' do
+        expect(@model_spec_content).to match(/pending\('.*'\)/)
+      end
+    end
+
+    describe 'factory' do
+      it 'creates a factory for the model' do
+        expect(@factory_content).to match(/factory :car/)
+      end
+
+      it 'creates a stub for each attribute' do
+        expect(@factory_content).to match(/association :transmission_type/)
+        expect(@factory_content).to match(/has_navigation false/)
+      end
+    end
+
+    after do
+      FileUtils.rm_rf(test_output_directory)
+    end
+  end
+
+  describe 'User model' do
+    before do
+      Napa::CLI::Model.new([ 'User',
+                             'username:string:index',
+                             'password:digest',
+                             'referrer:references',
+                             'birth_date:date:index' ]).invoke_all
+
+      expected_migration_file = File.join(test_output_directory, "#{version}_create_users.rb")
+      @migration_content = File.read(expected_migration_file)
+
+      expected_model_file = File.join(test_output_directory, 'user.rb')
+      @model_content = File.read(expected_model_file)
+
+      expected_model_spec_file = File.join(test_output_directory, 'user_spec.rb')
+      @model_spec_content = File.read(expected_model_spec_file)
+
+      expected_factory_file = File.join(test_output_directory, 'users.rb')
+      @factory_content = File.read(expected_factory_file)
+    end
+
+    describe 'migration' do
+      it 'creates a creates a camelized migration class' do
+        expect(@migration_content).to match(/class CreateUsers/)
+      end
+
+      it 'creates a table for the new model' do
+        expect(@migration_content).to match(/create_table :users/)
+      end
+
+      it 'adds the specified columns' do
+        expect(@migration_content).to match(/t.string :username/)
+      end
+
+      it 'adds the specified associations' do
+        expect(@migration_content).to match(/t.references :referrer/)
+      end
+
+      it 'adds password digest column' do
+        expect(@migration_content).to match(/t.string :password_digest/)
+      end
+
+      it 'adds the necessary indexes' do
+        expect(@migration_content).to match(/add_index :users, :username/)
+        expect(@migration_content).to match(/:referrer, index: true/)
+        expect(@migration_content).to match(/add_index :users, :birth_date/)
+      end
+    end
+
+    describe 'model' do
+      it 'creates a model class' do
+        expect(@model_content).to match(/class User/)
+      end
+
+      it 'model inherits from ActiveRecord::Base' do
+        expect(@model_content).to match(/User < ActiveRecord::Base/)
+      end
+
+      it 'adds has_secure_password for password digest attributes' do
+        expect(@model_content).to match(/has_secure_password/)
+      end
+    end
+
+    describe 'model spec' do
+      it 'loads the spec_helper' do
+        expect(@model_spec_content).to match(/require 'spec_helper'/)
+      end
+
+      it 'describes the model' do
+        expect(@model_spec_content).to match(/describe User/)
+      end
+
+      it 'tests the creation of an model instance' do
+        expect(@model_spec_content).to match(/user = create :user/)
+      end
+
+      it 'creates a pending test' do
+        expect(@model_spec_content).to match(/pending\('.*'\)/)
+      end
+    end
+
+    describe 'factory' do
+      it 'creates a factory for the model' do
+        expect(@factory_content).to match(/factory :user/)
+      end
+
+      it 'creates a stub for each attribute' do
+        expect(@factory_content).to match(/username "MyString"/)
+        expect(@factory_content).to match(/password "password"/)
+        expect(@factory_content).to match(/association :referrer/)
+        expect(@factory_content).to match(/birth_date { Date.today }/)
+      end
+
+      it 'creates a confirmation for password attributes' do
+        expect(@factory_content).to match(/password_confirmation "password"/)
+      end
+    end
+
+    after do
+      FileUtils.rm_rf(test_output_directory)
+    end
+  end
+
+  describe 'Gender model' do
+    before do
+      model = Napa::CLI::Model.new([ 'Gender',
+                                     'name:string',
+                                     'personal_characteristic:belongs_to{polymorphic}' ],
+                                   [ '--no-timestamps' ])
+      model.invoke_all
+
+      expected_migration_file = File.join(test_output_directory, "#{version}_create_genders.rb")
+      @migration_content = File.read(expected_migration_file)
+
+      expected_model_file = File.join(test_output_directory, 'gender.rb')
+      @model_content = File.read(expected_model_file)
+
+      expected_model_spec_file = File.join(test_output_directory, 'gender_spec.rb')
+      @model_spec_content = File.read(expected_model_spec_file)
+
+      expected_factory_file = File.join(test_output_directory, 'genders.rb')
+      @factory_content = File.read(expected_factory_file)
+    end
+
+    describe 'migration' do
+      it 'creates a migration class' do
+        expect(@migration_content).to match(/class CreateGenders/)
+      end
+
+      it 'creates a table for the new model' do
+        expect(@migration_content).to match(/create_table :genders/)
+      end
+
+      it 'adds the specified columns' do
+        expect(@migration_content).to match(/t.string :name/)
+      end
+
+      it 'adds the specified associations' do
+        expect(@migration_content).to match(/t.belongs_to :personal_characteristic/)
+      end
+
+      it 'sets up the polymorphic associations' do
+        expect(@migration_content).to match(/:personal_characteristic, polymorphic: true/)
+      end
+
+      it 'does NOT add timestamps to the table' do
+        expect(@migration_content).to_not match(/t.timestamps/)
+      end
+    end
+
+    describe 'model' do
+      it 'creates a model class' do
+        expect(@model_content).to match(/class Gender/)
+      end
+
+      it 'model inherits from ActiveRecord::Base' do
+        expect(@model_content).to match(/Gender < ActiveRecord::Base/)
+      end
+
+      it 'adds belongs_to associations' do
+        expect(@model_content).to match(/belongs_to :personal_characteristic/)
+      end
+
+      it 'sets up polymorphic associations' do
+        expect(@model_content).to match(/:personal_characteristic, polymorphic: true/)
+      end
+    end
+
+    describe 'model spec' do
+      it 'loads the spec_helper' do
+        expect(@model_spec_content).to match(/require 'spec_helper'/)
+      end
+
+      it 'describes the model' do
+        expect(@model_spec_content).to match(/describe Gender/)
+      end
+
+      it 'tests the creation of an model instance' do
+        expect(@model_spec_content).to match(/gender = create :gender/)
+      end
+
+      it 'creates a pending test' do
+        expect(@model_spec_content).to match(/pending\('.*'\)/)
+      end
+    end
+
+    describe 'factory' do
+      it 'creates a factory for the model' do
+        expect(@factory_content).to match(/factory :gender/)
+      end
+
+      it 'creates a stub for each attribute' do
+        expect(@factory_content).to match(/name "MyString"/)
+      end
+    end
+
+    after do
+      FileUtils.rm_rf(test_output_directory)
+    end
+  end
+end