dry_crud 2.0.0 → 2.1.0

data/lib/generators/dry_crud/dry_crud_generator_base.rb

@@ -0,0 +1,57 @@
+# encoding: UTF-8
+
+require 'rails/generators'
+
+class DryCrudGeneratorBase < Rails::Generators::Base
+  
+  def self.template_root
+     File.join(File.dirname(__FILE__), 'templates')
+  end
+
+  def self.gem_root
+     File.join(File.dirname(__FILE__), '..', '..', '..')
+  end
+
+  def self.source_paths
+    [self.gem_root,
+     self.template_root]
+  end
+
+  private
+
+  def all_template_files
+    { self.class.gem_root      => template_files(self.class.gem_root, 'app', 'config'),
+      self.class.template_root => template_files(self.class.template_root) }
+  end
+
+  def template_files(root, *folders)
+    pattern = File.join('**', '**')
+    pattern = File.join("{#{folders.join(',')}}", pattern) if folders.present?
+    Dir.chdir(root) do
+      Dir.glob(pattern).sort.reject { |f| File.directory?(f) }
+    end
+  end
+
+  def copy_files(root_files)
+    root_files.each do |root, files|
+      Dir.chdir(root) do
+        files.each do |file_source|
+          copy_file_source(file_source) if should_copy?(file_source)
+        end
+      end
+    end
+  end
+
+  def should_copy?(file_source)
+    true
+  end
+
+  def copy_file_source(file_source)
+    if file_source.end_with?('.erb')
+      copy_file(file_source)
+    else
+      template(file_source)
+    end
+  end
+  
+end

data/lib/generators/dry_crud/file_generator.rb

@@ -0,0 +1,41 @@
+# encoding: UTF-8
+
+require 'generators/dry_crud/dry_crud_generator_base'
+
+module DryCrud
+  # Copies one file of dry_crud to the rails application.
+  class FileGenerator < ::DryCrudGeneratorBase
+
+    desc "Copy one file from dry_crud to the application.\nFILENAME is a part of the name of the file to copy. Must match exactly one file."
+
+    argument :filename, type: :string, desc: 'Name or part of the filename to copy. Must match exactly one file.'
+
+    def copy_file
+      files = matching_files
+      case files.size
+      when 1
+        copy_files(@root_folder => files)
+      when 0
+        puts "No file containing '#{filename}' found in dry_crud."
+      else
+        puts "Please be more specific. All the following files match '#{filename}':"
+        files.each do |f|
+          puts " * #{f}"
+        end
+      end
+    end
+
+    private
+
+    def matching_files
+      all_template_files.collect do |root, files|
+        files.select do |f| 
+          included = f.include?(filename)
+          @root_folder = root if included
+          included
+        end
+      end.flatten
+    end
+
+  end
+end

data/lib/generators/dry_crud/templates/INSTALL

@@ -4,7 +4,7 @@ your needs. To integrate dry_crud into your code, only a few additions are
 required:
 
  * For uniform CRUD functionallity, just subclass your controllers from
-   CrudController.
+   CrudController and define the #permitted_attrs (for StrongParameters).
  * Overwrite the #to_s method of your models for a human-friendly
    representation.
 

data/lib/generators/dry_crud/templates/spec/controllers/crud_test_models_controller_spec.rb

@@ -68,7 +68,7 @@ describe CrudTestModelsController do
         end
 
         it 'provides entries helper method' do
-        should render_template('index')
+          should render_template('index')
           entries.should be(controller.send(:entries))
         end
       end

data/lib/generators/dry_crud/templates/spec/helpers/{crud/form_builder_spec.rb → dry_crud/form/builder_spec.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-describe 'Crud::FormBuilder' do
+describe 'DryCrud::Form::Builder' do
 
   include FormatHelper
   include FormHelper
@@ -18,30 +18,39 @@ describe 'Crud::FormBuilder' do
   after(:all) { reset_db }
 
   let(:entry) { CrudTestModel.first }
-<% if Rails.version < '4.0' -%>
-  let(:form)  do
-    Crud::FormBuilder.new(:entry, entry, self, {}, ->(form) { form })
+  if Rails.version < '4.0'
+    let(:form)  do
+      DryCrud::Form::Builder.new(:entry, entry, self, {}, ->(form) { form })
+    end
+  else
+    let(:form)  { DryCrud::Form::Builder.new(:entry, entry, self, {}) }
   end
-<% else -%>
-  let(:form)  { Crud::FormBuilder.new(:entry, entry, self, {}) }
-<% end -%>
 
   describe '#input_field' do
 
-    { name: :string_field,
-      password: :password_field,
+    it 'dispatches name attr to string field' do
+      form.should_receive(:string_field)
+          .with(:name, class: 'form-control', required: 'required')
+          .and_return('<input>')
+      form.input_field(:name)
+    end
+
+    it { form.input_field(:name).should be_html_safe }
+
+    { password: :password_field,
       email: :email_field,
       remarks: :text_area,
       children: :integer_field,
       human: :boolean_field,
       birthdate: :date_field,
       gets_up_at: :time_field,
+      last_seen: :datetime_field,
       companion_id: :belongs_to_field,
       other_ids: :has_many_field,
       more_ids: :has_many_field,
     }.each do |attr, method|
       it 'dispatches #{attr} attr to #{method}' do
-        form.should_receive(method).with(attr, {})
+        form.should_receive(method).with(attr, class: 'form-control')
         form.input_field(attr)
       end
 
@@ -62,12 +71,12 @@ describe 'Crud::FormBuilder' do
   describe '#labeled_input_field' do
     context 'when required' do
       subject { form.labeled_input_field(:name) }
-      it { should include(Crud::FormBuilder::REQUIRED_MARK) }
+      it { should include('input-group-addon') }
     end
 
     context 'when not required' do
       subject { form.labeled_input_field(:remarks) }
-      it { should_not include(Crud::FormBuilder::REQUIRED_MARK) }
+      it { should_not include('input-group-addon') }
     end
 
     context 'with help text' do
@@ -119,10 +128,10 @@ describe 'Crud::FormBuilder' do
     end
 
     it 'displays a message for an empty list' do
-       @others = []
-       f = form.has_many_field(:other_ids)
-       f.should match t('global.associations.none_available')
-       f.scan('</option>').should have(0).items
+      @others = []
+      f = form.has_many_field(:other_ids)
+      f.should match t('global.associations.none_available')
+      f.scan('</option>').should have(0).items
     end
   end
 
@@ -186,8 +195,8 @@ describe 'Crud::FormBuilder' do
     context 'with caption and content in argument' do
       subject do
         form.labeled('gugus',
-                     'Caption',
-                     "<input type='text' name='gugus' />".html_safe)
+                     "<input type='text' name='gugus' />".html_safe,
+                     caption: 'Caption')
       end
 
       it { should be_html_safe }
@@ -196,7 +205,7 @@ describe 'Crud::FormBuilder' do
 
     context 'with caption and content in block' do
       subject do
-        form.labeled('gugus', 'Caption') do
+        form.labeled('gugus', caption: 'Caption') do
           "<input type='text' name='gugus' />".html_safe
         end
       end

data/lib/generators/dry_crud/templates/spec/helpers/{crud/table_builder_spec.rb → dry_crud/table/builder_spec.rb}

@@ -1,13 +1,13 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-describe 'Crud::TableBuilder' do
+describe 'DryCrud::TableBuilder' do
 
   include FormatHelper
   include UtilityHelper
 
   let(:entries) { %w(foo bahr) }
-  let(:table)   { Crud::TableBuilder.new(entries, self) }
+  let(:table)   { DryCrud::Table::Builder.new(entries, self) }
 
   def format_size(obj) #:nodoc:
     "#{obj.size} chars"
@@ -111,7 +111,7 @@ describe 'Crud::TableBuilder' do
     FIN
     dom.gsub!(/[\n\t]/, '').gsub!(/\s{2,}/, '')
 
-    table = Crud::TableBuilder.new([], self)
+    table = DryCrud::Table::Builder.new([], self)
     table.col('head', class: 'left') { |e| link_to e, '/' }
     table.attrs :upcase, :size
     table.col { |e| "Never #{e}" }

data/lib/generators/dry_crud/templates/spec/helpers/form_helper_spec.rb

@@ -49,24 +49,9 @@ describe FormHelper do
       end
 
       it do
-        should match(/select .*?name="crud_test_model
-                                      \[birthdate\(1i\)\]"/x)
-      end
-
-      it do
-        should match(/option\ selected="selected"
-                            \ value="1910">1910<\/option>/x)
-      end
-
-      it do
-        should match(/option\ selected="selected"\ value="1">
-                      #{t('date.month_names')[1]}
-                      <\/option>/x)
-      end
-
-      it do
-        should match(/option\ selected="selected"
-                            \ value="1">1<\/option>/x)
+        should match(/input .*?name="crud_test_model\[birthdate\]"
+                            .*?type="date"
+                            .*?value="1910-01-01"/x)
       end
     end
   end
@@ -106,24 +91,9 @@ describe FormHelper do
       end
 
       it do
-        should match(/select .*?name="crud_test_model
-                                      \[birthdate\(1i\)\]"/x)
-      end
-
-      it do
-        should match(/option\ selected="selected"
-                            \ value="1910">1910<\/option>/x)
-      end
-
-      it do
-        should match(/option\ selected="selected"\ value="1">
-                      #{t('date.month_names')[1]}
-                      <\/option>/x)
-      end
-
-      it do
-        should match(/option\ selected="selected"
-                            \ value="1">1<\/option>/x)
+        should match(/input .*?name="crud_test_model\[birthdate\]"
+                             .*?type="date"
+                             .*?value="1910-01-01"/x)
       end
 
       it do
@@ -163,7 +133,7 @@ describe FormHelper do
       end
 
       it do
-        should match(/div\ class="control-group\ error"\>.*?
+        should match(/div\ class="form-group\ has-error"\>.*?
                       \<input .*?name="crud_test_model\[name\]"
                               .*?type="text"/x)
       end
@@ -192,8 +162,8 @@ describe FormHelper do
     end
 
     it do
-       should match /input .*?name="crud_test_model\[whatever\]"
-                           .*?type="text"/x
+      should match /input .*?name="crud_test_model\[whatever\]"
+                          .*?type="text"/x
     end
 
     it do
@@ -212,7 +182,18 @@ describe FormHelper do
     end
 
     it do
-      should match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/
+      should match /input .*?name="crud_test_model\[birthdate\]"
+                          .*?type="date"/x
+    end
+
+    it do
+      should match /input .*?name="crud_test_model\[gets_up_at\]"
+                          .*?type="time"/x
+    end
+
+    it do
+      should match /input .*?name="crud_test_model\[last_seen\]"
+                          .*?type="datetime"/x
     end
 
     it do

data/lib/generators/dry_crud/templates/spec/helpers/format_helper_spec.rb

@@ -74,15 +74,15 @@ describe FormatHelper do
 
     unless ENV['NON_LOCALIZED'] # localization dependent tests
       context 'Floats' do
-        it 'should add two digits' do
+        it 'adds two digits' do
           f(1.0).should == '1.000'
         end
 
-        it 'should truncate to two digits' do
+        it 'truncates to two digits' do
           f(3.14159).should == '3.142'
         end
 
-        it 'should add delimiters' do
+        it 'adds delimiters' do
           f(12345.6789).should == '12,345.679'
         end
       end
@@ -111,17 +111,17 @@ describe FormatHelper do
     end
 
     context 'nil' do
-      it 'should print an empty string' do
+      it 'prints an empty string' do
         f(nil).should == UtilityHelper::EMPTY_STRING
       end
     end
 
     context 'Strings' do
-      it 'should print regular strings unchanged' do
+      it 'prints regular strings unchanged' do
         f('blah blah').should == 'blah blah'
       end
 
-      it 'should not be html safe' do
+      it 'is not html safe' do
         f('<injection>').should_not be_html_safe
       end
     end
@@ -129,29 +129,29 @@ describe FormatHelper do
   end
 
   describe '#format_attr' do
-    it 'should use #f' do
+    it 'uses #f' do
       format_attr('12.342', :to_f).should == f(12.342)
     end
 
-    it 'should use object attr format method if it exists' do
+    it 'uses object attr format method if it exists' do
       format_attr('abcd', :size).should == '4 chars'
     end
 
-    it 'should use general attr format method if it exists' do
+    it 'uses general attr format method if it exists' do
       format_attr([1, 2], :size).should == '2 items'
     end
 
-    it 'should format empty belongs_to' do
+    it 'formats empty belongs_to' do
       format_attr(crud_test_models(:AAAAA), :companion).should ==
         t('global.associations.no_entry')
     end
 
-    it 'should format existing belongs_to' do
+    it 'formats existing belongs_to' do
       string = format_attr(crud_test_models(:BBBBB), :companion)
       string.should == 'AAAAA'
     end
 
-    it 'should format existing has_many' do
+    it 'formats existing has_many' do
       string = format_attr(crud_test_models(:CCCCC), :others)
       string.should be_html_safe
       string.should == '<ul><li>AAAAA</li><li>BBBBB</li></ul>'
@@ -161,7 +161,7 @@ describe FormatHelper do
   describe '#column_type' do
     let(:model) { crud_test_models(:AAAAA) }
 
-    it 'should recognize types' do
+    it 'recognizes types' do
       column_type(model, :name).should == :string
       column_type(model, :children).should == :integer
       column_type(model, :companion_id).should == :integer
@@ -179,47 +179,57 @@ describe FormatHelper do
   describe '#format_type' do
     let(:model) { crud_test_models(:AAAAA) }
 
-    it 'should format integers' do
-      model.children = 10000
+    it 'formats integers' do
+      model.children = 10_000
       format_type(model, :children).should == '10000'
     end
 
     unless ENV['NON_LOCALIZED'] # localization dependent tests
-      it 'should format floats' do
+      it 'formats floats' do
         format_type(model, :rating).should == '1.100'
       end
 
-      it 'should format decimals' do
+      it 'formata decimals' do
         format_type(model, :income).should == '10,000,000.1111'
       end
 
-      it 'should format dates' do
+      it 'formats dates' do
         format_type(model, :birthdate).should == '1910-01-01'
       end
 
-      it 'should format times' do
+      it 'formats times' do
         format_type(model, :gets_up_at).should == '01:01'
       end
 
-      it 'should format datetimes' do
+      it 'formats datetimes' do
         format_type(model, :last_seen).should == '2010-01-01 11:21'
       end
+
+      it 'formats boolean false' do
+        model.human = false
+        format_type(model, :human).should == 'no'
+      end
+
+      it 'formats boolean true' do
+        model.human = true
+        format_type(model, :human).should == 'yes'
+      end
     end
 
-    it 'should format texts' do
+    it 'formats texts' do
       string = format_type(model, :remarks)
       string.should be_html_safe
       string.should == "<p>AAAAA BBBBB CCCCC\n<br />AAAAA BBBBB CCCCC\n</p>"
     end
 
-    it 'should escape texts' do
+    it 'escapes texts' do
       model.remarks = '<unsecure>bla'
       string = format_type(model, :remarks)
       string.should be_html_safe
       string.should == '<p>&lt;unsecure&gt;bla</p>'
     end
 
-    it 'should format empty texts' do
+    it 'formats empty texts' do
       model.remarks = '   '
       string = format_type(model, :remarks)
       string.should be_html_safe
@@ -228,15 +238,15 @@ describe FormatHelper do
   end
 
   describe '#captionize' do
-    it 'should handle symbols' do
+    it 'handles symbols' do
       captionize(:camel_case).should == 'Camel Case'
     end
 
-    it 'should render all upper case' do
+    it 'renders all upper case' do
       captionize('all upper case').should == 'All Upper Case'
     end
 
-    it 'should render human attribute name' do
+    it 'renders human attribute name' do
       captionize(:gets_up_at, CrudTestModel).should == 'Gets up at'
     end
   end

data/lib/generators/dry_crud/templates/spec/helpers/table_helper_spec.rb

@@ -19,11 +19,11 @@ describe TableHelper do
   describe '#plain_table' do
     subject { plain_table(%w(foo bar), :size) { |t| t.attrs :upcase } }
 
-    it 'should contain attrs' do
+    it 'contains attrs' do
       should match(/<th>Size<\/th>/)
     end
 
-    it 'should contain block' do
+    it 'contains block' do
       should match(/<th>Upcase<\/th>/)
     end
   end
@@ -34,7 +34,7 @@ describe TableHelper do
 
       it { should be_html_safe }
 
-      it 'should handle empty data' do
+      it 'handles empty data' do
         should match(/div class=.table.\>.+\<\/div\>/)
       end
     end
@@ -46,7 +46,7 @@ describe TableHelper do
 
       it { should be_html_safe }
 
-      it 'should render table' do
+      it 'renders table' do
         should match(/^\<table.*\<\/table\>$/)
       end
     end

data/lib/generators/dry_crud/templates/spec/helpers/utility_helper_spec.rb

@@ -16,7 +16,7 @@ describe UtilityHelper do
   describe '#column_type' do
     let(:model) { crud_test_models(:AAAAA) }
 
-    it 'should recognize types' do
+    it 'recognizes types' do
       column_type(model, :name).should == :string
       column_type(model, :children).should == :integer
       column_type(model, :companion_id).should == :integer
@@ -33,30 +33,30 @@ describe UtilityHelper do
 
   describe '#content_tag_nested' do
 
-    it 'should escape safe content' do
+    it 'escapes safe content' do
       html = content_tag_nested(:div, %w(a b)) { |e| content_tag(:span, e) }
       html.should be_html_safe
       html.should == '<div><span>a</span><span>b</span></div>'
     end
 
-    it 'should escape unsafe content' do
+    it 'escapes unsafe content' do
       html = content_tag_nested(:div, %w(a b)) { |e| "<#{e}>" }
       html.should == '<div>&lt;a&gt;&lt;b&gt;</div>'
     end
 
-    it 'should simply join without block' do
+    it 'simplys join without block' do
       html = content_tag_nested(:div, %w(a b))
       html.should == '<div>ab</div>'
     end
   end
 
   describe '#safe_join' do
-    it 'should works as super without block' do
+    it 'works as super without block' do
       html = safe_join(['<a>', '<b>'.html_safe])
       html.should == '&lt;a&gt;<b>'
     end
 
-    it 'should collect contents for array' do
+    it 'collects contents for array' do
       html = safe_join(%w(a b)) { |e| content_tag(:span, e) }
       html.should == '<span>a</span><span>b</span>'
     end

data/lib/generators/dry_crud/templates/spec/support/crud_controller_examples.rb

@@ -326,4 +326,4 @@ shared_examples 'crud controller' do |options|
     end
   end
 
-end
+end

data/lib/generators/dry_crud/templates/spec/support/crud_controller_test_helper.rb

@@ -166,4 +166,3 @@ module CrudControllerTestHelper
   end
 
 end
-