model_base_generators 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 377e6ba19f399cf524fa5c25a8fa56c983724462
-  data.tar.gz: c7a89884e9ab54a5e4edacf078aa25f2ad9a28eb
+  metadata.gz: 68314ef8b406587412d78bdddaf77afac98fafd5
+  data.tar.gz: 4989519ef484404842ade4d6322048c4205fbe1f
 SHA512:
-  metadata.gz: 7c67f7275d7db7d492b66c2b825909f8bc3933088a4b66caf16f7af5491fd63a33484c19bfae33fbd0c1e1a5151848d2ca52dabf3bb8a25b82bc4da2805d848c
-  data.tar.gz: e3fcc7532cc2ea27e36b7c49b2f1ac9fa828b878d634e70e9739f1d2124caa7ed62b11cbec3c9f96bf5d345c8cf23702f0e85782f5f2a48ad3ec137527d1ea4e
+  metadata.gz: bb3fb2d839116e34fd7fad805a2f8e988c1b7f0f4db1f909c61fb9fe41cf3c6fffb41f13e085ab56a6f09af3657a1df31329d12ed9a55acf6612ff45fb9b35a9
+  data.tar.gz: 4c3462e95b70e2ba2dd8479e044a0bbe2da42323336ba2511e31cb5ae67beee6d50c6c90d4ccfddc642ad9d4a272eeb61c5b0530f271ecdf144d9058ccb76cf3

data/example/app/controllers/project_assignments_controller.rb

@@ -57,6 +57,6 @@ class ProjectAssignmentsController < ApplicationController
 
   # Only allow a trusted parameter "white list" through.
   def project_assignment_params
-    params.require(:project_assignment).permit(:project_id, :user_id)
+    params.require(:project_assignment).permit(:project_id, :user_id, :started_at, :finished_at)
   end
 end

data/example/app/views/project_assignments/_form.html.erb

@@ -36,6 +36,20 @@
     </div>
     <%=f.error_span(:user_id) %>
   </div>
+  <div class="form-group">
+    <%= f.label :started_at, :class => 'control-label col-lg-2' %>
+    <div class="col-lg-10">
+      <%= f.datetime_select :started_at, :class => 'form-control' %>
+    </div>
+    <%=f.error_span(:started_at) %>
+  </div>
+  <div class="form-group">
+    <%= f.label :finished_at, :class => 'control-label col-lg-2' %>
+    <div class="col-lg-10">
+      <%= f.datetime_select :finished_at, :class => 'form-control' %>
+    </div>
+    <%=f.error_span(:finished_at) %>
+  </div>
 
   <div class="form-group">
     <div class="col-lg-offset-2 col-lg-10">

data/example/app/views/project_assignments/_table.html.erb

@@ -5,6 +5,8 @@
       <th><%= model_class.human_attribute_name(:id) %></th>
       <th><%= model_class.human_attribute_name(:project_id) %></th>
       <th><%= model_class.human_attribute_name(:user_id) %></th>
+      <th><%= model_class.human_attribute_name(:started_at) %></th>
+      <th><%= model_class.human_attribute_name(:finished_at) %></th>
       <th><%= model_class.human_attribute_name(:created_at) %></th>
       <th><%=t '.actions', :default => t("helpers.actions") %></th>
     </tr>
@@ -15,6 +17,8 @@
         <td><%= project_assignment.id %></td>
         <td><%= project_assignment.project.name %></td>
         <td><%= project_assignment.user.email %></td>
+        <td><%=l project_assignment.started_at %></td>
+        <td><%=l project_assignment.finished_at %></td>
         <td><%=l project_assignment.created_at %></td>
         <td>
           <%= link_to t('.edit', :default => t("helpers.links.edit")),

data/example/app/views/project_assignments/show.html.erb

@@ -10,6 +10,10 @@
   <dd><%= @project_assignment.project.name %></dd>
   <dt><strong><%= model_class.human_attribute_name(:user_id) %>:</strong></dt>
   <dd><%= @project_assignment.user.email %></dd>
+  <dt><strong><%= model_class.human_attribute_name(:started_at) %>:</strong></dt>
+  <dd><%=l @project_assignment.started_at %></dd>
+  <dt><strong><%= model_class.human_attribute_name(:finished_at) %>:</strong></dt>
+  <dd><%=l @project_assignment.finished_at %></dd>
   <dt><strong><%= model_class.human_attribute_name(:created_at) %>:</strong></dt>
   <dd><%=l @project_assignment.created_at %></dd>
 </dl>

data/example/db/schema.rb

@@ -26,6 +26,8 @@ ActiveRecord::Schema.define(version: 20161013025452) do
   create_table :project_assignments do |t|
     t.references :project, null: false, foreign_key: true
     t.references :user   , null: false, foreign_key: true
+    t.datetime :started_at
+    t.datetime :finished_at
     t.datetime :created_at, null: false
   end
 

data/example/spec/factories/project_assignments.rb

@@ -2,5 +2,7 @@ FactoryGirl.define do
   factory :project_assignment do
     association :project, factory: :project
     association :user, factory: :user
+    started_at "2020-03-22 09:50:00"
+    finished_at "2020-03-22 23:40:00"
   end
 end

data/example/spec/support/field_assertions.rb

@@ -0,0 +1,5 @@
+def assert_select_datetime_field(object, field, n = 5)
+  (1..n).each do |i|
+    assert_select "select##{object}_#{field}_#{i}i[name=?]", "#{object}[#{field}(#{i}i)]"
+  end
+end

data/example/spec/views/project_assignments/edit.html.erb_spec.rb

@@ -14,6 +14,8 @@ RSpec.describe "project_assignments/edit", type: :view do
       assert_select "input#project_assignment_id[name=?]", "project_assignment[id]"
       assert_select "select#project_assignment_project_id[name=?]", "project_assignment[project_id]"
       assert_select "select#project_assignment_user_id[name=?]", "project_assignment[user_id]"
+      assert_select_datetime_field :project_assignment, :started_at
+      assert_select_datetime_field :project_assignment, :finished_at
     end
   end
 end

data/example/spec/views/project_assignments/index.html.erb_spec.rb

@@ -14,5 +14,7 @@ RSpec.describe "project_assignments/index", type: :view do
     render
     assert_select "tr>td", :text => 'project1', :count => 2
     assert_select "tr>td", :text => 'user1@example.com', :count => 2
+    assert_select "tr>td", :text => localize(Time.zone.parse('2020-03-22 09:50:00')), :count => 2
+    assert_select "tr>td", :text => localize(Time.zone.parse('2020-03-22 23:40:00')), :count => 2
   end
 end

data/example/spec/views/project_assignments/new.html.erb_spec.rb

@@ -14,6 +14,8 @@ RSpec.describe "project_assignments/new", type: :view do
       assert_select "input#project_assignment_id[name=?]", "project_assignment[id]"
       assert_select "select#project_assignment_project_id[name=?]", "project_assignment[project_id]"
       assert_select "select#project_assignment_user_id[name=?]", "project_assignment[user_id]"
+      assert_select_datetime_field :project_assignment, :started_at
+      assert_select_datetime_field :project_assignment, :finished_at
     end
   end
 end

data/example/spec/views/project_assignments/show.html.erb_spec.rb

@@ -11,5 +11,7 @@ RSpec.describe "project_assignments/show", type: :view do
     render
     expect(rendered).to match(/project1/)
     expect(rendered).to match(/user1@example.com/)
+    expect(rendered).to match(Regexp.new(Regexp.escape(localize(Time.zone.parse('2020-03-22 09:50:00')))))
+    expect(rendered).to match(Regexp.new(Regexp.escape(localize(Time.zone.parse('2020-03-22 23:40:00')))))
   end
 end

data/lib/model_base/column_attribute.rb

@@ -31,7 +31,7 @@ module ModelBase
     end
 
     def required?
-      !column.try(:null)
+      column ? !column.null : false
     end
 
     def enumerized?
@@ -53,6 +53,14 @@ module ModelBase
       LOCALIZED_TYPES.include?(type)
     end
 
+    def single_sample_only?
+      ref_model || enumerized? ||
+        case type
+        when :boolean, :datetime, :timestamp, :time, :date then true
+        else false
+        end
+    end
+
     def sample_value(idx = 1, context: nil)
       if name == 'id'
         idx
@@ -71,12 +79,12 @@ module ModelBase
         r = enum.values.first
         context == :factory ? r.to_sym : r.text
       else
-        @default ||= case type
+        case type
           when :integer                     then idx
           when :float                       then idx + 0.5
           when :decimal                     then "#{idx}.99"
-          when :datetime, :timestamp, :time then Time.now.to_s(:db)
-          when :date                        then Date.today.to_s(:db)
+          when :datetime, :timestamp, :time then sample_time(idx).to_s(:db)
+          when :date                        then sample_time(idx).to_date.to_s(:db)
           when :string                      then
             case name
             when 'type' then ""
@@ -91,8 +99,42 @@ module ModelBase
       end
     end
 
-    def sample_string(idx = 1)
-      "'%s'" % sample_value(idx)
+    def base_sample_value
+      name.split('').map(&:ord).sum
+    end
+
+    def sample_time(idx = 1)
+      ModelBase.base_time +
+        model.sample_value.hours +
+        (base_sample_value.minutes * 10 * idx)
+    end
+
+    def sample_value_regexp_exp(idx = 1)
+      case type
+      when :datetime, :timestamp, :time
+        'Regexp.new(Regexp.escape(%s))' % sample_string_exp(idx)
+      else
+        '/%s/' % sample_value(idx)
+      end
+    end
+
+    def assert_select_exp
+      model_name = model.full_resource_name
+      case type
+      when :datetime, :timestamp, :time
+        "assert_select_datetime_field :#{model_name}, :#{name}"
+      else
+        "assert_select \"#{ input_type }##{ model_name }_#{ name }[name=?]\", \"#{ model_name }[#{ name }]\""
+      end
+    end
+
+    def sample_string_exp(idx = 1)
+      case type
+      when :datetime, :timestamp, :time
+        'localize(Time.zone.parse(\'%s\'))' % sample_value(idx)
+      else
+        "'%s'" % sample_value(idx)
+      end
     end
 
     def new_attribute_exp

data/lib/model_base/config.rb

@@ -28,5 +28,9 @@ module ModelBase
       ['name', 'title', 'email', 'display_name', 'display_title', /_name\z/, /_title\z/]
     end
 
+    config_accessor(:base_time) do
+      '2020-01-01 00:00:00'
+    end
+
   end
 end

data/lib/model_base/meta_model.rb

@@ -48,7 +48,7 @@ module ModelBase
       belongs_to_refs = model_class.reflections.values.select{|ref| ref.is_a?(ActiveRecord::Reflection::BelongsToReflection) }
       cols = raw_cols.map do |col|
         ref = belongs_to_refs.detect{|ref| ref.foreign_key == col.name}
-        ColumnAttribute.new(self, col.name, col.type, reference: ref)
+        ColumnAttribute.new(self, col.name, col.type, column: col, reference: ref)
       end
       @title_column = nil
       ModelBase.config.title_column_candidates.each do |tcc|
@@ -66,6 +66,10 @@ module ModelBase
       @raw_columns ||= retrieve_columns
     end
 
+    def [](name)
+      raw_columns.detect{|c| c.name == name.to_s}
+    end
+
     def columns
       @columns ||=
         title_column ? raw_columns : [ColumnAttribute.new(self, 'id', :integer, title: true)] + raw_columns
@@ -136,5 +140,9 @@ module ModelBase
       r << "let(:user){ FactoryGirl.create(:user) }" unless deps.any?{|m| m.full_resource_name == 'user' }
       r.join("\n" << spacer)
     end
+
+    def sample_value
+      @sample_value ||= name.split('').map(&:ord).sum
+    end
   end
 end

data/lib/model_base/version.rb

@@ -1,3 +1,3 @@
 module ModelBase
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/model_base.rb

@@ -27,6 +27,10 @@ module ModelBase
       require 'model_base/generators/factory_girl/model'
       ::ModelBase::Generators::FactoryGirl::Model.enable!
     end
+
+    def base_time
+      Time.zone.parse(config.base_time)
+    end
   end
 end
 require 'model_base/railtie' if defined?(Rails)

data/lib/templates/rspec/scaffold/edit_spec.rb

@@ -11,8 +11,7 @@ RSpec.describe "<%= ns_table_name %>/edit", <%= type_metatag(:view) %> do
 
     assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= ns_file_name %>), "post" do
 <% model.columns_for(:form).each do |attribute| -%>
-      <%- name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]", "<%= ns_file_name %>[<%= name %>]"
+      <%= attribute.assert_select_exp %>
 <% end -%>
     end
   end

data/lib/templates/rspec/scaffold/index_spec.rb

@@ -18,11 +18,11 @@ RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
   it "renders a list of <%= ns_table_name %>" do
     render
 <% model.columns_for(:spec_index).each do |attribute| -%>
-  <%- if attribute.ref_model || attribute.enumerized? || attribute.type == :boolean -%>
-    assert_select "tr>td", :text => <%= attribute.sample_string %>, :count => 2
+  <%- if attribute.single_sample_only? -%>
+    assert_select "tr>td", :text => <%= attribute.sample_string_exp %>, :count => 2
   <%- else -%>
-    assert_select "tr>td", :text => <%= attribute.sample_string(1) %>, :count => 1
-    assert_select "tr>td", :text => <%= attribute.sample_string(2) %>, :count => 1
+    assert_select "tr>td", :text => <%= attribute.sample_string_exp(1) %>, :count => 1
+    assert_select "tr>td", :text => <%= attribute.sample_string_exp(2) %>, :count => 1
   <%- end -%>
 <% end -%>
   end

data/lib/templates/rspec/scaffold/new_spec.rb

@@ -12,8 +12,7 @@ RSpec.describe "<%= ns_table_name %>/new", <%= type_metatag(:view) %> do
 
     assert_select "form[action=?][method=?]", <%= index_helper %>_path, "post" do
 <% model.columns_for(:form).each do |attribute| -%>
-      <%- name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]", "<%= ns_file_name %>[<%= name %>]"
+      <%= attribute.assert_select_exp %>
 <% end -%>
     end
   end

data/lib/templates/rspec/scaffold/show_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
   it "renders attributes in <p>" do
     render
 <% model.columns_for(:spec_show).each do |attribute| -%>
-    expect(rendered).to match(/<%= attribute.sample_value %>/)
+    expect(rendered).to match(<%= attribute.sample_value_regexp_exp %>)
 <% end -%>
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_base_generators
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,6 +237,7 @@ files:
 - example/spec/spec_helper.rb
 - example/spec/support/controller_macros.rb
 - example/spec/support/devise.rb
+- example/spec/support/field_assertions.rb
 - example/spec/views/issues/edit.html.erb_spec.rb
 - example/spec/views/issues/index.html.erb_spec.rb
 - example/spec/views/issues/new.html.erb_spec.rb