From 30d954281fa6bc07303894a902c2917098b12ab7 Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Mon, 1 Oct 2012 11:33:12 -0400 Subject: [PATCH 1/7] refactoring --- app/contexts/bidding.rb | 87 ++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/app/contexts/bidding.rb b/app/contexts/bidding.rb index 5aba28e..b5a9f98 100644 --- a/app/contexts/bidding.rb +++ b/app/contexts/bidding.rb @@ -17,54 +17,73 @@ def self.buy user, bid_params, listener bidding.bid end - attr_reader :bidder, :biddable_auction, :bid_creator, :listener + attr_reader :bidder, :biddable, :validator, :request, :listener def initialize user, auction, bid_params, listener @bidder = user.extend Bidder - @biddable_auction = auction.extend BiddableAuction - @bid_creator = bid_params.extend BidCreator + @biddable = auction.extend Biddable + @validator = bid_params.extend Validator + @request = bid_params @listener = listener end def bid in_context do - bidder.create_bid + validator.validate + biddable.create_bid end + rescue InvalidRecordException => e listener.create_on_error e.errors + rescue ValidationException => e listener.create_on_error [e.message] end - module Bidder + module Validator include ContextAccessor - def create_bid - validate_bid - context.biddable_auction.create_bid - end - - def validate_bid + def validate validate_bidding_against_yourself - context.biddable_auction.validate_status - context.bid_creator.validate + validate_status + validate_presence + validate_against_last_bid + validate_against_buy_it_now end def validate_bidding_against_yourself - raise ValidationException, "Bidding against yourself is not allowed." if last_bidder? + raise ValidationException, "Bidding against yourself is not allowed." if context.bidder.last_bidder? end - def last_bidder? - context.biddable_auction.last_bidder == self + def validate_status + raise ValidationException, "Bidding on closed auction is not allowed." unless context.biddable.started? + end + + def validate_presence + raise ValidationException, errors.full_messages.join(", ") unless valid? + end + + def validate_against_last_bid + last_bid = context.biddable.last_bid + raise ValidationException, "The amount must be greater than the last bid." if last_bid && last_bid.amount >= amount + end + + def validate_against_buy_it_now + buy_it_now_price = context.biddable.buy_it_now_price + raise ValidationException, "Bid cannot exceed the buy it now price." if amount > buy_it_now_price end end - module BiddableAuction + module Bidder include ContextAccessor - def validate_status - raise ValidationException, "Bidding on closed auction is not allowed." unless started? + def last_bidder? + context.biddable.last_bidder == self end + end + + module Biddable + include ContextAccessor def last_bidder return nil unless last_bid @@ -72,7 +91,7 @@ def last_bidder end def create_bid - bid = make_bid(context.bidder, context.bid_creator.amount) + bid = make_bid(context.bidder, context.request.amount) if purchasing? bid close_auction @@ -104,32 +123,4 @@ def extend_auction extend_end_date_for EXTENDING_INTERVAL end end - - module BidCreator - include ContextAccessor - - def validate - validate_presence - validate_against_last_bid - validate_against_buy_it_now - end - - def validate_presence - raise ValidationException, validation_message unless valid? - end - - def validation_message - errors.full_messages.join(", ") - end - - def validate_against_last_bid - last_bid = context.biddable_auction.last_bid - raise ValidationException, "The amount must be greater than the last bid." if last_bid && last_bid.amount >= amount - end - - def validate_against_buy_it_now - buy_it_now_price = context.biddable_auction.buy_it_now_price - raise ValidationException, "Bid cannot exceed the buy it now price." if amount > buy_it_now_price - end - end end From 9d49e2604e2eacda5de2582f7e8c2bdde8dcb5db Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Mon, 1 Oct 2012 15:15:09 -0400 Subject: [PATCH 2/7] improves styling --- .../bootstrap_and_overrides.css.less | 20 +++---- app/models/user.rb | 3 + app/presenters/auction_presenter.rb | 24 +++++--- app/views/auctions/_bid.html.erb | 6 +- app/views/auctions/new.html.erb | 60 +++++++++++++------ app/views/auctions/show.html.erb | 34 ++++------- app/views/layouts/_navbar.html.erb | 6 +- spec/requests/authenticating_user_spec.rb | 1 + spec/requests/creating_auction_spec.rb | 8 +-- 9 files changed, 93 insertions(+), 69 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 0d6c5f6..54adaf9 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -2,6 +2,7 @@ body { padding-top: 60px; padding-left: 20px; + font-size: 13px; } @import "twitter/bootstrap/responsive"; @@ -42,16 +43,15 @@ select.datetime { width: 60px; } -.new_bid_params { - float: left; - padding-right: 20px; - - input[type=text]{ - width: 50px; - margin: 0px; - } -} - #bids { float: right; +} + +dl.dl-horizontal { + font-size: 17px; + + dt { + width: 200px; + margin-right: 20px; + } } \ No newline at end of file diff --git a/app/models/user.rb b/app/models/user.rb index 7d29d6f..babcf11 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -6,6 +6,9 @@ class User < ActiveRecord::Base attr_accessible :name, :email, :password, :password_confirmation, :remember_me + validates :name, presence: true + validates :email, presence: true + def address Address.new(address_country, address_city, address_street, address_postal_code) end diff --git a/app/presenters/auction_presenter.rb b/app/presenters/auction_presenter.rb index dcd2cab..5228c93 100644 --- a/app/presenters/auction_presenter.rb +++ b/app/presenters/auction_presenter.rb @@ -5,7 +5,7 @@ class AuctionPresenter def_delegator :@item, :description, :item_description def_delegator :@seller, :name, :seller_name - def_delegators :@auction, :buy_it_now_price, :id, :created_at, :extendable, :end_date + def_delegators :@auction, :buy_it_now_price, :id, :created_at, :extendable def initialize auction, current_user, view_context @auction = auction @@ -18,21 +18,27 @@ def initialize auction, current_user, view_context @current_user = current_user end + def render_end_date + return "" unless @auction.end_date + h.content_tag :dl, class: "dl-horizontal" do + h.content_tag(:dt, "End Date") + + h.content_tag(:dd, @auction.end_date, id: "end-date") + end + end + def render_winner return "" unless @winner - h.content_tag :p do - h.content_tag(:b, "Winner") + - h.tag(:br) + - h.content_tag(:span, @winner.name, id: "winner") + h.content_tag :dl, class: "dl-horizontal" do + h.content_tag(:dt, "Winner") + + h.content_tag(:dd, @winner.name, id: "winner") end end def render_last_bid return "" unless @auction.last_bid - h.content_tag :p do - h.content_tag(:b, "Last Bid") + - h.tag(:br) + - @auction.last_bid.amount.to_s + h.content_tag :dl, class: "dl-horizontal" do + h.content_tag(:dt, "Last Bid") + + h.content_tag(:dd, @auction.last_bid.amount.to_s, id: "last-bid") end end diff --git a/app/views/auctions/_bid.html.erb b/app/views/auctions/_bid.html.erb index d737e6b..909c6d6 100644 --- a/app/views/auctions/_bid.html.erb +++ b/app/views/auctions/_bid.html.erb @@ -1,4 +1,6 @@ -<%= form_for BidParams.empty, url: auction_bids_path(auction_id) do |f| %> - <%= f.text_field :amount %> +<%= form_for BidParams.empty, url: auction_bids_path(auction_id), html:{class: "form-inline", style: 'float: left; margin-right: 20px;'} do |f| %> +
+ $<%= f.text_field :amount, class: 'input-small' %>.00 +
<%= f.submit "Bid", class: "btn" %> <% end %> \ No newline at end of file diff --git a/app/views/auctions/new.html.erb b/app/views/auctions/new.html.erb index 078daf9..93cdf50 100644 --- a/app/views/auctions/new.html.erb +++ b/app/views/auctions/new.html.erb @@ -1,26 +1,50 @@ -<% content_for :title, "Create an Auction" %> +<% content_for :title, "Sell Item" %> -

Create an Auction

+<%= form_for AuctionParams.empty, url: auctions_path, remote: true, html: {class: 'form-horizontal'} do |f| %> + Sell Item - + -<%= form_for AuctionParams.empty, url: auctions_path, remote: true do |f| %>
- <%= f.label :item_name %> - <%= f.text_field :item_name %> - - <%= f.label :item_description %> - <%= f.text_field :item_description %> - - <%= f.label :buy_it_now_price %> - <%= f.text_field :buy_it_now_price %> - - <%= f.label :extendable %> - <%= f.check_box :extendable %> +
+ <%= f.label :item_name, "Name", class: 'control-label' %> +
+ <%= f.text_field :item_name %> +
+
+ +
+ <%= f.label :item_description, "Description", class: 'control-label' %> +
+ <%= f.text_field :item_description %> +
+
+ +
+ <%= f.label :buy_it_now_price, "Buy it now price", class: 'control-label' %> +
+
+ $<%= f.text_field :buy_it_now_price, class: 'input-small' %>.00 +
+
+
+ +
+ <%= f.label :end_date, class: 'control-label' %> +
+ +
+
+ +
+
+ <%= f.label :extendable, class: "checkbox" do %> + <%= f.check_box :extendable %> Extendable + <% end %> +
+
- <%= f.label :end_date %> -
diff --git a/app/views/auctions/show.html.erb b/app/views/auctions/show.html.erb index 053c31c..ce3210a 100644 --- a/app/views/auctions/show.html.erb +++ b/app/views/auctions/show.html.erb @@ -6,36 +6,24 @@

<%= @auction.item_name %>

+<%= @auction.item_description %> -

- Description
- <%= @auction.item_description %> -

+
+
Seller
+
<%= @auction.seller_name %>
+
-

- Seller
- <%= @auction.seller_name %> -

+
+
Buy it now price
+
<%= @auction.buy_it_now_price %>
+
-

- Price
- <%= @auction.buy_it_now_price %> -

+<%= @auction.render_end_date %> -

- Extendable
- <%= @auction.extendable %> -

- -

- End date
- <%= @auction.end_date %> -

+<%= @auction.render_winner %> <%= @auction.render_last_bid %> -<%= @auction.render_winner %> -
<%= @auction.render_actions %>
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index c1cccc1..c89b838 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -1,11 +1,11 @@
- DCI Sample Application + DCI-IN-RUBY: Auctions
    -
  • <%= link_to "All Auctions", auctions_path %>
    • -
  • <%= link_to "Sell an Item", new_auction_path %>
    • +
  • <%= link_to "Auctions", auctions_path %>
    • +
  • <%= link_to "Sell", new_auction_path %>
    • <% if user_signed_in? %>
  • <%= link_to 'Sign out', destroy_user_session_path, :method => :delete %>
    • <% else %> diff --git a/spec/requests/authenticating_user_spec.rb b/spec/requests/authenticating_user_spec.rb index 5952fe4..5f1b802 100644 --- a/spec/requests/authenticating_user_spec.rb +++ b/spec/requests/authenticating_user_spec.rb @@ -8,6 +8,7 @@ within("#new_user") do fill_in "user_email", :with => "mail@mail.com" + fill_in "user_name", :with => "username" fill_in "user_password", :with => "123456" fill_in "user_password_confirmation", :with => "123456" click_button "Sign up" diff --git a/spec/requests/creating_auction_spec.rb b/spec/requests/creating_auction_spec.rb index 98b0d23..0ffe9a1 100644 --- a/spec/requests/creating_auction_spec.rb +++ b/spec/requests/creating_auction_spec.rb @@ -10,8 +10,8 @@ scenario "Successfully creating an auction" do visit new_auction_path - fill_in "auction_params_item_name", with: "Stamps" - fill_in "Item description", with: "Collection of stamps" + fill_in "Name", with: "Stamps" + fill_in "Description", with: "Collection of stamps" fill_in "Buy it now price", with: "200" fill_in "End date", with: "2020-01-01 00:00:00" click_button "Create" @@ -22,8 +22,8 @@ scenario "Showing errors when cannot create an auction" do visit new_auction_path - fill_in "auction_params_item_name", with: "" - fill_in "Item description", with: "Collection of stamps" + fill_in "Name", with: "" + fill_in "Description", with: "Collection of stamps" fill_in "Buy it now price", with: "200" fill_in "End date", with: "2020-01-01 00:00:00" click_button "Create" From a0594626df706e3ab8caa6c68002765c5aae1648 Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Mon, 1 Oct 2012 15:15:20 -0400 Subject: [PATCH 3/7] adds devise views --- app/views/devise/confirmations/new.html.erb | 12 ++++++ .../mailer/confirmation_instructions.html.erb | 5 +++ .../reset_password_instructions.html.erb | 8 ++++ .../mailer/unlock_instructions.html.erb | 7 ++++ app/views/devise/passwords/edit.html.erb | 16 +++++++ app/views/devise/passwords/new.html.erb | 20 +++++++++ app/views/devise/registrations/edit.html.erb | 25 +++++++++++ app/views/devise/registrations/new.html.erb | 42 +++++++++++++++++++ app/views/devise/sessions/new.html.erb | 36 ++++++++++++++++ app/views/devise/shared/_links.erb | 25 +++++++++++ app/views/devise/unlocks/new.html.erb | 12 ++++++ 11 files changed, 208 insertions(+) create mode 100644 app/views/devise/confirmations/new.html.erb create mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb create mode 100644 app/views/devise/mailer/reset_password_instructions.html.erb create mode 100644 app/views/devise/mailer/unlock_instructions.html.erb create mode 100644 app/views/devise/passwords/edit.html.erb create mode 100644 app/views/devise/passwords/new.html.erb create mode 100644 app/views/devise/registrations/edit.html.erb create mode 100644 app/views/devise/registrations/new.html.erb create mode 100644 app/views/devise/sessions/new.html.erb create mode 100644 app/views/devise/shared/_links.erb create mode 100644 app/views/devise/unlocks/new.html.erb diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 0000000..81e4472 --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,12 @@ +

    Resend confirmation instructions

    + +<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + +
    <%= f.label :email %>
    + <%= f.email_field :email %>
    + +
    <%= f.submit "Resend confirmation instructions" %>
    +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 0000000..a5c4585 --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

    Welcome <%= @resource.email %>!

    + +

    You can confirm your account email through the link below:

    + +

    <%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

    diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000..ae9e888 --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +

    Hello <%= @resource.email %>!

    + +

    Someone has requested a link to change your password, and you can do this through the link below.

    + +

    <%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>

    + +

    If you didn't request this, please ignore this email.

    +

    Your password won't change until you access the link above and create a new one.

    diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000..2263c21 --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +

    Hello <%= @resource.email %>!

    + +

    Your account has been locked due to an excessive amount of unsuccessful sign in attempts.

    + +

    Click the link below to unlock your account:

    + +

    <%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>

    diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 0000000..fe620ef --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,16 @@ +

    Change your password

    + +<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> + +
    <%= f.label :password, "New password" %>
    + <%= f.password_field :password %>
    + +
    <%= f.label :password_confirmation, "Confirm new password" %>
    + <%= f.password_field :password_confirmation %>
    + +
    <%= f.submit "Change my password" %>
    +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 0000000..aef3523 --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,20 @@ +<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => {method: :post, class: 'form-horizontal'}) do |f| %> + Forgot your password? + +
    + <%= devise_error_messages! %> + +
    + <%= f.label :email, class: 'control-label' %> +
    + <%= f.email_field :email %> +
    +
    +
    + +
    + <%= f.submit "Send me reset password instructions", class: "btn btn-primary" %> +
    +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 0000000..ebca9ed --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,25 @@ +

    Edit <%= resource_name.to_s.humanize %>

    + +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> + <%= devise_error_messages! %> + +
    <%= f.label :email %>
    + <%= f.email_field :email %>
    + +
    <%= f.label :password %> (leave blank if you don't want to change it)
    + <%= f.password_field :password, :autocomplete => "off" %>
    + +
    <%= f.label :password_confirmation %>
    + <%= f.password_field :password_confirmation %>
    + +
    <%= f.label :current_password %> (we need your current password to confirm your changes)
    + <%= f.password_field :current_password %>
    + +
    <%= f.submit "Update" %>
    +<% end %> + +

    Cancel my account

    + +

    Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.

    + +<%= link_to "Back", :back %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 0000000..ac1e312 --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,42 @@ +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: {class: 'form-horizontal'}) do |f| %> + Sign up + +
    + <%= devise_error_messages! %> + +
    + <%= f.label :email, class: 'control-label' %> +
    + <%= f.email_field :email %> +
    +
    + +
    + <%= f.label :name, class: 'control-label' %> +
    + <%= f.text_field :name %> +
    +
    + +
    + <%= f.label :password, class: 'control-label' %> +
    + <%= f.password_field :password %> +
    +
    + +
    + <%= f.label :password_confirmation, class: 'control-label' %> +
    + <%= f.password_field :password_confirmation %> +
    +
    +
    + +
    + <%= f.submit "Sign up", class: "btn btn-primary" %> +
    + +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 0000000..e25215a --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,36 @@ +<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: {class: 'form-horizontal'}) do |f| %> + Sign in + +
    +
    + <%= f.label :email, class: 'control-label' %> +
    + <%= f.email_field :email %> +
    +
    + +
    + <%= f.label :password, class: 'control-label' %> +
    + <%= f.password_field :password %> +
    +
    + + <% if devise_mapping.rememberable? -%> +
    +
    + <%= f.label :remember_me, class: "checkbox" do %> + <%= f.check_box :remember_me %> Remember me + <% end %> +
    +
    + <% end -%> + +
    + +
    + <%= f.submit "Sign in", class: "btn btn-primary" %> +
    +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb new file mode 100644 index 0000000..eab783a --- /dev/null +++ b/app/views/devise/shared/_links.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Sign in", new_session_path(resource_name) %>
    +<% end -%> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
    +<% end -%> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
    +<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
    +<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
    +<% end -%> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
    + <% end -%> +<% end -%> \ No newline at end of file diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 0000000..e55e82e --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,12 @@ +

    Resend unlock instructions

    + +<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + +
    <%= f.label :email %>
    + <%= f.email_field :email %>
    + +
    <%= f.submit "Resend unlock instructions" %>
    +<% end %> + +<%= render "devise/shared/links" %> From af6d60bd2a5a3d55d885090ddbe20b37ee3bc06d Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Mon, 1 Oct 2012 16:02:37 -0400 Subject: [PATCH 4/7] adds authentication filters --- app/controllers/auctions_controller.rb | 2 ++ app/controllers/bids_controller.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/app/controllers/auctions_controller.rb b/app/controllers/auctions_controller.rb index 9adb54b..62f974e 100644 --- a/app/controllers/auctions_controller.rb +++ b/app/controllers/auctions_controller.rb @@ -1,4 +1,6 @@ class AuctionsController < ApplicationController + before_filter :authenticate_user!, except: [:index, :show] + def index @auctions = AuctionsPresenter.new(Auction.all, current_user, view_context) end diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index eb9e394..f635186 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -1,4 +1,5 @@ class BidsController < ApplicationController + before_filter :authenticate_user! def create Bidding.bid(current_user, bid_params, self) From 56a7b5aa9b410fc107109d2f33185e1f4289a4c3 Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Mon, 1 Oct 2012 16:12:17 -0400 Subject: [PATCH 5/7] fixes the styling of the list of bids --- app/presenters/auction_presenter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/presenters/auction_presenter.rb b/app/presenters/auction_presenter.rb index 5228c93..864b3ea 100644 --- a/app/presenters/auction_presenter.rb +++ b/app/presenters/auction_presenter.rb @@ -61,7 +61,7 @@ def render_actions def all_bids @auction.bids.map do |bid| h.content_tag :li do - "#{bid.user.name} $#{bid.amount}" + "#{bid.user.name} bids $#{bid.amount}" end.html_safe end.join("").html_safe end From cc216d0c73815a5e3e2ac8b34aa99b67b960699b Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Mon, 1 Oct 2012 18:31:50 -0400 Subject: [PATCH 6/7] updates readme --- README.md | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1e1887b..1c12130 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,30 @@ -DCI-Sample -========== +## Why DCI? + +DCI (Data Context Interaction) is a new way to look at object-oriented programming. Instead of focusing on individual objects, the DCI paradigm focuses on communication between object and makes it explicit. It improves the readability of the code, which helps programmers to reason about their programs. + +I'd been reading blogs posts and watching talks about DCI for a long time and I felt that it's time to try it out. I found that most material related to DCI is theoretical. There were a few books, a dozen of blog posts, and several presentations that could give you a good picture of what DCI is. However, I could not find any "real world" examples of actually using it. That's why I decided to write a simple application showing how to implement DCI in Ruby. + +## Like what? + +Like the following projects: + +* [DDDSample](http://dddsample.sourceforge.net/). This is a how-to example of implementing a typical DDD application. + +* [The Silverlight Cookbook](http://silverlightcookbook.codeplex.com/). A reference application for Silverlight 5 LOB apps. + +## Ruby/Rails + +The application is a Rails project. There are a few reasons for it: + +* All the DCI concepts can be implemented in Ruby. It doesn’t feel clunky or alien. +* Ruby is concise and readable. Even if you are a C# programmer, you should be able to understand what is going on. +* There is more interest in DCI in the Ruby community than in any other community. + +## Developers + +The application has been developed by Victor Savkin and Rinaldi Fonseca. + +## Read More + +[Read more about DCI and the project.](http://dci-in-ruby.info) -A sample application illustrating the Data Context Interaction paradigm (in Ruby) \ No newline at end of file From 0cbf5a373a08b67fb8bc367ef210e3875e5f6838 Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Sat, 6 Oct 2012 18:46:55 -0400 Subject: [PATCH 7/7] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c12130..7aa61df 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Why DCI? -DCI (Data Context Interaction) is a new way to look at object-oriented programming. Instead of focusing on individual objects, the DCI paradigm focuses on communication between object and makes it explicit. It improves the readability of the code, which helps programmers to reason about their programs. +DCI (Data Context Interaction) is a new way to look at object-oriented programming. Instead of focusing on individual objects, the DCI paradigm focuses on communication between objects and makes it explicit. It improves the readability of the code, which helps programmers to reason about their programs. I'd been reading blogs posts and watching talks about DCI for a long time and I felt that it's time to try it out. I found that most material related to DCI is theoretical. There were a few books, a dozen of blog posts, and several presentations that could give you a good picture of what DCI is. However, I could not find any "real world" examples of actually using it. That's why I decided to write a simple application showing how to implement DCI in Ruby.