From 585b386e7cae9260395c8b43e64bb8551b4021f4 Mon Sep 17 00:00:00 2001 From: Sai Date: Wed, 27 Aug 2014 15:22:47 +0200 Subject: [PATCH 01/16] change meetings --- app/assets/javascripts/fetmeetings.js.coffee | 3 + .../javascripts/fetmeetingtops.js.coffee | 3 + app/assets/stylesheets/fetmeetings.css.scss | 3 + .../stylesheets/fetmeetingtops.css.scss | 3 + app/controllers/fetmeetings_controller.rb | 84 +++++++++ app/controllers/fetmeetingtops_controller.rb | 83 +++++++++ app/controllers/neuigkeiten_controller.rb | 2 +- app/helpers/fetmeetings_helper.rb | 2 + app/helpers/fetmeetingtops_helper.rb | 2 + app/models/fetmeeting.rb | 11 ++ app/models/fetmeetingtop.rb | 7 + app/views/fetmeetings/_form.html.erb | 14 ++ app/views/fetmeetings/edit.html.erb | 6 + app/views/fetmeetings/index.html.erb | 25 +++ app/views/fetmeetings/new.html.erb | 5 + app/views/fetmeetings/show.html.erb | 20 +++ .../fetmeetingtops/_fetmeetingtop.html.erb | 1 + app/views/fetmeetingtops/_form.html.erb | 14 ++ app/views/fetmeetingtops/edit.html.erb | 6 + app/views/fetmeetingtops/index.html.erb | 31 ++++ app/views/fetmeetingtops/new.html.erb | 5 + app/views/fetmeetingtops/show.html.erb | 30 ++++ config/routes.rb | 6 + .../20140507125633_create_fetmeetings.rb | 10 ++ .../20140507130354_create_fetmeetingtops.rb | 13 ++ .../fetmeetings_controller_spec.rb | 160 ++++++++++++++++++ .../fetmeetingtops_controller_spec.rb | 160 ++++++++++++++++++ spec/factories/fetmeetings.rb | 8 + spec/factories/fetmeetingtops.rb | 11 ++ spec/helpers/fetmeetings_helper_spec.rb | 15 ++ spec/helpers/fetmeetingtops_helper_spec.rb | 15 ++ spec/models/fetmeeting_spec.rb | 5 + spec/models/fetmeetingtop_spec.rb | 5 + spec/requests/fetmeetings_spec.rb | 11 ++ spec/requests/fetmeetingtops_spec.rb | 11 ++ spec/routing/fetmeetings_routing_spec.rb | 35 ++++ spec/routing/fetmeetingtops_routing_spec.rb | 35 ++++ spec/views/fetmeetings/edit.html.erb_spec.rb | 20 +++ spec/views/fetmeetings/index.html.erb_spec.rb | 23 +++ spec/views/fetmeetings/new.html.erb_spec.rb | 20 +++ spec/views/fetmeetings/show.html.erb_spec.rb | 17 ++ .../fetmeetingtops/edit.html.erb_spec.rb | 26 +++ .../fetmeetingtops/index.html.erb_spec.rb | 32 ++++ .../views/fetmeetingtops/new.html.erb_spec.rb | 26 +++ .../fetmeetingtops/show.html.erb_spec.rb | 23 +++ 45 files changed, 1046 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/fetmeetings.js.coffee create mode 100644 app/assets/javascripts/fetmeetingtops.js.coffee create mode 100644 app/assets/stylesheets/fetmeetings.css.scss create mode 100644 app/assets/stylesheets/fetmeetingtops.css.scss create mode 100644 app/controllers/fetmeetings_controller.rb create mode 100644 app/controllers/fetmeetingtops_controller.rb create mode 100644 app/helpers/fetmeetings_helper.rb create mode 100644 app/helpers/fetmeetingtops_helper.rb create mode 100644 app/models/fetmeeting.rb create mode 100644 app/models/fetmeetingtop.rb create mode 100644 app/views/fetmeetings/_form.html.erb create mode 100644 app/views/fetmeetings/edit.html.erb create mode 100644 app/views/fetmeetings/index.html.erb create mode 100644 app/views/fetmeetings/new.html.erb create mode 100644 app/views/fetmeetings/show.html.erb create mode 100644 app/views/fetmeetingtops/_fetmeetingtop.html.erb create mode 100644 app/views/fetmeetingtops/_form.html.erb create mode 100644 app/views/fetmeetingtops/edit.html.erb create mode 100644 app/views/fetmeetingtops/index.html.erb create mode 100644 app/views/fetmeetingtops/new.html.erb create mode 100644 app/views/fetmeetingtops/show.html.erb create mode 100644 db/migrate/20140507125633_create_fetmeetings.rb create mode 100644 db/migrate/20140507130354_create_fetmeetingtops.rb create mode 100644 spec/controllers/fetmeetings_controller_spec.rb create mode 100644 spec/controllers/fetmeetingtops_controller_spec.rb create mode 100644 spec/factories/fetmeetings.rb create mode 100644 spec/factories/fetmeetingtops.rb create mode 100644 spec/helpers/fetmeetings_helper_spec.rb create mode 100644 spec/helpers/fetmeetingtops_helper_spec.rb create mode 100644 spec/models/fetmeeting_spec.rb create mode 100644 spec/models/fetmeetingtop_spec.rb create mode 100644 spec/requests/fetmeetings_spec.rb create mode 100644 spec/requests/fetmeetingtops_spec.rb create mode 100644 spec/routing/fetmeetings_routing_spec.rb create mode 100644 spec/routing/fetmeetingtops_routing_spec.rb create mode 100644 spec/views/fetmeetings/edit.html.erb_spec.rb create mode 100644 spec/views/fetmeetings/index.html.erb_spec.rb create mode 100644 spec/views/fetmeetings/new.html.erb_spec.rb create mode 100644 spec/views/fetmeetings/show.html.erb_spec.rb create mode 100644 spec/views/fetmeetingtops/edit.html.erb_spec.rb create mode 100644 spec/views/fetmeetingtops/index.html.erb_spec.rb create mode 100644 spec/views/fetmeetingtops/new.html.erb_spec.rb create mode 100644 spec/views/fetmeetingtops/show.html.erb_spec.rb diff --git a/app/assets/javascripts/fetmeetings.js.coffee b/app/assets/javascripts/fetmeetings.js.coffee new file mode 100644 index 0000000..7615679 --- /dev/null +++ b/app/assets/javascripts/fetmeetings.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/fetmeetingtops.js.coffee b/app/assets/javascripts/fetmeetingtops.js.coffee new file mode 100644 index 0000000..7615679 --- /dev/null +++ b/app/assets/javascripts/fetmeetingtops.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/fetmeetings.css.scss b/app/assets/stylesheets/fetmeetings.css.scss new file mode 100644 index 0000000..a3a67e2 --- /dev/null +++ b/app/assets/stylesheets/fetmeetings.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Fetmeetings controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/fetmeetingtops.css.scss b/app/assets/stylesheets/fetmeetingtops.css.scss new file mode 100644 index 0000000..797bb09 --- /dev/null +++ b/app/assets/stylesheets/fetmeetingtops.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Fetmeetingtops controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/fetmeetings_controller.rb b/app/controllers/fetmeetings_controller.rb new file mode 100644 index 0000000..f265f3b --- /dev/null +++ b/app/controllers/fetmeetings_controller.rb @@ -0,0 +1,84 @@ +class FetmeetingsController < ApplicationController + # GET /fetmeetings + # GET /fetmeetings.json + def index + @fetmeetings = Fetmeeting.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @fetmeetings } + end + end + + # GET /fetmeetings/1 + # GET /fetmeetings/1.json + def show + @fetmeeting = Fetmeeting.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @fetmeeting } + end + end + + # GET /fetmeetings/new + # GET /fetmeetings/new.json + def new + @fetmeeting = Fetmeeting.new + @fetmeeting.calentry=Calentry.new(typ: 0, object: @fetmeetings) + respond_to do |format| + format.html # new.html.erb + format.json { render json: @fetmeeting } + end + end + + # GET /fetmeetings/1/edit + def edit + @fetmeeting = Fetmeeting.find(params[:id]) + + end + + # POST /fetmeetings + # POST /fetmeetings.json + def create + @fetmeeting = Fetmeeting.new(params[:fetmeeting]) + + respond_to do |format| + if @fetmeeting.save + format.html { redirect_to @fetmeeting, notice: 'Fetmeeting was successfully created.' } + format.json { render json: @fetmeeting, status: :created, location: @fetmeeting } + else + format.html { render action: "new" } + format.json { render json: @fetmeeting.errors, status: :unprocessable_entity } + end + end + end + + # PUT /fetmeetings/1 + # PUT /fetmeetings/1.json + def update + @fetmeeting = Fetmeeting.find(params[:id]) + + respond_to do |format| + if @fetmeeting.update_attributes(params[:fetmeeting]) + format.html { redirect_to @fetmeeting, notice: 'Fetmeeting was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @fetmeeting.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /fetmeetings/1 + # DELETE /fetmeetings/1.json + def destroy + @fetmeeting = Fetmeeting.find(params[:id]) + @fetmeeting.destroy + + respond_to do |format| + format.html { redirect_to fetmeetings_url } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/fetmeetingtops_controller.rb b/app/controllers/fetmeetingtops_controller.rb new file mode 100644 index 0000000..17083d1 --- /dev/null +++ b/app/controllers/fetmeetingtops_controller.rb @@ -0,0 +1,83 @@ +class FetmeetingtopsController < ApplicationController + # GET /fetmeetingtops + # GET /fetmeetingtops.json + def index + @fetmeetingtops = Fetmeetingtop.all + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @fetmeetingtops } + end + end + + # GET /fetmeetingtops/1 + # GET /fetmeetingtops/1.json + def show + @fetmeetingtop = Fetmeetingtop.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @fetmeetingtop } + end + end + + # GET /fetmeetingtops/new + # GET /fetmeetingtops/new.json + def new + @fetmeetingtop = Fetmeetingtop.new + + respond_to do |format| + format.html # new.html.erb + format.json { render json: @fetmeetingtop } + end + end + + # GET /fetmeetingtops/1/edit + def edit + @fetmeetingtop = Fetmeetingtop.find(params[:id]) + end + + # POST /fetmeetingtops + # POST /fetmeetingtops.json + def create + @fetmeetingtop = Fetmeetingtop.new(params[:fetmeetingtop]) + + respond_to do |format| + if @fetmeetingtop.save + format.html { redirect_to @fetmeetingtop, notice: 'Fetmeetingtop was successfully created.' } + format.json { render json: @fetmeetingtop, status: :created, location: @fetmeetingtop } + else + format.html { render action: "new" } + format.json { render json: @fetmeetingtop.errors, status: :unprocessable_entity } + end + end + end + + # PUT /fetmeetingtops/1 + # PUT /fetmeetingtops/1.json + def update + @fetmeetingtop = Fetmeetingtop.find(params[:id]) + + respond_to do |format| + if @fetmeetingtop.update_attributes(params[:fetmeetingtop]) + format.html { redirect_to @fetmeetingtop, notice: 'Fetmeetingtop was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @fetmeetingtop.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /fetmeetingtops/1 + # DELETE /fetmeetingtops/1.json + def destroy + @fetmeetingtop = Fetmeetingtop.find(params[:id]) + @fetmeetingtop.destroy + + respond_to do |format| + format.html { redirect_to fetmeetingtops_url } + format.json { head :no_content } + end + end +end diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index f08759a..0eea8ea 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -1,4 +1,4 @@ -class NeuigkeitenController < ApplicationController + class NeuigkeitenController < ApplicationController before_filter :load_toolbar_elements, :only=>[:show,:find_link] before_filter :load_toolbar_elements_edit, :only=>[:edit] diff --git a/app/helpers/fetmeetings_helper.rb b/app/helpers/fetmeetings_helper.rb new file mode 100644 index 0000000..8317776 --- /dev/null +++ b/app/helpers/fetmeetings_helper.rb @@ -0,0 +1,2 @@ +module FetmeetingsHelper +end diff --git a/app/helpers/fetmeetingtops_helper.rb b/app/helpers/fetmeetingtops_helper.rb new file mode 100644 index 0000000..f8abb5f --- /dev/null +++ b/app/helpers/fetmeetingtops_helper.rb @@ -0,0 +1,2 @@ +module FetmeetingtopsHelper +end diff --git a/app/models/fetmeeting.rb b/app/models/fetmeeting.rb new file mode 100644 index 0000000..152d2d8 --- /dev/null +++ b/app/models/fetmeeting.rb @@ -0,0 +1,11 @@ +class Fetmeeting < ActiveRecord::Base + attr_accessible :tnlist, :typ, :calentry_attributes + has_many :fetmeetingtops + validates :typ, presence: true + validates :calentry, presence: true + has_one :calentry , as: :object + accepts_nested_attributes_for :calentry + def public + true + end +end diff --git a/app/models/fetmeetingtop.rb b/app/models/fetmeetingtop.rb new file mode 100644 index 0000000..c687d25 --- /dev/null +++ b/app/models/fetmeetingtop.rb @@ -0,0 +1,7 @@ +class Fetmeetingtop < ActiveRecord::Base + attr_accessible :discussion, :ersteller, :fetmeeting_id, :text, :title + belongs_to :fetmeeting + validates :fetmeeting, presence: true + validates :title, presence: true , length:{minimum: 4} + validates :ersteller, presence: true +end diff --git a/app/views/fetmeetings/_form.html.erb b/app/views/fetmeetings/_form.html.erb new file mode 100644 index 0000000..c1c31bd --- /dev/null +++ b/app/views/fetmeetings/_form.html.erb @@ -0,0 +1,14 @@ +<%= semantic_form_for @fetmeeting do |f| %> + <%= f.inputs do %> + <%= f.input :tnlist %> + <%= f.input :typ %> + <%= f.semantic_fields_for :calentry , @fetmeeting.calentry do |calentry| %> + <%= render 'calentries/nested_fields', :f => calentry %> + <% end %> + + <% end %> + + <%= f.actions do %> + <%= f.action :submit, :as => :input %> + <% end %> +<% end %> diff --git a/app/views/fetmeetings/edit.html.erb b/app/views/fetmeetings/edit.html.erb new file mode 100644 index 0000000..01aa711 --- /dev/null +++ b/app/views/fetmeetings/edit.html.erb @@ -0,0 +1,6 @@ +

Editing fetmeeting

+ +<%= render 'form' %> + +<%= link_to 'Show', @fetmeeting %> | +<%= link_to 'Back', fetmeetings_path %> diff --git a/app/views/fetmeetings/index.html.erb b/app/views/fetmeetings/index.html.erb new file mode 100644 index 0000000..28c259d --- /dev/null +++ b/app/views/fetmeetings/index.html.erb @@ -0,0 +1,25 @@ +

Listing fetmeetings

+ + + + + + + + + + +<% @fetmeetings.each do |fetmeeting| %> + + + + + + + +<% end %> +
TnlistTyp
<%= fetmeeting.tnlist %><%= fetmeeting.typ %><%= link_to 'Show', fetmeeting %><%= link_to 'Edit', edit_fetmeeting_path(fetmeeting) %><%= link_to 'Destroy', fetmeeting, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Fetmeeting', new_fetmeeting_path %> diff --git a/app/views/fetmeetings/new.html.erb b/app/views/fetmeetings/new.html.erb new file mode 100644 index 0000000..ab0d5ea --- /dev/null +++ b/app/views/fetmeetings/new.html.erb @@ -0,0 +1,5 @@ +

New fetmeeting

+ +<%= render 'form' %> + +<%= link_to 'Back', fetmeetings_path %> diff --git a/app/views/fetmeetings/show.html.erb b/app/views/fetmeetings/show.html.erb new file mode 100644 index 0000000..914785d --- /dev/null +++ b/app/views/fetmeetings/show.html.erb @@ -0,0 +1,20 @@ +

<%= notice %>

+ +

+ Tnlist: + <%= @fetmeeting.tnlist %> +

+ +

+ Typ: + <%= @fetmeeting.typ %> +

+

+

+

+<%= link_to 'Edit', edit_fetmeeting_path(@fetmeeting) %> | +<%= link_to 'Back', fetmeetings_path %> diff --git a/app/views/fetmeetingtops/_fetmeetingtop.html.erb b/app/views/fetmeetingtops/_fetmeetingtop.html.erb new file mode 100644 index 0000000..f697269 --- /dev/null +++ b/app/views/fetmeetingtops/_fetmeetingtop.html.erb @@ -0,0 +1 @@ +<%= fetmeetingtop.title %> (<%= fetmeetingtop.ersteller %>) diff --git a/app/views/fetmeetingtops/_form.html.erb b/app/views/fetmeetingtops/_form.html.erb new file mode 100644 index 0000000..23dd082 --- /dev/null +++ b/app/views/fetmeetingtops/_form.html.erb @@ -0,0 +1,14 @@ +<%= semantic_form_for @fetmeetingtop do |f| %> + <%= f.inputs do %> + <%= f.input :title %> + <%= f.input :text %> + <%= f.input :discussion , as: :tinymce_text %> + <%= f.input :ersteller %> + <%= f.input :fetmeeting_id %> + <% end %> + + <%= f.actions do %> + <%= f.action :submit, :as => :input %> + <% end %> +<% end %> +<%= tinymce %> diff --git a/app/views/fetmeetingtops/edit.html.erb b/app/views/fetmeetingtops/edit.html.erb new file mode 100644 index 0000000..a05d980 --- /dev/null +++ b/app/views/fetmeetingtops/edit.html.erb @@ -0,0 +1,6 @@ +

Editing fetmeetingtop

+ +<%= render 'form' %> + +<%= link_to 'Show', @fetmeetingtop %> | +<%= link_to 'Back', fetmeetingtops_path %> diff --git a/app/views/fetmeetingtops/index.html.erb b/app/views/fetmeetingtops/index.html.erb new file mode 100644 index 0000000..0292dd2 --- /dev/null +++ b/app/views/fetmeetingtops/index.html.erb @@ -0,0 +1,31 @@ +

Listing fetmeetingtops

+ + + + + + + + + + + + + +<% @fetmeetingtops.each do |fetmeetingtop| %> + + + + + + + + + + +<% end %> +
TitleTextDiscussionErstellerFetmeeting
<%= fetmeetingtop.title %><%= fetmeetingtop.text %><%= fetmeetingtop.discussion %><%= fetmeetingtop.ersteller %><%= fetmeetingtop.fetmeeting_id %><%= link_to 'Show', fetmeetingtop %><%= link_to 'Edit', edit_fetmeetingtop_path(fetmeetingtop) %><%= link_to 'Destroy', fetmeetingtop, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Fetmeetingtop', new_fetmeetingtop_path %> diff --git a/app/views/fetmeetingtops/new.html.erb b/app/views/fetmeetingtops/new.html.erb new file mode 100644 index 0000000..96198c4 --- /dev/null +++ b/app/views/fetmeetingtops/new.html.erb @@ -0,0 +1,5 @@ +

New fetmeetingtop

+ +<%= render 'form' %> + +<%= link_to 'Back', fetmeetingtops_path %> diff --git a/app/views/fetmeetingtops/show.html.erb b/app/views/fetmeetingtops/show.html.erb new file mode 100644 index 0000000..739bf08 --- /dev/null +++ b/app/views/fetmeetingtops/show.html.erb @@ -0,0 +1,30 @@ +

<%= notice %>

+ +

+ Title: + <%= @fetmeetingtop.title %> +

+ +

+ Text: + <%= @fetmeetingtop.text %> +

+ +

+ Discussion: + <%= @fetmeetingtop.discussion %> +

+ +

+ Ersteller: + <%= @fetmeetingtop.ersteller %> +

+ +

+ Fetmeeting: + <%= @fetmeetingtop.fetmeeting_id %> +

+ + +<%= link_to 'Edit', edit_fetmeetingtop_path(@fetmeetingtop) %> | +<%= link_to 'Back', fetmeetingtops_path %> diff --git a/config/routes.rb b/config/routes.rb index 404b381..74b381d 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,10 @@ Fetsite::Application.routes.draw do + resources :fetmeetingtops + + + resources :fetmeetings + + themes_for_rails devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } resources :home, :only=>[:index] do diff --git a/db/migrate/20140507125633_create_fetmeetings.rb b/db/migrate/20140507125633_create_fetmeetings.rb new file mode 100644 index 0000000..cea9fef --- /dev/null +++ b/db/migrate/20140507125633_create_fetmeetings.rb @@ -0,0 +1,10 @@ +class CreateFetmeetings < ActiveRecord::Migration + def change + create_table :fetmeetings do |t| + t.text :tnlist + t.integer :typ + + t.timestamps + end + end +end diff --git a/db/migrate/20140507130354_create_fetmeetingtops.rb b/db/migrate/20140507130354_create_fetmeetingtops.rb new file mode 100644 index 0000000..810e5ce --- /dev/null +++ b/db/migrate/20140507130354_create_fetmeetingtops.rb @@ -0,0 +1,13 @@ +class CreateFetmeetingtops < ActiveRecord::Migration + def change + create_table :fetmeetingtops do |t| + t.string :title + t.text :text + t.text :discussion + t.string :ersteller + t.integer :fetmeeting_id + + t.timestamps + end + end +end diff --git a/spec/controllers/fetmeetings_controller_spec.rb b/spec/controllers/fetmeetings_controller_spec.rb new file mode 100644 index 0000000..2467093 --- /dev/null +++ b/spec/controllers/fetmeetings_controller_spec.rb @@ -0,0 +1,160 @@ +require 'spec_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. + +describe FetmeetingsController do + + # This should return the minimal set of attributes required to create a valid + # Fetmeeting. As you add validations to Fetmeeting, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { { "tnlist" => "MyText" } } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # FetmeetingsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET index" do + it "assigns all fetmeetings as @fetmeetings" do + fetmeeting = Fetmeeting.create! valid_attributes + get :index, {}, valid_session + assigns(:fetmeetings).should eq([fetmeeting]) + end + end + + describe "GET show" do + it "assigns the requested fetmeeting as @fetmeeting" do + fetmeeting = Fetmeeting.create! valid_attributes + get :show, {:id => fetmeeting.to_param}, valid_session + assigns(:fetmeeting).should eq(fetmeeting) + end + end + + describe "GET new" do + it "assigns a new fetmeeting as @fetmeeting" do + get :new, {}, valid_session + assigns(:fetmeeting).should be_a_new(Fetmeeting) + end + end + + describe "GET edit" do + it "assigns the requested fetmeeting as @fetmeeting" do + fetmeeting = Fetmeeting.create! valid_attributes + get :edit, {:id => fetmeeting.to_param}, valid_session + assigns(:fetmeeting).should eq(fetmeeting) + end + end + + describe "POST create" do + describe "with valid params" do + it "creates a new Fetmeeting" do + expect { + post :create, {:fetmeeting => valid_attributes}, valid_session + }.to change(Fetmeeting, :count).by(1) + end + + it "assigns a newly created fetmeeting as @fetmeeting" do + post :create, {:fetmeeting => valid_attributes}, valid_session + assigns(:fetmeeting).should be_a(Fetmeeting) + assigns(:fetmeeting).should be_persisted + end + + it "redirects to the created fetmeeting" do + post :create, {:fetmeeting => valid_attributes}, valid_session + response.should redirect_to(Fetmeeting.last) + end + end + + describe "with invalid params" do + it "assigns a newly created but unsaved fetmeeting as @fetmeeting" do + # Trigger the behavior that occurs when invalid params are submitted + Fetmeeting.any_instance.stub(:save).and_return(false) + post :create, {:fetmeeting => { "tnlist" => "invalid value" }}, valid_session + assigns(:fetmeeting).should be_a_new(Fetmeeting) + end + + it "re-renders the 'new' template" do + # Trigger the behavior that occurs when invalid params are submitted + Fetmeeting.any_instance.stub(:save).and_return(false) + post :create, {:fetmeeting => { "tnlist" => "invalid value" }}, valid_session + response.should render_template("new") + end + end + end + + describe "PUT update" do + describe "with valid params" do + it "updates the requested fetmeeting" do + fetmeeting = Fetmeeting.create! valid_attributes + # Assuming there are no other fetmeetings in the database, this + # specifies that the Fetmeeting created on the previous line + # receives the :update_attributes message with whatever params are + # submitted in the request. + Fetmeeting.any_instance.should_receive(:update_attributes).with({ "tnlist" => "MyText" }) + put :update, {:id => fetmeeting.to_param, :fetmeeting => { "tnlist" => "MyText" }}, valid_session + end + + it "assigns the requested fetmeeting as @fetmeeting" do + fetmeeting = Fetmeeting.create! valid_attributes + put :update, {:id => fetmeeting.to_param, :fetmeeting => valid_attributes}, valid_session + assigns(:fetmeeting).should eq(fetmeeting) + end + + it "redirects to the fetmeeting" do + fetmeeting = Fetmeeting.create! valid_attributes + put :update, {:id => fetmeeting.to_param, :fetmeeting => valid_attributes}, valid_session + response.should redirect_to(fetmeeting) + end + end + + describe "with invalid params" do + it "assigns the fetmeeting as @fetmeeting" do + fetmeeting = Fetmeeting.create! valid_attributes + # Trigger the behavior that occurs when invalid params are submitted + Fetmeeting.any_instance.stub(:save).and_return(false) + put :update, {:id => fetmeeting.to_param, :fetmeeting => { "tnlist" => "invalid value" }}, valid_session + assigns(:fetmeeting).should eq(fetmeeting) + end + + it "re-renders the 'edit' template" do + fetmeeting = Fetmeeting.create! valid_attributes + # Trigger the behavior that occurs when invalid params are submitted + Fetmeeting.any_instance.stub(:save).and_return(false) + put :update, {:id => fetmeeting.to_param, :fetmeeting => { "tnlist" => "invalid value" }}, valid_session + response.should render_template("edit") + end + end + end + + describe "DELETE destroy" do + it "destroys the requested fetmeeting" do + fetmeeting = Fetmeeting.create! valid_attributes + expect { + delete :destroy, {:id => fetmeeting.to_param}, valid_session + }.to change(Fetmeeting, :count).by(-1) + end + + it "redirects to the fetmeetings list" do + fetmeeting = Fetmeeting.create! valid_attributes + delete :destroy, {:id => fetmeeting.to_param}, valid_session + response.should redirect_to(fetmeetings_url) + end + end + +end diff --git a/spec/controllers/fetmeetingtops_controller_spec.rb b/spec/controllers/fetmeetingtops_controller_spec.rb new file mode 100644 index 0000000..7c4a70d --- /dev/null +++ b/spec/controllers/fetmeetingtops_controller_spec.rb @@ -0,0 +1,160 @@ +require 'spec_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. + +describe FetmeetingtopsController do + + # This should return the minimal set of attributes required to create a valid + # Fetmeetingtop. As you add validations to Fetmeetingtop, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { { "title" => "MyString" } } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # FetmeetingtopsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET index" do + it "assigns all fetmeetingtops as @fetmeetingtops" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + get :index, {}, valid_session + assigns(:fetmeetingtops).should eq([fetmeetingtop]) + end + end + + describe "GET show" do + it "assigns the requested fetmeetingtop as @fetmeetingtop" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + get :show, {:id => fetmeetingtop.to_param}, valid_session + assigns(:fetmeetingtop).should eq(fetmeetingtop) + end + end + + describe "GET new" do + it "assigns a new fetmeetingtop as @fetmeetingtop" do + get :new, {}, valid_session + assigns(:fetmeetingtop).should be_a_new(Fetmeetingtop) + end + end + + describe "GET edit" do + it "assigns the requested fetmeetingtop as @fetmeetingtop" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + get :edit, {:id => fetmeetingtop.to_param}, valid_session + assigns(:fetmeetingtop).should eq(fetmeetingtop) + end + end + + describe "POST create" do + describe "with valid params" do + it "creates a new Fetmeetingtop" do + expect { + post :create, {:fetmeetingtop => valid_attributes}, valid_session + }.to change(Fetmeetingtop, :count).by(1) + end + + it "assigns a newly created fetmeetingtop as @fetmeetingtop" do + post :create, {:fetmeetingtop => valid_attributes}, valid_session + assigns(:fetmeetingtop).should be_a(Fetmeetingtop) + assigns(:fetmeetingtop).should be_persisted + end + + it "redirects to the created fetmeetingtop" do + post :create, {:fetmeetingtop => valid_attributes}, valid_session + response.should redirect_to(Fetmeetingtop.last) + end + end + + describe "with invalid params" do + it "assigns a newly created but unsaved fetmeetingtop as @fetmeetingtop" do + # Trigger the behavior that occurs when invalid params are submitted + Fetmeetingtop.any_instance.stub(:save).and_return(false) + post :create, {:fetmeetingtop => { "title" => "invalid value" }}, valid_session + assigns(:fetmeetingtop).should be_a_new(Fetmeetingtop) + end + + it "re-renders the 'new' template" do + # Trigger the behavior that occurs when invalid params are submitted + Fetmeetingtop.any_instance.stub(:save).and_return(false) + post :create, {:fetmeetingtop => { "title" => "invalid value" }}, valid_session + response.should render_template("new") + end + end + end + + describe "PUT update" do + describe "with valid params" do + it "updates the requested fetmeetingtop" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + # Assuming there are no other fetmeetingtops in the database, this + # specifies that the Fetmeetingtop created on the previous line + # receives the :update_attributes message with whatever params are + # submitted in the request. + Fetmeetingtop.any_instance.should_receive(:update_attributes).with({ "title" => "MyString" }) + put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => { "title" => "MyString" }}, valid_session + end + + it "assigns the requested fetmeetingtop as @fetmeetingtop" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => valid_attributes}, valid_session + assigns(:fetmeetingtop).should eq(fetmeetingtop) + end + + it "redirects to the fetmeetingtop" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => valid_attributes}, valid_session + response.should redirect_to(fetmeetingtop) + end + end + + describe "with invalid params" do + it "assigns the fetmeetingtop as @fetmeetingtop" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + # Trigger the behavior that occurs when invalid params are submitted + Fetmeetingtop.any_instance.stub(:save).and_return(false) + put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => { "title" => "invalid value" }}, valid_session + assigns(:fetmeetingtop).should eq(fetmeetingtop) + end + + it "re-renders the 'edit' template" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + # Trigger the behavior that occurs when invalid params are submitted + Fetmeetingtop.any_instance.stub(:save).and_return(false) + put :update, {:id => fetmeetingtop.to_param, :fetmeetingtop => { "title" => "invalid value" }}, valid_session + response.should render_template("edit") + end + end + end + + describe "DELETE destroy" do + it "destroys the requested fetmeetingtop" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + expect { + delete :destroy, {:id => fetmeetingtop.to_param}, valid_session + }.to change(Fetmeetingtop, :count).by(-1) + end + + it "redirects to the fetmeetingtops list" do + fetmeetingtop = Fetmeetingtop.create! valid_attributes + delete :destroy, {:id => fetmeetingtop.to_param}, valid_session + response.should redirect_to(fetmeetingtops_url) + end + end + +end diff --git a/spec/factories/fetmeetings.rb b/spec/factories/fetmeetings.rb new file mode 100644 index 0000000..8cf06b7 --- /dev/null +++ b/spec/factories/fetmeetings.rb @@ -0,0 +1,8 @@ +# Read about factories at https://github.com/thoughtbot/factory_girl + +FactoryGirl.define do + factory :fetmeeting do + tnlist "MyText" + typ 1 + end +end diff --git a/spec/factories/fetmeetingtops.rb b/spec/factories/fetmeetingtops.rb new file mode 100644 index 0000000..1443519 --- /dev/null +++ b/spec/factories/fetmeetingtops.rb @@ -0,0 +1,11 @@ +# Read about factories at https://github.com/thoughtbot/factory_girl + +FactoryGirl.define do + factory :fetmeetingtop do + title "MyString" + text "MyText" + discussion "MyText" + ersteller "MyString" + fetmeeting_id 1 + end +end diff --git a/spec/helpers/fetmeetings_helper_spec.rb b/spec/helpers/fetmeetings_helper_spec.rb new file mode 100644 index 0000000..ca81428 --- /dev/null +++ b/spec/helpers/fetmeetings_helper_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +# Specs in this file have access to a helper object that includes +# the FetmeetingsHelper. For example: +# +# describe FetmeetingsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +describe FetmeetingsHelper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/fetmeetingtops_helper_spec.rb b/spec/helpers/fetmeetingtops_helper_spec.rb new file mode 100644 index 0000000..1304fcd --- /dev/null +++ b/spec/helpers/fetmeetingtops_helper_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +# Specs in this file have access to a helper object that includes +# the FetmeetingtopsHelper. For example: +# +# describe FetmeetingtopsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +describe FetmeetingtopsHelper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/fetmeeting_spec.rb b/spec/models/fetmeeting_spec.rb new file mode 100644 index 0000000..f809f99 --- /dev/null +++ b/spec/models/fetmeeting_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Fetmeeting do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/fetmeetingtop_spec.rb b/spec/models/fetmeetingtop_spec.rb new file mode 100644 index 0000000..e508e83 --- /dev/null +++ b/spec/models/fetmeetingtop_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Fetmeetingtop do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/fetmeetings_spec.rb b/spec/requests/fetmeetings_spec.rb new file mode 100644 index 0000000..0444c6d --- /dev/null +++ b/spec/requests/fetmeetings_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe "Fetmeetings" do + describe "GET /fetmeetings" do + it "works! (now write some real specs)" do + # Run the generator again with the --webrat flag if you want to use webrat methods/matchers + get fetmeetings_path + response.status.should be(200) + end + end +end diff --git a/spec/requests/fetmeetingtops_spec.rb b/spec/requests/fetmeetingtops_spec.rb new file mode 100644 index 0000000..7273cc6 --- /dev/null +++ b/spec/requests/fetmeetingtops_spec.rb @@ -0,0 +1,11 @@ +require 'spec_helper' + +describe "Fetmeetingtops" do + describe "GET /fetmeetingtops" do + it "works! (now write some real specs)" do + # Run the generator again with the --webrat flag if you want to use webrat methods/matchers + get fetmeetingtops_path + response.status.should be(200) + end + end +end diff --git a/spec/routing/fetmeetings_routing_spec.rb b/spec/routing/fetmeetings_routing_spec.rb new file mode 100644 index 0000000..77d71e6 --- /dev/null +++ b/spec/routing/fetmeetings_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe FetmeetingsController do + describe "routing" do + + it "routes to #index" do + get("/fetmeetings").should route_to("fetmeetings#index") + end + + it "routes to #new" do + get("/fetmeetings/new").should route_to("fetmeetings#new") + end + + it "routes to #show" do + get("/fetmeetings/1").should route_to("fetmeetings#show", :id => "1") + end + + it "routes to #edit" do + get("/fetmeetings/1/edit").should route_to("fetmeetings#edit", :id => "1") + end + + it "routes to #create" do + post("/fetmeetings").should route_to("fetmeetings#create") + end + + it "routes to #update" do + put("/fetmeetings/1").should route_to("fetmeetings#update", :id => "1") + end + + it "routes to #destroy" do + delete("/fetmeetings/1").should route_to("fetmeetings#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/fetmeetingtops_routing_spec.rb b/spec/routing/fetmeetingtops_routing_spec.rb new file mode 100644 index 0000000..c937eee --- /dev/null +++ b/spec/routing/fetmeetingtops_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe FetmeetingtopsController do + describe "routing" do + + it "routes to #index" do + get("/fetmeetingtops").should route_to("fetmeetingtops#index") + end + + it "routes to #new" do + get("/fetmeetingtops/new").should route_to("fetmeetingtops#new") + end + + it "routes to #show" do + get("/fetmeetingtops/1").should route_to("fetmeetingtops#show", :id => "1") + end + + it "routes to #edit" do + get("/fetmeetingtops/1/edit").should route_to("fetmeetingtops#edit", :id => "1") + end + + it "routes to #create" do + post("/fetmeetingtops").should route_to("fetmeetingtops#create") + end + + it "routes to #update" do + put("/fetmeetingtops/1").should route_to("fetmeetingtops#update", :id => "1") + end + + it "routes to #destroy" do + delete("/fetmeetingtops/1").should route_to("fetmeetingtops#destroy", :id => "1") + end + + end +end diff --git a/spec/views/fetmeetings/edit.html.erb_spec.rb b/spec/views/fetmeetings/edit.html.erb_spec.rb new file mode 100644 index 0000000..5c565e6 --- /dev/null +++ b/spec/views/fetmeetings/edit.html.erb_spec.rb @@ -0,0 +1,20 @@ +require 'spec_helper' + +describe "fetmeetings/edit" do + before(:each) do + @fetmeeting = assign(:fetmeeting, stub_model(Fetmeeting, + :tnlist => "MyText", + :typ => 1 + )) + end + + it "renders the edit fetmeeting form" do + render + + # Run the generator again with the --webrat flag if you want to use webrat matchers + assert_select "form[action=?][method=?]", fetmeeting_path(@fetmeeting), "post" do + assert_select "textarea#fetmeeting_tnlist[name=?]", "fetmeeting[tnlist]" + assert_select "input#fetmeeting_typ[name=?]", "fetmeeting[typ]" + end + end +end diff --git a/spec/views/fetmeetings/index.html.erb_spec.rb b/spec/views/fetmeetings/index.html.erb_spec.rb new file mode 100644 index 0000000..96c6ac8 --- /dev/null +++ b/spec/views/fetmeetings/index.html.erb_spec.rb @@ -0,0 +1,23 @@ +require 'spec_helper' + +describe "fetmeetings/index" do + before(:each) do + assign(:fetmeetings, [ + stub_model(Fetmeeting, + :tnlist => "MyText", + :typ => 1 + ), + stub_model(Fetmeeting, + :tnlist => "MyText", + :typ => 1 + ) + ]) + end + + it "renders a list of fetmeetings" do + render + # Run the generator again with the --webrat flag if you want to use webrat matchers + assert_select "tr>td", :text => "MyText".to_s, :count => 2 + assert_select "tr>td", :text => 1.to_s, :count => 2 + end +end diff --git a/spec/views/fetmeetings/new.html.erb_spec.rb b/spec/views/fetmeetings/new.html.erb_spec.rb new file mode 100644 index 0000000..4773b40 --- /dev/null +++ b/spec/views/fetmeetings/new.html.erb_spec.rb @@ -0,0 +1,20 @@ +require 'spec_helper' + +describe "fetmeetings/new" do + before(:each) do + assign(:fetmeeting, stub_model(Fetmeeting, + :tnlist => "MyText", + :typ => 1 + ).as_new_record) + end + + it "renders new fetmeeting form" do + render + + # Run the generator again with the --webrat flag if you want to use webrat matchers + assert_select "form[action=?][method=?]", fetmeetings_path, "post" do + assert_select "textarea#fetmeeting_tnlist[name=?]", "fetmeeting[tnlist]" + assert_select "input#fetmeeting_typ[name=?]", "fetmeeting[typ]" + end + end +end diff --git a/spec/views/fetmeetings/show.html.erb_spec.rb b/spec/views/fetmeetings/show.html.erb_spec.rb new file mode 100644 index 0000000..4e54a71 --- /dev/null +++ b/spec/views/fetmeetings/show.html.erb_spec.rb @@ -0,0 +1,17 @@ +require 'spec_helper' + +describe "fetmeetings/show" do + before(:each) do + @fetmeeting = assign(:fetmeeting, stub_model(Fetmeeting, + :tnlist => "MyText", + :typ => 1 + )) + end + + it "renders attributes in

" do + render + # Run the generator again with the --webrat flag if you want to use webrat matchers + rendered.should match(/MyText/) + rendered.should match(/1/) + end +end diff --git a/spec/views/fetmeetingtops/edit.html.erb_spec.rb b/spec/views/fetmeetingtops/edit.html.erb_spec.rb new file mode 100644 index 0000000..11b3899 --- /dev/null +++ b/spec/views/fetmeetingtops/edit.html.erb_spec.rb @@ -0,0 +1,26 @@ +require 'spec_helper' + +describe "fetmeetingtops/edit" do + before(:each) do + @fetmeetingtop = assign(:fetmeetingtop, stub_model(Fetmeetingtop, + :title => "MyString", + :text => "MyText", + :discussion => "MyText", + :ersteller => "MyString", + :fetmeeting_id => 1 + )) + end + + it "renders the edit fetmeetingtop form" do + render + + # Run the generator again with the --webrat flag if you want to use webrat matchers + assert_select "form[action=?][method=?]", fetmeetingtop_path(@fetmeetingtop), "post" do + assert_select "input#fetmeetingtop_title[name=?]", "fetmeetingtop[title]" + assert_select "textarea#fetmeetingtop_text[name=?]", "fetmeetingtop[text]" + assert_select "textarea#fetmeetingtop_discussion[name=?]", "fetmeetingtop[discussion]" + assert_select "input#fetmeetingtop_ersteller[name=?]", "fetmeetingtop[ersteller]" + assert_select "input#fetmeetingtop_fetmeeting_id[name=?]", "fetmeetingtop[fetmeeting_id]" + end + end +end diff --git a/spec/views/fetmeetingtops/index.html.erb_spec.rb b/spec/views/fetmeetingtops/index.html.erb_spec.rb new file mode 100644 index 0000000..8935c13 --- /dev/null +++ b/spec/views/fetmeetingtops/index.html.erb_spec.rb @@ -0,0 +1,32 @@ +require 'spec_helper' + +describe "fetmeetingtops/index" do + before(:each) do + assign(:fetmeetingtops, [ + stub_model(Fetmeetingtop, + :title => "Title", + :text => "MyText", + :discussion => "MyText", + :ersteller => "Ersteller", + :fetmeeting_id => 1 + ), + stub_model(Fetmeetingtop, + :title => "Title", + :text => "MyText", + :discussion => "MyText", + :ersteller => "Ersteller", + :fetmeeting_id => 1 + ) + ]) + end + + it "renders a list of fetmeetingtops" do + render + # Run the generator again with the --webrat flag if you want to use webrat matchers + assert_select "tr>td", :text => "Title".to_s, :count => 2 + assert_select "tr>td", :text => "MyText".to_s, :count => 2 + assert_select "tr>td", :text => "MyText".to_s, :count => 2 + assert_select "tr>td", :text => "Ersteller".to_s, :count => 2 + assert_select "tr>td", :text => 1.to_s, :count => 2 + end +end diff --git a/spec/views/fetmeetingtops/new.html.erb_spec.rb b/spec/views/fetmeetingtops/new.html.erb_spec.rb new file mode 100644 index 0000000..43611f8 --- /dev/null +++ b/spec/views/fetmeetingtops/new.html.erb_spec.rb @@ -0,0 +1,26 @@ +require 'spec_helper' + +describe "fetmeetingtops/new" do + before(:each) do + assign(:fetmeetingtop, stub_model(Fetmeetingtop, + :title => "MyString", + :text => "MyText", + :discussion => "MyText", + :ersteller => "MyString", + :fetmeeting_id => 1 + ).as_new_record) + end + + it "renders new fetmeetingtop form" do + render + + # Run the generator again with the --webrat flag if you want to use webrat matchers + assert_select "form[action=?][method=?]", fetmeetingtops_path, "post" do + assert_select "input#fetmeetingtop_title[name=?]", "fetmeetingtop[title]" + assert_select "textarea#fetmeetingtop_text[name=?]", "fetmeetingtop[text]" + assert_select "textarea#fetmeetingtop_discussion[name=?]", "fetmeetingtop[discussion]" + assert_select "input#fetmeetingtop_ersteller[name=?]", "fetmeetingtop[ersteller]" + assert_select "input#fetmeetingtop_fetmeeting_id[name=?]", "fetmeetingtop[fetmeeting_id]" + end + end +end diff --git a/spec/views/fetmeetingtops/show.html.erb_spec.rb b/spec/views/fetmeetingtops/show.html.erb_spec.rb new file mode 100644 index 0000000..d566f58 --- /dev/null +++ b/spec/views/fetmeetingtops/show.html.erb_spec.rb @@ -0,0 +1,23 @@ +require 'spec_helper' + +describe "fetmeetingtops/show" do + before(:each) do + @fetmeetingtop = assign(:fetmeetingtop, stub_model(Fetmeetingtop, + :title => "Title", + :text => "MyText", + :discussion => "MyText", + :ersteller => "Ersteller", + :fetmeeting_id => 1 + )) + end + + it "renders attributes in

" do + render + # Run the generator again with the --webrat flag if you want to use webrat matchers + rendered.should match(/Title/) + rendered.should match(/MyText/) + rendered.should match(/MyText/) + rendered.should match(/Ersteller/) + rendered.should match(/1/) + end +end From 85d2bb5bf9ddb4e568d4886fb11be5f87c0966df Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Sun, 11 Jan 2015 22:18:31 +0100 Subject: [PATCH 02/16] Check for 0 themen --- app/controllers/home_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 34725b2..c85071d 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -2,8 +2,12 @@ class HomeController < ApplicationController def index @beispiele = Beispiel.last([Beispiel.count, 3].min) @neuigkeiten = Neuigkeit.recent + if Thema.count>0 t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml") @starttopic= @themen = Thema.where(:id=>t).first + else + @starttopic=@themen = nil + end end def dev From 2931ee6cd6ae04024588cc9ace25b8b06c9d9aba Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 15 Jan 2015 12:56:52 +0100 Subject: [PATCH 03/16] Need to enforce the jquery-fileupload version 0.4.2 broke uploads for me --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a83dee3..376b2cf 100755 --- a/Gemfile +++ b/Gemfile @@ -91,7 +91,7 @@ gem "simple_calendar", "~> 0.1.9" gem 'rmagick' gem 'bootstrap-addons-rails' -gem "jquery-fileupload-rails" +gem "jquery-fileupload-rails", "0.4.1" gem "jquery-ui-rails","~> 4.1.1" gem "font-awesome-rails" gem "jquery-datetimepicker-rails" @@ -115,4 +115,4 @@ gem 'sunspot_solr' gem 'sitemap_generator' gem 'whenever' gem 'yaml_db' -gem 'etherpad-lite' \ No newline at end of file +gem 'etherpad-lite' From 3a00794851b9da46312aef9848af59588fd955b6 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 15 Jan 2015 14:01:16 +0100 Subject: [PATCH 04/16] dfsd --- app/views/galleries/show.html.erb | 51 +++++++++++++------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 88ddcc2..4a370a5 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -39,45 +39,36 @@

-
- - - + <%= render 'layouts/pretty_toolbar' %> - - - - - - - - - - - From f6a95dee574b9963d8d3f41da3f9a60de966ab9c Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 15 Jan 2015 14:30:53 +0100 Subject: [PATCH 05/16] commit --- Gemfile | 1 + app/views/galleries/show.html.erb | 5 ++--- app/views/layouts/application.html.erb | Bin 1791 -> 1879 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 376b2cf..f653a62 100755 --- a/Gemfile +++ b/Gemfile @@ -73,6 +73,7 @@ gem "cancan" # Fileupload gem 'paperclip' ,'~>3.4.0' +gem 'blueimp-gallery' gem 'git' gem 'haml' diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 4a370a5..6d65392 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -52,7 +52,7 @@ -<%= render 'layouts/pretty_toolbar' %> + <%= render 'layouts/pretty_toolbar' %> - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 13182739bedae500d2febfd0f6d257a2d46a45da..fb611d0e325037a6fbb58e24daae22b185e94b43 100755 GIT binary patch delta 105 zcmey*d!28>{3tF31qGX&%)D%cqSPE)rQ(vxoYdls)YK9sg^Z%qG+QP8jQreG{gR}d z#H!S6{eq(Wbp5o{lH$ygRQ=@QV*R9?($vh{0^Rh)oSf96O1<37JUyVek{#E^1+Q5r I_plWM0PsI1{Qv*} delta 18 acmcc4_n&vdd`5+hKVP#lGE9ELRtx}6(+AA} From 3dff2d2bbe567c28eef8fedbef9fc596a643800b Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 15 Jan 2015 15:36:20 +0100 Subject: [PATCH 06/16] Fix: Bildergallerie MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bildergallerie läuft jetzt auf Blueimp-gallery. Viel spaß --- Gemfile | 4 +- app/assets/javascripts/application.js | 3 +- app/assets/stylesheets/application.css.scss | 103 +++++++++--------- app/assets/stylesheets/galleries.css.scss | 33 ------ app/assets/stylesheets/layout.css.scss | 3 + .../themes/blue1/application.css.scss | 1 - app/views/galleries/show.html.erb | 40 +++++-- app/views/layouts/application.html.erb | 1 - config/locales/de.yml | 4 +- 9 files changed, 90 insertions(+), 102 deletions(-) diff --git a/Gemfile b/Gemfile index f653a62..56e0ed6 100755 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,6 @@ gem "cancan" # Fileupload gem 'paperclip' ,'~>3.4.0' -gem 'blueimp-gallery' gem 'git' gem 'haml' @@ -117,3 +116,6 @@ gem 'sitemap_generator' gem 'whenever' gem 'yaml_db' gem 'etherpad-lite' + +# Image gallery +gem 'blueimp-gallery' diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e2b42f1..856bf31 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -23,11 +23,10 @@ //= require bootstrap //= require bootstrap/colorpicker //= require bootstrap/datepicker -//= require bootstrap/load-image.min -//= require bootstrap/image-gallery.min //= require jquery-fileupload // require jquery.remotipart //= require jquery.datetimepicker +//= require blueimp-gallery-all function insertAttachment(url,name) { var ext = url.split('.').pop().toLowerCase(); diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 65e39bf..34fa42c 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,22 +1,21 @@ /* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require_self - * require_tree . - *= require 'calendars' - *= require jquery.fileupload-ui - * require 'bootstrap' - *= require 'tinymce' - - */ +* This is a manifest file that'll be compiled into application.css, which will include all the files +* listed below. +* +* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, +* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. +* +* You're free to add application-wide styles to this file and they'll appear at the top of the +* compiled file, but it's generally better to create a new file per style scope. +*= require_self +* require_tree . +*= require 'calendars' +*= require jquery.fileupload-ui +* require 'bootstrap' +*= require 'tinymce' + +*/ // Colorshema #0A64A4 $color_prim: #0A64A4; $color_prim_light: #0B65A5; @@ -45,34 +44,34 @@ $sansFontFamily: Helvetica, Arial; @import 'font-awesome'; h1 { - font-size: 23px +font-size: 23px } h2 { - font-size: 19px +font-size: 19px } body,html { - padding:0; - margin:0; +padding:0; +margin:0; } a:hover { - text-decoration:none; +text-decoration:none; } div.header { - display: block; - // background: url('/header1.png') no-repeat; - background-color: #FFF; - background-position: right; - border-bottom:1px solid black; - height:41px; - color:#000; - padding-left:87px; - padding-top:0px; - overflow:hidden; - margin-bottom: 20px +display: block; +// background: url('/header1.png') no-repeat; +background-color: #FFF; +background-position: right; +border-bottom:1px solid black; +height:41px; +color:#000; +padding-left:87px; +padding-top:0px; +overflow:hidden; +margin-bottom: 20px } div.header h1 { padding:0; @@ -81,40 +80,40 @@ font-size:20px; line-height:32px; } #menudiv { - width:100%; +width:100%; } - + .navbar .nav li { - min-width:100%; +min-width:100%; } .navbar .nav .divider { - border-style: solid; - border-width: 1px 0px 0px 0px; - border-color: grey; - min-width: 100%; +border-style: solid; +border-width: 1px 0px 0px 0px; +border-color: grey; +min-width: 100%; } .navbar .navbar-inner { - border:none; - box-shadow:none; +border:none; +box-shadow:none; } #contentdiv { - background: #FFFFFF +background: #FFFFFF } #contentdiv .container-fluid { - padding:0; +padding:0; } a.linkbox, div.contentbox { - display:block; - padding:5px; - border-radius: 10px; - border: lightgray solid 1px; +display:block; +padding:5px; +border-radius: 10px; +border: lightgray solid 1px; } @@ -132,16 +131,18 @@ margin-bottom:10px; } ul.linkbox-list { - max-width:70em; +max-width:70em; } div.contentbox { - margin: 5px; +margin: 5px; } .navbar .nav li { min-width:100%; background:44F; -} \ No newline at end of file +} + +@import 'galleries'; \ No newline at end of file diff --git a/app/assets/stylesheets/galleries.css.scss b/app/assets/stylesheets/galleries.css.scss index 27e63bf..0689e8e 100644 --- a/app/assets/stylesheets/galleries.css.scss +++ b/app/assets/stylesheets/galleries.css.scss @@ -2,39 +2,6 @@ // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -//.modal.fade { -// top: -25%; -// transition: opacity 0.3s linear 0s, top 0.3s ease-out 0s; -//} -//.modal-gallery { -// max-height: none; -// outline: medium none; -// width: auto; -//} -//.modal { -// color: #333333; -//} -//.hide { -// display: none; -//} -//.modal { -//background-clip: padding-box; -// background-color: #FFFFFF; -// border: 1px solid rgba(0, 0, 0, 0.3); -//border-radius: 6px 6px 6px 6px; -// box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -// left: 50%; -// margin-left: -280px; -// outline: medium none; -// position: fixed; -// top: 10%;; -// z-index: 1050; -//} -//.fade { -// opacity: 0; -// transition: opacity 0.15s linear 0s; -//} - div.gallery-block { padding: 10px; diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index 34fc843..f23f112 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -1,3 +1,6 @@ + +@import 'blueimp-gallery-all'; + h1 { font-size: 23px } diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss index 53484fe..70e9a96 100755 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ b/app/assets/stylesheets/themes/blue1/application.css.scss @@ -15,7 +15,6 @@ *= require jquery.datetimepicker *= require jquery.ui.dialog * require 'bootstrap' - * require 'neuigkeiten' */ diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 6d65392..9c4bf77 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -40,15 +40,40 @@
- + <%= javascript_include_tag "blueimp-gallery-all" %> <%= render 'layouts/pretty_toolbar' %> From 75667ae6ceb1f4ec56240fa4a40c000832d06db7 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Fri, 16 Jan 2015 00:03:09 +0100 Subject: [PATCH 11/16] work in progress --- app/assets/stylesheets/layout.css.scss | 9 +++++++- app/controllers/galleries_controller.rb | 7 +++++- app/models/gallery.rb | 2 +- app/views/galleries/_form.html.erb | 29 ++++++++++++++++--------- config/sunspot.yml | 7 +++--- solr/conf/schema.xml | 14 ++++-------- 6 files changed, 41 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index c0827a1..6c63179 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -1,6 +1,13 @@ @import 'blueimp-gallery-all'; - +.left +{ + float: left; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + /* etc. */ +} h1 { font-size: 23px } diff --git a/app/controllers/galleries_controller.rb b/app/controllers/galleries_controller.rb index 7745872..c68fe1d 100644 --- a/app/controllers/galleries_controller.rb +++ b/app/controllers/galleries_controller.rb @@ -18,7 +18,7 @@ class GalleriesController < ApplicationController # GET /galleries/1.json def show @gallery = Gallery.find(params[:id]) - + @pppage_array = [ 25 , 50 , 100 ] #defines number & size of picture chunks @pppage = 0 #starting index of pppage_array @@ -56,6 +56,7 @@ class GalleriesController < ApplicationController # GET /galleries/1/edit def edit @gallery = Gallery.find(params[:id]) + @fotos_old = @gallery.fotos end # POST /galleries @@ -81,6 +82,10 @@ class GalleriesController < ApplicationController @foto = Foto.new respond_to do |format| if @gallery.update_attributes(params[:gallery]) + + Foto.where(:gallery_id=>nil).each do |tbd| + tbd.destroy + end format.html { redirect_to @gallery, notice: 'Gallery was successfully updated.' } format.json { head :no_content } else diff --git a/app/models/gallery.rb b/app/models/gallery.rb index 7c2079e..9371f2d 100644 --- a/app/models/gallery.rb +++ b/app/models/gallery.rb @@ -12,7 +12,7 @@ class Gallery < ActiveRecord::Base WORD_COUNT = 20 - attr_accessible :datum, :desc, :name + attr_accessible :datum, :desc, :name, :foto_ids has_many :fotos has_many :nlinks, as: :link # scope :search, ->(query) {where("name like ? or galleries.desc like ?", "%#{query}%", "%#{query}%")} diff --git a/app/views/galleries/_form.html.erb b/app/views/galleries/_form.html.erb index 6322dc2..9a63688 100644 --- a/app/views/galleries/_form.html.erb +++ b/app/views/galleries/_form.html.erb @@ -1,11 +1,20 @@ -<%= semantic_form_for @gallery do |f| %> - <%= f.inputs do %> - <%= f.input :name %> - <%= f.input :desc %> - <%= f.input :datum %> - <% end %> +
+
+
+ <%= semantic_form_for @gallery do |f| %> + <%= f.inputs do %> + <%= f.input :name %> + <%= f.input :desc %> + <%= f.input :datum %> + <%= f.input :fotos,:label=>"test", :as=>:check_boxes, :member_label =>Proc.new{|u| u.title.html_safe+"
".html_safe+image_tag(u.datei.thumb.url,{:class=>"img-polaroid img-rounded"})}, :wrapper_html => {:class => "left"}%> + <% end %> - <%= f.actions do %> - <%= f.action :submit, :as => :input %> - <% end %> -<% end %> + <%= f.actions do %> + <%= f.action :submit, :as => :input %> + <% end %> + <% end %> +
+ +
+ <%= @fotos_old %> +
diff --git a/config/sunspot.yml b/config/sunspot.yml index cef12a4..5e81092 100644 --- a/config/sunspot.yml +++ b/config/sunspot.yml @@ -1,10 +1,9 @@ production: solr: hostname: localhost - port: 8080 + port: 8983 log_level: WARNING - path: /solr-4.10.2/default #production #ollection1 #production -# solr_home: solr + path: /solr/production # read_timeout: 2 # open_timeout: 0.5 @@ -21,4 +20,4 @@ test: port: 8981 log_level: WARNING path: /solr/test - + \ No newline at end of file diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml index 8da24f2..adcb9a8 100644 --- a/solr/conf/schema.xml +++ b/solr/conf/schema.xml @@ -60,17 +60,11 @@ - - + + + - - - - - - - - + From a9969a6c728ab44f74f55f57db0074bd5a036906 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Fri, 16 Jan 2015 09:46:01 +0100 Subject: [PATCH 12/16] updates --- app/models/gallery.rb | 2 +- app/views/galleries/_form.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/gallery.rb b/app/models/gallery.rb index 9371f2d..2dcbadc 100644 --- a/app/models/gallery.rb +++ b/app/models/gallery.rb @@ -13,7 +13,7 @@ class Gallery < ActiveRecord::Base WORD_COUNT = 20 attr_accessible :datum, :desc, :name, :foto_ids - has_many :fotos + has_many :fotos, :dependent => :destroy # Delete fotos if gallery is destroyed has_many :nlinks, as: :link # scope :search, ->(query) {where("name like ? or galleries.desc like ?", "%#{query}%", "%#{query}%")} searchable do diff --git a/app/views/galleries/_form.html.erb b/app/views/galleries/_form.html.erb index 9a63688..1e8d6e5 100644 --- a/app/views/galleries/_form.html.erb +++ b/app/views/galleries/_form.html.erb @@ -6,7 +6,7 @@ <%= f.input :name %> <%= f.input :desc %> <%= f.input :datum %> - <%= f.input :fotos,:label=>"test", :as=>:check_boxes, :member_label =>Proc.new{|u| u.title.html_safe+"
".html_safe+image_tag(u.datei.thumb.url,{:class=>"img-polaroid img-rounded"})}, :wrapper_html => {:class => "left"}%> + <% end %> <%= f.actions do %> @@ -16,5 +16,5 @@
- <%= @fotos_old %> + From 9c6038d6dd5855104081d0cb2da0aa7cedaaf734 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Fri, 16 Jan 2015 12:10:02 +0100 Subject: [PATCH 13/16] Gallery show enhancements a) Worked on better pagination, knows now 25, 50, 100 and "all" b) Viewer always shows ALL pictures, sorted to fit the order of the pagination --- app/controllers/galleries_controller.rb | 22 +++++++++++++++++----- app/views/galleries/show.html.erb | 18 ++++++++++-------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/app/controllers/galleries_controller.rb b/app/controllers/galleries_controller.rb index c68fe1d..048f7a0 100644 --- a/app/controllers/galleries_controller.rb +++ b/app/controllers/galleries_controller.rb @@ -19,19 +19,31 @@ class GalleriesController < ApplicationController def show @gallery = Gallery.find(params[:id]) - @pppage_array = [ 25 , 50 , 100 ] #defines number & size of picture chunks + @pppage_array = [ 25 , 50 , 100, "all"] #defines number & size of picture chunks @pppage = 0 #starting index of pppage_array - - if params[:pppage].to_i <= 2 && params[:pppage].to_i >= 0 + + if !params[:pppage].nil? && params[:pppage].to_i <= 2 && params[:pppage].to_i >= 0 @pppage = params[:pppage].to_i end @page = params[:page].nil? ? 1 : params[:page].to_i # @fotos = Foto.where(:gallery_id => params[:id]).limit(@pppage_array[@pppage]).offset(@pppage_array[@pppage]*(@page-1)) @fotos = Foto.where(:gallery_id => params[:id]) - @pages = (Foto.where(:gallery_id => params[:id]).count/(@pppage_array[@pppage])+1) + if @pppage_array[@pppage] != "all" + @fotos_p = @fotos.page(@page).per(@pppage_array[@pppage]) + + @fotos_n = @fotos- @fotos_p + @foto_ind = @fotos.find_index(@fotos_p.first) + @fotos_n = @fotos_n.rotate(@foto_ind) + @pages = (Foto.where(:gallery_id => params[:id]).count/(@pppage_array[@pppage])+1) + else + @fotos_p = @fotos + @fotos_n = [] + @pages = 1 + end + @showind=[] - @showind.fill(0,@pppage_array[@pppage]){ |i| i+ @pppage_array[@pppage]*(@page-1)} # Hier ausrechnen welche angezeigt werden sollen + # Hier ausrechnen welche angezeigt werden sollen @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('fotos.new-fotos'), :path=>new_gallery_foto_path(@gallery)} @toolbar_elements << {:hicon=>'icon-pencil', :text => I18n.t('common.edit'), :path=>edit_gallery_path(@gallery)} @toolbar_elements << {:hicon=>'icon-arrow-left', :text=>I18n.t('common.back'), :path=>galleries_path()} diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 8e9f042..2be79fd 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -36,10 +36,8 @@ -
- -
- +