banner_lite 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7e934a8dd646f7cf44a45fd21394fad170840d7
-  data.tar.gz: 458ab0043eccd6a0659ab7f8b2be3324fdfc9601
+  metadata.gz: e1e3a85fef15acb781582d7b034bf9d88c879425
+  data.tar.gz: e4883b046f7482c366ea74cf1f7d8907481a36e5
 SHA512:
-  metadata.gz: 99192c8ca580a9c361d7059f3f483df2f3cbdb300fd228a0176ab450ad300fe7e123082cb374321f5af3c01ccfae41b85095839a03417791fd2b3cbd729e7dd9
-  data.tar.gz: 21aa65dc5c6f18dd256af34c5446a1f16424b5eeccb8d61936c5fbc52ea6e2fa7f9f8441762eb2316afe825ac23cc0582abefd8a735b7636b5c548b74c4635f6
+  metadata.gz: 623b459d9d000dafcd2040557a75e175106f95dca3b70d1c9cd86235bb7a44ff2ce0909b876a4a290771577ba9e44facf929bd85594c2dde74669c6448eda173
+  data.tar.gz: d89b2caa71352bd2667b7443dc7b392bdfc8fc4d9c9aee5f4846df7f1ce5beee213bbefd46e22f6dd3dd2cdf972d810d221b1c740f6a22f4415227c40cf805f8

data/Rakefile

@@ -21,3 +21,12 @@ load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+
+task :default => :spec

data/app/controllers/banner_lite/{banners_controller.rb → image_banners_controller.rb}

@@ -1,28 +1,28 @@
 require_dependency "banner_lite/application_controller"
 
 module BannerLite
-  class BannersController < ApplicationController
+  class ImageBannersController < ApplicationController
     before_action :set_banner, only: [:show, :edit, :update, :destroy]
 
     def index
-      @banners = Banner.all
+      @banners = ImageBanner.all
     end
 
     def show
     end
 
     def new
-      @banner = Banner.new
+      @banner = ImageBanner.new
     end
 
     def edit
     end
 
     def create
-      @banner = Banner.new(banner_params)
+      @banner = ImageBanner.new(banner_params)
 
       if @banner.save
-        redirect_to @banner, notice: 'Banner was successfully created.'
+        redirect_to @banner, notice: 'ImageBanner was successfully created.'
       else
         render action: 'new'
       end
@@ -30,7 +30,7 @@ module BannerLite
 
     def update
       if @banner.update(banner_params)
-        redirect_to @banner, notice: 'Banner was successfully updated.'
+        redirect_to @banner, notice: 'ImageBanner was successfully updated.'
       else
         render action: 'edit'
       end
@@ -38,16 +38,16 @@ module BannerLite
 
     def destroy
       @banner.destroy
-      redirect_to banners_url, notice: 'Banner was successfully destroyed.'
+      redirect_to image_banners_url, notice: 'ImageBanner was successfully destroyed.'
     end
 
     private
       def set_banner
-        @banner = Banner.find(params[:id])
+        @banner = ImageBanner.find(params[:id])
       end
 
       def banner_params
-        params.require(:banner).permit(:url, :file, :active_from, :active_until)
+        params.require(:image_banner).permit(:url, :file, :active_from, :active_until)
       end
   end
 end

data/app/controllers/banner_lite/text_banners_controller.rb

@@ -0,0 +1,53 @@
+require_dependency "banner_lite/application_controller"
+
+module BannerLite
+  class TextBannersController < ApplicationController
+    before_action :set_text_banner, only: [:show, :edit, :update, :destroy]
+
+    def index
+      @text_banners = TextBanner.all
+    end
+
+    def show
+    end
+
+    def new
+      @text_banner = TextBanner.new
+    end
+
+    def edit
+    end
+
+    def create
+      @text_banner = TextBanner.new(text_banner_params)
+
+      if @text_banner.save
+        redirect_to @text_banner, notice: 'Text banner was successfully created.'
+      else
+        render :new
+      end
+    end
+
+    def update
+      if @text_banner.update(text_banner_params)
+        redirect_to @text_banner, notice: 'Text banner was successfully updated.'
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      @text_banner.destroy
+      redirect_to text_banners_url, notice: 'Text banner was successfully destroyed.'
+    end
+
+    private
+      def set_text_banner
+        @text_banner = TextBanner.find(params[:id])
+      end
+
+      def text_banner_params
+        params.require(:text_banner).permit(:url, :active_from, :active_until, :text)
+      end
+  end
+end

data/app/helpers/banner_lite/{banners_helper.rb → image_banners_helper.rb}

@@ -1,7 +1,7 @@
 module BannerLite
-  module BannersHelper
-    def banners(bnnrs = nil)
-      bnnrs ||= Banner.active
+  module ImageBannersHelper
+    def image_banners(bnnrs = nil)
+      bnnrs ||= ImageBanner.active
       bnnrs.map{|b| banner_html(b) }.join("\n").html_safe
     end
 

data/app/helpers/banner_lite/text_banners_helper.rb

@@ -0,0 +1,12 @@
+module BannerLite
+  module TextBannersHelper
+    def text_banners(bnnrs = nil)
+      bnnrs ||= TextBanner.active
+      bnnrs.map{|b| banner_html(b) }.join("\n").html_safe
+    end
+
+    def banner_html(banner)
+      link_to banner.text, banner.url
+    end
+  end
+end

data/app/models/banner_lite/banner.rb

@@ -1,35 +1,6 @@
 module BannerLite
   class Banner < ActiveRecord::Base
-    attr_accessor :file
     validates :url, presence: true
-    validates :file, presence: true, if: ->(b){ b.file_name.blank? }
-
-    before_save :fill_file_name, if: :file
-    after_save :save_file, if: :file
-    after_destroy :remove_file
-
     scope :active, ->{ now = Time.zone.now; where(arel_table[:active_from].lteq(now).and(arel_table[:active_until].gt(now))) }
-
-    def src
-      "/system/#{id}/#{file_name}"
-    end
-
-    private
-      def base_dir
-        @base_dir ||= Rails.root.join('public', 'system', id.to_s)
-      end
-
-      def fill_file_name
-        self.file_name = file.original_filename
-      end
-
-      def remove_file
-        FileUtils.rm_rf(base_dir)
-      end
-
-      def save_file
-        FileUtils.mkdir(base_dir) unless File.directory?(base_dir)
-        File.open(base_dir + file_name, 'wb'){|f| f.write(file.read) }
-      end
   end
 end

data/app/models/banner_lite/image_banner.rb

@@ -0,0 +1,32 @@
+module BannerLite
+  class ImageBanner < Banner
+    attr_accessor :file
+    validates :file, presence: true, if: ->(b){ b.file_name.blank? }
+
+    before_save :fill_file_name, if: :file
+    after_save :save_file, if: :file
+    after_destroy :remove_file
+
+    def src
+      "/system/#{id}/#{file_name}"
+    end
+
+    private
+      def base_dir
+        @base_dir ||= Rails.root.join('public', 'system', id.to_s)
+      end
+
+      def fill_file_name
+        self.file_name = file.original_filename
+      end
+
+      def remove_file
+        FileUtils.rm_rf(base_dir)
+      end
+
+      def save_file
+        FileUtils.mkdir(base_dir) unless File.directory?(base_dir)
+        File.open(base_dir + file_name, 'wb'){|f| f.write(file.read) }
+      end
+  end
+end

data/app/models/banner_lite/text_banner.rb

@@ -0,0 +1,5 @@
+module BannerLite
+  class TextBanner < Banner
+    validates :text, presence: true
+  end
+end

data/app/views/banner_lite/{banners → image_banners}/edit.html.erb

@@ -3,4 +3,4 @@
 <%= render 'form' %>
 
 <%= link_to 'Show', @banner %> |
-<%= link_to 'Back', banners_path %>
+<%= link_to 'Back', image_banners_path %>

data/app/views/banner_lite/{banners → image_banners}/index.html.erb

@@ -19,7 +19,7 @@
         <td><%= banner.active_from %></td>
         <td><%= banner.active_until %></td>
         <td><%= link_to 'Show', banner %></td>
-        <td><%= link_to 'Edit', edit_banner_path(banner) %></td>
+        <td><%= link_to 'Edit', edit_image_banner_path(banner) %></td>
         <td><%= link_to 'Destroy', banner, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
@@ -28,4 +28,4 @@
 
 <br>
 
-<%= link_to 'New Banner', new_banner_path %>
+<%= link_to 'New Banner', new_image_banner_path %>

data/app/views/banner_lite/{banners → image_banners}/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', banners_path %>
+<%= link_to 'Back', image_banners_path %>

data/app/views/banner_lite/image_banners/preview.html.erb

@@ -0,0 +1 @@
+<%= image_banners %>

data/app/views/banner_lite/{banners → image_banners}/show.html.erb

@@ -21,5 +21,5 @@
   <%= @banner.active_until %>
 </p>
 
-<%= link_to 'Edit', edit_banner_path(@banner) %> |
-<%= link_to 'Back', banners_path %>
+<%= link_to 'Edit', edit_image_banner_path(@banner) %> |
+<%= link_to 'Back', image_banners_path %>

data/app/views/banner_lite/text_banners/_form.html.erb

@@ -0,0 +1,33 @@
+<%= form_for(@text_banner) do |f| %>
+  <% if @text_banner.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@text_banner.errors.count, "error") %> prohibited this text_banner from being saved:</h2>
+
+      <ul>
+      <% @text_banner.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :url %><br>
+    <%= f.text_field :url %>
+  </div>
+  <div class="field">
+    <%= f.label :active_from %><br>
+    <%= f.datetime_select :active_from %>
+  </div>
+  <div class="field">
+    <%= f.label :active_until %><br>
+    <%= f.datetime_select :active_until %>
+  </div>
+  <div class="field">
+    <%= f.label :text %><br>
+    <%= f.text_field :text %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/banner_lite/text_banners/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing text_banner</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @text_banner %> |
+<%= link_to 'Back', text_banners_path %>

data/app/views/banner_lite/text_banners/index.html.erb

@@ -0,0 +1,31 @@
+<h1>Listing text_banners</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Url</th>
+      <th>Active from</th>
+      <th>Active until</th>
+      <th>Text</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @text_banners.each do |text_banner| %>
+      <tr>
+        <td><%= text_banner.url %></td>
+        <td><%= text_banner.active_from %></td>
+        <td><%= text_banner.active_until %></td>
+        <td><%= text_banner.text %></td>
+        <td><%= link_to 'Show', text_banner %></td>
+        <td><%= link_to 'Edit', edit_text_banner_path(text_banner) %></td>
+        <td><%= link_to 'Destroy', text_banner, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Text banner', new_text_banner_path %>

data/app/views/banner_lite/text_banners/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New text_banner</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', text_banners_path %>

data/app/views/banner_lite/text_banners/preview.html.erb

@@ -0,0 +1 @@
+<%= text_banners %>

data/app/views/banner_lite/text_banners/show.html.erb

@@ -0,0 +1,24 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Url:</strong>
+  <%= @text_banner.url %>
+</p>
+
+<p>
+  <strong>Active from:</strong>
+  <%= @text_banner.active_from %>
+</p>
+
+<p>
+  <strong>Active until:</strong>
+  <%= @text_banner.active_until %>
+</p>
+
+<p>
+  <strong>Banner text:</strong>
+  <%= @text_banner.text %>
+</p>
+
+<%= link_to 'Edit', edit_text_banner_path(@text_banner) %> |
+<%= link_to 'Back', text_banners_path %>

data/config/routes.rb

@@ -1,5 +1,10 @@
 BannerLite::Engine.routes.draw do
-  resources :banners do
+  resources :image_banners do
+    collection do
+      get 'preview'
+    end
+  end
+  resources :text_banners do
     collection do
       get 'preview'
     end

data/db/migrate/20140901033058_add_banner_text_to_banner_lite_banners.rb

@@ -0,0 +1,13 @@
+class AddBannerTextToBannerLiteBanners < ActiveRecord::Migration
+  def up
+    add_column :banner_lite_banners, :text, :string
+    add_column :banner_lite_banners, :type, :string
+
+    ::BannerLite::Banner.update_all(type: 'BannerLite::ImageBanner')
+  end
+
+  def down
+    remove_column :banner_lite_banners, :text
+    remove_column :banner_lite_banners, :type
+  end
+end

data/lib/banner_lite/engine.rb

@@ -3,7 +3,8 @@ module BannerLite
     isolate_namespace BannerLite
 
     config.generators do |g|
-      g.test_framework :rspec
+      g.test_framework :rspec, fixture: false
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
     end
   end
 end

data/lib/banner_lite/version.rb

@@ -1,3 +1,3 @@
 module BannerLite
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/controllers/banner_lite/image_banners_controller_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+module BannerLite
+  describe ImageBannersController do
+    routes { BannerLite::Engine.routes }
+
+    let(:valid_attributes) { {
+      "url" => "MyString",
+      "file" => Rack::Test::UploadedFile.new(File.expand_path('../../../fixtures/files/dummy.png', __FILE__), 'image/jpeg'),
+    } }
+    let(:valid_session) { {} }
+
+    describe "GET index" do
+      it "assigns all banners as @banners" do
+        banner = ImageBanner.create! valid_attributes
+        get :index, {}, valid_session
+        assigns(:banners).should eq([banner])
+      end
+    end
+
+    describe "GET show" do
+      it "assigns the requested banner as @banner" do
+        banner = ImageBanner.create! valid_attributes
+        get :show, {:id => banner.to_param}, valid_session
+        assigns(:banner).should eq(banner)
+      end
+    end
+
+    describe "GET new" do
+      it "assigns a new banner as @banner" do
+        get :new, {}, valid_session
+        assigns(:banner).should be_a_new(ImageBanner)
+      end
+    end
+
+    describe "GET edit" do
+      it "assigns the requested banner as @banner" do
+        banner = ImageBanner.create! valid_attributes
+        get :edit, {:id => banner.to_param}, valid_session
+        assigns(:banner).should eq(banner)
+      end
+    end
+
+    describe "POST create" do
+      describe "with valid params" do
+        it "creates a new ImageBanner" do
+          expect {
+            post :create, {:image_banner => valid_attributes}, valid_session
+          }.to change(ImageBanner, :count).by(1)
+        end
+
+        it "assigns a newly created banner as @banner" do
+          post :create, {:image_banner => valid_attributes}, valid_session
+          assigns(:banner).should be_a(ImageBanner)
+          assigns(:banner).should be_persisted
+        end
+
+        it "redirects to the created banner" do
+          post :create, {:image_banner => valid_attributes}, valid_session
+          response.should redirect_to(ImageBanner.last)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved banner as @banner" do
+          # Trigger the behavior that occurs when invalid params are submitted
+          ImageBanner.any_instance.stub(:save).and_return(false)
+          post :create, {:image_banner => { "url" => "invalid value" }}, valid_session
+          assigns(:banner).should be_a_new(ImageBanner)
+        end
+
+        it "re-renders the 'new' template" do
+          # Trigger the behavior that occurs when invalid params are submitted
+          ImageBanner.any_instance.stub(:save).and_return(false)
+          post :create, {:image_banner => { "url" => "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 banner" do
+          banner = ImageBanner.create! valid_attributes
+          # Assuming there are no other banners in the database, this
+          # specifies that the ImageBanner created on the previous line
+          # receives the :update_attributes message with whatever params are
+          # submitted in the request.
+          ImageBanner.any_instance.should_receive(:update).with({ "url" => "MyString" })
+          put :update, {:id => banner.to_param, :image_banner => { "url" => "MyString" }}, valid_session
+        end
+
+        it "assigns the requested banner as @banner" do
+          banner = ImageBanner.create! valid_attributes
+          put :update, {:id => banner.to_param, :image_banner => valid_attributes}, valid_session
+          assigns(:banner).should eq(banner)
+        end
+
+        it "redirects to the banner" do
+          banner = ImageBanner.create! valid_attributes
+          put :update, {:id => banner.to_param, :image_banner => valid_attributes}, valid_session
+          response.should redirect_to(banner)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the banner as @banner" do
+          banner = ImageBanner.create! valid_attributes
+          # Trigger the behavior that occurs when invalid params are submitted
+          ImageBanner.any_instance.stub(:save).and_return(false)
+          put :update, {:id => banner.to_param, :image_banner => { "url" => "invalid value" }}, valid_session
+          assigns(:banner).should eq(banner)
+        end
+
+        it "re-renders the 'edit' template" do
+          banner = ImageBanner.create! valid_attributes
+          # Trigger the behavior that occurs when invalid params are submitted
+          ImageBanner.any_instance.stub(:save).and_return(false)
+          put :update, {:id => banner.to_param, :image_banner => { "url" => "invalid value" }}, valid_session
+          response.should render_template("edit")
+        end
+      end
+    end
+
+    describe "DELETE destroy" do
+      it "destroys the requested banner" do
+        banner = ImageBanner.create! valid_attributes
+        expect {
+          delete :destroy, {:id => banner.to_param}, valid_session
+        }.to change(ImageBanner, :count).by(-1)
+      end
+
+      it "redirects to the banners list" do
+        banner = ImageBanner.create! valid_attributes
+        delete :destroy, {:id => banner.to_param}, valid_session
+        response.should redirect_to(image_banners_url)
+      end
+    end
+
+  end
+end