dorsale 1.1.4 → 1.2.0

data/spec/models/dorsale/address_spec.rb

@@ -2,33 +2,43 @@ require 'rails_helper'
 
 module Dorsale
   RSpec.describe Address, :type => :model do
-    it {should validate_presence_of :city}
-    it {should belong_to :addressable}
+    it { should belong_to :addressable }
+    it { should validate_presence_of :addressable }
+
     describe '#one_line' do
       it 'should build a one line address' do
-        address = Address.create(street: '3 Rue Marx Dormoy', 
-                                 street_bis: 'L\'atelier',
-                                 zip: '13004',
-                                 city: 'Marseille', 
-                                 country: 'France')
+        address = Address.create(
+          street:     '3 Rue Marx Dormoy',
+          street_bis: 'L\'atelier',
+          zip:        '13004',
+          city:       'Marseille',
+          country:    'France'
+        )
+
         expect(address.one_line).to eq('3 Rue Marx Dormoy, L\'atelier, 13004 Marseille, France')
       end
 
       it 'should remove useless commas' do
-        address = Address.create(street: '3 Rue Marx Dormoy', 
-                                 street_bis: '',
-                                 zip: '13004',
-                                 city: 'Marseille', 
-                                 country: '')
+        address = Address.create(
+          street:     '3 Rue Marx Dormoy',
+          street_bis: '',
+          zip:        '13004',
+          city:       'Marseille',
+          country:    ''
+        )
+
         expect(address.one_line).to eq('3 Rue Marx Dormoy, 13004 Marseille')
       end
 
       it 'should remove useless commas' do
-        address = Address.create(street: '3 Rue Marx Dormoy', 
-                                 street_bis: '',
-                                 zip: '',
-                                 city: 'Marseille', 
-                                 country: '')
+        address = Address.create(
+          street:     '3 Rue Marx Dormoy',
+          street_bis: '',
+          zip:        '',
+          city:       'Marseille',
+          country:    ''
+        )
+
         expect(address.one_line).to eq('3 Rue Marx Dormoy, Marseille')
       end
     end

data/spec/models/dorsale/small_data/filter_spec.rb

@@ -0,0 +1,45 @@
+require "rails_helper"
+
+module Dorsale
+  describe SmallData::Filter do
+    let(:jar)    { {} }
+    let(:filter) { {"name" => "bidule"} }
+    let(:f)      { Dorsale::SmallData::Filter.new(jar) }
+
+    describe "store" do
+      it "should store the provided hash as json in the jar" do
+        f.store(filter)
+        expect(jar["filters"]).to eq filter.to_json
+      end
+    end
+
+    describe "read" do
+      it "should read stored filters" do
+        f.store(filter)
+        expect(f.read).to eq(filter)
+      end
+      it "should return empty hash by default" do
+        expect(f.read).to eq({})
+      end
+      it "should return empty hash on invalid json" do
+        jar["filters"] = "ce json est invalide"
+        expect(f.read).to eq({})
+      end
+    end
+
+    describe "get" do
+      it "should return the value" do
+        f.store(filter)
+        expect(f.get("name")).to eq("bidule")
+      end
+    end
+
+    describe "set" do
+      it "should set the value" do
+        f.store(filter)
+        f.set("new", "truc")
+        expect(f.get("new")).to eq("truc")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -270,7 +270,6 @@ files:
 - app/assets/stylesheets/dorsale/forms.sass
 - app/assets/stylesheets/dorsale/styles.sass
 - app/assets/stylesheets/dorsale/tables.sass
-- app/controllers/dorsale/addresses_controller.rb
 - app/controllers/dorsale/application_controller.rb
 - app/controllers/dorsale/comments_controller.rb
 - app/controllers/dorsale/small_data/filters_controller.rb
@@ -288,12 +287,7 @@ files:
 - app/views/dorsale/_actions.html.slim
 - app/views/dorsale/_contextual.html.slim
 - app/views/dorsale/_flash.html.slim
-- app/views/dorsale/addresses/_form.html.slim
-- app/views/dorsale/addresses/_nested_form.html.slim
-- app/views/dorsale/addresses/edit.html.slim
-- app/views/dorsale/addresses/index.html.slim
-- app/views/dorsale/addresses/new.html.slim
-- app/views/dorsale/addresses/show.html.slim
+- app/views/dorsale/comments/_comment.html.slim
 - app/views/dorsale/comments/_comments.html.slim
 - app/views/dorsale/comments/_form.html.slim
 - config/locales/fr.yml
@@ -312,7 +306,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- spec/controllers/dorsale/addresses_controller_spec.rb
+- spec/controllers/dorsale/small_data/filters_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -341,7 +335,6 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -351,14 +344,10 @@ files:
 - spec/dummy/README.rdoc
 - spec/factories/dorsale_addresses.rb
 - spec/models/dorsale/address_spec.rb
+- spec/models/dorsale/small_data/filter_spec.rb
 - spec/rails_helper.rb
-- spec/routing/dorsale/addresses_routing_spec.rb
 - spec/routing/dorsale/small_data_routing_spec.rb
 - spec/spec_helper.rb
-- spec/views/dorsale/addresses/edit.html.slim_spec.rb
-- spec/views/dorsale/addresses/index.html.slim_spec.rb
-- spec/views/dorsale/addresses/new.html.slim_spec.rb
-- spec/views/dorsale/addresses/show.html.slim_spec.rb
 homepage: https://github.com/agilidee/dorsale
 licenses: []
 post_install_message: 
@@ -373,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2165199409979397592
+      hash: 3070631001148619015
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -382,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2165199409979397592
+      hash: 3070631001148619015
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2
@@ -390,7 +379,7 @@ signing_key:
 specification_version: 3
 summary: Modular ERP made with Ruby on Rails
 test_files:
-- spec/controllers/dorsale/addresses_controller_spec.rb
+- spec/controllers/dorsale/small_data/filters_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -419,7 +408,6 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -429,11 +417,7 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/factories/dorsale_addresses.rb
 - spec/models/dorsale/address_spec.rb
+- spec/models/dorsale/small_data/filter_spec.rb
 - spec/rails_helper.rb
-- spec/routing/dorsale/addresses_routing_spec.rb
 - spec/routing/dorsale/small_data_routing_spec.rb
 - spec/spec_helper.rb
-- spec/views/dorsale/addresses/edit.html.slim_spec.rb
-- spec/views/dorsale/addresses/index.html.slim_spec.rb
-- spec/views/dorsale/addresses/new.html.slim_spec.rb
-- spec/views/dorsale/addresses/show.html.slim_spec.rb

data/app/controllers/dorsale/addresses_controller.rb

@@ -1,62 +0,0 @@
-require_dependency "dorsale/application_controller"
-
-module Dorsale
-  class AddressesController < ApplicationController
-    before_action :set_address, only: [:show, :edit, :update, :destroy]
-
-    # GET /addresses
-    def index
-      @addresses = Address.all
-    end
-
-    # GET /addresses/1
-    def show
-    end
-
-    # GET /addresses/new
-    def new
-      @address = Address.new
-    end
-
-    # GET /addresses/1/edit
-    def edit
-    end
-
-    # POST /addresses
-    def create
-      @address = Address.new(address_params)
-
-      if @address.save
-        redirect_to @address, notice: 'Address was successfully created.'
-      else
-        render action: 'new'
-      end
-    end
-
-    # PATCH/PUT /addresses/1
-    def update
-      if @address.update(address_params)
-        redirect_to [dorsale, @address], notice: 'Address was successfully updated.'
-      else
-        render action: 'edit'
-      end
-    end
-
-    # DELETE /addresses/1
-    def destroy
-      @address.destroy
-      redirect_to dorsale.addresses_url, notice: 'Address was successfully destroyed.'
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_address
-        @address = Address.find(params[:id])
-      end
-
-      # Only allow a trusted parameter "white list" through.
-      def address_params
-        params.require(:address).permit(:street, :street_bis, :city, :zip, :country)
-      end
-  end
-end

data/app/views/dorsale/addresses/_form.html.slim

@@ -1,11 +0,0 @@
-= form_for [dorsale, @address] do |f|
-  - if @address.errors.any?
-    #error_explanation
-      h2 = "#{pluralize(@address.errors.count, "error")} prohibited this address from being saved:"
-      ul
-        - @address.errors.full_messages.each do |message|
-          li = message
-  
-  = render partial: 'dorsale/addresses/nested_form', :locals => {:f => f}
- 
-  .actions = f.submit 'Save'

data/app/views/dorsale/addresses/_nested_form.html.slim

@@ -1,20 +0,0 @@
-.form-group
-  = f.label "Street", class:"control-label col-lg-2"
-  div class="col-lg-10"
-    = f.text_field :street, class:"form-control"
-.form-group
-  = f.label "Street bis", class:"control-label col-lg-2"
-  div class="col-lg-10"
-    = f.text_field :street_bis, class:"form-control"
-.form-group
-  = f.label "zip", class:"control-label col-lg-2"
-  div class="col-lg-10"
-    = f.text_field :zip, class:"form-control"
-.form-group
-  = f.label "city", class:"control-label col-lg-2"
-  div class="col-lg-10"
-    = f.text_field :city, class:"form-control"
-.form-group
-  = f.label "country", class:"control-label col-lg-2"
-  div class="col-lg-10"
-    = f.text_field :country, class:"form-control"

data/app/views/dorsale/addresses/edit.html.slim

@@ -1,8 +0,0 @@
-h1 Editing address
-
-== render 'form'
-
-= link_to 'Show', [dorsale, @address]
-'|
-= link_to 'Back', dorsale.addresses_path
-

data/app/views/dorsale/addresses/index.html.slim

@@ -1,29 +0,0 @@
-h1 Listing addresses
-
-table
-  thead
-    tr
-      th Street
-      th Street bis
-      th City
-      th Zip
-      th Country
-      th
-      th
-      th
-
-  tbody
-    - @addresses.each do |address|
-      tr
-        td = address.street
-        td = address.street_bis
-        td = address.city
-        td = address.zip
-        td = address.country
-        td = link_to 'Show', [dorsale, address]
-        td = link_to 'Edit', dorsale.edit_address_path(address)
-        td = link_to 'Destroy', [dorsale, address], data: {:confirm => 'Are you sure?'}, :method => :delete
-
-br
-
-= link_to 'New Address', dorsale.new_address_path

data/app/views/dorsale/addresses/new.html.slim

@@ -1,5 +0,0 @@
-h1 New address
-
-== render 'form'
-
-= link_to 'Back', dorsale.addresses_path

data/app/views/dorsale/addresses/show.html.slim

@@ -1,21 +0,0 @@
-p#notice = notice
-
-p
-  strong Street:
-  = @address.street
-p
-  strong Street bis:
-  = @address.street_bis
-p
-  strong City:
-  = @address.city
-p
-  strong Zip:
-  = @address.zip
-p
-  strong Country:
-  = @address.country
-
-= link_to 'Edit', dorsale.edit_address_path(@address)
-'|
-= link_to 'Back', dorsale.addresses_path

data/spec/controllers/dorsale/addresses_controller_spec.rb

@@ -1,162 +0,0 @@
-require 'rails_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.
-
-module Dorsale
-  RSpec.describe AddressesController, :type => :controller do
-    routes { Dorsale::Engine.routes }
-
-    # This should return the minimal set of attributes required to create a valid
-    # Address. As you add validations to Address, be sure to
-    # adjust the attributes here as well.
-    let(:valid_attributes) {
-      FactoryGirl.attributes_for(:dorsale_address)
-    }
-
-    let(:invalid_attributes) {
-      {city: ''}
-    }
-
-    # 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
-    # AddressesController. Be sure to keep this updated too.
-    let(:valid_session) { {} }
-
-    describe "GET index" do
-      it "assigns all addresses as @addresses" do
-        address = Address.create! valid_attributes
-        get :index, {}, valid_session
-        expect(assigns(:addresses)).to eq([address])
-      end
-    end
-
-    describe "GET show" do
-      it "assigns the requested address as @address" do
-        address = Address.create! valid_attributes
-        get :show, {:id => address.to_param}, valid_session
-        expect(assigns(:address)).to eq(address)
-      end
-    end
-
-    describe "GET new" do
-      it "assigns a new address as @address" do
-        get :new, {}, valid_session
-        expect(assigns(:address)).to be_a_new(Address)
-      end
-    end
-
-    describe "GET edit" do
-      it "assigns the requested address as @address" do
-        address = Address.create! valid_attributes
-        get :edit, {:id => address.to_param}, valid_session
-        expect(assigns(:address)).to eq(address)
-      end
-    end
-
-    describe "POST create" do
-      describe "with valid params" do
-        it "creates a new Address" do
-          expect {
-            post :create, {:address => valid_attributes}, valid_session
-          }.to change(Address, :count).by(1)
-        end
-
-        it "assigns a newly created address as @address" do
-          post :create, {:address => valid_attributes}, valid_session
-          expect(assigns(:address)).to be_a(Address)
-          expect(assigns(:address)).to be_persisted
-        end
-
-        it "redirects to the created address" do
-          post :create, {:address => valid_attributes}, valid_session
-          expect(response).to redirect_to(Address.last)
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved address as @address" do
-          post :create, {:address => invalid_attributes}, valid_session
-          expect(assigns(:address)).to be_a_new(Address)
-        end
-
-        it "re-renders the 'new' template" do
-          post :create, {:address => invalid_attributes}, valid_session
-          expect(response).to render_template("new")
-        end
-      end
-    end
-
-    describe "PUT update" do
-      describe "with valid params" do
-        let(:new_attributes) {
-          {city: 'new city'}
-        }
-
-        it "updates the requested address" do
-          address = Address.create! valid_attributes
-          put :update, {:id => address.to_param, :address => new_attributes}, valid_session
-          address.reload
-          expect(address.city).to eq('new city')
-        end
-
-        it "assigns the requested address as @address" do
-          address = Address.create! valid_attributes
-          put :update, {:id => address.to_param, :address => valid_attributes}, valid_session
-          expect(assigns(:address)).to eq(address)
-        end
-
-        it "redirects to the address" do
-          address = Address.create! valid_attributes
-          put :update, {:id => address.to_param, :address => valid_attributes}, valid_session
-          expect(response).to redirect_to(address)
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns the address as @address" do
-          address = Address.create! valid_attributes
-          put :update, {:id => address.to_param, :address => invalid_attributes}, valid_session
-          expect(assigns(:address)).to eq(address)
-        end
-
-        it "re-renders the 'edit' template" do
-          address = Address.create! valid_attributes
-          put :update, {:id => address.to_param, :address => invalid_attributes}, valid_session
-          expect(response).to render_template("edit")
-        end
-      end
-    end
-
-    describe "DELETE destroy" do
-      it "destroys the requested address" do
-        address = Address.create! valid_attributes
-        expect {
-          delete :destroy, {:id => address.to_param}, valid_session
-        }.to change(Address, :count).by(-1)
-      end
-
-      it "redirects to the addresses list" do
-        address = Address.create! valid_attributes
-        delete :destroy, {:id => address.to_param}, valid_session
-        expect(response).to redirect_to(addresses_url)
-      end
-    end
-
-  end
-end