riveter 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b51c150059867905f381fcd4a303bcae0464683
-  data.tar.gz: e2aa27934831b4e6066b63e6c7edc7577beed1cb
+  metadata.gz: 490a7f61ea22d7e68dcf0b8b634322d69e2989d3
+  data.tar.gz: 5593071d86a1e9372f755844be534ebf60b3ba98
 SHA512:
-  metadata.gz: 72454455538bb878d56831daf6ec8281e749e0f2118852f4107d2191d2bc656412e8f38e031722a9a9b1be7f8d6df14d77d8250e749c3571104dacfd23908269
-  data.tar.gz: 952dc079df4c947453484ab371d8fe1920368d111e23d7c66c0912a3383d05ea8ebae7375b1ef36902cfc01c6c2ce0ec6ed71285947c5ce0d9d797a49c73ee73
+  metadata.gz: ff3996ed69e012715a3dfdceefaca6406fe3cb0b808c6c19c5ca696608d7b74392299885847fe41d15aefdf432dab6488ec4e3eb084ef95e428c6fb5e9d89c6e
+  data.tar.gz: d3a29892bceebcfa3a928c372fb323fcf88d1cc566a5b0b5a65681d0a6d697bda83f0dac09752426c9efc54b7e4e922b1c3fbaec6dc024487d453b87d9b0a092

data/.travis.yml

@@ -2,10 +2,7 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.0.0
   - 2.1.0
-  - 2.1.1
-  - 2.1.2
 
 script: 'bundle exec rake spec'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riveter (0.0.1)
+    riveter (0.0.3)
       actionpack
       activemodel
       activerecord

data/README.md

@@ -1,4 +1,8 @@
-# Riveter [![Build Status](https://secure.travis-ci.org/virtualstaticvoid/riveter.png?branch=master)](http://travis-ci.org/virtualstaticvoid/riveter) [![Code Climate](https://codeclimate.com/github/virtualstaticvoid/riveter.png)](https://codeclimate.com/github/virtualstaticvoid/riveter)
+# Riveter
+
+[![Gem Version](https://badge.fury.io/rb/riveter.svg)](http://badge.fury.io/rb/riveter)
+[![Build Status](https://secure.travis-ci.org/virtualstaticvoid/riveter.png?branch=master)](http://travis-ci.org/virtualstaticvoid/riveter)
+[![Code Climate](https://codeclimate.com/github/virtualstaticvoid/riveter.png)](https://codeclimate.com/github/virtualstaticvoid/riveter)
 
 Provides several useful patterns, packaged in a gem, for use in Rails.
 Includes generators to help you improve consistency in your applications.

data/app/helpers/riveter.rb

@@ -0,0 +1,2 @@
+module Riveter
+end

data/app/helpers/riveter/query_filter_form_helper.rb

@@ -4,7 +4,7 @@ module Riveter
       query_filter_class_name = query_filter.class.name.underscore
       options = {
         :as => query_filter_class_name.gsub(/_query_filter$/, ''),
-        :url => query_filter_class_name,
+        :url => query_filter_class_name.gsub(/_query_filter$/, ''),
         :method => :get
       }.merge(options)
 

data/lib/generators/haml/command_controller/command_controller_generator.rb

@@ -37,7 +37,7 @@ module Haml
             when :integer, :decimal, :boolean, :date, :time, :datetime
               ", :as => :#{type}"
             when :enum
-              ", :collection => #{name.titleize}.collection"
+              ", :collection => #{name.titleize}Enum.collection"
             when :model
               ", :collection => #{name.titleize}.all"
             else

data/lib/generators/haml/enquiry_controller/enquiry_controller_generator.rb

@@ -37,7 +37,7 @@ module Haml
             when :integer, :decimal, :boolean, :date, :time, :datetime
               ", :as => :#{type}"
             when :enum
-              ", :collection => #{name.titleize}.collection"
+              ", :collection => #{name.titleize}Enum.collection"
             when :model
               ", :collection => #{name.titleize}.all"
             else

data/lib/generators/riveter/enquiry/enquiry_generator.rb

@@ -14,6 +14,11 @@ module Riveter
 
       check_class_collision :suffix => 'Enquiry'
 
+      argument :filter_attributes,
+               :type => :array,
+               :default => [],
+               :banner => "[attribute[:type[:required]] attribute[:type[:required]]]"
+
       def create_enquiry_file
         template 'enquiry.rb', File.join('app/enquiries', class_path, "#{file_name}_enquiry.rb")
       end

data/lib/generators/riveter/enum/enum_generator.rb

@@ -16,7 +16,7 @@ module Riveter
       end
 
       def create_enum_file
-        template 'enum.rb', File.join('app/enums', class_path, "#{file_name}.rb")
+        template 'enum.rb', File.join('app/enums', class_path, "#{file_name}_enum.rb")
       end
 
       def create_module_file

data/lib/generators/riveter/query_filter/query_filter_generator.rb

@@ -21,7 +21,7 @@ module Riveter
 
       def create_module_file
         return if regular_class_path.empty?
-        template 'module.rb', File.join('app/enums', "#{class_path.join('/')}.rb") if behavior == :invoke
+        template 'module.rb', File.join('app/query_filters', "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 
       def create_locale_file

data/lib/riveter/booleaness_validator.rb

@@ -1,13 +1,6 @@
 module Riveter
   class BooleanessValidator < ActiveModel::EachValidator
-    def initialize(options)
-      @allow_nil, @allow_blank = options.delete(:allow_nil), options.delete(:allow_blank)
-      super
-    end
-
     def validate_each(record, attribute, value)
-      return if (@allow_nil && value.nil?) || (@allow_blank && value.blank?)
-
       unless [true, false].include?(value)
         record.errors.add(attribute, :booleaness, :value => value)
       end

data/lib/riveter/version.rb

@@ -1,3 +1,3 @@
 module Riveter
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/spec/examples/generator_examples.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+shared_examples_for "a generator with locale file output" do |file_name|
+  describe "the generated files" do
+    describe "the #{file_name}.en.yml" do
+      describe "creates when missing" do
+        before do
+          run_generator %w(foo_bar)
+        end
+
+        subject { file("config/locales/#{file_name}.en.yml") }
+
+        it { should exist }
+        it { should contain("#{file_name}:") }
+      end
+
+      describe "skips when exists" do
+        before do
+          FileUtils.mkdir_p(file('config/locales'))
+          File.open(file("config/locales/#{file_name}.en.yml"), 'w') {|f| f.write 'untouched' }
+          run_generator %w(foo_bar)
+        end
+
+        subject { file("config/locales/#{file_name}.en.yml") }
+
+        it { should exist }
+        it { should contain('untouched')}
+      end
+    end
+  end
+end
+
+shared_examples_for "a generator with output to routes" do |route|
+  describe "the generated files" do
+    describe "the route" do
+      before do
+        run_generator %w(foo_bar)
+      end
+
+      subject { file('config/routes.rb') }
+
+      it { should contain(route) }
+    end
+  end
+end
+
+shared_examples_for "a generator with a module" do |path|
+  describe "the module" do
+    before do
+      run_generator %w(test_ns/foo_bar)
+    end
+
+    subject { file("#{path}/test_ns.rb") }
+
+    it { should exist }
+  end
+end

data/spec/generators/haml/command_controller/command_controller_generator_spec.rb

@@ -2,33 +2,52 @@ require 'spec_helper'
 require 'generators/haml/command_controller/command_controller_generator'
 
 describe Haml::Generators::CommandControllerGenerator, :type => :generator do
-  it "creates the view with defaults" do
-    gen = generator %w(create_something)
+  it "should run all tasks in the generator" do
+    gen = generator %w(foo_bar)
     expect(gen).to receive(:create_template_file)
     capture(:stdout) { gen.invoke_all }
   end
 
-  it "creates the view with specified action name" do
-    gen = generator %w(create_something create)
-    expect(gen).to receive(:create_template_file)
-    capture(:stdout) { gen.invoke_all }
-  end
+  describe "the generated files" do
+    describe "the view" do
+      describe "with defaults" do
+        before do
+          run_generator %w(foo_bar)
+        end
 
-  it "creates the view with specified action name and attributes" do
-    gen = generator %w(create_something create name:string:required active:boolean other)
-    expect(gen).to receive(:create_template_file)
-    capture(:stdout) { gen.invoke_all }
-  end
+        subject { file('app/views/foo_bar_command/new.html.haml') }
 
-  describe "the generated files" do
-    before do
-      run_generator %w(create_something create name:string:required active:boolean other)
-    end
+        it { should exist }
+        it { should contain('= command_form_for') }
+      end
 
-    describe "the view" do
-      subject { file('app/views/create_something_command/create.html.haml') }
+      describe "with specified action name" do
+        before do
+          run_generator %w(foo_bar create)
+        end
+
+        subject { file('app/views/foo_bar_command/create.html.haml') }
+
+        it { should exist }
+        it { should contain('= command_form_for') }
+      end
+
+      describe "with specified action name and attributes" do
+        before do
+          run_generator %w(foo_bar baz qux:string quux:string:required corge:enum grault:boolean garply:model other)
+        end
+
+        subject { file('app/views/foo_bar_command/baz.html.haml') }
 
-      it { should exist }
+        it { should exist }
+        it { should contain('= command_form_for') }
+        it { should contain('= f.input :qux') }
+        it { should contain('= f.input :quux') }
+        it { should contain('= f.input :corge, :collection => CorgeEnum.collection') }
+        it { should contain('= f.input :grault') }
+        it { should contain('= f.input :garply, :collection => Garply.all') }
+        it { should contain('= f.input :other') }
+      end
     end
   end
 end

data/spec/generators/haml/enquiry_controller/enquiry_controller_generator_spec.rb

@@ -2,33 +2,52 @@ require 'spec_helper'
 require 'generators/haml/enquiry_controller/enquiry_controller_generator'
 
 describe Haml::Generators::EnquiryControllerGenerator, :type => :generator do
-  it "creates the view with defaults" do
-    gen = generator %w(list_something)
+  it "should run all tasks in the generator" do
+    gen = generator %w(foo_bar)
     expect(gen).to receive(:create_template_file)
     capture(:stdout) { gen.invoke_all }
   end
 
-  it "creates the view with specified action name" do
-    gen = generator %w(list_something list)
-    expect(gen).to receive(:create_template_file)
-    capture(:stdout) { gen.invoke_all }
-  end
+  describe "the generated files" do
+    describe "the view" do
+      describe "with defaults" do
+        before do
+          run_generator %w(foo_bar)
+        end
 
-  it "creates the view with specified action name and attributes" do
-    gen = generator %w(list_something list name:string:required active:boolean other)
-    expect(gen).to receive(:create_template_file)
-    capture(:stdout) { gen.invoke_all }
-  end
+        subject { file('app/views/foo_bar_enquiry/index.html.haml') }
 
-  describe "the generated files" do
-    before do
-      run_generator %w(list_something list name:string:required active:boolean other)
-    end
+        it { should exist }
+        it { should contain('= enquiry_form_for') }
+      end
 
-    describe "the view" do
-      subject { file('app/views/list_something_enquiry/list.html.haml') }
+      describe "with specified action name" do
+        before do
+          run_generator %w(foo_bar baz)
+        end
+
+        subject { file('app/views/foo_bar_enquiry/baz.html.haml') }
+
+        it { should exist }
+        it { should contain('= enquiry_form_for') }
+      end
+
+      describe "with specified action name and attributes" do
+        before do
+          run_generator %w(foo_bar baz qux:string quux:string:required corge:enum grault:boolean garply:model other)
+        end
+
+        subject { file('app/views/foo_bar_enquiry/baz.html.haml') }
 
-      it { should exist }
+        it { should exist }
+        it { should contain('= enquiry_form_for') }
+        it { should contain('= f.input :qux') }
+        it { should contain('= f.input :quux') }
+        it { should contain('= f.input :corge, :collection => CorgeEnum.collection') }
+        it { should contain('= f.input :grault') }
+        it { should contain('= f.input :garply, :collection => Garply.all') }
+        it { should contain('= f.input :other') }
+      end
     end
   end
 end

data/spec/generators/riveter/command/command_generator_spec.rb

@@ -1,58 +1,54 @@
 require 'spec_helper'
 require 'generators/riveter/command/command_generator'
-require 'fileutils'
 
 describe Riveter::Generators::CommandGenerator, :type => :generator do
-  it "creates the command with defaults" do
-    gen = generator %w(create_something --no-command-controller)
-    expect(gen).to receive(:create_command_file)
-    capture(:stdout) { gen.invoke_all }
+  before do
+    FileUtils.mkdir_p(file('config/locales'))
+    File.open(file('config/routes.rb'), 'w') {|f| f.write "TestApp::Application.routes.draw do\nend\n" }
   end
 
-  it "creates the command with specified attributes" do
-    gen = generator %w(create_something name:string:required active:boolean other --no-command-controller)
+  it "should run all tasks in the generator" do
+    gen = generator %w(foo_bar)
     expect(gen).to receive(:create_command_file)
-    capture(:stdout) { gen.invoke_all }
-  end
-
-  it "creates a module file" do
-    gen = generator %w(test_ns/create_something name:string:required active:boolean other --no-command-controller)
     expect(gen).to receive(:create_module_file)
-    capture(:stdout) { gen.invoke_all }
-  end
-
-  it "creates a locale file if it doesn't exist" do
-    gen = generator %w(create_something --no-command-controller)
     expect(gen).to receive(:create_locale_file)
-    capture(:stdout) { gen.invoke_all }
-  end
 
-  it "skips creating a locale file if it exists" do
-    pending
+    # hooks
+    expect(gen).to receive(:_invoke_from_option_command_controller)
+    expect(gen).to receive(:_invoke_from_option_test_framework)
+
+    capture(:stdout) { gen.invoke_all }
   end
 
   describe "the generated files" do
     describe "the command" do
-      before do
-        run_generator %w(create_something name:string:required active:boolean other --no-command-controller)
-      end
+      describe "with defaults" do
+        before do
+          run_generator %w(foo_bar)
+        end
 
-      subject { file('app/commands/create_something_command.rb') }
+        subject { file('app/commands/foo_bar_command.rb') }
 
-      it { should exist }
-    end
-
-    describe "the commands.en.yml locale" do
-      before do
-        FileUtils.mkdir_p(file('config/locales'))
-        File.open(file('config/locales/commands.en.yml'), 'w') {|f| f.write 'empty' }
-        run_generator %w(create_something name:string:required active:boolean other --no-command-controller)
+        it { should exist }
+        it { should contain('class FooBarCommand') }
       end
 
-      subject { file('config/locales/commands.en.yml') }
+      describe "with attributes" do
+        before do
+          run_generator %w(foo_bar name:string:required active:boolean other)
+        end
+
+        subject { file('app/commands/foo_bar_command.rb') }
 
-      it { should exist }
-      it { File.open(file('config/locales/commands.en.yml'), 'r') {|f| f.read }.should eq('empty') }
+        it { should exist }
+        it { should contain('class FooBarCommand') }
+        it { should contain('attr_string :name, :required => true') }
+        it { should contain('attr_boolean :active') }
+        it { should contain('attr_string :other') }
+      end
     end
+
+    it_should_behave_like 'a generator with a module', 'app/commands'
+    it_should_behave_like 'a generator with locale file output', 'commands'
   end
 end

data/spec/generators/riveter/command_controller/command_controller_generator_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'generators/riveter/command_controller/command_controller_generator'
+
+describe Riveter::Generators::CommandControllerGenerator, :type => :generator do
+  before do
+    FileUtils.mkdir_p(file('config'))
+    File.open(file('config/routes.rb'), 'w') {|f| f.write "TestApp::Application.routes.draw do\nend\n" }
+  end
+
+  it "should run all tasks in the generator" do
+    gen = generator %w(foo_bar)
+    expect(gen).to receive(:create_command_controller_file)
+    expect(gen).to receive(:create_module_file)
+    expect(gen).to receive(:add_command_route)
+
+    # hooks
+    expect(gen).to receive(:_invoke_from_option_template_engine)
+    expect(gen).to receive(:_invoke_from_option_test_framework)
+
+    capture(:stdout) { gen.invoke_all }
+  end
+
+  describe "the generated files" do
+    describe "the controller" do
+      describe "with defaults" do
+        before do
+          run_generator %w(foo_bar)
+        end
+
+        subject { file('app/controllers/foo_bar_command_controller.rb') }
+
+        it { should exist }
+        it { should contain('command_controller_for FooBarCommand') }
+      end
+
+      describe "with action names" do
+        before do
+          run_generator %w(foo_bar start doit)
+        end
+
+        subject { file('app/controllers/foo_bar_command_controller.rb') }
+
+        it { should exist }
+        it { should contain('command_controller_for FooBarCommand, :new_action => :start, :create_action => :doit') }
+      end
+    end
+
+    it_should_behave_like 'a generator with a module', 'app/controllers'
+    it_should_behave_like 'a generator with output to routes', 'command :foo_bar'
+  end
+end